1
0

112 Commits 372726adee ... 2fb75ce2f6

Autor SHA1 Mensagem Data
  alecsp 2fb75ce2f6 Changed STD appearance penalty, considering only visible sympthoms há 2 anos atrás
  alecsp 681f492820 Merge branch 'original-master' into mine há 2 anos atrás
  Kevin_Smarts f587c92257 [fixed] Terminology correction as my skirt length expertise is offensively bad há 2 anos atrás
  Kevin_Smarts e0357711fd Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' há 2 anos atrás
  Kevin_Smarts 94a1c4ba09 [fixed] Set return locations wrong way around há 2 anos atrás
  Kevin_Smarts 384fea00d1 [fixed] Phone can only ring if the menu is on so it can't interupt events há 2 anos atrás
  bgkjdgbizgblzdgbr 55a3898a66 [changed] Chenged the Katja Ivan school scene to be an anal only scene. New sexscene by nutluck. há 2 anos atrás
  Kevin_Smarts 52a5d1d9f3 [fixed] Tidied up the tables in the intro customisation há 2 anos atrás
  Kevin_Smarts ccf48e20bc [fixed] Use of $loc_arg in customisation overwriting return code há 2 anos atrás
  Kevin_Smarts d74be4f19b [fixed] Additional gt messing up city starts há 2 anos atrás
  Kevin_Smarts 67bc51be9f [fixed] Casting file not on .qproj há 2 anos atrás
  Kevin_Smarts 2a33dc28d4 [changed] Increased number of purses in Nerdvana as per request from Gwen há 2 anos atrás
  Kevin_Smarts 55541747b9 [changed] Just neateed up and sped up the tailor, plus made both tailors aware of you current clothing if it already fits well há 2 anos atrás
  bgkjdgbizgblzdgbr dff852a1b9 [changed] Changed the running at the school sport facility to use the proper exercise gosub. há 2 anos atrás
  Kevin_Smarts 0931d1820f [fixed] Cum eater was using old swallow variable and not stat['swallow'] há 2 anos atrás
  Kevin_Smarts def72d2493 Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' há 2 anos atrás
  Kevin_Smarts b510cc911b Merge remote-tracking branch 'netuttki/master' há 2 anos atrás
  Kevin_Smarts 2a576b6f33 [changed] Small cosmetic change in sg_tg intro há 2 anos atrás
  bgkjdgbizgblzdgbr 5e0a877c7d [chenged] Change some images that weren't appropriate. (Chois of images by nutluck) há 2 anos atrás
  bgkjdgbizgblzdgbr 98e5ae9eda [fixxed] Missung *clr & cla há 2 anos atrás
  Netuttki 8dfaddf7a9 Fixed the remaining storyline ! 0 check for Uncle Misha há 2 anos atrás
  Netuttki ce0367d225 Made the 'work_floor' part more sensible há 2 anos atrás
  Netuttki 71663951a1 Merge remote-tracking branch 'upstream/master' há 2 anos atrás
  Kevin_Smarts 6baa0da387 [fixed] redundant end and missing colon há 2 anos atrás
  Netuttki 6057638937 Merge remote-tracking branch 'upstream/master' há 2 anos atrás
  Anya c83d5aa4e2 [Changed] Made the Mom relationship choice in the new intros a little more obvious há 2 anos atrás
  Kevin_Smarts c174ec786f Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' há 2 anos atrás
  Vengeance11 2c8dfaec33 Minor text edits há 2 anos atrás
  Netuttki 91f3624ebb Merge remote-tracking branch 'upstream/master' há 2 anos atrás
  bgkjdgbizgblzdgbr 5e76bc62b7 [fixed] Missing *clr & cla could lead to multiple pictures being showen on the screen. há 2 anos atrás
  Kevin_Smarts 4635cf8262 [fixed] Uses of old check for swimwear purged with fire!!! há 2 anos atrás
  Netuttki 8adbf64b4b Merge remote-tracking branch 'upstream/master' há 2 anos atrás
  Kevin_Smarts 06c8b5744d Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' há 2 anos atrás
  Kevin_Smarts 3321c39519 [fixed] Couldn't do sg_m start as I hadn't added split and was overwriting the start type há 2 anos atrás
  bgkjdgbizgblzdgbr 7d8217db3b [fixed/added] Some grade combinantions fell between the descriptions of how you are doing and gave impressions of the player doing worse than the were. So added some more descriptions to close these gabs. há 2 anos atrás
  bgkjdgbizgblzdgbr 6c2a662b6d [fixed] Some fixes to the Katja journal quest discription and a missing > which meant that the Katja Ivan lake scene was not repeateble, which it should be. há 2 anos atrás
  Kevin_Smarts f25ba2b667 [fixed] Image filename mismatch há 2 anos atrás
  Kevin_Smarts 01a500d502 Merge branch 'master' of https://git.catrenelle.com/Vengeance_11/glife há 2 anos atrás
  Vengeance11 8004e1c6eb Text edits to intros há 2 anos atrás
  Netuttki c8ce571cff Merge remote-tracking branch 'upstream/master' há 2 anos atrás
  Kevin_Smarts a717ef9a7e [fixed] SG_TG start wasn't initialised so lots of things were broken, the sg specific option in customisation were not set to display in menu correctly and the $loc_args was being overwritten in relationship customisation há 2 anos atrás
  Kevin_Smarts 9487457c6e [fixed] Appearnce value was starting way too high and system now re-initialises to correct for this há 2 anos atrás
  Kevin_Smarts 147743ad8c [fixed] Re-ordered the hair customisation to exactly match the face_image function as it had a 2pt error in it through terrible maths há 2 anos atrás
  Kevin_Smarts 63117ad8f2 Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' há 2 anos atrás
  alecsp 4a6ef0eec9 Merge branch 'original-master' into mine há 2 anos atrás
  rachels 34fa698689 use the standing variable name há 2 anos atrás
  bgkjdgbizgblzdgbr ce6156c43b [fixed] Somebosy can't read the file there are editing and henc get the links wrong. há 2 anos atrás
  Vengeance11 9614ccb8ce Proofreading há 2 anos atrás
  Kevin_Smarts a7a93b2ff5 [changed] City start school group options with updated text and code by nutluck and Vengeance11 há 2 anos atrás
  Kevin_Smarts f6369ce0fc [fixed] A number of other uses of storyline variable updated to new starting variable check há 2 anos atrás
  Kevin_Smarts 5c6102faaf [added] Additional release so Sveta can orgasm if very horny even if she has built up to it. há 2 anos atrás
  Kevin_Smarts f822cbc78e [changed] Setting for school starts in itros changed by nutluck (should have been this and not the last file which will get redone) há 2 anos atrás
  Kevin_Smarts 88c3b336be [changed] Updated data for school option for city starts from nutluck há 2 anos atrás
  Kevin_Smarts 185516c123 [fixed] couple of old links and some name unity for starts há 2 anos atrás
  Kevin_Smarts 76545ca840 [removed] The old pre... files and a couple of bad lines of code in new intro files há 2 anos atrás
  Kevin_Smarts 81568d0151 [fixed] Set home and removed a rogue $start_type variable há 2 anos atrás
  Kevin_Smarts 77cdd74875 Merge remote-tracking branch 'origin/master' há 2 anos atrás
  Kevin_Smarts d770c1a417 Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' há 2 anos atrás
  Kevin_Smarts 597d5081d9 [changed] updated all teh flags for game start types so things like magic and magic story line will not seep in to teh regular game. Also removed teh storyline alternatives so that all Sveta's now have ties back to Pav há 2 anos atrás
  rachels 1e3069529e remove the rest of obsolete variables há 2 anos atrás
  rachels bd5f32600e remove variables flex, stamina, and intel há 2 anos atrás
  rachels 83567b913d remove variable musle há 2 anos atrás
  rachels 40a9217a6d remove varible "wipo" há 2 anos atrás
  bgkjdgbizgblzdgbr eb59b7a9fc [fixed] Missing reseting of Katja's hornyness after the disco threeseome with Marcus. há 2 anos atrás
  bgkjdgbizgblzdgbr 0b967fbdc4 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife há 2 anos atrás
  bgkjdgbizgblzdgbr 5e4354ec0f [textedits] Fixing some gramar mistakes. há 2 anos atrás
  rachels c533e9375f use faster method há 2 anos atrás
  rachels de2334c9b6 fix typos há 2 anos atrás
  Kevin_Smarts 1ecdea1b4f [fixed] missing apostrophes há 2 anos atrás
  Kevin_Smarts 9d690265aa Merge remote-tracking branch 'origin/master' há 2 anos atrás
  Kevin_Smarts 34d3055f00 [fixed] Could select more than one start há 2 anos atrás
  Vengeance11 e6d2212787 Proofreading há 2 anos atrás
  Kevin_Smarts 52116c4d31 Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' há 2 anos atrás
  bgkjdgbizgblzdgbr bcd1c14b8f [fixed/texedit] Added an uodate to the savegame updater such taht christinas chat command will point to the correct place even if she is an outcast. Also some text eddit to her chat. há 2 anos atrás
  Vengeance11 0860a75866 Text edits to make Albina's beach chat more location accurate há 2 anos atrás
  bgkjdgbizgblzdgbr 03697034b0 [fixed] Somebody forgot to update the links gschool_events1 just after adding the file. há 2 anos atrás
  rachels 3a20cb175e Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife.git há 2 anos atrás
  rachels 586748128f fix typos há 2 anos atrás
  Kevin_Smarts ca0f6ddf80 [added] Code for changes from Veng há 2 anos atrás
  Kevin_Smarts d85998b431 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife há 2 anos atrás
  Kevin_Smarts 578ff6f163 [fixed] no more summer hoiliday message repeating if you change hair or eyes há 2 anos atrás
  Vengeance11 98ce400825 Text edits há 2 anos atrás
  Kevin_Smarts c36f50c2e6 [fixed] Custom hair fixed and intro music will play through the whole intro again há 2 anos atrás
  Kevin_Smarts 0334be717c [fixed] Needed to set args for next block há 2 anos atrás
  Kevin_Smarts d2ebdc2d6a Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' há 2 anos atrás
  Kevin_Smarts db94fb1768 Merge remote-tracking branch 'Anya/master' há 2 anos atrás
  Kevin_Smarts 1633322277 [fixed] Hair and eye edits were only showing fixed avatar regardless of player choice há 2 anos atrás
  Kevin_Smarts b83849415a [fixed] a number of location issues in the selection and customization files há 2 anos atrás
  bgkjdgbizgblzdgbr 0231060765 [chenged/added] New Katja chat at the disco, including a threesome she with her and Marcus. Splitt the pav_disco_coolkids since to was becomming to big. há 2 anos atrás
  Kevin_Smarts 554edb18bc [fixed] Birthday setting was leading to blank screen há 2 anos atrás
  Anya 2410c959db [Changed] new cars and some replacements of cars by Black Onix há 2 anos atrás
  bgkjdgbizgblzdgbr 39ba387ed9 [Changed] Some changes to the butt garab events in the school by nutluck. há 2 anos atrás
  bgkjdgbizgblzdgbr 7f133dddc3 [Changed] Sveta can now only enroll in uinversity from May to August há 2 anos atrás
  rachels 86959aad7c Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife.git há 2 anos atrás
  rachels 18ced3eed4 add nerd game chat and more like sms invitation há 2 anos atrás
  Kevin_Smarts e84d3798e7 [fixes] A few more fixes and tweaks. Should all be working now há 2 anos atrás
  Kevin_Smarts 71d6be9964 [fixed] Body_shape rename updated in city initialization há 2 anos atrás
  Kevin_Smarts 1afe6db43c Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife há 2 anos atrás
  Kevin_Smarts bad08589d5 [added] New begin selector and various changes but need to commit them first so I can pull rachels fixes so I can test it further há 2 anos atrás
  rachels d4d5a6cc83 fix typos and simplify the elseif conditions há 2 anos atrás
  rachels 176bbfc233 fix typos há 2 anos atrás
  Kevin_Smarts a711cd7ffe Merge remote-tracking branch 'ADCSux/master' há 2 anos atrás
  ADCSux a628f6dc23 [Fixed] Fixed Niko dates in table view há 2 anos atrás
  bgkjdgbizgblzdgbr 8ef90debbe Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife há 2 anos atrás
  bgkjdgbizgblzdgbr 8ebddc49ff [changed] The gossip in the school halway will now use the gossip pictures instead of the hallway picture for the morning gossip. Also fixed it such that you will only hear each dyle rumor once. há 2 anos atrás
  ADCSux bdad598487 Merge branch 'working' há 2 anos atrás
  ADCSux 68fe7fbaad [Fixed] Fixed city hotel pictures há 2 anos atrás
  ADCSux 0ea00cb8ea [Fixed] Fixed room description at Pav hotel há 2 anos atrás
  ADCSux 52cf553815 [Added] Added a feature to rent a room at the hotel in city center há 2 anos atrás
  ADCSux 097c679a17 [Refactored] Refactored renting a room feature at pav hotel so it can be reused há 2 anos atrás
  ADCSux 3dfb1f771f [Renamed] Renamed Pav hotel file names to make it more clear há 2 anos atrás
  ADCSux 1fc02d70f4 [Renamed] Renamed hotel.qsrc to city_hotel.qsrc to avoid confusion with pav hotel há 2 anos atrás
100 ficheiros alterados com 3777 adições e 3239 exclusões
  1. 3 0
      changes from 0_8_5 to 0_8_6.txt
  2. 12 15
      glife.qproj
  3. 46 15
      locations/ApperanceSystem.qsrc
  4. 5 5
      locations/Cheatmenu_din.qsrc
  5. 3 5
      locations/FedorMisc.qsrc
  6. 15 21
      locations/HotelRoom.qsrc
  7. 439 391
      locations/KatjaHomeTalk.qsrc
  8. 21 3
      locations/Katja_Tanga.qsrc
  9. 1 1
      locations/Komp.qsrc
  10. 1 1
      locations/MartinSex.qsrc
  11. 3 3
      locations/MartinTalk.qsrc
  12. 3 3
      locations/TV.qsrc
  13. 1 1
      locations/_body_image.qsrc
  14. 2 2
      locations/_difficulty.qsrc
  15. 38 32
      locations/albina_chat.qsrc
  16. 36 37
      locations/albina_house_events.qsrc
  17. 1 1
      locations/albina_school_sex.qsrc
  18. 3 8
      locations/alexandriaEv.qsrc
  19. 4 1
      locations/arousal.qsrc
  20. 70 70
      locations/autosalonF.qsrc
  21. 22 17
      locations/bed2.qsrc
  22. 1 1
      locations/bedrPar.qsrc
  23. 95 308
      locations/begin.qsrc
  24. 0 3
      locations/body.qsrc
  25. 66 66
      locations/body_desc.qsrc
  26. 2 2
      locations/booty_call.qsrc
  27. 3 3
      locations/booty_call_after.qsrc
  28. 1 1
      locations/booty_call_morning.qsrc
  29. 1 1
      locations/brothel.qsrc
  30. 2 2
      locations/budilnik.qsrc
  31. 2 2
      locations/buklinik.qsrc
  32. 0 1
      locations/carF.qsrc
  33. 10 10
      locations/carF1.qsrc
  34. 1 1
      locations/cikl.qsrc
  35. 1 1
      locations/city_center.qsrc
  36. 1 1
      locations/city_drugden.qsrc
  37. 175 0
      locations/city_hotel.qsrc
  38. 2 2
      locations/city_industrial.qsrc
  39. 11 0
      locations/city_island.qsrc
  40. 12 7
      locations/city_market.qsrc
  41. 1 0
      locations/city_nightclub.qsrc
  42. 5 3
      locations/city_sauna.qsrc
  43. 1 1
      locations/city_trashplace.qsrc
  44. 1 1
      locations/clothing.qsrc
  45. 1 1
      locations/clothing_QV.qsrc
  46. 1 1
      locations/clothing_descriptions.qsrc
  47. 1 1
      locations/cum_call.qsrc
  48. 0 1
      locations/danceGev.qsrc
  49. 67 65
      locations/din_bad.qsrc
  50. 10 10
      locations/din_van.qsrc
  51. 2 2
      locations/dina.qsrc
  52. 1 1
      locations/dreams.qsrc
  53. 0 1
      locations/drugs.qsrc
  54. 2 2
      locations/ender.qsrc
  55. 10 10
      locations/fame.qsrc
  56. 1 1
      locations/family.qsrc
  57. 1 1
      locations/fit.qsrc
  58. 1 1
      locations/food_menu.qsrc
  59. 1 1
      locations/foto_albums.qsrc
  60. 1 1
      locations/foto_events.qsrc
  61. 1 1
      locations/foto_model_documentary.qsrc
  62. 4 4
      locations/foto_models.qsrc
  63. 1 1
      locations/gaddvor.qsrc
  64. 1 1
      locations/gadfield.qsrc
  65. 88 90
      locations/gadforest.qsrc
  66. 9 9
      locations/gadforestlost.qsrc
  67. 1 1
      locations/gadriver.qsrc
  68. 2 2
      locations/gadroad.qsrc
  69. 1 1
      locations/gadsarai.qsrc
  70. 4 4
      locations/gadukino.qsrc
  71. 6 4
      locations/gameover.qsrc
  72. 3 3
      locations/gdksport.qsrc
  73. 6 6
      locations/gkafe.qsrc
  74. 1 1
      locations/grigory.qsrc
  75. 243 187
      locations/gschool_chats.qsrc
  76. 16 625
      locations/gschool_events.qsrc
  77. 1201 0
      locations/gschool_events1.qsrc
  78. 57 27
      locations/gschool_gossip.qsrc
  79. 9 11
      locations/gschool_grounds.qsrc
  80. 2 2
      locations/gschool_jock_chats.qsrc
  81. 4 3
      locations/gschool_lessons.qsrc
  82. 62 73
      locations/gschool_sex.qsrc
  83. 3 3
      locations/hookup.qsrc
  84. 1 1
      locations/hookup_after.qsrc
  85. 2 2
      locations/hookup_morning.qsrc
  86. 0 101
      locations/hotel.qsrc
  87. 39 39
      locations/hotel_anna.qsrc
  88. 112 112
      locations/hotel_anna_gear.qsrc
  89. 1 1
      locations/hunterLoveSex.qsrc
  90. 8 8
      locations/hunters.qsrc
  91. 1 1
      locations/huntersex.qsrc
  92. 8 2
      locations/igor_schedule.qsrc
  93. 1 1
      locations/ilyroom.qsrc
  94. 41 61
      locations/intro_city.qsrc
  95. 1 2
      locations/intro_city_m.qsrc
  96. 220 306
      locations/intro_city_select.qsrc
  97. 117 227
      locations/intro_city_tg.qsrc
  98. 126 121
      locations/intro_customization.qsrc
  99. 10 16
      locations/intro_initialization.qsrc
  100. 141 30
      locations/intro_initialization_city.qsrc

+ 3 - 0
changes from 0_8_5 to 0_8_6.txt

@@ -22,6 +22,9 @@ katja_meynold_schedule
 igor_schedule
 pav_beach_chat
 katja_lake			<- split from katjaEv
+gschool_events1		<- split from gschool_events
+petkaEv			<- split from gschool_events
+pav_disco_classmates		<- split from pav_disco_coolkids
 
 body_desc
 AppearanceSystem               <- body

+ 12 - 15
glife.qproj

@@ -214,15 +214,6 @@
 		<Location name="succubus"/>
 		<Location name="serpent"/>
 	</Folder>
-	<Folder name="Prehistory">
-		<Location name="preSYS"/>
-		<Location name="preSYS2"/>
-		<Location name="preTG"/>
-		<Location name="preNT"/>
-		<Location name="preCUST"/>
-		<Location name="preALT"/>
-		<Location name="preCSB"/>
-	</Folder>
 	<Folder name="Intro">
 		<Location name="intro_sg"/>
 		<Location name="intro_sg_m"/>
@@ -234,7 +225,7 @@
 		<Location name="intro_uni_m"/>
 		<Location name="intro_uni_tg"/>
 		<Location name="intro_initialization"/>
-		<Location name="intro_initialization_uni"/>
+		<Location name="intro_initialization_city"/>
 		<Location name="intro_customization"/>
 		<Location name="intro_sg_select"/>
 		<Location name="intro_sg_select_custom"/>
@@ -557,6 +548,7 @@
 		<Location name="gschool_lunch"/>
 		<Location name="gschool_office"/>
 		<Location name="gschool_events"/>
+		<Location name="gschool_events1"/>
 		<Location name="gschool_gossip"/>
 		<Location name="gschool_groups"/>
 		<Location name="gschool_boys_bathroom"/>
@@ -613,6 +605,7 @@
 		<Location name="cumreaction"/>
 		<Location name="kotovtalker"/>
 		<Location name="pav_disco"/>
+		<Location name="pav_disco_classmates"/>
 		<Location name="pav_disco_coolkids"/>
 		<Location name="pav_disco_gopniks"/>
 		<Location name="pav_disco_jocks"/>
@@ -661,6 +654,9 @@
 		<Location name="natpimp"/>
 		<Location name="NatBelGo"/>
 	</Folder>
+	<Folder name="Petka">
+		<Location name="petkaEv"/>
+	</Folder>
 	<Folder name="Albina">
 		<Location name="albina_starlets_aftermath"/>
 		<Location name="albinahome"/>
@@ -784,6 +780,7 @@
 		<Location name="city_library"/>
 		<Location name="fit"/>
 		<Location name="talent_agency"/>
+		<Location name="casting"/>
 		<Location name="tatiana_lab"/>
 		<Location name="tatiana_missions"/>
 		<Location name="alexandriaHome"/>
@@ -867,7 +864,7 @@
 		<Location name="MartinSex3"/>
 		<Location name="casino"/>
 		<Location name="mqroom"/>
-		<Location name="hotel"/>
+		<Location name="city_hotel"/>
 		<Location name="deckShuffle"/>
 	</Folder>
 	<Folder name="City Red Light">
@@ -1137,10 +1134,10 @@
 		<Location name="card"/>
 	</Folder>
 	<Folder name="Hotel">
-		<Location name="HotelHole"/>
-		<Location name="hotel_resep"/>
-		<Location name="HotelAdmin"/>
-		<Location name="hotel_work"/>
+		<Location name="pav_hotel"/>
+		<Location name="pav_hotelReception"/>
+		<Location name="pav_hotelAdmin"/>
+		<Location name="pav_hotelWork"/>
 		<Location name="HotelRoom"/>
 		<Location name="hotel_anna"/>
 		<Location name="hotel_anna_gear"/>

+ 46 - 15
locations/ApperanceSystem.qsrc

@@ -9,17 +9,14 @@ if $ARGS[0] = '':
     }
 	if pcs_makeup = 6 and bimbolevel >= 2: extra_supnatvnesh = 2*bimbolevel - 2
 
-	!STD check. STD will make appearance automatically -10
-	if Gerpes >= 3 or Sifilis >= 21 or Triper > 2:
-		pcs_apprnc = -10
-	else:
-		clothingBonus = func($this, 'CalcClothingBonus')
-		accessoriesBonus = func($this, 'CalcAccessoriesBonus', bonusZ, PShoQuality)
-		groomingBonus = func($this, 'CalcGroomingBonus')
-		groomingPenalty = func($this, 'CalcGroomingPenalty')
-		pcs_apprnc = func($this, 'CalcAppearance', (supnatvnesh + extra_supnatvnesh))
-		Hotcat = func($this, 'ConvertToHotcat')
-	end
+	clothingBonus = func($this, 'CalcClothingBonus')
+	accessoriesBonus = func($this, 'CalcAccessoriesBonus', bonusZ, PShoQuality)
+	groomingBonus = func($this, 'CalcGroomingBonus')
+	groomingPenalty = func($this, 'CalcGroomingPenalty')
+	stdPenalty = func($this, 'CalcSTDPenalty')
+
+	pcs_apprnc = func($this, 'CalcAppearance', (supnatvnesh + extra_supnatvnesh))
+	Hotcat = func($this, 'ConvertToHotcat')
 
 	killvar 'clothingBonus'
 	killvar 'accessoriesBonus'
@@ -43,7 +40,7 @@ if $args[0] = 'UpdateBaseAppearnce':
 	elseif vidage > 30: 
 		vidageBonus = 160 - (2 * vidage)
 	else
-		vinageBonus = 100
+		vidageBonus = 100
 	end
 
 	skinBonus = (pcs_skin * 2 / 5)
@@ -186,7 +183,7 @@ end
 if $ARGS[0] = 'CalcClothingBonus':
 	if $clothingworntype = 'nude':
 		if pcs_bmi >= 19 and pcs_bmi < 30:
-			! Healthy and overweight
+			! Healthy and not overweight
 			tempRevealing = 405
 			PCloQuality = 3
 		else
@@ -198,7 +195,7 @@ if $ARGS[0] = 'CalcClothingBonus':
 			!Skinny and severely skinny
 			tempRevealing = ((400 - PXCloThinness) + (500 - PXCloTopCut) + (400 - PXCloBottomShortness))/2
 		elseif pcs_bmi >= 19 and pcs_bmi < 30:
-			!Healthy and overweight
+			!Healthy and not overweight
 			tempRevealing = (PXCloThinness + PXCloTopCut + PXCloBottomShortness)/2
 		elseif pcs_bmi >= 30:
 			!Moderately overweight and above
@@ -319,11 +316,45 @@ if $ARGS[0] = 'CalcGroomingPenalty':
 	killvar 'legPenalty'
 end
 
+if $ARGS[0] = 'CalcSTDPenalty':
+	if Gerpes >= 3 and Orerpes = 1 and pcs_makeup < 4: oralHerpesPenalty = 20
+	if Sifilis >= 50:
+		syphilisPenalty = 250
+	elseif Sifilis >= 21:
+		syphilisPenalty = rand(150, 200)
+	end
+
+	if $pantyworntype = 'none' and (PCloSkirt > 3 or $clothingworntype = 'nude'):
+		if GenHerpes = 1:
+			if Gerpes >= 20:
+				genitalHerpesPenalty = 250
+			elseif Gerpes >= 10:
+				genitalHerpesPenalty = 150
+			elseif Gerpes >= 5:
+				genitalHerpesPenalty = 25
+			end
+		end
+		if Triper > 2:
+			gonorrheaPenalty = rand(150, 200)
+		end
+		if Kandidoz > 30:
+			yeastPenalty = rand(150, 200)
+		end
+	end
+
+	result = oralHerpesPenalty + genitalHerpesPenalty + syphilisPenalty + gonorrheaPenalty + yeastPenalty
+
+	killvar 'oralHerpesPenalty'
+	killvar 'genitalHerpesPenalty'
+	killvar 'syphilisPenalty'
+	killvar 'gonorrheaPenalty'
+	killvar 'yeastPenalty'
+end
 
 if $ARGS[0] = 'CalcAppearance':
 	superNaturalBonus = ARGS[1] & !! supnatvnesh
 
-	temp_apprnc = pcs_apprncbase + clothingBonus + accessoriesBonus + groomingBonus - groomingPenalty
+	temp_apprnc = pcs_apprncbase + clothingBonus + accessoriesBonus + groomingBonus - groomingPenalty - stdPenalty
 
 	if temp_apprnc >= 200: temp_apprnc = 200 
 	if temp_apprnc < 0: temp_apprnc = 0

+ 5 - 5
locations/Cheatmenu_din.qsrc

@@ -951,7 +951,7 @@ $cheatmenu['parameters'] = {
 	*nl
 	'Body Shape Parameters'
 	'<<pcs_bust>> - <<pcs_waist>> - <<pcs_hips>>, <<$titsize>> breasts, the difference between the hips and waist <<pcs_hips-pcs_waist>> cm'
-	'Muscularity: musle = <<musle>>, salo =	<<salo>>, fat = <<fat>>'
+	'Muscularity: strenbuf = <<strenbuf>>, salo =	<<salo>>, fat = <<fat>>'
 	'Variable List:'
 	'agilbuf = <<agilbuf>>'
 	'strenbuf = <<strenbuf>>'
@@ -1190,7 +1190,7 @@ $cheatmenu['stats'] = {
 	if workPTU > 1:*pl'<a href="exec:teachlevel += 10 & dynamic $cheatmenu[''stats'']">Reputation teacher+10: <<teachlevel>></a>'
 	if workPTU > 1:*pl'<a href="exec:teachlevel -= 10 & dynamic $cheatmenu[''stats'']">Reputation teacher-10: <<teachlevel>></a>'
 	*nl
-	if StoryLine = 1 and SchoolAtestat = 0:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
 		*pl'<b>School:</b>'
 		if class['school_math_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''math'', 10 & dynamic $cheatmenu[''stats'']">Improve your Math grade: <<class[''school_math_grade'']>></a>'
 		if class['school_rus_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''rus'', 10 & dynamic $cheatmenu[''stats'']">Improve your Russian grade: <<class[''school_rus_grade'']>></a>'
@@ -1272,7 +1272,7 @@ $cheatmenu['reputation'] = {
 	'<center>If they exceed this limit they will be reset overnight.</center>'
 	'<center><table  width="90%" cellspacing="0" cellpadding="0" valign="top">'
 	'<tr><td width="50%" cellpadding="10" valign="top">'
-	if storyline = 1:
+	if mid($start_type,1,2) = 'sg':
 		*nl
 		'Relationships in Pavlovsk'
 		*nl
@@ -1517,7 +1517,7 @@ $cheatmenu['reputation'] = {
 	end
 	*nl
 	if opusk > 0 or gnewQW > 0 or sipovka > 0:'<a href="exec:opusk = 0 & gnewQW = 0 & sipovka = 0 & dynamic $cheatmenu[''reputation'']">Clear reputation with Gopniks</a>'
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 
 		*nl
 		'<font color="red"><b>WARNING</b></font>: Clearing reputation flags with your family may cause bugs. Use at your own risk!'
@@ -1575,7 +1575,7 @@ $cheatmenu['documents'] = {
 	'<td width="300" cellspacing="0" cellpadding="20" valign="top">'
 	'<td width="400" cellspacing="0" cellpadding="20" valign="top">'
 	if SchoolAtestat = 0: '<a href="exec:SchoolAtestat = 1 & dynamic $cheatmenu[''documents'']">Get School Certificate</a>'
-	if storyline = 1 and SchoolAtestat = 0: '<font color="red"><b>WARNING!</b></font>: This will end your school year!' & *nl
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0: '<font color="red"><b>WARNING!</b></font>: This will end your school year!' & *nl
 	if SchoolAtestat = 1:'Already have a School Certificate'
 	if university['diploma'] > 0:
 		'You already have a Diploma'

+ 3 - 5
locations/FedorMisc.qsrc

@@ -70,7 +70,7 @@ if $ARGS[0] = 'Fedor Chat':
 	if ARGS[1] ! 1:
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
-		act 'Move away': gt 'pav_disco_coolkids', 'classmates'
+		act 'Move away': gt 'pav_disco_classmates', 'classmates'
 	end
 	
 	act 'Chat':
@@ -103,7 +103,7 @@ if $ARGS[0] = 'Fedor Chat':
 		if ARGS[1] ! 1:
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		else
-			act 'Move away': gt 'pav_disco_coolkids', 'classmates'
+			act 'Move away': gt 'pav_disco_classmates', 'classmates'
 		end
 	end
 
@@ -144,7 +144,7 @@ if $ARGS[0] = 'Fedor Hate':
 	if ARGS[1] ! 1:
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
-		act 'Move away': gt 'pav_disco_coolkids', 'classmates'
+		act 'Move away': gt 'pav_disco_classmates', 'classmates'
 	end
 end
 
@@ -519,7 +519,6 @@ if $ARGS[0] = 'Smoke':
 	gs 'cum_cleanup'
 	pcs_breath = 0
 	pcs_mood += 100
-	wipo += 100
 	gs 'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/hall/smoke.jpg"></center>'
@@ -538,7 +537,6 @@ if $ARGS[0] = 'Smoke 2':
 	gs 'cum_cleanup'
 	pcs_breath = 0
 	pcs_mood += 100
-	wipo += 100
 	gs 'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/hall/smoke.jpg"></center>'

+ 15 - 21
locations/HotelRoom.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'normal':
 	gs 'themes', 'indoors'
 	gs 'stat'
 	'<center><b><font color = maroon>Your normal hotel room</font></b></center>'
-	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
+	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal.jpg"></center>'
 	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">laptop</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
@@ -24,7 +24,8 @@ if $ARGS[0] = 'normal':
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			hotelWiFi = 0
-			gt'hotelHole'
+			gt $hotel
+			killvar '$hotel'
 		else
 			msg'<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
 			gt'HotelRoom','normal'
@@ -35,9 +36,6 @@ if $ARGS[0] = 'normal':
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin
-	if curr_home ! 6:
-		act 'Set this hotel room as your main home':gs 'set_home', 6 & gt 'HotelRoom', 'normal'
-	end
 end
 
 if $ARGS[0] = 'better':
@@ -55,14 +53,15 @@ if $ARGS[0] = 'better':
 	gs 'themes', 'indoors'
 	gs 'stat'	
 	'<center><b><font color = maroon>Your luxury room</font></b></center>'
-	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
+	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better.jpg"></center>'
 	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a small flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">laptop</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			hotelWiFi = 0
-			gt'hotelHole'
+			gt $hotel
+			killvar '$hotel'
 		else
 			msg'<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
 			gt'HotelRoom','better'
@@ -74,9 +73,6 @@ if $ARGS[0] = 'better':
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin
-	if curr_home ! 6:
-		act 'Set this hotel room as your main home':gs 'set_home', 6 & gt 'HotelRoom', 'better'
-	end
 end
 
 if $ARGS[0] = 'best':
@@ -94,14 +90,15 @@ if $ARGS[0] = 'best':
 	gs 'themes', 'indoors'
 	gs 'stat'	
 	'<center><b><font color = maroon>Your royal suite</font></b></center>'
-	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
+	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best.jpg"></center>'
 	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a huge flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">laptop</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			hotelWiFi = 0
-			gt'hotelHole'
+			gt $hotel
+			killvar '$hotel'
 		else
 			msg'<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
 			gt'HotelRoom','best'
@@ -114,9 +111,6 @@ if $ARGS[0] = 'best':
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin
-	if curr_home ! 6:
-		act 'Set this hotel room as your main home':gs 'set_home', 6 & gt 'HotelRoom', 'best'
-	end
 end
 
 if $ARGS[0] = 'shower1':
@@ -132,21 +126,21 @@ if $ARGS[0] = 'shower1':
 	gs'stat'
 	
 	'<center><b><font color = maroon>The bathroom of your hotel room</font></b></center>'
-	if hotelroom = 1:
+	if hotelRoom[$hotel] = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal1.jpg"></center>'&'A small and unpretentious bathroom, that is nevertheless quite stylish and has everything you need.'
-	elseif hotelroom = 2:
+	elseif hotelRoom[$hotel] = 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better1.jpg"></center>'&'A nice looking and spacious bathroom, with separate bath tub.'
-	elseif hotelroom = 3:
+	elseif hotelRoom[$hotel] = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best1.jpg"></center>'&'A very luxurious and spacious bathroom, fit for a king.'
 	end
 	
 	act 'Return to your room':
 		hotelShampoo = 0
-		if hotelroom = 1:
+		if hotelRoom[$hotel] = 1:
 			gt'HotelRoom','normal'
-		elseif hotelroom = 2:
+		elseif hotelRoom[$hotel] = 2:
 			gt'HotelRoom','better'
-		elseif hotelroom = 3:
+		elseif hotelRoom[$hotel] = 3:
 			gt'HotelRoom','best'
 		end
 	end

Diff do ficheiro suprimidas por serem muito extensas
+ 439 - 391
locations/KatjaHomeTalk.qsrc


+ 21 - 3
locations/Katja_Tanga.qsrc

@@ -289,7 +289,13 @@ if $ARGS[0] = 'dance':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco6_2.jpg"></center>'
 						'Laughing, you pull aside your dress and reveal one of your bare breasts. Katja looks at you, wanting more. "I showed you both of mine!" 
 						You smile. "Yeah, but you''re wearing panties and I''m not."'
-						act 'Move away': gt'pav_disco'
+						act 'Do something else': gt 'pav_disco_classmates', 'classmates'
+						if hour >= 20:
+							act 'Keep dancing': 
+								if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) 
+								gt 'pav_disco_coolkids', 'katja_dance'
+							end
+						end	
 					end
 				end
 				act 'Tease her':
@@ -299,7 +305,13 @@ if $ARGS[0] = 'dance':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco6_3.jpg"></center>'
 					'You pull at the edge of your dress, barely exposing one of your nipples as Katja indignantly squeaks."Hey, I showed you mine!"
 					You respond with a laugh. "I already showed you my pussy, so that makes us even."'
-					act 'Move away': gt'pav_disco'
+					act 'Do something else': gt 'pav_disco_classmates', 'classmates'
+					if hour >= 20:
+						act 'Keep dancing': 
+							if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) 
+							gt 'pav_disco_coolkids', 'katja_dance'
+						end
+					end
 				end
 			else
 				gs 'arousal', 'end'
@@ -315,7 +327,13 @@ if $ARGS[0] = 'dance':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco7_<<i>>.jpg"></center>'
 			'Katja doesn''t hesitate and lifts the hem of her skirt, showing you her bare pussy.'
 		end
-		act 'Move away': gt'pav_disco'
+		act 'Do something else': gt 'pav_disco_classmates', 'classmates'
+		if hour >= 20:
+			act 'Keep dancing': 
+				if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) 
+				gt 'pav_disco_coolkids', 'katja_dance'
+			end
+		end
 	end
 end
 

+ 1 - 1
locations/Komp.qsrc

@@ -82,7 +82,7 @@ if $ARGS[0] = 'brows':
 		if shantfoto > 0:act 'Find the girl you took photos of in the park on "Assbook"':gt 'komp', 'foto'
 		if gor_dorm = 7:act 'Read letter from Eugene':gt 'etoexhib', 'pos91'
 		if camwhore = 1 and $loc ! 'shulga_room' and $loc ! 'anushapt' and $loc ! 'artemhome' and $loc ! 'albinahome' and $loc ! 'pav_library':act 'Go to MyFreeCams.org':gt 'komp', 'mfc'
-		if (storyline = 1 and SchoolAtestat = 0) or func('uniutil', 'student', 'enrolled'):act 'Spend time studying':gt 'komp', 'study'
+		if (mid($start_type,1,2) = 'sg' and SchoolAtestat = 0) or func('uniutil', 'student', 'enrolled'):act 'Spend time studying':gt 'komp', 'study'
 		if sucpcinfo = 0 and succubxp > 0: act 'Research the strange feelings you''ve been having': gt 'succubus', 'kompresearch'
 	end
 end

+ 1 - 1
locations/MartinSex.qsrc

@@ -167,7 +167,7 @@ if $ARGS[0] = '':
 					'"Fine, you know what? Fuck this." You turn around, walking towards the door, barely able to contain your anger.'
 					'"<<$pcs_firstname>>," Martin begins, his voice taking on his most calming tone, but instead of calming you, it is the pinprick needed to set you off.'
 					*nl
-					'In the blink of an eye, you are face to face with him again, yelling at him unrestrainedly. "No! Apparently, you think I''m too young and too dumb to know what I want, so you don''t get to ''<<$pcs_firstname>>'' me! I don''t need ' + iif(StoryLine > 0,'another','a') + ' stepdad who knows what''s best for me!"'
+					'In the blink of an eye, you are face to face with him again, yelling at him unrestrainedly. "No! Apparently, you think I''m too young and too dumb to know what I want, so you don''t get to ''<<$pcs_firstname>>'' me! I don''t need another stepdad who knows what''s best for me!"'
 					'Before Martin could utter even another word, you had stormed out of the bar, livid at his paternalism and, deep down, below the layers of fury, wounded by his rejection.'
 
 					act 'Get out of the bar': gt 'city_industrial'

+ 3 - 3
locations/MartinTalk.qsrc

@@ -819,13 +819,13 @@ if $ARGS[0] = '':
 		'"Yeah, I guess we are. We don''t talk much, but," he taps his chest, just above the heart, "in here, where it counts, we care about each other. Always have."'
 		*nl
 		
-		if StoryLine = 1 and (npc_rel['A33'] >= 50 or npc_rel['A34'] >= 50):
+		if mid($start_type,1,2) = 'sg' and (npc_rel['A33'] >= 50 or npc_rel['A34'] >= 50):
 			'"Yeah, I know what you mean," you nod, thinking of your own siblings. "No matter where they are, you always know that somebody''s there for you."'
 			'"You have siblings?"'
 			'"An older sister and a younger brother", you nod. "My ' + iif(npc_rel['A33']>=npc_rel['A34'],'sister','brother') + ' and I are really close, but I care about both of them."'
 			'"There''s always a favorite sibling," he chuckles. "Usually the one who shared the most candy with you."'
 
-		elseif Storyline = 1:
+		elseif mid($start_type,1,2) = 'sg':
 			'"I wish I knew what that''s like. I have siblings, but we''re not very close."'
 			'"I was the same around your age," Martin admits, "but trust me: That can change quickly. Sometimes, the tiniest event can pull you closer together."'
 
@@ -936,7 +936,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		*nl
 		$OpenInnerThought+'He wouldn''t be Martin if he didn''t tell me to "watch out" at least once a day,'+$CloseInnerThought+' you think and roll your eyes, but still smile and say "I always do" before he has to get back to work.'
 	
-	elseif StoryLine = 1 and home_owned[2] = 1:
+	elseif mid($start_type,1,2) = 'sg' and home_owned[2] = 1:
 		'"I still live with my parents, in Pavlovsk," you admit.'
 		*nl
 		'"Oh, well, that can''t be easy at your age."'

+ 3 - 3
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 StoryLine = 0 and ntstart = 0:'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart < 10 and $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 StoryLine = 0 and ntstart = 0:'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart < 10 and $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,7 +48,7 @@ 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 StoryLine = 0 and ntstart = 0:'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart < 10 and $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

+ 1 - 1
locations/_body_image.qsrc

@@ -74,7 +74,7 @@ if $ARGS[0] = 'clothes':
 		$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 $clothingworntype ! 'swimwear':
+		if $clothingworntype ! 'coat' and PCloswimwear = 0:
 			gs 'clothing_attributes', $clothingworntype, clothingwornnumber
 			gs 'clothing_descriptions'
 			$body_image_msg += '<br><<$description>>'

+ 2 - 2
locations/_difficulty.qsrc

@@ -27,8 +27,8 @@ end &! --- getdifficulty ---
 !! easy peasy: 20
 !! use func('_difficulty','getexpadj')
 if $ARGS[0] = 'getexpadj':
-	!!Trait ''Everything is new again'', gained from the cursed school boy start
-	if csb_start = 1 and daystart <= 84: 
+	!!Trait ''Everything is new again'', gained from the sg_tg start
+	if $start_type = 'sg_tg' and daystart <= 84: 
 		result = 10 * difficulty
 	else
 		result = 20 * difficulty

+ 38 - 32
locations/albina_chat.qsrc

@@ -322,7 +322,7 @@ if $ARGS[0] = 'Cowgirl':
 	act'It feels better':
 		cla & *nl
 		'"It just feels better," you shrug. "I don''t know how to explain it. The angle? Just the way it fits inside when I''m on top? It feels good. What can I say?"'
-		'"I think it feels best in doggy," Albina says. "It goes way deeper and you can get surprise anal in that position which is the <i>best</i> kind of anal. Plus spankings. If I can''t sit down after a fuck, it was a good fuck."'
+		'"I think it feels best in doggy," Albina says. "It goes way deeper and you can get surprise anal in that position, which is the <i>best</i> kind of anal. Plus spankings. If I can''t sit down after a fuck, it was a good fuck."'
 		gs'albina_chat','Cowgirl2'
 	end
 	
@@ -363,7 +363,7 @@ if $ARGS[0] = 'Anal':
 	'''I would fuck Albina''s asshole while slapping her juicy cheeks like I''m playing some bongos!'' '
 	'''I bet her pussy is tighter than a nun''s with all the anal she does.'' '
 	*nl
-	'"I''ve heard them all, but none of the perverted fucking cowards dare mention them in front of me. To answer your question, I''m not going to. I don''t need to explain my sex life to anyone." She then turns away and goes quiet.'
+	'"I''ve heard them all, but none of the perverted fucking cowards dare mention them in front of me. To answer your question, I just like anal, okay? I don''t even know why I''m justifying my sex life to you!" She then turns away and goes quiet.'
 	'You''ve clearly hit a nerve and know better than to push her further, so you change the subject.'
 	act 'Stop talking': gt 'albinahome', 'bedroom'
 	act 'Change the subject': gt 'albina_chat', 'chat'
@@ -498,7 +498,7 @@ if $ARGS[0] = 'wine_chat1':
 				'"I l''ke the taste of my pussy too," you slur back.'
 				'"I fuhcking knew it!" Albina exclaims. "Every girl loves her own juice!"'
 				'"If you knew, then why are you asking if it''s weird?" you ask, puzzled.'
-				'"I jus'' wanted to see if <i>you</i> were the weird one!" Albina mumbles, voice echoing off the inside of the glass as she takes another sip.'
+				'"I jus'' wanted to see if <i>you</i> were the weird one!" Albina mumbles, her voice echoing off the inside of the glass as she takes another sip.'
 			end
 			gs'albina_chat','wine_chat2'
 		end
@@ -513,9 +513,15 @@ if $ARGS[0] = 'wine_chat1':
 	elseif albina['wine_convo'] = 2:
 		'Shaving convo'
 	elseif albina['wine_convo'] = 3:
-		'"Honest question Sveta. How would dominate me in bed?"'
+		'"Honest question <<$pcs_nickname>>. How would dominate me in bed?" she asks and looks up at you with a drunk smile.'
+		act 'Pound your ass':
+			cla & *nl
+			'You drunkenly smile down at her. "I''d get the biggest, <i>thickest</i> strap-on dildo I could find..." You lean in and softly whisper in her ear. "Then I would shove it up your tight ass and pound you until you cum like the buttslut you are..."'
+			'Albina bites her lip while moaning softly and squeezing her thighs together. "Oh <<$pcs_nickname>>, you''re making me wet just thinking about it. I love it when my ass gets stretched and left gaping wide..."'
+			gs 'albina_chat', 'wine_chat2'
+		end
 	elseif albina['wine_convo'] = 4:
-		'"How often do you masturbate Sveta? Do you have any dildos? Ever double penetrated yourself with them? Ever wanted to try it?"'
+		'"How often do you masturbate <<$pcs_nickname>>? Do you have any dildos? Ever double penetrated yourself with them? Ever wanted to try it?"'
 	elseif albina['wine_convo'] = 5:
 		'"What''s the sluttiest thing you''ve ever done?"'
 	elseif albina['wine_convo'] = 6:
@@ -546,7 +552,7 @@ if $ARGS[0] = 'wine_chat1':
 					gs'albina_chat','wine_chat2'
 				end
 			end
-			
+
 			act'Nope, never':
 				cla & *nl
 				'"Nope!" you say, popping the P with your lips. "Neverrrrrr."'
@@ -554,7 +560,7 @@ if $ARGS[0] = 'wine_chat1':
 				'"Nneh," you shrug. "You ged used to it."'
 				gs'albina_chat','wine_chat2'
 			end
-						
+
 			act'I hate them':
 				cla & *nl
 				'"Neverrr!" you say, wrinkling your nose. "I <i>hate</i> wearing them!"'
@@ -570,31 +576,31 @@ if $ARGS[0] = 'wine_chat1':
 				'"Hah! Slut!" she shouts, taking another slurp of her wine.'
 				gs'albina_chat','wine_chat2'
 			end
-			
+
 			act'Rarely':
 				cla & *nl
-				
-				
+
+
 				gs'albina_chat','wine_chat2'
-			
+
 			end
 		else
 			albina['commando_know'] = 0
 			act'Nope, never':
 				cla & *nl
-				
-				
+
+
 				gs'albina_chat','wine_chat2'
 			end
-			
+
 			act'I hate them':
 				cla & *nl
-				
-				
+
+
 				gs'albina_chat','wine_chat2'
-			
+
 			end
-			
+
 		end
 	elseif albina['wine_convo'] = 8:
 		'"Do you think I would make a good stripper?" Albina asks.'
@@ -604,7 +610,7 @@ if $ARGS[0] = 'wine_chat1':
 			'"Was thinking about how to pay for uni. Mama could probably do it for me, but what if I want some extra cash on the side?"'
 			gs'albina_chat','wine_chat2'
 		end
-		
+
 		act'Too bitchy':
 			cla & *nl
 			'"Nah." You wave your glass dismissively. "You''re too bitchy."'
@@ -628,7 +634,7 @@ if $ARGS[0] = 'wine_chat2':
 		'"Fuck yeah, I am. And I <i>love</i> being one," she grins back, almost spilling her wine all over her face when you both cackle with uncontrollable laughter.'
 		act'Continue':gt'albina_chat','wine_chat1'
 	end
-	
+
 	act'Spit or swallow?':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/wine_talk.jpg"></center>'
@@ -642,7 +648,7 @@ if $ARGS[0] = 'wine_chat2':
 			'"But if he comes in your mouth, that means he wants you to swallow, right?" she says, looking genuinely confused that you''re suggesting there''s a choice.'
 			act'Continue':gt'albina_chat','wine_chat1'
 		end
-		
+
 		act'Me too':
 			cla & *nl
 			'"Me too," you mumble. "Spitting is quitting."'
@@ -662,7 +668,7 @@ if $ARGS[0] = 'wine_chat2':
 			end
 		end
 	end
-	
+
 	act'Your mom is is very pretty':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/wine_talk.jpg"></center>'
@@ -671,18 +677,18 @@ if $ARGS[0] = 'wine_chat2':
 		'"Fucking hell, I <i>knowwwwwwww</i>," Albina whines beneath you. "I gots ass fer dayz, but she''s gots tits to match. Big fucking bootyful bounshy tits that give ''er cleavage in a t-shirt. <i>And</i> a great ass! Life is so un-fucking-fair..."'
 		act'Continue':gt'albina_chat','wine_chat1'
 	end
-	
+
 	act'':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/wine_talk.jpg"></center>'
-		
+
 		act'Continue':gt'albina_chat','wine_chat1'
 	end
-	
+
 	act'':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/wine_talk.jpg"></center>'
-		
+
 		act'Continue':gt'albina_chat','wine_chat1'
 	end
 end
@@ -786,7 +792,7 @@ if $ARGS[0] = 'first_visit2':
 				'Not saying anything else, you awkwardly pick up your things and walk towards the door. Albina sits in silence, her shoulders hunched as she stares downward. As far as you know, she doesn''t move even as you close the door behind you.'
 				act 'Leave':gt 'pav_residential'
 			end
-			
+
 			act 'Comfort her':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
@@ -812,7 +818,7 @@ if $ARGS[0] = 'first_visit2':
 						'Your friend truly comforted, you finally collect your things and bid her farewell. She takes you to the door and as you walk down the driveway, both of you waving goodbye, you think you catch sight of the first genuine smile you''ve ever seen on Albina''s face.'
 						act 'Leave':gt 'pav_residential'
 					end
-					
+
 					act 'Kiss her':
 						gs 'arousal', 'kiss', -5
 						cla & *clr
@@ -824,8 +830,8 @@ if $ARGS[0] = 'first_visit2':
 					end
 				end
 			end
-			
-			
+
+
 			act 'Kiss her':
 				cla & *clr
 				gs 'arousal', 'kiss', -5
@@ -843,7 +849,7 @@ if $ARGS[0] = 'first_visit2':
 	else
 		act 'Pull away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	
+
 	act 'Kiss her back':
 		*clr & cla
 		gs 'arousal', 'kiss', 2
@@ -911,7 +917,7 @@ if $ARGS[0] = 'first_sex':
 					'The two of you lay on her bed, slowly recovering after your high-intensity orgasms. Incredibly, Albina''s pussy continues to trickle a steady stream of juices, even several minutes later.'
 					'"Oh fuck," she breathes. "I get so wet after I cum, but this is just ridiculous! What did you do to me <<$pcs_nickname>>?"'
 					'You laugh, finally managing to prop yourself up. You look over at her and her expression seems to change to something more tender.'
-					'"Thanks <<$pcs_nickname>>. It was nice to let it all out... and I''m not just talking about my feelings..." she says, expression turning mischevious again. "Thanks for being a good friend."' 
+					'"Thanks <<$pcs_nickname>>. It was nice to let it all out... and I''m not just talking about my feelings..." she says, expression turning mischevious again. "Thanks for being a good friend."'
 					act 'Get dressed':
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome.jpg"></center>'

+ 36 - 37
locations/albina_house_events.qsrc

@@ -677,7 +677,7 @@ if $ARGS[0] = 'computer':
 	if AlbinaQW['CompUse'] = 0:
 		AlbinaQW['CompUse'] = 1
 		*clr & cla
-		'<center><img <<$set_imgh>>src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/laptop.jpg"></center>'
+		'<center><img <<$set_imgh>>src="images/locations/pavlovsk/resident/albinahome/laptop.jpg"></center>'
 		'You point towards the laptop sitting at the foot of her bed. "I should''ve guessed that you would have something like that."'
 		'"Yeah, I honestly don''t know why I bought it. I sometimes look up workout techniques and sex tips, but I mostly just use it to watch porn when I feel like rubbing one out."'
         'You''re a little surprised that she would admit such a thing to you given how private and guarded she is about herself.'
@@ -686,51 +686,50 @@ if $ARGS[0] = 'computer':
 		
 	elseif AlbinaQW['CompUse'] > 0:
 		*clr & cla
-		'You decide to use Albina''s laptop while she''s gone, despite knowing she would be upset at you doing so. You boot it up and are a little surprised to find that such a private person doesn''t have a password on her laptop.'
-		act 'Turn it off':gt 'albinahome','bedroom'
-		act 'Go online': gt 'Komp', 'start'
-		act 'Check out her porn':
-			*clr & cla
+		'<center><img <<$set_imgh>>src="images/pc/items/accessories/computer/komp.jpg"></center>'
+		'You decide to use Albina''s laptop while she''s gone, despite knowing she would be upset at you doing so. You boot it up, but are confronted by a screen asking for a password.'
+		if rand(1,5) = 1:		
 			'<center><img <<$set_imgh>>src="images/pc/items/accessories/computer/komp.jpg"></center>'
-			'You get comfortable on the bed in front of the laptop. You''re curious about what sort of porn Albina would watch, so you click on the internet browser and look through her browsing history.'
-			*nl
-			'You aren''t surprised to find that she watches a lot of anal and lesbian sex, but are surprised to see that she also likes watching BDSM. You feel yourself getting aroused as you keep browsing.'
-			gs 'arousal', 'porn', 10
-			act 'Turn it off':gt 'albinahome','bedroom'
-			act 'Masturbate':
+			'Taking a wild guess, you manage to successfully input the correct password and her desktop loads up. You wonder if you should risk snooping around before she comes back.'
+			act 'Turn it off':
 				*clr & cla
-		
-				'<center><img <<$set_imgh>>src="images/pc/items/accessories/computer/kompmas.jpg"></center>'
-				'While browsing, you find a title you like the sound of and sit back on the bed to start watching. Before long, you pull your clothes aside and find yourself masturbating to the video, having completely forgotten where you are.'
-				$orgasm_or = 'no'
-				gs 'arousal', 'clit_finger', 10, 'masturbate'
-				act 'Continue':
+				'<center><img <<$set_imgh>>src="images/locations/pavlovsk/resident/albinahome/laptop.jpg"></center>'
+				'You decide not to risk it and turn the laptop off before closing the screen.'
+				act 'Wait for Albina to return':gt 'albinahome','bedroom'
+			end
+			act 'Check out her porn':
+				*clr & cla
+				'<center><img <<$set_imgh>>src="images/pc/items/accessories/computer/komp.jpg"></center>'
+				'You''re curious about what sort of porn Albina would watch, so you click on the internet browser and proceed to look through her browsing history.'
+				'You aren''t surprised to find that she watches a lot of anal and lesbian sex, but are surprised to see that she also likes watching BDSM. You feel yourself getting aroused as you keep browsing.'
+				gs 'arousal', 'porn', 10
+				act 'Turn it off':
+					*clr & cla
+					'<center><img <<$set_imgh>>src="images/locations/pavlovsk/resident/albinahome/laptop.jpg"></center>'
+					'Although you''re turned on by what you''ve seen, you decide not to risk getting caught and turn the laptop off before closing the screen.'
+					act 'Wait for Albina to return':gt 'albinahome','bedroom'
+				end
+				act 'Masturbate':
 					*clr & cla
-					
 					'<center><img <<$set_imgh>>src="images/pc/items/accessories/computer/kompmas.jpg"></center>'
-					'You keep rubbing your clit as you feel your climax building through the pleasure.'
-					temp = rand(0,3)
-					if temp = 0:
-                     npc_rel['A23'] -= 5
-						'Just as you''re about to cum, you hear someone clearing their throat. Your heart leaps into your mouth and you turn to see Albina standing in the doorway watching you. You quickly rip your hand from between your legs and pull your clothes back into place. You can tell she''s pissed at you as she storms over and slams the laptop screen down. "Have fun <<$pcs_nickname>>?" You sheepishly apologize as she takes the laptop and throws it aside, not caring as it clatters across the floor. "Don''t touch my stuff when I''m not here!"'
-						act 'Find something else to do':gt 'albinahome','bedroom'
-		
-					else
-						'You lean back and spread your legs wide as you feel your climax approaching. You clamp your free hand over your mouth to muffle your screams as an intense orgasm rocks your body. It takes you a few minutes to recover once it''s over, and you manage to fix your clothes and turn the laptop off before Albina returns.'
-						$orgasm_or = 'yes'
-						gs 'arousal', 'clit_finger', 'masturbate', 10
-						gs 'arousal', 'end'
-						gs 'stat'
-						act 'Find something else to do':gt 'albinahome','bedroom'
-					end
-					killvar 'temp'
+					'While browsing, you find a title you like the sound of and sit back on the bed to start watching it. It turns you on and you instinctively start rubbing your clit through your clothes.'
+					'The video is very arousing and you find yourself getting wet after just a few seconds. Just as you''re about to cum, your heart leaps into your mouth when you hear someone approaching. You quickly rip your hand from between your legs and slam the laptop screen down before Albina walks into the room.'
+					$orgasm_or = 'no'
+					gs 'arousal', 'clit_finger', 10, 'masturbate'
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Find something else to do':gt 'albinahome','bedroom'
 				end
 			end
+		else
+			'<center><img <<$set_imgh>>src="images/pc/items/accessories/computer/komp.jpg"></center>'
+			'Despite your best efforts, you fail to guess her password and stop before you end up locking it with another incorrect attempt. You close the screen before Albina walks back into the room.'
+			act 'Find something else to do': gt 'albinahome', 'bedroom'
 		end
 	else
 		*clr & cla
-		'<center><img <<$set_imgh>>src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/laptop.jpg"></center>'
-		'You know Albina values her privacy and using her laptop without her permission would break the trust she has in you, so you decide to leave it alone.'
+		'<center><img <<$set_imgh>>src="images/locations/pavlovsk/resident/albinahome/laptop.jpg"></center>'
+		'You know Albina greatly values her privacy and using her laptop without her permission would break the trust she has in you, so you decide to leave it alone.'
 		act 'Return': gt 'albinahome','bedroom'
 	end
 end

+ 1 - 1
locations/albina_school_sex.qsrc

@@ -1,6 +1,6 @@
 # albina_school_sex
 
-!! If AlbQW['Friend'] = 2 and npc_sex[A23] > 0 when the player tries speaking to Albina during break, then there is the random chance that they will get this event instead. This should only happen once or twice a week and be somwhat uncommon.
+!! If AlbinaQW['Friend'] = 2 and npc_sex[A23] > 0 when the player tries speaking to Albina during break, then there is the random chance that they will get this event instead. This should only happen once or twice a week and be somwhat uncommon.
 
 if $ARGS[0] = 'break_fun_1':
 	menu_off = 1

+ 3 - 8
locations/alexandriaEv.qsrc

@@ -210,16 +210,11 @@ if $ARGS[0] = 'interview3':
 	'<center><b><font color="maroon">Aleksei?</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/alexandria/chair.jpg"></center>'
 	'You finally reach a study where a morose... Alexandria? Sits on a couch, and in an interesting twist, there isn''t another one for you.'
-	if $start_type = 'tg':
+	if $start_type[1] = 'tg':
 		npc_rel['A241'] +=1
-		'"Yes Mr. Kuznetsu... I am another victim of Rikudo''s games, that is the reason for my interest in you."'
+		'"Yes Mr. Ivanov... I am another victim of Rikudo''s games, that is the reason for my interest in you."'
 	else
-		if csb_start = 1:
-			npc_rel['A241'] +=1
-			'"Yes Mr. Ivanov... I am another victim of Rikudo''s games, that is the reason for my interest in you."'
-		else
-			'"Yes... Cursed by Rikudo, the being that created The Talisman of Power, and the reason for my interest in you."'
-		end
+		'"Yes... Cursed by Rikudo, the being that created The Talisman of Power, and the reason for my interest in you."'
 	end
 	'After this little revelation, he exhales a big puff of smoke, and continue with his explanation.'
 	'"As I remember telling you the last time we meet, my name is Aleksei, and the hows and whys of my curse is better left for another time, suffice is to say, that is my understanding, that you and your relation with the powers that have been transferred to your persona, holds the key to break my current predicament. As you can see from our early confrontation, the powers that be, wanted the monopoly over your attention, so I looked for an alternative, that is the reason after the... convoluted way we met in Aphrodite, hm... as an afterthought, if you want to know, I took care of that little parasite, banishing it."'

+ 4 - 1
locations/arousal.qsrc

@@ -773,9 +773,12 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		end
 	end
 
-!!This is release is Sveta is so horny and pent up that she can cum with minimal stimulation
+!!This is release is Sveta is so pent up that she can cum with minimal stimulation
 	if $orgasm_or ! 'no' and orgasm_buildup >= 300 and pcs_horny >= 60: gs 'orgasm', $ARGS[0]
 
+!!This is release is Sveta is so horny that she can cum if directly stimulated
+	if $orgasm_or ! 'no' and orgasm_buildup >= 50 and pcs_horny >= 300 and orgasm_flag['trigger'] ! 0: gs 'orgasm', $ARGS[0]
+
 !!Clearing temporary variables with orgasm as a gs this will catch anything there too
 	killvar 'temp_dick'
 	killvar 'temp_unaware'

+ 70 - 70
locations/autosalonF.qsrc

@@ -15,30 +15,30 @@ if $ARGS[0] = 'start':
 	nl
 	$car_table = '<center><table border=0>'
 	$car_table += '<TH>Car</TH><TH></TH><TH>Price in <b>₽</b></TH>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''6''">Kalina VAZ</a>.</TD><TD> - </TD><TD> 400,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''7''">WHA PRIORA</a>.</TD><TD> - </TD><TD> 450,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''8''">Chevrolet NIVA</a>.</TD><TD> - </TD><TD> 500,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''9''">UAZ HUNTER</a>.</TD><TD> - </TD><TD> 500,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''10''">UAZ Patriot</a>.</TD><TD> - </TD><TD> 600,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''13''">Ford Focus 2</a>.</TD><TD> - </TD><TD> 500,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''102''">Renault LOGAN</a>.</TD><TD> - </TD><TD> 700,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''110''">Ford Mondeo</a>.</TD><TD> - </TD><TD> 850,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''104''">Toyota Celica</a>.</TD><TD> - </TD><TD> 1,000,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''95''">Mitsubishi l200</a>.</TD><TD> - </TD><TD> 1,000,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''103''">Toyota Corolla</a>.</TD><TD> - </TD><TD> 1,100,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''105''">Mazda 6</a>.</TD><TD> - </TD><TD> 1,200,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''106''">Mercedes-Benz E 212</a>.</TD><TD> - </TD><TD> 1,700,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''109''">Audi A6</a>.</TD><TD> - </TD><TD> 1,900,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''97''">Cadillac Escalade</a>.</TD><TD> - </TD><TD> 2,000,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''101''">BMW Z4</a>.</TD><TD> - </TD><TD> 3,000,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''107''">BMW M5</a>.</TD><TD> - </TD><TD> 4,500,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''99''">BMW X6</a>.</TD><TD> - </TD><TD> 4,500,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''96''">Audi Q7</a>.</TD><TD> - </TD><TD> 5,000,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''98''">Porsche Cayenne</a>.</TD><TD> - </TD><TD> 5,000,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''108''">Jaguar XKR-S</a>.</TD><TD> - </TD><TD> 7,000,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''100''">Mercedes-Benz S 600</a>.</TD><TD> - </TD><TD> 8,000,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''111''">Bentley Continental gt</a>.</TD><TD> - </TD><TD> 10,000,000 </TD>'
-	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''112''">Ferrari 458 Italia</a>.</TD><TD> - </TD><TD> 20,000,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''6''">LADA Kalina</a>.</TD><TD> - </TD><TD> 535,800 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''7''">LADA Vesta</a>.</TD><TD> - </TD><TD> 645,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''8''">Chevrolet NIVA</a>.</TD><TD> - </TD><TD> 625,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''9''">UAZ HUNTER</a>.</TD><TD> - </TD><TD> 600,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''10''">UAZ Patriot</a>.</TD><TD> - </TD><TD> 760,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''13''">Ford Focus</a>.</TD><TD> - </TD><TD> 884,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''102''">Renault LOGAN</a>.</TD><TD> - </TD><TD> 649,990 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''110''">Ford Mondeo</a>.</TD><TD> - </TD><TD> 1,329,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''104''">Toyota Camry</a>.</TD><TD> - </TD><TD> 1,484,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''95''">Mitsubishi L200</a>.</TD><TD> - </TD><TD> 1,749,990 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''103''">Toyota Corolla</a>.</TD><TD> - </TD><TD> 1,097,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''105''">Mazda 6</a>.</TD><TD> - </TD><TD> 1,299,700 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''106''">Mercedes-Benz E-Class</a>.</TD><TD> - </TD><TD> 2,950,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''109''">Audi A6</a>.</TD><TD> - </TD><TD> 2,914,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''97''">Lexus RX 350</a>.</TD><TD> - </TD><TD> 3,374,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''101''">BMW 3-Seria</a>.</TD><TD> - </TD><TD> 2,721,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''107''">BMW M5</a>.</TD><TD> - </TD><TD> 7,000,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''99''">BMW X6</a>.</TD><TD> - </TD><TD> 5,366,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''96''">Audi Q7</a>.</TD><TD> - </TD><TD> 5,000,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''98''">Porsche Cayenne</a>.</TD><TD> - </TD><TD> Price: 5,500,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''108''">Jaguar XJ</a>.</TD><TD> - </TD><TD> 6,500,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''100''">Mercedes-Benz S-Class</a>.</TD><TD> - </TD><TD> 7,600,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''111''">Bentley Continental GT</a>.</TD><TD> - </TD><TD> 13,000,000 <b>₽</b> </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''112''">Ferrari 458 Italia</a>.</TD><TD> - </TD><TD> 14,000,000 <b>₽</b> </TD>'
 	$car_table += '</table></center>'
 	
 	$car_table
@@ -66,100 +66,100 @@ if $ARGS[0] = 'manager1':
 	act 'Leave':gt 'city_industrial'
 
 	if prava = 1:
-		if karta + bankDebtLimit >= 400000:
-			act 'Buy a Kalina VAZ (400,000 <b>₽</b>)':gt 'autosalonF', 'buy', 400000, 'Kalina VAZ', 6, 400
+		if karta + bankDebtLimit >= 535800:
+			act 'Buy a LADA Kalina (535,800 <b>₽</b>)':gt 'autosalonF', 'buy', 535800, 'LADA Kalina', 6, 400
 		end
 
-		if karta + bankDebtLimit >= 450000:
-			act 'Buy a VAZ Priora (450,000 <b>₽</b>)':gt 'autosalonF', 'buy', 450000, 'WHA PRIORA', 7, 450
+		if karta + bankDebtLimit >= 645000:
+			act 'Buy a LADA Vesta (645,000 <b>₽</b>)':gt 'autosalonF', 'buy', 645000, 'LADA Vesta', 7, 450
 		end
 
-		if karta + bankDebtLimit >= 500000:
-			act 'Buy a Chevrolet Niva (500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 500000, 'Chevrolet NIVA', 8, 500
+		if karta + bankDebtLimit >= 625000:
+			act 'Buy a Chevrolet Niva (625,000 <b>₽</b>)':gt 'autosalonF', 'buy', 625000, 'Chevrolet NIVA', 8, 500
 		end
 
-		if karta + bankDebtLimit >= 500000:
-			act 'Buy a UAZ Hunter (500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 500000, 'UAZ HUNTER', 9, 300
+		if karta + bankDebtLimit >= 600000:
+			act 'Buy a UAZ Hunter (600,000 <b>₽</b>)':gt 'autosalonF', 'buy', 600000, 'UAZ HUNTER', 9, 300
 		end
 
-		if karta + bankDebtLimit >= 600000:
-			act 'Buy a UAZ Patriot (600,000 <b>₽</b>)':gt 'autosalonF', 'buy', 600000, 'UAZ Patriot', 10, 400
+		if karta + bankDebtLimit >= 760000:
+			act 'Buy a UAZ Patriot (760,000 <b>₽</b>)':gt 'autosalonF', 'buy', 760000, 'UAZ Patriot', 10, 400
 		end
 
-		if karta + bankDebtLimit >= 500000:
-			act 'Buy a Ford Focus 2 (500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 500000, 'Ford Focus 2', 13, 800
+		if karta + bankDebtLimit >= 884000:
+			act 'Buy a Ford Focus (884,000 <b>₽</b>)':gt 'autosalonF', 'buy', 884000, 'Ford Focus', 13, 800
 		end
 
-		if karta + bankDebtLimit >= 700000:
-			act 'Buy a Renault LOGAN (700,000 <b>₽</b>)':gt 'autosalonF', 'buy', 700000, 'Renault LOGAN', 102, 1000
+		if karta + bankDebtLimit >= 649990:
+			act 'Buy a Renault LOGAN (649,990 <b>₽</b>)':gt 'autosalonF', 'buy', 649990, 'Renault LOGAN', 102, 1000
 		end
 
-		if karta + bankDebtLimit >= 850000:
-			act 'Buy a Ford Mondeo (850,000 <b>₽</b>)':gt 'autosalonF', 'buy', 850000, 'Ford Mondeo', 110, 2000
+		if karta + bankDebtLimit >= 1329000:
+			act 'Buy a Ford Mondeo (1,329,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1329000, 'Ford Mondeo', 110, 2000
 		end
 
-		if karta + bankDebtLimit >= 1000000:
-			act 'Buy a Toyota Celica (1,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1000000, 'Toyota Celica', 104, 3000
+		if karta + bankDebtLimit >= 1484000:
+			act 'Buy a Toyota Camry (1,484,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1484000, 'Toyota Camry', 104, 3000
 		end
 
-		if karta + bankDebtLimit >= 1000000:
-			act 'Buy a Mitsubishi l200 (1,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1000000, 'Mitsubishi l200', 95, 2000
+		if karta + bankDebtLimit >= 1749990:
+			act 'Buy a Mitsubishi L200 (1,749,990 <b>₽</b>)':gt 'autosalonF', 'buy', 1749990, 'Mitsubishi L200', 95, 2000
 		end
 
-		if karta + bankDebtLimit >= 1100000:
-			act 'Buy a Toyota Corolla (1,100,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1100000, 'Toyaboutta Corolla', 103, 3000
+		if karta + bankDebtLimit >= 1097000:
+			act 'Buy a Toyota Corolla (1,097,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1097000, 'Toyaboutta Corolla', 103, 3000
 		end
 
-		if karta + bankDebtLimit >= 1200000:
-			act 'Buy a Mazda 6 (1,200,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1200000, 'Mazda 6', 105, 3000
+		if karta + bankDebtLimit >= 1299700:
+			act 'Buy a Mazda 6 (1,299,700 <b>₽</b>)':gt 'autosalonF', 'buy', 1299700, 'Mazda 6', 105, 3000
 		end
 
-		if karta + bankDebtLimit >= 1700000:
-			act 'Buy a Mercedes-Benz E 212 (1,700,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1700000, 'Mercedes-Benz E 212', 106, 5000
+		if karta + bankDebtLimit >= 2950000:
+			act 'Buy a Mercedes-Benz E-Class (2,950,000 <b>₽</b>)':gt 'autosalonF', 'buy', 2950000, 'Mercedes-Benz E-Class', 106, 5000
 		end
 
-		if karta + bankDebtLimit >= 1900000:
-			act 'Buy an Audi A6 (1,900,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1900000, 'Audi A6', 109, 5000
+		if karta + bankDebtLimit >= 2914000:
+			act 'Buy an Audi A6 (2,914,000 <b>₽</b>)':gt 'autosalonF', 'buy', 2914000, 'Audi A6', 109, 5000
 		end
 
-		if karta + bankDebtLimit >= 2000000:
-			act 'Buy a Cadillac Escalade (2,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 2000000, 'Cadillac Escalade', 97, 4000
+		if karta + bankDebtLimit >= 3374000:
+			act 'Buy a Lexus RX 350(3,374,000 <b>₽</b>)':gt 'autosalonF', 'buy', 3374000, 'Lexus RX 350', 97, 4000
 		end
 
-		if karta + bankDebtLimit >= 3000000:
-			act 'Buy a BMW Z4 (3,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 3000000, 'BMW Z4', 101, 4000
+		if karta + bankDebtLimit >= 2721000:
+			act 'Buy a BMW 3-Seria (2,721,000 <b>₽</b>)':gt 'autosalonF', 'buy', 2721000, 'BMW 3-Seria', 101, 4000
 		end
 
-		if karta + bankDebtLimit >= 4500000:
-			act 'Buy a BMW M5 (4,500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 4500000, 'BMW M5', 107, 6000
+		if karta + bankDebtLimit >= 7000000:
+			act 'Buy a BMW M5 (7,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 7000000, 'BMW M5', 107, 6000
 		end
 
-		if karta + bankDebtLimit >= 4500000:
-			act 'Buy a BMW X6 (4,500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 4500000, 'BMW X6', 99, 4000
+		if karta + bankDebtLimit >= 5366000:
+			act 'Buy a BMW X6 (5,366,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5366000, 'BMW X6', 99, 4000
 		end
 
 		if karta + bankDebtLimit >= 5000000:
 			act 'Buy an Audi Q7 (5,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5000000, 'Audi Q7', 96, 5000
 		end
 
-		if karta + bankDebtLimit >= 5000000:
-			act 'Buy a Porsche Cayenne (5,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5000000, 'Porsche Cayenne', 98, 3000
+		if karta + bankDebtLimit >= 5500000:
+			act 'Buy a Porsche Cayenne (5,500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5500000, 'Porsche Cayenne', 98, 3000
 		end
 
-		if karta + bankDebtLimit >= 7000000:
-			act 'Buy a Jaguar XKR-S (7,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 7000000, 'Jaguar XKR-S', 108, 4000
+		if karta + bankDebtLimit >= 6500000:
+			act 'Buy a Jaguar XJ (6,500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 6500000, 'Jaguar XJ', 108, 4000
 		end
 
-		if karta + bankDebtLimit >= 8000000:
-			act 'Buy a Mercedes-Benz S 600 (8,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 8000000, 'Mercedes-Benz S 600', 100, 8000
+		if karta + bankDebtLimit >= 7600000:
+			act 'Buy a Mercedes-Benz S-Class (7,600,000 <b>₽</b>)':gt 'autosalonF', 'buy', 7600000, 'Mercedes-Benz S-Class', 100, 8000
 		end
 
-		if karta + bankDebtLimit >= 10000000:
-			act 'Buy a Bentley Continental GT (10,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 10000000, 'Bentley Continental GT', 111, 8000
+		if karta + bankDebtLimit >= 13000000:
+			act 'Buy a Bentley Continental GT (13,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 13000000, 'Bentley Continental GT', 111, 8000
 		end
 
-		if karta + bankDebtLimit >= 20000000:
-			act 'Buy a Ferrari 458 Italia (20,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 20000000, 'Ferrari 458 Italia', 112, 10000
+		if karta + bankDebtLimit >= 14000000:
+			act 'Buy a Ferrari 458 Italia (14,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 14000000, 'Ferrari 458 Italia', 112, 10000
 		end
 	end
 end

+ 22 - 17
locations/bed2.qsrc

@@ -99,10 +99,12 @@ if $ARGS[0] = '':
 					gs 'underwear', 'wear'
 				end
 				if disable_autosave = 0:
-					if StoryLine = 0:
-						savegame 'autosave.sav'
+					if mid($start_type,1,4) = 'city':
+						savegame 'autosave_city.sav'
+					elseif mid($start_type,1,3) = 'uni':
+						savegame 'autosave_uni.sav'
 					else
-						savegame 'autosave_alt.sav'
+						savegame 'autosave_sg.sav'
 					end
 				end
 				if $clothingworntype ! 'nude':
@@ -183,13 +185,12 @@ if $ARGS[0] = 'sleep':
 	end
 	pcs_hairbsh = 0
 	pain['killer'] = 0
-	if StoryLine = 1 and $loc ! 'bedrPar' and SchoolAtestat = 0:
+	if mid($start_type,1,2) = 'sg' and $loc ! 'bedrPar' and SchoolAtestat = 0:
 		notathomesleep += 1
 	else
 		notathomesleep = 0
 	end
 
-	
 
 	if succubusflag = 1 and sucwalkday <= daystart and (succhungry < (0 - 1 - succublvl) or pcs_willpwr < ((succublvl * willpowermax) / 13) or sucpowzeroed >= 3): gs 'succubus', 'sucwalkinginit'
 
@@ -512,14 +513,14 @@ if $ARGS[0] = 'wake_horny':
 end
 
 if $ARGS[0] = 'wake':
-	if StoryLine = 1 and indorf = 0 and motherQW['bathroom_dildos'] > 0 and MarishaQW["marisha_sleepover"] = 0:gt'mother_sextalk','dildo_wakeup1'
+	if mid($start_type,1,2) = 'sg' and indorf = 0 and motherQW['bathroom_dildos'] > 0 and MarishaQW["marisha_sleepover"] = 0:gt'mother_sextalk','dildo_wakeup1'
 	menu_off = 1
 	InSleep = 1
 	gs 'stat'
 	if MarishaQW["marisha_sleepover"] = 1: gs 'marisha_ev', 'morning'
-	if daystart < 10 and StoryLine = 0 and ntstart = 0:'The first thing you think as you wake up is, "Damn! It''s is not a dream, I really am a woman now."'
-	if daystart >= 10 and daystart < 30 and StoryLine = 0 and ntstart = 0:'Looking at your female body, you are still a little surprised it''s actually you.'
-	if slept_in = 1 and kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 9 and hour < 14 and suspended['on'] ! 1:
+	if daystart < 10 and $start_type[1] = 'tg':'The first thing you think as you wake up is, "Damn! It''s is not a dream, I really am a woman now."'
+	if daystart >= 10 and daystart < 30 and $start_type[1] = 'tg':'Looking at your female body, you are still a little surprised it''s actually you.'
+	if slept_in = 1 and kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 9 and hour < 14 and suspended['on'] ! 1:
 		if schoolprogul > 2 and schoolPredupr = 2:
 			pcs_mood -= 35
 			gs 'stat'
@@ -538,7 +539,7 @@ if $ARGS[0] = 'wake':
 			msg '<center>Damn it''s <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>. It''s too late to go to school now!<br><<$npc_nickname[''A29'']>> will be very upset if I''m not at school every day.</center>'
 		end
 	end
-	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
+	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
 		if slept_in = 1 and (hour = 7 or hour = 8) and suspended['on'] ! 1:
 			pcs_mood -= 10
 			gs 'stat'
@@ -575,7 +576,7 @@ if $ARGS[0] = 'wake':
 			end
 			gs 'bed2', 'end'
 		end
-		if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9 and suspended['on'] ! 1:
+		if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9 and suspended['on'] ! 1:
 			act 'Full morning routine for School (01:00)':
 				fullmorrout = 1
 				minut += 15
@@ -635,10 +636,12 @@ if $ARGS[0] = 'succhoice':
 	'<font color="red"><b>You also feel that both are <i>permanent</i> choices.</b></font>'
 	act 'Try to ignore it and go to sleep':
 		if disable_autosave = 0:
-			if StoryLine = 0:
-				savegame 'autosave.sav'
+			if mid($start_type,1,4) = 'city':
+				savegame 'autosave_city.sav'
+			elseif mid($start_type,1,3) = 'uni':
+				savegame 'autosave_uni.sav'
 			else
-				savegame 'autosave_alt.sav'
+				savegame 'autosave_sg.sav'
 			end
 		end
 		gt 'bed2', 'sleep'
@@ -663,10 +666,12 @@ if $ARGS[0] = 'succhoiceNO':
 	gs 'stat'
 	act 'Go to sleep':
 		if disable_autosave = 0:
-			if StoryLine = 0:
-				savegame 'autosave.sav'
+			if mid($start_type,1,4) = 'city':
+				savegame 'autosave_city.sav'
+			elseif mid($start_type,1,3) = 'uni':
+				savegame 'autosave_uni.sav'
 			else
-				savegame 'autosave_alt.sav'
+				savegame 'autosave_sg.sav'
 			end
 		end
 		gt 'bed2', 'sleep'

+ 1 - 1
locations/bedrPar.qsrc

@@ -130,7 +130,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden in one of your desk drawers.'
 		end
 		
-		if StoryLine = 1 and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and SchoolAtestat = 0 and detention_warning ! daystart:
+		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and SchoolAtestat = 0 and detention_warning ! daystart:
 			detention_warning = daystart
 			msg 'You have detention this morning and must be at school before 09:00.'
 		end

+ 95 - 308
locations/begin.qsrc

@@ -12,78 +12,104 @@ if $ARGS[0] = 'start':
 	showstat 1
 	'<center><b><font color="maroon">CHOOSE GAME START</font></b></center>'
 	*nl
-	'<b>Transformation Start:</b>'
-	'You are Mikhail Kuznetsov, a fairly average 35 year old businessman who finds an artifact that changes everything about him and his life. Features magic.'
-	'(magic is still a WIP)'
+	'<center>There are three main start types:'
+	'Last year of school (before or after summer holidays);'
+	'In the city post graduation from school;'
+	'First year of university.'
 	*nl
-	'<b>Schoolgirl Start:</b>'
-	'You are a schoolgirl in the most lustful town in Russia. Will you study hard and keep your purity for that special someone, become a sex addicted whore or anything in between? The possibilities are endless. No magic.'
-	'(currently has most content for non-magic playthrough)'
+	'For each start type there are 3 options:'
+	'Standard;'
+	'Magical (Your character will gain magic abilities and learn about a secret magical world);'
+	'M2F (As per magic but your character will magically be turned into a girl in the intro).</center>'
 	*nl
-	'<b>Cursed Schoolgirl Start:</b>'
-	'Marvel as we recklessly squish both of the above into one start. You are a schoolgirl who finds the amulet and not much changes, except for the magic used.'
-	'(currently has most content but magic is still a WIP)'
 	*nl
-	'<b>Cursed Schoolboy Start:</b>'
-	'You are Peter Ivanov, a fairly average teenage boy who, while trying to escape a bad situation, ends up in the body of a schoolgirl. Now you have to deal with a new body, new desires and your new life in the most lustful town in Russia. Features magic.'
-	'(currently has most content but magic is still a WIP)'
 	*nl
-	'<b>New in Town Start:</b>'
-	'You''re controlled by your overbearing mother and can''t take it any more. It is time to find a new life in the city away from her influence. For the first time, you can make your own decisions and mistakes. No magic.'
-	'(currently has the least content - not recommended for your first playthrough)'
-	
-	act '<center><b>Transformation Start</b></center>':
-		settingmode = 0
-		showstat 0
-		cla
-		act '<center>Show intro (recommended)</center>':
-			gt 'preSYS', 'TGStart'
-		end
-		act '<center>Skip intro (seen it before)</center>':
-			tgs_skipinto = 1
-			gt 'preSYS', 'TGStart'
-		end
+	*nl
+
+	'<center><table><TH>Start Type</TH><TH>Standard</TH><TH>Magical</TH><TH>M2F</TH><TR>'
+
+	$start_text = '<TD>School</TD>'
+
+	if $start_type = 'sg':
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:$start_type = ''sg'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
 	end
 
-	act '<center><b>Schoolgirl Start</b></center>':
-		cla
-		settingmode = 0
-		showstat 0
-		MagikDostup = 1
-		!!blocks the save update for group standings
-		gruptipe[9000] = 1
-		gt 'preSYS', 'SGStart'
-		
+	if $start_type = 'sg_m':
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:$start_type = ''sg_m'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
 	end
 
-	act '<center><b>Cursed Schoolgirl Start</b></center>':
-		cla
-		settingmode = 0
-		showstat 0
-		altQS = 1
-		!!blocks the save update for group standings
-		gruptipe[9000] = 1
-		gt 'preSYS', 'SGStart'
+	if $start_type = 'sg_tg':
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD><TR>'
+	else
+		$start_text += '<TD><center><a href="exec:$start_type = ''sg_tg'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD><TR>'
 	end
-	
-	act '<center><b>Cursed Schoolboy Start</b></center>':
-		cla
-		settingmode = 0
-		showstat 0
-		altQS = 1
-		csb_start = 1
-		!!blocks the save update for group standings
-		gruptipe[9000] = 1
-		gt 'preSYS', 'CSBStart'
+
+	$start_text += '<TD>City</TD>'
+
+	if $start_type = 'city':
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:$start_type = ''city'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
+	end
+
+	if $start_type = 'city_m':
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:$start_type = ''city_m'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
+	end
+
+	if $start_type = 'city_tg':
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD><TR>'
+	else
+		$start_text += '<TD><center><a href="exec:$start_type = ''city_tg'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD><TR>'
+	end
+
+	$start_text += '<TD>University</TD>'
+
+	if $start_type = 'uni':
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:$start_type = ''uni'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
+	end
+
+	if $start_type = 'uni_m':
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:$start_type = ''uni_m'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
+	end
+
+	if $start_type = 'uni_tg':
+		$start_text += '<TD><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:$start_type = ''uni_tg'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
 	end
 
-	act '<center><b>New in Town Start</b></center>':
-		cla
-		settingmode = 0
-		showstat 0
-		MagikDostup = 1
-		gt 'preSYS', 'TGStart'
+	$start_text
+
+	'</table></center>'
+	
+	if $start_type = 'sg' or $start_type = 'sg_m':
+		act '<center><b>Start</b></center>': gt 'intro_sg', 'start'
+	elseif $start_type = 'sg_tg':
+		act '<center><b>Start</b></center>': gt 'intro_sg_tg', 'start'
+	elseif $start_type = 'city':
+		act '<center><b>Start</b></center>': gt 'intro_city', 'start'
+	elseif $start_type = 'city_m':
+		act '<center><b>Start</b></center>': gt 'intro_city_m', 'start'
+	elseif $start_type = 'city_tg':
+		act '<center><b>Start</b></center>': gt 'intro_city_tg', 'start'
+	elseif $start_type = 'uni':
+		act '<center><b>Start</b></center>': gt 'intro_uni', 'start'
+	elseif $start_type = 'uni_m':
+		act '<center><b>Start</b></center>': gt 'intro_uni_m', 'start'
+	elseif $start_type = 'uni_tg':
+		act '<center><b>Start</b></center>': gt 'intro_uni_tg', 'start'
 	end
+	
 	act '<center><b>Change game settings</b></center>': settingmode = 1 & gs '$menu_setting'
 end
 
@@ -97,7 +123,7 @@ if $ARGS[0] = 'warning':
 	*nl
 	'<center><img <<$set_imgh>> src="images/system/1_openings/warning.jpg" ></center>'
 	
-	act 'Continue': gt 'begin','real_character'
+	act '<center><b>Continue</b></center>': gt 'begin','real_character'
 end
 	
 if $ARGS[0] = 'real_character':
@@ -106,266 +132,27 @@ if $ARGS[0] = 'real_character':
 	'<center><b><font color = maroon>CHARACTER SELECTION</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/character_creation_1.jpg"></center>'
 	*nl
-	'This game offers the ability to create your own character.'
-	'To do this, replace the image "avatar" in the "images" folder of the game with a file of the same name and format JPEG (.jpg). That''s it!'
-	'Please note, this choice can only be changed in the cheat menu and in-game changes to hair color, length etc. will not affect the displayed image if you are using a custom one.'
-	'This function is made solely to simplify things for those that want to use a custom image without having to sort through hundreds of pictures.'
+	'This game has two ways to display your character''s face, either dynamically depending on your hair style or a fixed image of your choice.'
+	'To use a fixed image, replace the image "avatar" in the "images" folder of the game with a file of the same name and format (.jpg) and select "Use a fixed image".'
+	'Please note, this choice can only be changed in the cheat menu at any time and only one custom image can be used at anytime across all saves.'
 	'Your selected image is your own personal choice, and is based on your personal preferences. By default, the game uses an avatar image from the site wikimedia.org.'
 
-	*NL 'If you are playing with Quest player for Android, click '
+	*nl
+	'If you are playing with Quest player for Android, click '
 	if Enable_Android = 1:
 	   *P '<a href="exec:Enable_Android = 0 & gt ''begin'',''real_character''">Here</a> (Current: <B>Yes</B>)'
 	else
 	   *P '<a href="exec:Enable_Android = 1 & gt ''begin'',''real_character''">Here</a> (Current: <B>No</B>)'
 	end
 
-	act'<center><b>Start a standard character</b></center>':
+	act'<center><b>Use the dynamic profile system</b></center>':
 		cls
 		gt 'begin', 'start'
 	end
-	act'<center><b>Use the avatar system</b></center>':
+	act'<center><b>Use a fixed profile image</b></center>':
 		cls
 		player_avatar = 1
-		pcs_eyecol = 1
-		pcs_eyesize = 2
-		pcs_lashes = 1
-		pcs_haircol = 1
-		pcs_hairlng = 81
-		pcs_lip = 2
-		if birthyear = 0: birthyear = 1998
-		if birthmonth = 0: birthmonth = 4
-		if birthday = 0: birthday = 1
-		gt 'begin', 'description_real_character'
-	end
-end
-
-if $ARGS[0] = 'description_real_character':
-	gs 'begin', 'hair'
-	gs 'begin', 'lip'
-	gs 'begin', 'eyes'
-	if birthyear = 0: birthyear = 1998
-	if birthmonth = 0: birthmonth = 4
-	if birthday = 0: birthday = 1
-	cls
-	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
-	*nl
-	'<center>On this screen, you may adjust your character''s description to match your avatar. Please note, at present, hair color and glasses choice may be overridden by the personality choice you make during the game intro.</center>'
-	*nl
-	'<center>Customize your:</center>'
-	!'<center>Your name is <B><i><<$pcs_nickname>> <<$pcs_lastname>></B></i>. (You may change this during the intro, and also at the passport office in-game.)'
-	'<center><a href="exec:gs ''begin'', ''hair''"><img src="images/system/1_openings/shared/icon_hair.png"></a> <a href="exec:gs ''begin'', ''eyes''"><img src="images/system/1_openings/shared/icon_eye.png"></a> <a href="exec:gs ''begin'', ''lip''"><img src="images/system/1_openings/shared/icon_lip.png"></a> <a href="exec:gs ''begin'', ''birthday''"><img src="images/system/1_openings/shared/icon_birthday.png"></a></center>'
-
-	act'<center><b>Done</b></center>': gt 'begin', 'start'
-end
-
-if $ARGS[0] = 'hair':
-	cls
-	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
-	*nl
-	if pcs_hairlng <= 1:
-		$hair = 'You have <a href="exec:pcs_hairlng = 31 & gs ''begin'', ''hair''">very short</a>,'
-	elseif pcs_hairlng <= 31:
-		$hair = 'You have <a href="exec:pcs_hairlng = 81 & gs ''begin'', ''hair''">short</a>,'
-	elseif pcs_hairlng <= 81:
-		$hair = 'You have <a href="exec:pcs_hairlng = 161 & gs ''begin'', ''hair''">chin length</a>,'
-	elseif pcs_hairlng <= 161:
-		$hair = 'You have <a href="exec:pcs_hairlng = 261 & gs ''begin'', ''hair''">shoulder length</a>,'
-	elseif pcs_hairlng <= 261:
-		$hair = 'You have <a href="exec:pcs_hairlng = 401 & gs ''begin'', ''hair''">breast length</a>,'
-	elseif pcs_hairlng <= 401:
-		$hair = 'You have <a href="exec:pcs_hairlng = 601 & gs ''begin'', ''hair''">back length</a>,'
-	elseif pcs_hairlng <= 601:
-		$hair = 'You have <a href="exec:pcs_hairlng = 801 & gs ''begin'', ''hair''">hip length</a>,'
-	elseif pcs_hairlng <= 801:
-		$hair = 'You have <a href="exec:pcs_hairlng = 1001 & gs ''begin'', ''hair''">ass length</a>,'
-	else
-		$hair = 'You have <a href="exec:pcs_hairlng = 1 & gs ''begin'', ''hair''">extremely long</a>,'
-	end
-
-	if pcs_haircol = 0 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">black</a> hair.'& $hair2 = 'black hair' & $hair3 = 'black hair'
-	if pcs_haircol = 1 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">brown</a> hair.'& $hair2 = 'brown hair' & $hair3 = 'brown hair'
-	if pcs_haircol = 2 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">red</a> hair.'& $hair2 = 'Red hair' & $hair3 = 'red hair'
-	if pcs_haircol = 3 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">blonde</a> hair.'& $hair2 = 'blond hair' & $hair3 = 'blond hair'
-	if pcs_haircol = 0 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">black</a> hair.'& $hair2 = 'curls' & $hair3 = 'black curls'
-	if pcs_haircol = 1 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">brown</a> hair.'& $hair2 = 'curls' & $hair3 = 'brown curls'
-	if pcs_haircol = 2 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">red</a> hair.'& $hair2 = 'curls' & $hair3 = 'red hair'
-	if pcs_haircol = 3 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">blonde</a> hair.' &$hair2 = 'curls' & $hair3 = 'blond curls'
-	'<center>Adjust your hair to match your avatar. Please note that, at present, hair choices are overridden by your starting personality choice (e.g. volleyball players will always have straight blond hair).</center>'
-	*nl
-	nathcol = pcs_haircol
-	if player_avatar = 1:
-		if avatar_hair = 1:
-			'<center>Please note that this choice is given only once and you will not be able to change it without starting a new game!</center>'
-			'<center>You have <i><<$av_hair>>.</i> <a href="exec:avatar_hair = 0 & gs ''begin'', ''hair''">Revert to default</a>.</center>'
-		else
-			'<center><i><<$hair>></i> You may also <a href="exec:gs ''begin'', ''hair_input'' & gs ''begin'', ''hair''">manually enter a description</a></center>.'
-		end
-	end
-	if $start_type = 'sgs':
-		act'<center><b>Done</b></center>': gt 'preCUST', 'SGStart'
-	else
-		act'<center><b>Done</b></center>': gt 'begin', 'description_real_character'
-	end
-end
-
-if $ARGS[0] = 'pcs_haircol':
-	pcs_haircol += 1
-	if pcs_haircol > 3: pcs_haircol = 0
-end
-
-if $ARGS[0] = 'hair_input':
-	avatar_hair = 1
-	$av_hair = input("Enter a description of your hair:")
-end
-
-if $ARGS[0] = 'lip':
-	cls
-	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
-	*nl
-	if pcs_lip = 0:$pcs_lip = 'you have thin<<$pcs_lipbalm>> lips.' & $liptalk = 'thin lips' & $liptalk2 = 'thin lips' & $liptalk3 = 'thin lips'
-	if pcs_lip = 1:$pcs_lip = 'You have normal<<$pcs_lipbalm>> lips.' & $liptalk = 'soft lips' & $liptalk2 = 'delicate lips' & $liptalk3 = 'tender lips'
-	if pcs_lip = 2:$pcs_lip = 'You have plump<<$pcs_lipbalm>> lips.' & $liptalk = 'plump lips' & $liptalk2 = 'plump lips' & $liptalk3 = 'plump lips'
-	if pcs_lip = 3:$pcs_lip = 'You have large,<<$pcs_lipbalm>> full lips.' & $liptalk = 'full lips' & $liptalk2 = 'plump lips' & $liptalk3 = 'full lips'
-	if pcs_lip = 4:$pcs_lip = 'You have huge, thick<<$pcs_lipbalm>> lips.' & $liptalk = 'thick lips' & $liptalk2 = 'thick lips' & $liptalk3 = 'thick lips'
-	'<center>Adjust the size of your lips to match your <a href="exec:view''images/avatar.jpg''">image</a>:</center>'
-	*nl
-	'<center><i><<$pcs_lip>></i></center>'
-	*nl
-	if pcs_lip < 4:'<center><a href="exec:pcs_lip += 1 & gs ''begin'', ''lip''">Bigger lips</a></center>'
-	if pcs_lip > 0:'<center><a href="exec:pcs_lip -= 1 & gs ''begin'', ''lip''">Smaller lips</a></center>'
-	act'<center><b>Done</b></center>': gt'begin','description_real_character'
-end
-
-if $ARGS[0] = 'eyes':
-	cls
-	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	if player_avatar = 1:
-		'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-	end
-	*nl
-	if pcs_eyecol = 0:$pcs_eyecol = 'brown' & $glacol2 = 'brown'
-	if pcs_eyecol = 1:$pcs_eyecol = 'gray' & $glacol2 = 'gray'
-	if pcs_eyecol = 2:$pcs_eyecol = 'green' & $glacol2 = 'green'
-	if pcs_eyecol = 3:$pcs_eyecol = 'blue' & $glacol2 = 'blue'
-	if glass <= 0:$glass = '' & glassvnesh = 0
-	if glass = 1:$glass = ' You wear silly glasses in a cheap frame.' & glassvnesh = 10
-	if pcs_lashes > 2:pcs_lashes = 2
-	if pcs_lashes = 0:$pcs_lashes = 'with short eyelashes'
-	if pcs_lashes = 1:$pcs_lashes = 'with normal eyelashes'
-	if pcs_lashes = 2:$pcs_lashes = 'with long eyelashes'
-	if pcs_eyesize > 3:pcs_eyesize = 3
-	if pcs_eyesize = 0:$glaza = 'You have small <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = '<<$pcs_eyecol>> eyes' & $glaza3 = '<<$glacol2>> eyes'
-	if pcs_eyesize = 1:$glaza = 'You have expressive <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'expressive <<$pcs_eyecol>> eyes' & $glaza3 = 'expressive <<$glacol2>> eyes'
-	if pcs_eyesize = 2:$glaza = 'You have large <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'big <<$pcs_eyecol>> eyes' & $glaza3 = 'high <<$glacol2>> eyes'
-	if pcs_eyesize = 3:$glaza = 'You have huge <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'great <<$pcs_eyecol>> eyes' & $glaza3 = 'great <<$glacol2>> eyes'
-
-	if player_avatar = 1:
-		'<center>Adjust your eyes and eyelashes to match your avatar. Please note, glasses choice may be overridden by your starting personality choice (e.g. bookworms/nerds will always start with glasses).</center>'
-	else
-		'<center>Please note, glasses choice may be overridden by your starting personality choice (e.g. bookworms/nerds will always start with glasses).</center>'
-	end	
-	*nl
-	'<center><i><<$glaza>></i></center>'
-	*nl
-	if pcs_lashes < 2:'<center><a href="exec:pcs_lashes += 1 & gs ''begin'', ''eyes''">Lengthen lashes</a></center>'
-	if pcs_lashes > 0:'<center><a href="exec:pcs_lashes -= 1 & gs ''begin'', ''eyes''">Shorten lashes</a></center>'
-	if pcs_eyesize < 3:'<center><a href="exec:pcs_eyesize += 1 & gs ''begin'', ''eyes''">Larger eyes</a></center>'
-	if pcs_eyesize > 0:'<center><a href="exec:pcs_eyesize -= 1 & gs ''begin'', ''eyes''">Smaller eyes</a></center>'
-	if glass = 0:'<center><a href="exec:glass = 1 & gs ''begin'', ''eyes''">Wear glasses</a></center>'
-	if glass = 1:'<center><a href="exec:glass = 0 & gs ''begin'', ''eyes''">Remove glasses</a></center>'
-
-	if player_avatar = 1:
-		act'<center><b>Done</b></center>': gt'begin','description_real_character'
-	elseif $start_type = 'nt':
-		act'<center><b>Done</b></center>': gt 'preCUST', 'NTStart2'
-	elseif $start_type = 'sgs':
-		act'<center><b>Done</b></center>': gt 'preCUST', 'SGStart'
-	else
-		act'<center><b>Done</b></center>': gt 'preCUST', 'TGStart'
-	end
-end
-
-if $ARGS[0] = 'eye color':
-	pcs_eyecol += 1
-	if pcs_eyecol > 3: pcs_eyecol = 0
-end
-
-if $ARGS[0] = 'birthday':
-	cls
-	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	if csb_start ! 1:
-		if player_avatar = 1:
-			'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-		end
-	else
-		'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/16.jpg"></center>'
-	end
-	'<center>Choose your date of birth:</center>'
-	*nl
-	if birthyear = 0: birthyear = 1998
-	if birthmonth = 0: birthmonth = 4
-	if birthday = 0: birthday = 1
-
-	if birthmonth = 2:
-		if ((birthyear mod 4 = 0) and (birthyear mod 100 ! 0)) or (birthyear mod 400 = 0): 
-			monthdays = 29
-		else
-			monthdays = 28
-		end
-	elseif birthmonth = 4 or birthmonth = 6 or birthmonth = 9 or birthmonth = 11:
-		monthdays = 30
-	else
-		monthdays = 31
-	end
-
-	if birthmonth > 12: birthmonth = 12
-	if birthmonth < 1: birthmonth = 1
-	if birthday < 1: birthday = 1
-	if birthday > monthdays: birthday = monthdays
-
-	if birthday < 10 and birthmonth < 10:
-		'<center>Your birthday: <B>0<<birthmonth>>/0<<birthday>></B> (MM/DD)</center>'
-	elseif birthday < 10 and birthmonth >= 10:
-		'<center>Your birthday: <B><<birthmonth>>/0<<birthday>></B> (MM/DD)</center>'
-	elseif birthday >= 10 and birthmonth < 10:
-		'<center>Your birthday: <B>0<<birthmonth>>/<<birthday>></B> (MM/DD)</center>'
-	elseif birthday >= 10 and birthmonth >= 10:
-		'<center>Your birthday: <B><<birthmonth>>/<<birthday>></B> (MM/DD)</center>'
-	end
-
-	*nl
-	'<center><a href="exec:birthday += 5 & gs ''begin'', ''birthday''">+5 Days</a></center>'
-	'<center><a href="exec:birthday += 1 & gs ''begin'', ''birthday''">+1 Day</a></center>'
-	'<center><a href="exec:birthday -= 1 & gs ''begin'', ''birthday''">-1 Day</a></center>'
-	'<center><a href="exec:birthday -= 5 & gs ''begin'', ''birthday''">-5 Days</a></center>'
-	'<center><a href="exec:birthmonth = 1 & gs ''begin'', ''birthday''">January</a></center>'
-	'<center><a href="exec:birthmonth = 2 & gs ''begin'', ''birthday''">February</a></center>'
-	'<center><a href="exec:birthmonth = 3 & gs ''begin'', ''birthday''">March</a></center>'
-	'<center><a href="exec:birthmonth = 4 & gs ''begin'', ''birthday''">April</a></center>'
-	'<center><a href="exec:birthmonth = 5 & gs ''begin'', ''birthday''">May</a></center>'
-	'<center><a href="exec:birthmonth = 6 & gs ''begin'', ''birthday''">June</a></center>'
-	'<center><a href="exec:birthmonth = 7 & gs ''begin'', ''birthday''">July</a></center>'
-	'<center><a href="exec:birthmonth = 8 & gs ''begin'', ''birthday''">August</a></center>'
-	'<center><a href="exec:birthmonth = 9 & gs ''begin'', ''birthday''">September</a></center>'
-	'<center><a href="exec:birthmonth = 10 & gs ''begin'', ''birthday''">October</a></center>'
-	'<center><a href="exec:birthmonth = 11 & gs ''begin'', ''birthday''">November</a></center>'
-	'<center><a href="exec:birthmonth = 12 & gs ''begin'', ''birthday''">December</a></center>'
-
-	if csb_start ! 1:
-		if player_avatar = 1:
-			act'<center><b>Done</b></center>': gt 'begin', 'description_real_character'
-		else
-			act'<center><b>Done</b></center>': gt 'preSYS', 'SGStart2'
-		end
-	else
-		act'<center><b>Done</b></center>': gt 'preSys', 'CSBStart'
+		gt 'begin', 'start'
 	end
 end
 

+ 0 - 3
locations/body.qsrc

@@ -40,9 +40,6 @@ if $ARGS[0] = 'RegularUpdate':
 	elseif pcs_skin < 0:
 		pcs_skin = 0
 	end
-	
-	!!Since "musle" is used all over the place
-	musle = strenbuf
 end
 
 if $ARGS[0] = 'DailyUpdate':

+ 66 - 66
locations/body_desc.qsrc

@@ -10,24 +10,24 @@
 }
 
 if $ARGS[0] = '':
-    $this = 'body_desc'
-    gs $this, 'throat'
-    gs $this, 'pussy'
-    gs $this, 'anus'
+	$this = 'body_desc'
+	gs $this, 'throat'
+	gs $this, 'pussy'
+	gs $this, 'anus'
 	if dounspell = 0: gs $this, 'butt' & gs $this, 'breasts' & gs $this, 'BMI'
 	gs $this, 'lips'
 	gs $this, 'hair'
-    gs $this, 'tan'
-    gs $this, 'skin'
-    gs $this, 'eye_color'
+	gs $this, 'tan'
+	gs $this, 'skin'
+	gs $this, 'eye_color'
 	gs $this, 'eyelashes'
 	gs $this, 'glasses'
-    gs $this, 'eye_size'
-    gs $this, 'makeup'
-    gs $this, 'nipples'
-    gs $this, 'clit'
-    gs $this, 'pubes'
-    gs $this, 'legs'
+	gs $this, 'eye_size'
+	gs $this, 'makeup'
+	gs $this, 'nipples'
+	gs $this, 'clit'
+	gs $this, 'pubes'
+	gs $this, 'legs'
 	gs $this, 'appearance'
 end
 
@@ -41,7 +41,7 @@ if $ARGS[0] = 'ChooseDescWord':
 end
 
 if $ARGS[0] = 'throat':
-    if pcs_throat = 0:
+	if pcs_throat = 0:
 		$pcs_throat = 'You have a chaste <a href="exec:view''images/pc/body/throat/th0.jpg''">mouth</a>.'
 		$pc_desc['throat'] = 'virgin'
 		$pc_descWordy['throat'] = 'virginal, unused'
@@ -82,7 +82,7 @@ if $ARGS[0] = 'throat':
 end
 
 if $ARGS[0] = 'pussy':
-    if vgape >= 4:
+	if vgape >= 4:
 		if rand(0,1) = 0:
 			$pcs_vag = 'Your regularly-fucked <a href="exec:view''images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg''">playground</a> can take most things you force up there.'
 		else
@@ -126,7 +126,7 @@ if $ARGS[0] = 'pussy':
 end
 
 if $ARGS[0] = 'anus':
-    !! The original variables are all named for ass, but really, this is just all about the asshole.
+	!! The original variables are all named for ass, but really, this is just all about the asshole.
 	if analplugIN = 0:
 		if agape >= 4:
 			anpic = 5
@@ -175,7 +175,7 @@ if $ARGS[0] = 'anus':
 		$pc_descWordy['anus'] = 'plug-stuffed'
 		$anustipe = 'plugged'
 		if $pantyworntype ! 'none':
-			$pcs_ass = 'Your <a href="exec:view''images/pc/body/analplug.jpg''">anus</a> is currently filled with your butt plug.'	
+			$pcs_ass = 'Your <a href="exec:view''images/pc/body/analplug.jpg''">anus</a> is currently filled with your butt plug.'
 		else
 			if pirsG > 0 and pirsG < 10000:
 				$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/pirs' + rand(1,3) + '.jpg''">anus</a> is currently filled with your butt plug.'
@@ -190,19 +190,19 @@ if $ARGS[0] = 'BMI':
 	!!BMI Descriptions
 	if pcs_bmi < 16:
 		$bmi_desc = 'You are severely underweight.'
-	elseif pcs_bmi >= 16 and pcs_bmi < 19:
+	elseif pcs_bmi < 19:
 		$bmi_desc = 'You are underweight'
-	elseif pcs_bmi >= 19 and pcs_bmi < 25:
+	elseif pcs_bmi < 25:
 		$bmi_desc = 'You have a normal, healthy weight.'
-	elseif pcs_bmi >= 25 and pcs_bmi < 30:
+	elseif pcs_bmi < 30:
 		$bmi_desc = 'You are overweight.'
-	elseif pcs_bmi >= 30 and pcs_bmi < 35:
+	elseif pcs_bmi < 35:
 		$bmi_desc = 'You are moderately obese.'
-	elseif pcs_bmi >= 35 and pcs_bmi < 40:
+	elseif pcs_bmi < 40:
 		$bmi_desc = 'You are severely obese.'
-	elseif pcs_bmi >= 40 and bmi_pcs_bmicalc < 45:
+	elseif pcs_bmi < 45:
 		$bmi_desc = 'You are very severely obese.'
-	elseif pcs_bmi >= 45:
+	else
 		$bmi_desc = 'You are morbidly obese.'
 	end
 end
@@ -264,7 +264,7 @@ if $ARGS[0] = 'breasts':
 		$pcdesc_breastsqualifierinsertive = ''
 		pcdesc_breastimplantcheck = 0
 	end
-	
+
 	!! These will not be used below, but can be referenced by descriptive writers in case they want to be able to quickly reference whether or not the PC has implants, as in "He reaches up and cups your<<$pcdesc_breastsfakeinsertive>> breasts."
 	if pcdesc_breastimplantcheck = 1:
 		$pcdesc_breastsfakeinsertive = ' fake'
@@ -407,13 +407,13 @@ end
 
 if $ARGS[0] = 'butt':
 	!natural butt
-	if pcs_butt <= 4: 
+	if pcs_butt <= 4:
 		$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank.  It can be considered very masculine looking and isn''t very impressive.'
-	elseif pcs_butt <= 8: 
+	elseif pcs_butt <= 8:
 		$pcs_butt = 'You have an average, feminine looking <a href="exec:view''images/pc/body/ass/2.jpg''">ass</a>. While it''s not flat, it''s nothing special either.'
-	elseif pcs_butt <= 12: 
-		$pcs_butt = 'Your tight <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a> is a little bigger, rounder and firmer than average. You often draw the stares of guys around you.'
-	elseif pcs_butt <= 16: 
+	elseif pcs_butt <= 12:
+		$pcs_butt = 'Your tight <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a> is bigger, rounder and firmer than average. You often draw the stares of guys around you.'
+	elseif pcs_butt <= 16:
 		$pcs_butt = 'You have a large and natural bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk. Guys hungrily fixate on you with their tongues hanging out and other girls are often envious of your booty.'
 	end
 
@@ -449,7 +449,7 @@ if $ARGS[0] = 'lips':
 		$pc_descWordy['lip size'] = 'plush, pillowy and inviting'
 	end
 	!! Lip balm is used OVER makeup, and given the descriptions already provided for what it does to lips, I feel with some certainty it is meant to be lip gloss, not lip BALM. Still, cannot change the old variables...
-	!! $pcdesc_lipglossed is used for a past-tense descriptive, present-tense descriptives will use $pcdesc_lipgloss. In most cases, the lip balm descriptors should only add options when looking at random choices, as the additional random options are merely indicative of 
+	!! $pcdesc_lipglossed is used for a past-tense descriptive, present-tense descriptives will use $pcdesc_lipgloss. In most cases, the lip balm descriptors should only add options when looking at random choices, as the additional random options are merely indicative of
 	!! a more suggestive lip shape and fullness, not necessarily a different type of gloss. Only shiny is culled past 1, because it is boring. $pcs_lipbalm is left for backwards compatibility.
 	if pcs_lipbalm > 0:
 		$pc_desc['lip gloss'] = func($this, 'ChooseDescWord', 'shiny', 'glossy', 'juicy', 'slippery')
@@ -480,7 +480,7 @@ if $ARGS[0] = 'lips':
 
 	$lip = 'You have <<$pcs_lipSize>>, <<$pc_desc[''lip gloss'']>> ' + iif(pcs_lip = 4, 'suggestively full ', '') +  'lips. <<$pirsB>> <<$pirsA>>'
 
-    !! A pair of ready-made lip strings for writers to use if they are unsure how to construct them themselves. Again, these are not great and should preferably not be relied on, but they are here.
+	!! A pair of ready-made lip strings for writers to use if they are unsure how to construct them themselves. Again, these are not great and should preferably not be relied on, but they are here.
 	$pc_desc['lips'] = '<<$pc_desc[''lip size'']>> <<$pc_desc[''lip gloss'']>>'
 	$pc_descWordy['lips'] = '<<$pc_desc[''lip gloss'']>>, <<$pc_descWordy[''lip size'']>>'
 end
@@ -516,7 +516,7 @@ if $ARGS[0] = 'tan':
 end
 
 if $ARGS[0] = 'skin':
-    if pcs_skin < 20:
+	if pcs_skin < 20:
 		$pc_desc['skin'] = func($this, 'ChooseDescWord', 'terrible', 'awful', 'greasy', 'pimple-strewn')
 		$pc_descWordy['skin'] = 'awful, greasy and pimply'
 		$skin = 'Your <<$pcs_tan>> skin is rough and covered with pimples and moles. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
@@ -573,7 +573,7 @@ if $ARGS[0] = 'eyelashes':
 		if false_lashes >= 1:
 			$pcs_lashes = 'with lavish, fluttery false lashes'
 			$pc_descWordy['eyelashes'] = 'lavish, attention-grabbing false'
-		else	
+		else
 			$pcs_lashes = 'with lavishly seductive lash extensions'
 			$pc_descWordy['eyelashes'] = 'lavish, seductively dark'
 		end
@@ -614,7 +614,7 @@ if $ARGS[0] = 'glasses':
 end
 
 if $ARGS[0] = 'eye_color':
-    if pcs_eyecol = 0:
+	if pcs_eyecol = 0:
 		$pc_desc['eye colour'] = func($this, 'ChooseDescWord', 'brown', 'hazel')
 		$pc_descWordy['eye colour'] = 'warm, hazel'
 		$pcs_eyecol = 'brown'
@@ -638,7 +638,7 @@ if $ARGS[0] = 'eye_color':
 end
 
 if $ARGS[0] = 'eye_size':
-    !! Most of these sound really terrible. Would REALLY recommend only using the insertive context, as the less-flowery versions will simply not return anything at all.
+	!! Most of these sound really terrible. Would REALLY recommend only using the insertive context, as the less-flowery versions will simply not return anything at all.
 	if pcs_eyesize = 0:
 		$pc_desc['eye size'] = ''
 		$pc_descWordy['eye size'] = 'little'
@@ -660,7 +660,7 @@ if $ARGS[0] = 'eye_size':
 end
 
 if $ARGS[0] = 'pierrcing':
-    !! If, like me, you are confused by the logic of what initially appear to be arbitrary numbers, it turns out the piercing location value is set to a number to indicate which photo it uses, which is tied to what jewelry you have for the piercing. 10000 means pierced, but no jewelry.
+	!! If, like me, you are confused by the logic of what initially appear to be arbitrary numbers, it turns out the piercing location value is set to a number to indicate which photo it uses, which is tied to what jewelry you have for the piercing. 10000 means pierced, but no jewelry.
 	if pirsA > 0 and pirsA < 10000:
 		$pirsA = 'When you talk to people, they can sometimes get a glimpse of your tongue piercing.'
 		rand_tongue = rand(0,1)
@@ -763,25 +763,25 @@ if $ARGS[0] = 'pierrcing':
 end
 
 if $ARGS[0] = 'makeup':
-    if pcs_makeup = 0:
+	if pcs_makeup = 0:
 		$pc_desc['makeup'] = func($this, 'ChooseDescWord', 'makeup-ruined', 'makeup-smeared', 'makeup-trashed')
 		$pc_descWordy['makeup'] = 'clownishly makeup-smeared'
 		$pcs_makeup = '<b><font color="red">Your makeup is smeared all over your face</font></b>'
 		$pcs_makeup_msg = 'Your makeup is smeared all over your face.'
 		$pcs_makeup_tooltip = 'Your makeup is ruined.'
-	elseif pcs_makeup = 1: 
+	elseif pcs_makeup = 1:
 		$pc_desc['makeup'] = func($this, 'ChooseDescWord', 'natural', 'bare')
 		$pc_descWordy['makeup'] = 'bare, natural'
 		$pcs_makeup = 'You''re not wearing any kind of makeup'
 		$pcs_makeup_msg = 'You''re not wearing any kind of makeup.'
 		$pcs_makeup_tooltip = 'You''re not wearing makeup.'
-	elseif pcs_makeup = 2: 
+	elseif pcs_makeup = 2:
 		$pc_desc['makeup'] = func($this, 'ChooseDescWord', 'lightly-accented', 'subtly-highlighted')
 		$pc_descWordy['makeup'] = 'almost natural, subtly-accented'
 		$pcs_makeup = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty'
 		$pcs_makeup_msg = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty.'
 		$pcs_makeup_tooltip = 'Your makeup is light and subtle.'
-	elseif pcs_makeup = 3: 
+	elseif pcs_makeup = 3:
 		$pc_desc['makeup'] = func($this, 'ChooseDescWord', 'colourfully done-up', 'vibrantly done-up')
 		$pc_descWordy['makeup'] = 'colourful, tastefully done-up'
 		$pcs_makeup = 'Your makeup has some mildly vibrant tones, covering your minor imperfections and enhancing your best features'
@@ -809,7 +809,7 @@ if $ARGS[0] = 'makeup':
 end
 
 if $ARGS[0] = 'nipples':
-    if pcs_nips < 20:
+	if pcs_nips < 20:
 		$nipplesize = 'You have average <a href="exec:view''images/pc/body/nipples/nipples1.jpg''">nipples</a>.'
 		$pc_desc['nipples'] = func($this, 'ChooseDescWord', 'small', 'tiny', 'little')
 		$pc_descWordy['nipples'] = 'small, tiny'
@@ -834,7 +834,7 @@ if $ARGS[0] = 'nipples':
 end
 
 if $ARGS[0] = 'clit':
-    if clit_size < 20:
+	if clit_size < 20:
 		$pc_descWordy['clit'] = 'small, oft-hidden'
 		$pc_desc['clit'] = func($this, 'ChooseDescWord', 'small', 'tiny')
 		$clitsize = 'You consider your <a href="exec:view''images/pc/body/clit/clit1.jpg''">clitoris</a> to be of an average size.'
@@ -859,9 +859,9 @@ if $ARGS[0] = 'clit':
 end
 
 if $ARGS[0] = 'pubes':
-    if lashair = 0:
+	if lashair = 0:
 		if pcs_pubes <= 3:
-			lobkoef = 3 
+			lobkoef = 3
 			$pcs_pubes = 'You have a smoothly <a href="exec:view''<<FUNC(''$pube_image'')>>''">shaved pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 			$pc_desc['pubes'] = func($this, 'ChooseDescWord', 'silky', 'hairless', 'smooth-shaven', 'freshly-shaven')
 			$pc_descWordy['pubes'] = 'silky, freshly-shaven'
@@ -901,7 +901,7 @@ if $ARGS[0] = 'pubes':
 			$pc_desc['pubes'] = func($this, 'ChooseDescWord', 'thickly-furred', 'very hairy', 'ill-maintained')
 			$pc_descWordy['pubes'] = 'hairy, wild-maned'
 		end
-    elseif lashair = 1:
+	elseif lashair = 1:
 		$pc_desc['pubes'] = func($this, '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>>'
@@ -909,7 +909,7 @@ if $ARGS[0] = 'pubes':
 end
 
 if $ARGS[0] = 'legs':
-    if pcs_leghair <= 0:
+	if pcs_leghair <= 0:
 		$pc_desc['legs'] = func($this, 'ChooseDescWord', 'smooth', 'silky', 'soft')
 		$pc_descWordy['legs'] = 'soft and silky-smooth'
 		$pcs_leghair = 'You have smooth legs.'
@@ -1071,57 +1071,57 @@ if $ARGS[0] = 'hair':
 		$pcs_haircol = 'pink'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'bubblegum-pink', 'Barbie pink', 'fuchsia', 'pink', 'bright pink')
 		$pc_descWordy['hair colour'] = 'bright, bubblegum-pink'
-	
+
 	elseif pcs_haircol = 13:
 		$pcs_haircol = 'light pink'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'light pink', 'pale pink', 'babydoll pink', 'China pink', 'cotton-candy pink', 'candy-floss pink')
 		$pc_descWordy['hair colour'] = 'pale, cotton-candy pink'
-	
+
 	elseif pcs_haircol = 14:
 		$pcs_haircol = 'dark purple'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'dark purple', 'deep purple', 'midnight purple', 'indigo')
 		$pc_descWordy['hair colour'] = 'deep, bluish-purple'
-	
+
 	elseif pcs_haircol = 15:
 		$pcs_haircol = 'purple'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'purple', 'plum purple', 'royal purple')
 		$pc_descWordy['hair colour'] = 'rich, royal purple'
-	
+
 	elseif pcs_haircol = 16:
 		$pcs_haircol = 'light purple'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'light purple', 'pale purple', 'amethyst coloured', 'lavender')
 		$pc_descWordy['hair colour'] = 'pale, floral purple'
-	
+
 	elseif pcs_haircol = 17:
 		$pcs_haircol = 'light orange'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'light orange', 'pumpkin orange', 'bright orange')
 		$pc_descWordy['hair colour'] = 'bright, fiery orange'
-	
+
 	elseif pcs_haircol = 18:
 		$pcs_haircol = 'dark red'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'dark red', 'wine red', 'auburn')
 		$pc_descWordy['hair colour'] = 'deep, seductive red'
-	
+
 	elseif pcs_haircol = 19:
 		$pcs_haircol = 'medium red'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'medium red', 'cherry red', 'bronze')
 		$pc_descWordy['hair colour'] = 'strong, fiery red'
-	
+
 	elseif pcs_haircol = 20:
 		$pcs_haircol = 'turquoise'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'turquoise', 'ultramarine', 'aquamarine', 'sea green')
 		$pc_descWordy['hair colour'] = 'soft milky blue'
-	
+
 	elseif pcs_haircol = 21:
 		$pcs_haircol = 'medium orange'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'medium orange', 'pumpkin orange', 'carrot orange')
 		$pc_descWordy['hair colour'] = 'strong, fiery orange'
-	
+
 	elseif pcs_haircol = 22:
 		$pcs_haircol = 'dark orange'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'dark orange', 'burnt Orange', 'rust')
 		$pc_descWordy['hair colour'] = 'strong, burnt orange'
-	
+
 		!! This below is a catch-all, it should not actually ever wind up occurring, but just in case it does...
 	else
 		$pcs_haircol = 'strangely-coloured'
@@ -1141,7 +1141,7 @@ if $ARGS[0] = 'hair':
 		$pc_desc['hair style'] = 'pigtails'
 		$pc_descWordy['hair style'] = 'youthful, playful and flirty <<$pcs_haircol>> pigtails'
 
-	elseif hbraids > 0:	
+	elseif hbraids > 0:
 		$hairstyle = 'Your hair is beautifully braided.'
 		$pc_desc['hair style'] = 'braid'
 		$pc_descWordy['hair style'] = 'delicately-wound <<$pcs_haircol>> braid'
@@ -1173,33 +1173,33 @@ if $ARGS[0] = 'hair':
 			$hair = 'You have short <<$pcs_haircol>> hair which just covers your ears to their lobes. It''s a modern, classy hairstyle. Currently your hair is <<$pcs_hairbsh>>.'
 			$pc_desc['hair length'] = func($this, 'ChooseDescWord', 'short', 'pixie-cut', 'androgynously short')
 			$pc_descWordy['hair length'] = 'short, page-boy'
-		
+
 		elseif pcs_hairlng > 80 and pcs_hairlng <= 160:
 			$hair = 'You have <<$curly>><<$pcs_haircol>> hair<<$hbangs>>. Your hair goes down to your chin line and can be considered of a medium length, which fits almost all face shapes. Your hair is <<$pcs_hairbsh>> at the moment. <<$hairstyle>>'
 			$pc_desc['hair length'] = func($this, 'ChooseDescWord', 'medium', 'average')
 			$pc_descWordy['hair length'] = 'medium-length'
-		
+
 		elseif pcs_hairlng > 160 and pcs_hairlng <= 260:
 			$hair = 'You have <<$curly>><<$pcs_haircol>> hair<<$hbangs>>. Your hair reaches your shoulders with several strands going just beyond. Currently your hair is <<$pcs_hairbsh>>. <<$hairstyle>>'
 			$pc_desc['hair length'] = 'moderate'
 			$pc_descWordy['hair length'] = 'shoulder-length'
-		
+
 		elseif pcs_hairlng > 260 and pcs_hairlng <= 400:
 			$hair = 'You have <<$curly>><<$pcs_haircol>> hair<<$hbangs>>. As your hair reaches your bra line, hairdressers would consider this a rather long style, yet beautiful looks are created with this length. Your hair is <<$pcs_hairbsh>>. <<$hairstyle>>'
 			$pc_desc['hair length'] = func($this, 'ChooseDescWord', 'long', 'lengthy')
 			$pc_descWordy['hair length'] = 'long, past the shoulders'
-		
+
 		elseif pcs_hairlng > 400 and pcs_hairlng <= 600:
 			$hair = 'You have <<$curly>><<$pcs_haircol>> hair<<$hbangs>>. As your hair reaches your back, hairdressers would consider this a rather long hair style, yet beautiful looks are created with this length. Your hair is <<$pcs_hairbsh>>. <<$hairstyle>>'
 			$pc_desc['hair length'] = func($this, 'ChooseDescWord', 'very long', 'rather lengthy', 'quite long', 'back-length')
 			$pc_descWordy['hair length'] = 'very long, back-length'
-		
+
 		elseif pcs_hairlng > 600 and pcs_hairlng <= 800:
 			$hair = 'You have <<$curly>><<$pcs_haircol>> hair<<$hbangs>>. As your hair reaches your butt, hairdressers would consider this a very long hair style, yet beautiful looks are created with this length. Your hair is <<$pcs_hairbsh>>. <<$hairstyle>>'
 			$pc_desc['hair length'] = func($this, 'ChooseDescWord', 'extremely long', 'waist-length')
 			$pc_descWordy['hair length'] = 'extremely long and waist-length'
-		
-		else 
+
+		else
 			$hair = 'You have extremely long <<$pcs_haircol>> hair<<$hbangs>>. Reaching all the way past your butt, even Rapunzel would be jealous. Your hair is currently <<$pcs_hairbsh>>. <<$hairstyle>>'
 			$pc_desc['hair length'] = func($this, 'ChooseDescWord', 'exceptionally long', 'incredibly lengthy')
 			$pc_descWordy['hair length'] = 'exceptionally lengthy and princess-like'

+ 2 - 2
locations/booty_call.qsrc

@@ -954,7 +954,7 @@ if $ARGS[0] = 'bj_react1.2':
 						gs'booty_call','generous_lick'
 					else
 						'"Saving yourself for marriage but still give blowjobs to strangers?" he asks pointedly.'
-						if StoryLine = 1: 
+						if mid($start_type,1,2) = 'sg': 
 							'"I don''t know. Ask my mom why it matters so much," you shrug.'
 						else
 							'You shrug. "I''m still a virgin aren''t I?"'
@@ -1014,7 +1014,7 @@ if $ARGS[0] = 'bj_react2':
 						gs'booty_call','generous_lick'
 					else
 						'"Saving yourself for marriage but still give blowjobs to strangers?" he asks pointedly.'
-						if StoryLine = 1: 
+						if mid($start_type,1,2) = 'sg': 
 							'"I don''t know. Ask my mom why it matters so much," you shrug.'
 						else
 							'You shrug. "I''m still a virgin aren''t I?"'

+ 3 - 3
locations/booty_call_after.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'no_cum_end':
 					'"Because I want to," you say, a little annoyed. "I have to explain myself to you?"'
 					gs'booty_call_after','after_sex1'
 				end
-				if StoryLine = 1:
+				if mid($start_type,1,2) = 'sg':
 					act'Ask my mom':
 						cla & *nl
 						'"I don''t know," you shrug. "Ask my mom why it''s so important."'
@@ -446,7 +446,7 @@ if $ARGS[0] = 'after_sex2':
 				gs'booty_call_after','spend_night'
 			end
 			
-			if StoryLine = 1:
+			if mid($start_type,1,2) = 'sg':
 				act'I''m sick of my mom':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
@@ -1017,7 +1017,7 @@ if $ARGS[0] = 'sleep':
 				gs'sleep','simple'
 			end	
 			
-			if StoryLine = 1 and home_owned[2] = 1: sveta_punishment['no_come_home'] = 1
+			if mid($start_type,1,2) = 'sg' and home_owned[2] = 1: sveta_punishment['no_come_home'] = 1
 			gt'booty_call_morning','morning'
 		end
 	end

+ 1 - 1
locations/booty_call_morning.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'morning':
 		'Your mind stirs and you slowly come to consciousness. Your first thoughts are...'
 		act'<i>Yawn</i>':gt'booty_call_morning','yawn_wake'
 !!	end
-	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
+	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
 		act'School!':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'

+ 1 - 1
locations/brothel.qsrc

@@ -281,7 +281,7 @@ if $ARGS[0] = 'abducted4':
 	pcs_hairbsh = 0
 	InSleep = 1
 	pain['killer'] = 0
-	if StoryLine = 1 and SchoolAtestat = 0:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
 		notathomesleep += 1
 	else
 		notathomesleep = 0

+ 2 - 2
locations/budilnik.qsrc

@@ -24,9 +24,9 @@ if $ARGS[0] = 'start':
 	'<center><b>Currently set for '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' </b></center>'
 	'<center><b><a href="exec:  bud_weekend = 1 & gt ''budilnik'', ''Reset''">Reset weekend alarm</a> <a href="exec: bud_weekend = 1 & gt ''budilnik'', ''Time''">Set</a> weekend alarm to this time</b></center>'
 	'<center><b>Currently set for '+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b></center>'
-	if Storyline > 0 and alarm_holiday = 0:
+	if mid($start_type,1,2) = 'sg' and alarm_holiday = 0:
 		'<center><b>Use weekend alarm for holidays - <a href="exec:  alarm_holiday = 1 & gt ''budilnik'', ''start''">OFF</a></b></center>'
-	elseif Storyline > 0 and alarm_holiday = 1:
+	elseif mid($start_type,1,2) = 'sg' and alarm_holiday = 1:
 		'<center><b>Use weekend alarm for holidays - <a href="exec:  alarm_holiday = 0 & gt ''budilnik'', ''start''">ON</a></b></center>'
 	end
 

+ 2 - 2
locations/buklinik.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'holl':
 	'<center><b>Entrance</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_holl.jpg"></center>'
 	'The interior is even worse than the exterior, the paint on the wall is falling off and hasn''t been repainted for quite a while. There are some lights working but not all of them and there is this weird smell that you can''t really pinpoint what it is.'
-	if StoryLine = 1 and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and bumtolik >= 5:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and bumtolik >= 5:
 		'You can volunteer here on the weekends.'
 	else
 		if bumtolik > 4:'There is a lock on the <a href="exec:gt ''buklinik'', ''sklad''">storage</a> room.'
@@ -69,7 +69,7 @@ if $ARGS[0] = 'registr':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_reg.jpg"></center>'
 	'You approach the counter as you see two women in white coats sitting and chatting with each other, laughing.'
 
-	if StoryLine = 1 and SchoolAtestat = 0 and bumtolik < 5:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and bumtolik < 5:
 		!r125
 		'You clear you throat to get their attention, "Hello, my name is <<$pcs_firstname>>, I read on that note that you were looking for volunteers..."'
 		'The two women cheerfully reply, "Hello! Welcome to our little humble shelter. As you probably noticed we really need some volunteers, just a fair warning the job is not always fun and there''s always lots to do. What you see here is just a small part of it, we even help out the elderly and the less fortunate ones outside the shelter.'

+ 0 - 1
locations/carF.qsrc

@@ -320,7 +320,6 @@ if $ARGS[0] = 'other':
 		benz -= 4
 		teh -= rand(2, 6)
 		pcs_mood += 20
-		wipo += 10
 		'You go to the track and have fun driving around before leaving.'
 
 		act 'Finish':xgt 'carF', 'salon'

+ 10 - 10
locations/carF1.qsrc

@@ -18,9 +18,9 @@ elseif $ARGS[0] = '4':
 elseif $ARGS[0] = '5':
 	'<center><b>VAZ 2119</b></center>'
 elseif $ARGS[0] = '6':
-	'<center><b>VAZ Kalina</b></center>'
+	'<center><b>LADA Kalina</b></center>'
 elseif $ARGS[0] = '7':
-	'<center><b>WHA PRIORA</b></center>'
+	'<center><b>LADA Vesta</b></center>'
 elseif $ARGS[0] = '8':
 	'<center><b>Chevrolet Niva</b></center>'
 elseif $ARGS[0] = '9':
@@ -28,35 +28,35 @@ elseif $ARGS[0] = '9':
 elseif $ARGS[0] = '10':
 	'<center><b>UAZ Patriot</b></center>'
 elseif $ARGS[0] = '13':
-	'<center><b>Ford Focus 2</b></center>'
+	'<center><b>Ford Focus</b></center>'
 elseif $ARGS[0] = '95':
-	'<center><b>Mitsubishi l200</b></center>'
+	'<center><b>Mitsubishi L200</b></center>'
 elseif $ARGS[0] = '96':
 	'<center><b>Audi Q7</b></center>'
 elseif $ARGS[0] = '97':
-	'<center><b>Cadillac Escalade</b></center>'
+	'<center><b>Lexus RX 350</b></center>'
 elseif $ARGS[0] = '98':
 	'<center><b>Porsche Cayenne</b></center>'
 elseif $ARGS[0] = '99':
 	'<center><b>BMW X6</b></center>'
 elseif $ARGS[0] = '100':
-	'<center><b>Mercedes-Benz S 600</b></center>'
+	'<center><b>Mercedes-Benz S-Class</b></center>'
 elseif $ARGS[0] = '101':
-	'<center><b>BMW Z4</b></center>'
+	'<center><b>BMW 3-Seria</b></center>'
 elseif $ARGS[0] = '102':
 	'<center><b>Renault LOGAN</b></center>'
 elseif $ARGS[0] = '103':
 	'<center><b>Toyota Corolla</b></center>'
 elseif $ARGS[0] = '104':
-	'<center><b>Toyota Celica</b></center>'
+	'<center><b>Toyota Camry</b></center>'
 elseif $ARGS[0] = '105':
 	'<center><b>Mazda 6</b></center>'
 elseif $ARGS[0] = '106':
-	'<center><b>Mercedes-Benz E 212</b></center>'
+	'<center><b>Mercedes-Benz E-Class</b></center>'
 elseif $ARGS[0] = '107':
 	'<center><b>BMW M5</b></center>'
 elseif $ARGS[0] = '108':
-	'<center><b>Jaguar XKR-S</b></center>'
+	'<center><b>Jaguar XJ</b></center>'
 elseif $ARGS[0] = '109':
 	'<center><b>Audi A6</b></center>'
 elseif $ARGS[0] = '110':

+ 1 - 1
locations/cikl.qsrc

@@ -972,7 +972,7 @@ killvar 'pcs_drank'
 !!suspension ends
 if suspended['day'] = daystart:	suspended['on'] = 0
 
-if storyline = 1:
+if mid($start_type,1,2) = 'sg':
 !!Party refresh if you didn''t see sis
 	if week = 1 and sisboyparty ! 2:
 		if sisterQW['party'] = -1: sisterQW['party'] = 0

+ 1 - 1
locations/city_center.qsrc

@@ -219,7 +219,7 @@ if hour >= 8 and hour <= 18:
 else
 	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 8:00''">National Library of Russia</a>'
 end
-'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>> and <<$desc_txt3>> and the 5-star <a href="exec: minut += 5 & gt ''hotel'', ''foyer''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>> and <<$desc_txt5>> can be found at the end of the road.'
+'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>> and <<$desc_txt3>> and the 5-star <a href="exec: minut += 5 & gt ''city_hotel'', ''start''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>> and <<$desc_txt5>> can be found at the end of the road.'
 *nl
 if week < 6 and hour >= 7 and hour <= 17:
 	$desc_txt6 = '<a href="exec: minut += 5 & gt ''sentence'',''start''">The City Courthouse</a>'

+ 1 - 1
locations/city_drugden.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 		act 'Ask for amphetamine': gt 'city_drugden', 'amphetamine'
 		act 'Ask for weed': gt 'city_drugden', 'joints'
 		act 'Ask for cocaine': gt 'city_drugden', 'cocaine'
-		if StoryLine = 1 and snarkozak = 0: act 'Ask for a drop-off point in Pavlovsk':	minut += 5 & gs 'events', 'narkozakladka'
+		if mid($start_type,1,2) = 'sg' and snarkozak = 0: act 'Ask for a drop-off point in Pavlovsk':	minut += 5 & gs 'events', 'narkozakladka'
 	elseif drugUser = 0:
 		'"Ahhh, what do you have?" you ask.'
 		'His eyes light up at a freshy and smiles wildy, "Well I have some H and amphetamine."'

+ 175 - 0
locations/city_hotel.qsrc

@@ -0,0 +1,175 @@
+# city_hotel
+
+if $ARGS[0] = 'start' or $ARGS[0] = '':
+	*clr & cla
+	nom_o[1] = 100
+	nom_o[2] = 1000
+	nom_o[3] = 10000
+	nom_o[4] = 100000
+	$loc = 'city_hotel'
+	$menu_loc = 'city_hotel'
+	$loc_arg = 'start'
+	$menu_arg = 'start'
+	menu_off = 0
+	gs 'stat'
+	'<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
+
+	act 'Leave': minut += 5 & gt 'city_center'
+
+	if hotelRoom['city_hotel'] > 1:
+		act 'Go to your room':
+			$hotel = 'city_hotel'
+			if hotelRoom['city_hotel'] = 1:gt'hotelroom','normal'
+			if hotelRoom['city_hotel'] = 2:gt'hotelroom','better'
+			if hotelRoom['city_hotel'] = 3:gt'hotelroom','best'
+		end
+
+	end
+
+	act 'Go to the reception desk': gt 'city_hotel', 'reception'
+
+end
+
+if $ARGS[0] = 'reception':
+	*clr & cla
+	menu_off = 1
+	minut += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hotel/receptionist.jpg"></center>'
+	'You walk up to the front reception and get greeted by a smiling young woman behind the counter.'
+	'"How can I help you?" she asks.'
+
+	act 'Go back to the foyer': minut += 1 & gt 'city_hotel', 'start'
+
+	act 'See the room descriptions':
+		cla
+		minut += 1
+		gs 'stat'
+		'There are 4 types of rooms available:'
+		'1. Budget rooms, our most simplest rooms for the ones that just want a bed to sleep the night. There''s a public bathroom shared with the rest of the floor.'
+		'2. Standard rooms, our reasonably priced rooms. Every room has a private bathroom and a TV.'
+		'3. Suites, our luxurious room. Beside a private bathroom there''s also an extra livingroom.'
+
+		act 'Continue': gt 'city_hotel', 'reception'
+	end
+
+	if tobiQW = 2000:
+		act 'Why is the hotel so crowded?':
+			cla
+			tobiQW = 2001
+			minut += 1
+			'"Why so the hotel so crowded today?" you ask.'
+			'"There''s an conference on indigenous languages, they meet every year and complain about their disappearing languages." she says laughing.'
+				act 'Move away': gt 'city_hotel', 'start'
+		end
+	end
+
+	act 'Rent a room':
+		menu_off = 1
+		*clr & cla
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hotel/receptionist.jpg"></center>'
+		'The girl behind the desk smiles at you and asks: "Hello miss! Would you like to rent a room?"'
+
+		if hotelRoom['city_hotel'] > 0:
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hotel/receptionist.jpg"></center>'
+			'She looks in the computer: "I see you already have a room here. As it is already booked and paid for the only way to change it to a different room, would be to cancel your existing booking. To do so without notice would forfeit your payment, I would advise against this, but you may do so if you wish."'
+			act'Yes, cancel your booking':hotelroom=0 & gt'city_hotel'
+			act'No':gt'city_hotel'
+		elseif hotelRoom['city_hotel'] = 0:
+			act 'Yes':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hotel/receptionist.jpg"></center>'
+				'She smiles at you happily: "Excellent! We have the following rooms available right now:"'
+				'Standard room - 500 <b>₽</b> / night;'
+				'Luxury room - 1500 <b>₽</b> / night;'
+				'and the Royal Suite - 10000 <b>₽</b> / night.'
+
+				act'Standard room':
+					*clr & cla
+					hotelRoomDays['city_hotel']=input ("For how long would you like to stay?")
+					totalCost = hotelRoomDays['city_hotel'] * 500
+					if hotelRoomDays['city_hotel'] <= 0:gt'city_hotel'
+
+					if totalCost<=money:
+						money-=totalCost
+						hotelRoom['city_hotel']=3
+						hotelRoomDays['city_hotel'] = daystart + hotelRoomDays['city_hotel']
+						'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you miss, I hope you enjoy your stay!"'
+						act'Step away from the reception desk':gt'city_hotel'
+					else
+						msg'You can''t afford to stay in the hotel for that long.'
+						gt'city_hotel'
+					end
+				end
+				act 'Luxury room':
+					*clr & cla
+					hotelRoomDays['city_hotel']=input ("For how long would you like to stay?")
+					totalCost = hotelRoomDays['city_hotel'] * 1500
+					if hotelRoomDays['city_hotel'] <= 0:gt'city_hotel'
+
+					if totalCost<=money:
+						money-=totalCost
+						hotelRoom['city_hotel']=3
+						hotelRoomDays['city_hotel'] = daystart + hotelRoomDays['city_hotel']
+						'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you miss, I hope you enjoy your stay!"'
+						act'Step away from the reception desk':gt'city_hotel'
+					else
+						msg'You can''t afford to stay in the hotel for that long.'
+						gt'city_hotel'
+					end
+				end
+
+				act'Royal Suite':
+					*clr
+					cla
+					hotelRoomDays['city_hotel']=input ("For how long would you like to stay?")
+					totalCost = hotelRoomDays['city_hotel'] * 10000
+					if hotelRoomDays['city_hotel'] <= 0:gt'city_hotel'
+
+					if totalCost<=money:
+						money-=totalCost
+						hotelRoom['city_hotel']=3
+						hotelRoomDays['city_hotel'] = daystart + hotelRoomDays['city_hotel']
+						'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you miss, I hope you enjoy your stay!"'
+						act'Step away from the reception desk':gt'city_hotel'
+					else
+						msg'You can''t afford to stay in the hotel for that long.'
+						gt'city_hotel'
+					end
+				end
+
+				act 'Step away from the reception desk':gt'city_hotel'
+			end
+			act'No, thank you':gt'city_hotel'
+		end
+	end
+end
+
+
+--- city_hotel ---------------------------------
+

+ 2 - 2
locations/city_industrial.qsrc

@@ -100,9 +100,9 @@ if $ARGS[0] = '':
 		'The community centre is currently closed. It''s only open during the week between 09:00 and 17:00.'
 	end
 
-	if hour >= 9 and hour <= 17 and (StoryLine = 1 and SchoolAtestat = 0) or bumtolik > 3: 
+	if hour >= 9 and hour <= 17 and (mid($start_type,1,2) = 'sg' and SchoolAtestat = 0) or bumtolik > 3: 
 		'<a href="exec: gt ''buklinik'',''start''">Mercy clinic</a> is open.'
-	elseif (hour < 9 or hour > 17) and (StoryLine = 1 and SchoolAtestat = 0) or bumtolik > 3:
+	elseif (hour < 9 or hour > 17) and (mid($start_type,1,2) = 'sg' and SchoolAtestat = 0) or bumtolik > 3:
 		'Mercy clinic is closed.'
 	end
 	if hour >= 8 and hour <= 20:

+ 11 - 0
locations/city_island.qsrc

@@ -77,6 +77,17 @@ end
 
 if home_owned[11] = 1 or university['student'] = 1 or hour >= 6:'The <a href="exec:gt ''uni_dorm'', ''start''">University dorms</a> offers small, but cheap, living space, for university students.'
 
+if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,3) = 'uni':
+	*clr & cla
+	menu_off = 1
+	mainQW = 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main.jpg"></center>'
+	'In front of your dorm, you see Tatiana and Gustav. Tatiana adjusts her glasses and looks around, while Gustav seems to be distracted, glancing here and there with a strange look on his face as his tattoos are not visible.'
+	'Tatiana looks at you closely, "I felt a burst of energy. Were you attacked by a magician?"'
+	act 'No':gt 'mainQW'
+	exit
+end
 
 --- city_island ---------------------------------
 

+ 12 - 7
locations/city_market.qsrc

@@ -248,19 +248,24 @@ if $ARGS[0] = 'tailor':
 			'"So <<$pcs_nickname>>. Do you need any clothing adjusted?"'
 
 			if money >= 500:
-				act 'Take in the clothes you are wearing (500 <b>₽</b>)':
-					cla
-					*clr
-					minut += 15
+				act 'Resize the clothes you''re wearing (500 <b>₽</b>)':
+					*clr & cla
+					minut += 10
 					if CloStyle = 5 or $clothingworntype = 'danilovich_outfits':
-						'"What are you wasting my time for? This does not need to be resized!"'
+						'The tailor is looking irritatingly at you, "Why are you wasting my time with exercise clothing? That type of clothing does not need to be resized..."'
+					elseif dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') = pcs_hips:
+						'The tailor is looking irritatingly at you, "Is this joke? Your clothes could not fit you better if they had been made for you. I have no time for such foolishness."'
+					elseif (dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') > pcs_hips + 4) or (dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') < pcs_hips - 4):
+						'The tailor is looking irritatingly at you, "Why are you wasting my time? Your clothing does not need to be resized. It might not be perfect but it is still fine."'
 					else
 						money -= 500
 						dynamic '<<$clothingworntype>>_b[<<clothingwornnumber>>] = pcs_hips'
-						'You undress and give your clothes to Jacob. Fifteen minutes pass before he returns.'
+						'You are handed a t-shirt and shorts as you undress and give the clothes to the tailor for adjustment.'
+						'Jacob quickly measures your waist and hips, then only takes a few minutes to adjust your outfit.'
+						'You are handed your clothes back and quickly get dressed. You''re pleased with the job that the tailor has done.'
 					end
 
-					act 'Leave': minut += 10 & gt 'city_residential'
+					act 'Continue': minut += 10 & gt 'city_market', 'tailor'
 				end
 
 				act 'Take in different clothes':gt 'clothing', 'view_clothing_list', 'resize'

+ 1 - 0
locations/city_nightclub.qsrc

@@ -172,6 +172,7 @@ if $ARGS[0] = 'inside':
 
 	if (hour < 1 or hour >= 18) and clubwork = 1:
 		act 'Find Erik for work':
+			menu_off = 1
 			*clr & cla
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'

+ 5 - 3
locations/city_sauna.qsrc

@@ -220,10 +220,12 @@ if $ARGS[0] = 'saunaroom':
 						money -= 850
 					end
 					if disable_autosave = 0:
-						if StoryLine = 0:
-							savegame 'autosave.sav'
+						if mid($start_type,1,4) = 'city':
+							savegame 'autosave_city.sav'
+						elseif mid($start_type,1,3) = 'uni':
+							savegame 'autosave_uni.sav'
 						else
-							savegame 'autosave_alt.sav'
+							savegame 'autosave_sg.sav'
 						end
 					end
 					if $clothingworntype ! 'nude': gs 'clothing', 'strip'

+ 1 - 1
locations/city_trashplace.qsrc

@@ -302,7 +302,7 @@ if bomzQW = 0 and rand(1, 10) >= 8 and hour <= 16 and week ! 4:
 		*clr & cla
 		gs 'stat'
 
-		if storyline = 0:
+		if $start_type[1] = 'tg':
 			if daystart < 10 or stat['vaginal'] <= 2:
 				'"I''d love to, but I don''t have much money." Hell, you''re not even accustomed to your new body, but you take care not to say anything.'
 				'"Are you alright?" He looks you up and down.'

+ 1 - 1
locations/clothing.qsrc

@@ -409,7 +409,7 @@ if $ARGS[0] = 'clothing_list':
 			:loopgm_school_filter
 		end
 
-		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):
+		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):
 			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'gm_school', 6)
 		end
 

+ 1 - 1
locations/clothing_QV.qsrc

@@ -276,7 +276,7 @@ if $ARGS[0] = 'clothing_list':
 				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0:
 					!! Default school uniform
 					if i = 6:
-						if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0: *p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', 6"><img src="images/pc/items/gm/school/6.jpg" 	height="250" /></a>'
+						if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0: *p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', 6"><img src="images/pc/items/gm/school/6.jpg" 	height="250" /></a>'
 					elseif CloInhibit <= pcs_inhib:
 						if gm_school_s[i] = 0 and gm_school_h[i] > 0 and gm_school_b[i] >= (pcs_hips - 8) and gm_school_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', <<i>>"><img src="images/pc/items/gm/school/<<i>>.jpg" 	height="250" /></a>'
 					end

+ 1 - 1
locations/clothing_descriptions.qsrc

@@ -174,7 +174,7 @@ elseif CloSkirtShortness > 0:
 	elseif CloSkirtShortness = 2:
 		$description += ' and a knee-length skirt.'
 	elseif CloSkirtShortness = 3:
-		$description += ' and a fairly standard skirt.'
+		$description += ' and an above knee length skirt.'
 	elseif CloSkirtShortness = 4:
 		$description += ' and a rather short skirt.'
 	elseif CloSkirtShortness = 5:

+ 1 - 1
locations/cum_call.qsrc

@@ -4,7 +4,7 @@
 'labia' - 'pantyfront' - 'anus' - 'butt' - 'pantyrear' - 'clothes_hidden' - 'clothes' - 'back' - 'legs'
 'arms' - 'face' - 'mouth' - 'hands' - 'stomach' - 'breasts' - 'hair' - 'internalcondom' - 'precum' - 'mouth_swallow'
 	'precum' - is for whenever Sveta has unprotected vaginal sex. It will automatically set the volume to 1.
-	'mouth_swallow' does the same as mouth but increaments swallow for the cum eater trait
+	'mouth_swallow' does the same as mouth but increments swallow for the cum eater trait
 	'feet' redirects to 'legs'
 	'anal' redirects to 'anus' (prevents further errors)
 $ARGS[1] is for the name of the sexual partner

+ 0 - 1
locations/danceGev.qsrc

@@ -6,7 +6,6 @@ if lesbian > 0:
 	pcs_horny += 5
 elseif lesbian = 0:
 	pcs_mood += 10
-	wipo += 5
 end
 
 danceevtimes += 1

+ 67 - 65
locations/din_bad.qsrc

@@ -1,81 +1,83 @@
 # din_bad
 !2021/05/02
 $mobile_check = {
-	gs 'stat'
-	if vladimirday ! daystart and hour >= 15 and hour <= 17:
-		if vladimirQW = 20:
-			'<b><font color="red">Your phone is ringing</font></b>'
-			$caller = 'Vladimir'
-			$callerid = 'images/characters/city/vladimir/001.jpg'
-			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''2''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
-		elseif vladimirQW = 25 and week = 6:
+	if menu_off = 0:
+		gs 'stat'
+		if vladimirday ! daystart and hour >= 15 and hour <= 17:
+			if vladimirQW = 20:
+				'<b><font color="red">Your phone is ringing</font></b>'
+				$caller = 'Vladimir'
+				$callerid = 'images/characters/city/vladimir/001.jpg'
+				gs 'telefon','phone_ring'
+				pl'<center><a href="exec:gt ''qwloc'',''2''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			elseif vladimirQW = 25 and week = 6:
+				'<b><font color="red">Your phone is ringing</font></b>'
+				$caller = 'Vladimir'
+				$callerid = 'images/characters/city/vladimir/001.jpg'
+				gs 'telefon','phone_ring'
+				pl'<center><a href="exec:gt ''qwloc'',''3''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			elseif vladimirQW = 35 and week = 6:
+				'<b><font color="red">Your phone is ringing</font></b>'
+				$caller = 'Vladimir'
+				$callerid = 'images/characters/city/vladimir/001.jpg'
+				gs 'telefon','phone_ring'
+				pl'<center><a href="exec:gt ''qwloc'',''4''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			end
+		end
+
+		if leonidSlaveDay = daystart and hour >= 6 and hour <= 10 and leonidVisit = 0:
 			'<b><font color="red">Your phone is ringing</font></b>'
-			$caller = 'Vladimir'
-			$callerid = 'images/characters/city/vladimir/001.jpg'
+			$caller = 'Leonid Vostov'
+			$callerid = 'images/characters/pavlovsk/resident/leonid/leonidphone.jpg'
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''3''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
-		elseif vladimirQW = 35 and week = 6:
+			pl'<center><a href="exec:gt ''leonid'', ''call''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:leonidSlaveDay = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+		end
+
+		if QWdogreiqTimer = 0 and QWdogReiq = 2 and week = 7 and qwdogiventday ! daystart and hour >= 12:
 			'<b><font color="red">Your phone is ringing</font></b>'
-			$caller = 'Vladimir'
-			$callerid = 'images/characters/city/vladimir/001.jpg'
+			$caller = 'Margaret'
+			$callerid = ''
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''4''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			'<center><a href="exec:gt ''qwlocdog''"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:qwdogiventday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 		end
-	end
 
-	if leonidSlaveDay = daystart and hour >= 6 and hour <= 10 and leonidVisit = 0:
-		'<b><font color="red">Your phone is ringing</font></b>'
-		$caller = 'Leonid Vostov'
-		$callerid = 'images/characters/pavlovsk/resident/leonid/leonidphone.jpg'
-		gs 'telefon','phone_ring'
-		pl'<center><a href="exec:gt ''leonid'', ''call''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:leonidSlaveDay = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
-	end
-
-	if QWdogreiqTimer = 0 and QWdogReiq = 2 and week = 7 and qwdogiventday ! daystart and hour >= 12:
-		'<b><font color="red">Your phone is ringing</font></b>'
-		$caller = 'Margaret'
-		$callerid = ''
-		gs 'telefon','phone_ring'
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		'<center><a href="exec:gt ''qwlocdog''"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:qwdogiventday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
-	end
-
-	!! 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>'
+		!! 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>'
+				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 = '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
-		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
-	if lover_number < arrsize('pcs_lovers'): jump 'loverloop'
+		lover_number += 1
+		if lover_number < arrsize('pcs_lovers'): jump 'loverloop'
 
-	killvar 'lover_number'
+		killvar 'lover_number'
+	end
 }
 
 $d_salf = {

+ 10 - 10
locations/din_van.qsrc

@@ -79,10 +79,10 @@ $shower = {
 		'<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 (StoryLine = 0 or (StoryLine = 1 and csb_start = 1)) and ntstart = 0:
+		if daystart < 10 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 (StoryLine = 0 or (StoryLine = 1 and csb_start = 1)) and ntstart = 0:
+		elseif daystart < 30 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
@@ -223,11 +223,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 StoryLine = 0 and ntstart = 0:
+		if daystart < 10 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 StoryLine = 0 and ntstart = 0:
+		elseif daystart < 30 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
@@ -296,11 +296,11 @@ $brit = {
 	if shave_menu = 1 and stanok > 1:
 		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 StoryLine = 0 and ntstart = 0:
+				if daystart < 10 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 StoryLine = 0 and ntstart = 0:
+				elseif daystart < 30 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:
@@ -389,10 +389,10 @@ $brit = {
 					if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 					*nl
-					if daystart < 10 and StoryLine = 0 and ntstart = 0:
+					if daystart < 10 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 StoryLine = 0 and ntstart = 0:
+					elseif daystart < 30 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
@@ -494,10 +494,10 @@ $brit = {
 				if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 				*nl
-				if daystart < 10 and StoryLine = 0 and ntstart = 0:
+				if daystart < 10 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 StoryLine = 0 and ntstart = 0:
+				elseif daystart < 30 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

+ 2 - 2
locations/dina.qsrc

@@ -12,7 +12,7 @@ $brodila = {
 }
 
 $brodilr = {
-	if StoryLine = 1 and home_owned[2] = 1:
+	if mid($start_type,1,2) = 'sg' and home_owned[2] = 1:
 		gt 'pav_residential'
 	elseif home_owned[4] = 1:
 		gt'liames'
@@ -36,7 +36,7 @@ $brodils = {
 		gt'sitr','start'
 	elseif home_owned[4] = 1:
 		gt'sitr2x','start'
-	elseif StoryLine = 1 and home_owned[2] = 1:
+	elseif mid($start_type,1,2) = 'sg' and home_owned[2] = 1:
 		gt 'sitrPar'
 	else
 		gt'city_residential', 'start'

+ 1 - 1
locations/dreams.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'start':
 			gs 'dreams','d_dreams'
 		end
 	else
-		if storyline = 0:
+		if $start_type[1] = 'tg':
 			temp = rand(1, 10)
 			if temp = 1:
 				'You have hazy dreams about your past.'

+ 0 - 1
locations/drugs.qsrc

@@ -29,7 +29,6 @@ if $ARGS[0] = 'smoke':
 	gs 'cum_cleanup'
 	pcs_breath = 0
 	pcs_mood += 100
-	wipo += 100
 	if pcs_hydra >= 100:
 		pcs_hydra -= 5
 	else

+ 2 - 2
locations/ender.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'loss':
 
 		'You fall to the floor and feel your consciousness slipping away.'
 
-		act 'Further': gt 'preTG', 'tatianaPRE'
+		act 'Further': gt 'intro_city_tg', 'tatianaPRE'
 		exit
 	elseif fightEnding = 2:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
@@ -777,7 +777,7 @@ if $ARGS[0] = 'surrender':
 		'He ignores your pleas and hits you with a huge upper cut.'
 		'You fall to the floor and feel your consciousness slipping away.'
 
-		act 'Further': gt 'preTG', 'tatianaPRE'
+		act 'Further': gt 'intro_city_tg', 'tatianaPRE'
 		exit
 	elseif fightEnding = 2:
 		if pcs_health < 100: pcs_health = 100

+ 10 - 10
locations/fame.qsrc

@@ -16,14 +16,14 @@
 !!acting, dance, painting, music, ballet, modelling, porn, stripping, prostitute, sex, kickboxing, running, volleyball, chess, teaching
 
 !!ARGS[2] is the value of the increase this can be an integer or one on the following keywords:
-!!Tiny (Adding a small amount of fame which even at low level of fame only will make the fame grow if the are performed daily)
-!!Small (Adding a small amount of fame, that at low level of fame will make the fame grow if done a couble times a week, but for medium levels of fame need to be done daily)
-!!Medium (Adding a medium amount of fame, that at low level of fame can make the fame grow if done once a week, and even at high levels can make the fame grow if done daily.)
-!!Large (Adding a large amount of fame which will make the fame grow fast at low level of fame, and even at high level of fame it will make the fame grow if performed a couple of times a week.)
-!!Huge (Adding a large amount of fame will increase the fame drastically at low levels of fame, make it grow if done weekly at high levels of fame and even keep the fame steady at extreme levels of fame.) 
-!!GoldMedal (Adding an extraordinary amount of fame, to be used for one time events or things that can be repeated very really, for example the PC winning the St. Burg championship in running or a talent competition in Pavlovsk.)
-!!SilverMedal (Adding an extraordinary amount of fame, used in the same way as GoldMedal above, but with the PC being the runner up instead of the winner.)
-!!BronzeMedal (Adding an extraordinary amount of fame, used in the same way as GoldMedal and SilverMedal above, but with the PC begin number 3.)
+!!tiny (Adding a small amount of fame which even at low level of fame only will make the fame grow if the are performed daily)
+!!small (Adding a small amount of fame, that at low level of fame will make the fame grow if done a couble times a week, but for medium levels of fame need to be done daily)
+!!medium (Adding a medium amount of fame, that at low level of fame can make the fame grow if done once a week, and even at high levels can make the fame grow if done daily.)
+!!large (Adding a large amount of fame which will make the fame grow fast at low level of fame, and even at high level of fame it will make the fame grow if performed a couple of times a week.)
+!!huge (Adding a large amount of fame will increase the fame drastically at low levels of fame, make it grow if done weekly at high levels of fame and even keep the fame steady at extreme levels of fame.) 
+!!goldMedal (Adding an extraordinary amount of fame, to be used for one time events or things that can be repeated very really, for example the PC winning the St. Burg championship in running or a talent competition in Pavlovsk.)
+!!silverMedal (Adding an extraordinary amount of fame, used in the same way as GoldMedal above, but with the PC being the runner up instead of the winner.)
+!!bronzeMedal (Adding an extraordinary amount of fame, used in the same way as GoldMedal and SilverMedal above, but with the PC begin number 3.)
 
 !!ARGS[3] is an optional argument, which will make it so that the fame given do not spread to other locations. If ARGS[3] is not 'local' then the fame will be added so that is can spread to other regions.
 
@@ -494,7 +494,7 @@ if $ARGS[0] = 'calculate':
 	
 
 	!! Fame in the city will take alittle while before it start being noticed in other places. But the it will start spreading much faster than in the city. (The formula is +1050-52500000/(50000+(fame_city/10)^3 if the palyer is Sveta, but will spread a little slower for non Sveta starts using the formula +fame_city^2/1000)
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		if dyneval('RESULT = fame[''city_<<$ARGS[1]>>_core'']') >= 2000: 
 			dynamic 'fame[''city_<<$ARGS[1]>>_contribution_high''] = 1050'
 		else 
@@ -516,7 +516,7 @@ if $ARGS[0] = 'calculate':
 	end
 	
 	!!The fame from city takes sometime before it starts being noticed in the village, but after that it spread very fast (the formula is +1050 -672000000/(640000+(fame_city/10-20)^4) is player is Svata and +1050 -672000000/(640000+(fame_city/10-40)^4) in other starts).
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		if dyneval('RESULT = fame[''city_<<$ARGS[1]>>_core'']') >= 2000: 
 			dynamic 'fame[''city_<<$ARGS[1]>>_contribution_low''] = 1050'
 		elseif dyneval('RESULT = fame[''city_<<$ARGS[1]>>'']') >= 200:

+ 1 - 1
locations/family.qsrc

@@ -40,7 +40,7 @@ end
 if sisboyparty_day + 1 = daystart:sister_indorf = 0
 *nl
 
-if StoryLine = 1:
+if mid($start_type,1,2) = 'sg':
 	if sisboyparty_day + 1 = daystart and hour > 18 and sisboypartyQW = 1:
 		if sisboyparty = 1: sisboyparty = -1
 		if sisboyparty = 2:

+ 1 - 1
locations/fit.qsrc

@@ -334,7 +334,7 @@ if $ARGS[0] = 'gym':
 	*nl
 	if abonement > 0:'Your existing subscription package is valid for <<abonement>> more classes.'
 
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		if hour >= 10 and hour < 12 and week = 7 and centr = 1: 'In the hall you see <a href="exec:gt ''VolleyTrenCentr''">Mikhail Nikolaevich</a> talking with a strange man.'
 		if hour >= 10 and hour < 12 and week = 7 and centr = 2 and ricewine < 2: 'In the hall you see <a href="exec:gt ''VolleyTrenCentr''">Guang</a>'
 	end

+ 1 - 1
locations/food_menu.qsrc

@@ -71,7 +71,7 @@ elseif $loc = 'gkafe':
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/menus/borislav.jpg"</center><br>'
 	!'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
-	if storyline = 1 and home_owned[2] = 1:
+	if mid($start_type,1,2) = 'sg' and home_owned[2] = 1:
 		$_eat['0,name'] = 'Vegetarian Piroshki'
 		$_eat['0,type'] = 'pirosh'
 		$_eat['0,price'] = 'Free'

+ 1 - 1
locations/foto_albums.qsrc

@@ -345,7 +345,7 @@ if $ARGS[0] = 'anushka':
 	if nush_model >= 1:
 		'You open up the ninth album and browse through some of the pictures of Anushka placed inside. Well she did say she modeled here, so you are not really surprised to see a album of her here.'
 		'The photo''s all seem to be single pictures taken from past photo shoots.'
-	elseif storyline = 1:
+	elseif mid($start_type,1,2) = 'sg':
 		nush_model = 1
 		'You open up the ninth album and are surprised to see pictures of Anushka placed inside. She is one of the prettier girls in school and it is not surprising she would like being a model, she loves attention, still you are surprised no one has mentioned it at school, surely someone else has to know right?'
 		'The photo''s all seem to be single pictures taken from past photo shoots.'

+ 1 - 1
locations/foto_events.qsrc

@@ -2166,7 +2166,7 @@ if $ARGS[0] = 'runway2':
 								modelfoto['earnings'] += modelpayfin
 								gs'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-								if StoryLine = 1 and age < 18:
+								if mid($start_type,1,2) = 'sg' and age < 18:
 									'Another hour later, the show is over, the clothes are taken back, and you''re left naked in the studio, counting the <<modelpayfin>> <b>₽</b> you''ve been paid and musing over the happenings of the night. Working the runway isn''t too bad. But at the same time, this kind of thing has the tendency to circle around and you <i>really</i> hope nobody in Pavlovsk hears about this...'
 									act'Back in the studio':gt'foto','studio'
 								else

+ 1 - 1
locations/foto_model_documentary.qsrc

@@ -131,7 +131,7 @@ if $ARGS[0] = '1st_documentary':
 		end
 	end
 
-!!	if storyline = 1 and age < 18:
+!!	if mid($start_type,1,2) = 'sg' and age < 18:
 !!		act'No thanks (don''t want people to find out)':
 !!			cla & *clr
 !!			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'

+ 4 - 4
locations/foto_models.qsrc

@@ -149,7 +149,7 @@ if $ARGS[0] = 'mari_1':
 			'Something piques an interest in you as Mari mentions she''s from out of town, "If you don''t mind me asking where do you come from?"'
 			'"Oh, just some place called Gadukino. You''ve probably never heard of it. It''s a small village outside the city. Too small too be honest, same boring ins and outs every day. I wanted more excitement in my life! More than a simple farm girl would ever have. So I moved here."'
 
-			if storyline = 1:
+			if mid($start_type,1,2) = 'sg':
 				act'"You''re from Gadukino?"':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/mari_e/meeting/4a.jpg"></center>'
@@ -437,7 +437,7 @@ if $ARGS[0] = 'mari_chat':
 			'"Any siblings Mari?"'
 			*nl
 			'"No, none for me. I''m an only child. What about you?"'
-			if storyline = 1:
+			if mid($start_type,1,2) = 'sg':
 				if npc_rel['A34'] < 20:
 					'"Yeah, I''ve got two. My sister who''s about the same age as you are and my stupid little brother. He''s such a pain in the ass!"'
 					'Mari sits up a bit. "Really? What''s so bad about him?"'
@@ -738,7 +738,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 		end
 	end
 	
-	if mari['parent_ask'] < 1 and StoryLine = 1:
+	if mari['parent_ask'] < 1 and mid($start_type,1,2) = 'sg':
 		act'Ask about her parents':
 			mari['parent_ask'] = 1
 			cla & *clr
@@ -844,7 +844,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading2.jpg"></center>'
 							'"I''m <<age>>. I didn''t work here when I was still underage, but I still needed the fake to buy booze and stuff," you grin.'
-							if StoryLine = 1:
+							if mid($start_type,1,2) = 'sg':
 								'"That''s fair enough I guess. Not everyone has a neighbor like Misha brewing moonshine vodka in his barn," she laughs.'
 							else
 								'"That''s fair enough I guess. I didn''t drink when I lived in the village, but if I ever wanted one, I had a neighbor who would brew moonshine in his barn," she laughs.'

+ 1 - 1
locations/gaddvor.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0]='':
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
 
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		'<center><h4>Your grandparents'' yard</h4></center>'
 	else
 		'<center><h4>Old couple''s yard</h4></center>'

+ 1 - 1
locations/gadfield.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'field':
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadfield_night.jpg"></center>'
 		end
-		if hour >= 9 and hour <= 17 and npc_qw['A221'] = 0 and storyline = 1: gs 'grigory', 'meet' & exit
+		if hour >= 9 and hour <= 17 and npc_qw['A221'] = 0 and mid($start_type,1,2) = 'sg': gs 'grigory', 'meet' & exit
 	else
 		if hour >= 8 and hour < 18:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadfield_winter.jpg"></center>'

+ 88 - 90
locations/gadforest.qsrc

@@ -188,15 +188,15 @@ if $ARGS[0] = 'forest_edge':
 			if gadforest_clothestorn = 1:
 				gadforest_clothestorn = 0
 				'Your clothes were torn to shreds in the woods, leaving you with no choice but to head back home naked.'
-				'You try your best to stay in the shadows as you move towards '+iif(StoryLine=1,'your grandparents house ','the village ')+'as stealthily as possible.'
+				'You try your best to stay in the shadows as you move towards your grandparents house as stealthily as possible.'
 			! clothes are here
 			elseif clothesAtLocation = 1:
 				'You decide to leave your clothes behind and sneak home naked, purely for the thrill of it.'
-				'You try your best to stay in the shadows as you move towards '+iif(StoryLine=1,'your grandparents house ','the village ')+'as stealthily as possible.'
+				'You try your best to stay in the shadows as you move towards your grandparents house as stealthily as possible.'
 			! no clothes here
 			elseif clothesAtLocation = 0:
 				'You seem to have misplaced your clothes, leaving you with no choice but to head back home naked. You wonder where you might have left your clothes.'
-				'You try your best to stay in the shadows as you move towards '+iif(StoryLine=1,'your grandparents house ','the village ')+'as stealthily as possible.'
+				'You try your best to stay in the shadows as you move towards your grandparents house as stealthily as possible.'
 			end
 			! Allow schoolgirl player to leave naked but go straight back home
 			! Non-schoolgirls will just find a random sweatshirt to put on - it is the same everytime but walking around naked in the village is not implemented yet
@@ -207,7 +207,7 @@ if $ARGS[0] = 'forest_edge':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				if StoryLine = 1 and grandaQW['block'] = 0:
+				if mid($start_type,1,2) = 'sg' and grandaQW['block'] = 0:
 					if hour >= 10 and hour < 16 and month >= 4 and month <= 10:
 						forestcaughtrand = rand(4,10)
 					elseif hour >= 6 and hour < 20 and month >= 4 and month <= 10:
@@ -782,9 +782,9 @@ if $ARGS[0] = 'walking':
 					gt 'gadforest_event', 'find_meadow'
 				else
 					if month >= 4 and month <= 10:
-						if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
-						if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest1.'+rand(1,3)+'.jpg"></center>'
-						if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga0.'+rand(1,2)+'.jpg"></center>'
+						if ($clothingworntype ! 'nude' and PCloswimwear = 0) and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
+						if ($clothingworntype ! 'nude' and PCloswimwear = 0) and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest1.'+rand(1,3)+'.jpg"></center>'
+						if ($clothingworntype ! 'nude' and PCloswimwear = 0) and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga0.'+rand(1,2)+'.jpg"></center>'
 						if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_nude0.'+rand(1,4)+'.jpg"></center>'
 						*nl
 						'You spend an hour walking through the woods, enjoying the sounds of the forest and the fresh air.'
@@ -809,105 +809,103 @@ end
 ! $forest_args1 - location of forest where this is called from
 ! Example: gs 'gadforest', 'picking'
 if $ARGS[0] = 'picking':
-	if StoryLine = 1 or (StoryLine = 0 and mirapickingtalk = 1):
-		if hour >= 6 and hour <= 22 and month >= 6 and month <= 9 and boletus + boletus_cooked + bilberry < 5:
-			if ($forest_args1 = 'forest_edge' and edge_pickingday ! daystart) or ($forest_args1 = 'forest_outskirts' and outskirts_pickingday ! daystart) or ($forest_args1 = 'forest_center' and center_pickingday ! daystart) or ($forest_args1 = 'swamp_woods' and swamp_pickingday ! daystart):
-				act 'Look for mushrooms and berries'+iif(MiraLoc = 3 and $forest_args1 = 'forest_edge', ' with Mira (0:30)',' (0:30)'):
-					*clr & cla
-					menu_off = 1
+	if hour >= 6 and hour <= 22 and month >= 6 and month <= 9 and boletus + boletus_cooked + bilberry < 5:
+		if ($forest_args1 = 'forest_edge' and edge_pickingday ! daystart) or ($forest_args1 = 'forest_outskirts' and outskirts_pickingday ! daystart) or ($forest_args1 = 'forest_center' and center_pickingday ! daystart) or ($forest_args1 = 'swamp_woods' and swamp_pickingday ! daystart):
+			act 'Look for mushrooms and berries'+iif(MiraLoc = 3 and $forest_args1 = 'forest_edge', ' with Mira (0:30)',' (0:30)'):
+				*clr & cla
+				menu_off = 1
 
-					if $forest_args1 = 'forest_edge':
-						edge_pickingday = daystart
-						mushroom_pickers_check = 1
-						max_boletus = 1
-						max_bilberry = 1
-					elseif $forest_args1 = 'forest_outskirts':
-						outskirts_pickingday = daystart
-						mushroom_pickers_check = 2
-						max_boletus = 2
-						max_bilberry = 2
-					elseif $forest_args1 = 'forest_center':
-						center_pickingday = daystart
-						mushroom_pickers_check = 3
-						max_boletus = 3
-						max_bilberry = 3
-					elseif $forest_args1 = 'swamp_woods':
-						swamp_pickingday = daystart
-						mushroom_pickers_check = 4
-						max_boletus = 4
-						max_bilberry = 4
-					end
+				if $forest_args1 = 'forest_edge':
+					edge_pickingday = daystart
+					mushroom_pickers_check = 1
+					max_boletus = 1
+					max_bilberry = 1
+				elseif $forest_args1 = 'forest_outskirts':
+					outskirts_pickingday = daystart
+					mushroom_pickers_check = 2
+					max_boletus = 2
+					max_bilberry = 2
+				elseif $forest_args1 = 'forest_center':
+					center_pickingday = daystart
+					mushroom_pickers_check = 3
+					max_boletus = 3
+					max_bilberry = 3
+				elseif $forest_args1 = 'swamp_woods':
+					swamp_pickingday = daystart
+					mushroom_pickers_check = 4
+					max_boletus = 4
+					max_bilberry = 4
+				end
 
-					minut += 30
-					new_boletus = 0
-					new_bilberry = 0
-					gs 'gadforest', 'bushcraft', $forest_args1
-					if $clothingworntype = 'nude':
-						if pcs_inhib < 50:inhib_exp += rand(1,5)
-						if MiraLoc = 3 and $forest_args1 = 'forest_edge':
-							gs 'arousal', 'flash', 5
-							gs 'arousal', 'end'
-						end
+				minut += 30
+				new_boletus = 0
+				new_bilberry = 0
+				gs 'gadforest', 'bushcraft', $forest_args1
+				if $clothingworntype = 'nude':
+					if pcs_inhib < 50:inhib_exp += rand(1,5)
+					if MiraLoc = 3 and $forest_args1 = 'forest_edge':
+						gs 'arousal', 'flash', 5
+						gs 'arousal', 'end'
 					end
+				end
+				gs 'stat'
+
+				! mushroom_pickers are not at the location of the forest Sveta is in
+				if mushroom_pickers ! mushroom_pickers_check:
+					new_boletus += max_boletus
+					new_bilberry += max_bilberry
+					boletus += new_boletus
+					bilberry += new_bilberry
+					pcs_mood += 10
+					gs 'stat'
+
+					gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+					*nl
+					'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+				! mushroom pickers are at the location of the forest Sveta is in
+				elseif mushroom_pickers = mushroom_pickers_check:
+					new_boletus += rand(0,max_boletus)
+					new_bilberry += rand(0,max_bilberry)
+					boletus += new_boletus
+					bilberry += new_bilberry
 					gs 'stat'
 
-					! mushroom_pickers are not at the location of the forest Sveta is in
-					if mushroom_pickers ! mushroom_pickers_check:
-						new_boletus += max_boletus
-						new_bilberry += max_bilberry
-						boletus += new_boletus
-						bilberry += new_bilberry
+					if new_boletus > 0 and new_bilberry > 0:
 						pcs_mood += 10
 						gs 'stat'
 
 						gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
 						*nl
 						'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
-					! mushroom pickers are at the location of the forest Sveta is in
-					elseif mushroom_pickers = mushroom_pickers_check:
-						new_boletus += rand(0,max_boletus)
-						new_bilberry += rand(0,max_bilberry)
-						boletus += new_boletus
-						bilberry += new_bilberry
+					elseif new_boletus = 0 and new_bilberry > 0:
+						pcs_mood += 5
 						gs 'stat'
 
-						if new_boletus > 0 and new_bilberry > 0:
-							pcs_mood += 10
-							gs 'stat'
-
-							gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
-							*nl
-							'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
-						elseif new_boletus = 0 and new_bilberry > 0:
-							pcs_mood += 5
-							gs 'stat'
-
-							gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
-							*nl
-							'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
-						elseif new_boletus > 0 and new_bilberry = 0:
-							pcs_mood += 5
-							gs 'stat'
-
-							gs 'gadforest', 'picking_clothes', $forest_args1, 'mushroom'
-							*nl
-							'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms'
-						elseif new_boletus = 0 and new_bilberry = 0:
-							pcs_mood -= 5
-							gs 'stat'
-
-							gs 'gadforest', 'picking_clothes_empty', $forest_args1
-							*nl
-							'After searching for mushrooms and berries for half an hour you found nothing.'
-						end
-					end
+						gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+						*nl
+						'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
+					elseif new_boletus > 0 and new_bilberry = 0:
+						pcs_mood += 5
+						gs 'stat'
 
-					if $forest_args1 = 'swamp_woods':
-						act 'Continue': gt 'swamp_woods', 'start'
-					else
-						act 'Continue': gt 'gadforest', $forest_args1
+						gs 'gadforest', 'picking_clothes', $forest_args1, 'mushroom'
+						*nl
+						'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms'
+					elseif new_boletus = 0 and new_bilberry = 0:
+						pcs_mood -= 5
+						gs 'stat'
+
+						gs 'gadforest', 'picking_clothes_empty', $forest_args1
+						*nl
+						'After searching for mushrooms and berries for half an hour you found nothing.'
 					end
 				end
+
+				if $forest_args1 = 'swamp_woods':
+					act 'Continue': gt 'swamp_woods', 'start'
+				else
+					act 'Continue': gt 'gadforest', $forest_args1
+				end
 			end
 		end
 	end

+ 9 - 9
locations/gadforestlost.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'forest_outskirts':
 	foresteventrand = rand(1,40)
 	if foresteventrand <= (2+(bonfire*5)) and daystart >= forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', 'forest_outskirts'
 	if foresteventrand <= (4+(bonfire*5)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and daystart > forest_lostday + 1: gt 'gadforestlost', 'rescue', 'hunters', 'forest_outskirts'
-	if foresteventrand <= (6+(bonfire*5)) and StoryLine = 1 and daystart > forest_lostday: gt 'gadforestlost', 'rescue', 'ranger', 'forest_outskirts'
+	if foresteventrand <= (6+(bonfire*5)) and mid($start_type,1,2) = 'sg' and daystart > forest_lostday: gt 'gadforestlost', 'rescue', 'ranger', 'forest_outskirts'
 	if foresteventrand <= (8-(bonfire*5)) and (hour < 6 or hour > 22): gt 'gadforestlost', 'wolves', 'forest_outskirts'
 
 	gs 'gadforestlost', 'wander'
@@ -57,7 +57,7 @@ if $ARGS[0] = 'forest_center':
 	! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 	foresteventrand = rand(1,40)
 	if foresteventrand <= (1+(bonfire*2)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and daystart > forest_lostday: gt 'gadforestlost', 'rescue', 'hunters', 'forest_center'
-	if foresteventrand <= (3+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday + 1: gt 'gadforestlost', 'rescue', 'ranger', 'forest_center'
+	if foresteventrand <= (3+(bonfire*2)) and mid($start_type,1,2) = 'sg' and daystart > forest_lostday + 1: gt 'gadforestlost', 'rescue', 'ranger', 'forest_center'
 	if foresteventrand <= (8-(bonfire*2)) and (hour < 6 or hour > 22): gt 'gadforestlost', 'wolves', 'forest_center'
 
 	gs 'gadforestlost', 'wander'
@@ -152,12 +152,12 @@ if $ARGS[0] = 'relax':
 		foresteventrand = rand(1,30)
 		if foresteventrand <= (2+(bonfire*5)) and daystart >= forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', $forest_args1
 		if foresteventrand <= (4+(bonfire*5)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
-		if foresteventrand <= (6+(bonfire*5)) and StoryLine = 1 and daystart > forest_lostday+1: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
+		if foresteventrand <= (6+(bonfire*5)) and mid($start_type,1,2) = 'sg' and daystart > forest_lostday+1: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
 	elseif $forest_args1 = 'forest_center':
 		! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 		foresteventrand = rand(1,40)
 		if foresteventrand <= (1+(bonfire*5)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
-		if foresteventrand <= (3+(bonfire*5)) and StoryLine = 1 and daystart > forest_lostday+1: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
+		if foresteventrand <= (3+(bonfire*5)) and mid($start_type,1,2) = 'sg' and daystart > forest_lostday+1: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
 	end
 
 	'<center><H4>Somewhere in the forest</H4></center>'
@@ -491,9 +491,9 @@ if $ARGS[0] = 'rescue':
 	bonfire = 0
 	pcs_mood += 20
 	bushcraft_exp += rand(1,5)
-	if StoryLine = 0: lost_girl = 0
+	lost_girl = 0
 	if swamp_clothes = 1:
-		'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear'+iif(StoryLine=1,' at your grandparents house.','.')
+		'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear at your grandparents house.'
 		gs 'clothing', 'strip', 'gadforest'
 		gs 'clothing', 'swamp_clothes', 0
 	end
@@ -504,7 +504,7 @@ if $ARGS[0] = 'rescue':
 		*nl
 		'Suddenly you hear the sounds of people approaching. A group of pickers from the village appear out of the bushes.'
 		if bonfire = 1:'They notice your fire and praise you, "When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others."'
-		if StoryLine = 1 and grandmaQW['block'] = 0:
+		if mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 			'They walk up to you and say, "Your grandparents are very worried about you. They asked us to keep an eye out for you. Follow us, we will lead you back '+iif($clothingworntype ! 'nude','to their house."','to the edge of the forest."')
 			if $clothingworntype ! 'nude':
 				if $ARGS[2] = 'forest_outskirts':
@@ -540,7 +540,7 @@ if $ARGS[0] = 'rescue':
 		*nl
 		'Suddenly you hear the sounds of people approaching. '+iif(hunters_were_met=1,'The hunters from the swamp ','A group of hunters ')+'appear out of the bushes.'
 		if bonfire = 1:'They notice your fire and praise you, "When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others."'
-		if StoryLine = 1 and grandmaQW['block'] = 0:
+		if mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 			'They walk up to you and say, "Your grandparents are very worried about you. They asked us to keep an eye out for you. Follow us, you can stay at our camp for the time being until someone can take you back."'
             if $ARGS[2] = 'forest_outskirts':
                 act 'Continue': minut += 45 & gt 'hunter_interactions', 'meet_hunters_after_rescue'
@@ -560,7 +560,7 @@ if $ARGS[0] = 'rescue':
 		*nl
 		'Suddenly you hear the sound of a person approaching. A man you vaguely recognize from the village appears out of the bushes.'
 		if bonfire = 1:'They notice your fire and praise you, "When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others."'
-		if StoryLine = 1 and grandmaQW['block'] = 0:
+		if mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 			'He walks up to you and says, "Your grandparents are very worried about you. They asked me to keep an eye out for you. Follow me, I will lead you back '+iif($clothingworntype ! 'nude','to their house."','to the edge of the forest."')
 			if $clothingworntype ! 'nude':
 				if $ARGS[2] = 'forest_outskirts':

+ 1 - 1
locations/gadriver.qsrc

@@ -1233,7 +1233,7 @@ if $ARGS[0] = 'fishing':
 
 				act 'Leave':gt $loc, $loc_arg
 			end
-			if StoryLine = 1 and grandmaQW['block'] = 0:
+			if mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 				act 'Bring a fish to Boniface':
 					cla
 					*clr

+ 2 - 2
locations/gadroad.qsrc

@@ -79,7 +79,7 @@ if $ARGS[0] = '':
 			elseif month=9 or month=10 or month=4 or month=5:
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg3.jpg"></center>'
 			else
-				if musle >= salo:
+				if strenbuf >= salo:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg1.jpg"></center>'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg2.jpg"></center>'
@@ -109,7 +109,7 @@ if $ARGS[0] = 'drinking_invite':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drunk.jpg"></center>'
 	'You quickly catch up to the boys who have already started drinking.'
 	!School girl Sveta
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		! Sveta has never been drinking with Mitka before
 		if mitka_first_drink = 1:
 			'Mitka is the first to greet you, "Hey <<$pcs_nickname>>, glad you decided to join us today!"'

+ 1 - 1
locations/gadsarai.qsrc

@@ -114,7 +114,7 @@ if $ARGS[0] = 'search':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/necklace.jpg"></center>'
 		*nl
-		if altQS = 1:
+		if $start_type[1] ! 'nomagic':
 			'While looking through the barn your foot goes through a rotten floorboard. You suddenly feel the presence of something magical under the floor. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The feeling of power is coming from within the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You feel the power coming from the necklace, but it doesn''t feel like any power you have ever felt.'
 		else
 			'While looking through the barn your foot goes through a rotten floorboard and gets stuck. As you work your foot free, you glimpse something underneath the floor - a box or something. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The exotic look of the box gives you gooseflesh and you find yourself holding your breath as you prepare to open the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You let your breath out slowly as you tilt the necklace from side to side, watching the light sparkle as it is reflected by the facets on the deep red rubies. You cannot begin to guess what this necklace must be worth.'

+ 4 - 4
locations/gadukino.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = '':
 		gs 'stat'
 		'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big63.jpg"></center>'
-		if StoryLine = 1:
+		if mid($start_type,1,2) = 'sg':
 			'As you walk through the village, you are approached by Mitka, your childhood friend.'
 		else
 			if npc_rel['A63'] = 0:
@@ -99,7 +99,7 @@ if $ARGS[0] = '':
 		*nl
 		'A small village with many old wooden houses and even more in various states of disrepair. It has certainly seen better times.'
 		if car > 0 and cardrive = 23: '<a href="exec:GS ''carF'',''start''">Your <<$car>></a> is close by.'
-		if StoryLine = 1 and grandmaQW['block'] = 0:
+		if mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 			'Several small farms are scattered around the outskirts of the village, one of which belongs to <a href="exec:minut += 5 & gt ''gaddvor''">your grandparents</a>.'
 			act 'Go to your grandparent''s house': minut += 5 & gt 'gaddvor'
 		end
@@ -118,7 +118,7 @@ if $ARGS[0] = '':
 			end
 		end
 		if npc_rel['A60'] > 0 and metmira = 1:
-			'Just down the road '+iif(StoryLine=1,'from your grandparents house ','')+'is <a href="exec:minut += 5 & gt ''miroslavahome'', ''start''">Mira''s house</a>.'
+			'Just down the road from your grandparents house is <a href="exec:minut += 5 & gt ''miroslavahome'', ''start''">Mira''s house</a>.'
 			act 'Go to Mira''s house': minut += 5 & gt 'miroslavahome', 'start'
 		end
 		*nl
@@ -327,7 +327,7 @@ if $ARGS[0] = 'mira_events':
 			'You decide to lend a hand to help the girl with the calf. You are lonely in the village, and maybe this girl, if you get to know her, could make your trips to Gadukino less boring. You walk over to the girl and introduce yourself and ask if she wants help. She nods and resumes pulling on the rope, while you walk over behind the calf and give it a load slap on the rump. The calf is surprised and immediately moves forward away from you. The girl smiles in thanks and tells you her name is Miroslava, but everyone calls her Mira.'
 			'Together you are able to guide the calf back into its pen. Mira turns out to be quite a sociable girl and conversationalist. You learn that her family was recently forced to move to the village from the city. Her father''s huge gambling debts to some questionable men forced him to eventually sell the family''s property in the city to pay them back. Mira is having a rough time adjusting to the life in a small village. She misses the apartment in the center of the city and the money to buy nice dresses and makeup with. After selling everything and paying off the debt, her father was told to leave the city "or else...".'
 			'They were left quite poor and could only afford to buy a house in this run-down, dust-covered village.'
-			if StoryLine = 1:
+			if mid($start_type,1,2) = 'sg':
 				'You walk with her and chat until you reach her house, which turns out to be just down the road from your grandparent''s place. Mira invites you to come and visit her any time. She is just as bored in the village as you are.'
 			else
 				'You walk with her and chat until you reach her house, which is close by to the center of the village. Mira invites you to come and visit her at any time. She is just as bored in the village as you are.'

+ 6 - 4
locations/gameover.qsrc

@@ -14,7 +14,7 @@ if over = 1:
 	'You are dragged out by the morgue attendants. The pathologist notes that you died from an unknown cause. Soon, your body is handed over to your parents...'
 elseif over = 2:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/over.jpg"></center>'
-	if StoryLine = 0 and ntstart = 0:
+	if $start_type[1] = 'tg':
 		'You go mad and start running around town naked screaming, "I am a man!". The police are quickly alerted, and you are taken to a mental hospital. There, you are put in a straitjacket then placed in a room with soft walls. You spend the rest of your days in happy delusions about your family and being a man again, but the delusions never became reality.'
 		*nl
 		'Hint:'
@@ -90,10 +90,12 @@ if $ARGS[0] = 'endscreen':
 end
 
 if $ARGS[0] = 'load_autosave':
-	if StoryLine = 0:
-		opengame 'autosave.sav'
+	if mid($start_type,1,4) = 'city':
+		opengame 'autosave_city.sav'
+	elseif mid($start_type,1,3) = 'uni':
+		opengame 'autosave_uni.sav'
 	else
-		opengame 'autosave_alt.sav'
+		opengame 'autosave_sg.sav'
 	end
 end
 

+ 3 - 3
locations/gdksport.qsrc

@@ -78,7 +78,7 @@ if $ARGS[0] = 'start':
 		gt 'wardrobe', 'start'
 	end
 
-	if shampoo > 0 or (StoryLine = 1 and (SchoolAtestat = 0 or SchoolBlock = 0)):
+	if shampoo > 0 or (mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0)):
 		act 'Take a shower': gt 'gdksport', 'shower'
 	else
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
@@ -269,7 +269,7 @@ if $ARGS[0] = 'dance2':
 
 		act 'Leave':
 			if rand (0,4) = 0:
-				if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and StoryLine ! 0 and ( month < 10 or ( month = 10 and day < 18 )):
+				if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and mid($start_type,1,2) = 'sg' and ( month < 10 or ( month = 10 and day < 18 )):
 					if alterstrtimg = 13:
 						gt 'albina_starlets', 'albina3'
 					elseif grupTipe = 1 or grupTipe = 2:
@@ -579,7 +579,7 @@ if $ARGS[0] = 'shower':
 	menu_off = 1
 	*clr & cla
 	$location_type = 'bathroom'
-	if StoryLine = 1 and (SchoolAtestat = 0 or SchoolBlock = 0): noShampoo = 1
+	if mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0): noShampoo = 1
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1

+ 6 - 6
locations/gkafe.qsrc

@@ -75,18 +75,18 @@ if $ARGS[0] = '':
 			
 			gs 'gkafe', 'menu'
 
-			if StoryLine > 0 and home_owned[2] = 1 and SchoolBlock = 0:
+			if mid($start_type,1,2) = 'sg' and home_owned[2] = 1 and SchoolBlock = 0:
 				'Since your <<$npc_nickname[''A29'']>> works here, you can eat-in for free.'
-			elseif StoryLine > 0 and home_owned[2] = 0 and SchoolBlock = 0:
+			elseif mid($start_type,1,2) = 'sg' and home_owned[2] = 0 and SchoolBlock = 0:
 				'Since your <<$npc_nickname[''A29'']>> kicked you out, you can no longer eat here for free.'
-			elseif StoryLine > 0 and home_owned[2] = 1 and SchoolBlock = 0:
+			elseif mid($start_type,1,2) = 'sg' and home_owned[2] = 1 and SchoolBlock = 0:
 				'Since you got kicked out of school, you can no longer eat here for free. Your <<$npc_nickname[''A29'']>> wants you to earn a living.'
-			elseif StoryLine > 0 and home_owned[2] = 0 and SchoolBlock = 1:
+			elseif mid($start_type,1,2) = 'sg' and home_owned[2] = 0 and SchoolBlock = 1:
 				'Since you were expelled from school and your <<$npc_nickname[''29'']>> kicked you out, you can no longer eat here for free.'
 			end
 
 			if week < 6:
-				if hour >= 6 and hour < 16 and StoryLine > 0:
+				if hour >= 6 and hour < 16:
 					'Your <a href="exec:gt ''mother''">mother</a> is currently working at the cafe, taking orders behind the counter.'
 				else
 					'The bar owner <a href="exec:gt ''gkafe'', ''boris''">Borislav</a> is currently taking orders at the counter. Most people call him Slava.'
@@ -109,7 +109,7 @@ if $ARGS[0] = '':
 					act '"Drink tea" with Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1-1'
 				end
 			end
-			if StoryLine = 1 and SchoolAtestat = 0:
+			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
 				if (sunWeather = 0 or temper <= 0) and (hour >= 18 and hour < 20 and week < 6) or (week >= 6 and hour >= 9 and hour < 20):
 					'<a href="exec:minut += 3 & gt ''gopskver''">Vitek, Dan and Vasily</a> are sitting at a table in the far corner.'
 			end

+ 1 - 1
locations/grigory.qsrc

@@ -1046,7 +1046,7 @@ if $ARGS[0] = 'romantic_event':
 			'"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 StoryLine = 1 and grandmaQW['block'] = 0:
+			if mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 				act 'Grandparents Home':
 					'"I should probably get back to my Grandparent''s place," You say.'
 					'You see a rueful smile cross Grigory''s face, "Ok," Standing, he gives you a little hug, your feet dangling off the ground, before he lowers you to stand on your own two feet again.'

+ 243 - 187
locations/gschool_chats.qsrc

@@ -1,16 +1,29 @@
 # gschool_chats
-!!2021/05/02
+!!2022/02/11
 
 if $ARGS[0] = 'nerds':
 	*clr & cla
 	minut += 5
-	if rand(1,6) = 1 and pcs_vag > 12 and mesec <= 0 and gschool_gropeday ! daystart:
+	if ((hotcat >= 8 and rand(1,5) = 1) or (hotcat >= 5 and rand(1,10) = 1)) and gschool_gropeday ! daystart:
+		!!It is more likely that somebody will grap the player''s butt the hooter she is.
 		menu_off = 1
 		gschool_gropeday = daystart
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boysex_tualet.jpg"></center>'
-		'When you enter the class, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you.'
+		if $pantyworntype = 'none':
+			gs 'fame', 'pav', 'sex', 'small'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/buttgrab_nopanties.jpg"></center>'
+			'When you enter the hallway heading for the classroom the nerds hangout in, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your naked ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you. You hear several classmates remark on your lack of panties.'
+			gs 'arousal', 'flash', 1, 'humiliation'
+			gs 'arousal', 'end'
+			gs 'stat'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boysex_tualet.jpg"></center>'
+			'When you enter the hallway heading for the classroom the nerds hangout in, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you.'
+			gs 'arousal', 'flashlite', 1, 'humiliation'
+			gs 'arousal', 'end'
+			gs 'stat'
+		end
 		act 'Ignore it': gt 'gschool_chats', 'nerds'
-		act 'Identify the perpetrator': gt 'gschool_events', 'rand_scoolboy'
+		act 'Identify the perpetrator': gt 'gschool_events1', 'butt_grab'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/nerd' + rand(1,3) + '.jpg"></center>'
 		if PCloStyle2 = 4:
@@ -83,95 +96,116 @@ if $ARGS[0] = 'gopniks':
 	*clr & cla
 	minut += 5
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/gopnik.jpg"></center>'
-	if PCloStyle2 = 4:
-		if PCloInhibit <= 10:
-			'<font color="blue">This uniform is very conservative. Only the nerds would approve of you wearing it.</font>'
-			if grupTipe = 4:
-				grupvalue[4] -= 10
-				gs 'gschool_socialchg', 'group_rel_change', 'gopniks', -5
-				gs 'npc_relationship', 'modify', 'A189', 5
-				
-				'You go to the stairwell that you and your fellow gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual.'
-				'At first, a couple of them stare at you and then more and more of them do. Finally, Dan laughs and Lavrenti speaks up. "What are you wearing?" They just seem stunned at your uniform. Anushka chimes in. "Please tell me you just lost some kind of bet." Several others comment, all expressing displeasure at your choice of uniform. After a few minutes of ridicule they finally lose interest in you, but you can tell you lost their respect and maybe more today.'
-			else
-				grupvalue[4] -= 5
-				gs 'gschool_socialchg', 'group_rel_change', 'gopniks', -2
-				
-				'You go to the stairwell that the gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations.'
-				'At first, a couple of them stare at you and then more and more of them do. Finally, Radomir speaks up. "Are you lost or something?" Paulina chimes in, pointing back the way you came. "The nerds are back that way, loser." Several others also comment, all expressing displeasure at your choice of uniform. You feel very unwelcome among them, which makes you uneasy. They are well known to bully their fellow students, maybe this was a bad idea.'
-			end
-			'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are all hanging around.'
-			gs 'gschool_groups', 'gopniks'
-			act 'Leave': gt 'gschool_lessons', 'short_break'
-		elseif PCloSkirt < 5 and PCloThinness < 5 and PCloBra = 0:
-			if grupTipe = 4:
-				'You go to the stairwell that you and your fellow gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual.'
-			else
-				'You go to the stairwell that the gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations.'
-			end
-			'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are hanging around.'
-			gs 'gschool_groups', 'gopniks'
-			act 'Leave': gt 'gschool_lessons', 'short_break'
-		elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
-			grupvalue[4] += 5
-			gs 'gschool_socialchg', 'group_rel_change', 'gopniks', 1
-			gs 'npc_relationship', 'modify', 'A143', 'like'
-			gs 'npc_relationship', 'modify', 'A144', 'love'
-			gs 'npc_relationship', 'modify', 'A189', 'like'
-			if grupTipe = 4:
-				'You go to the stairwell that you and your fellow gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. A few of them take note of your slightly risky uniform and seem to approve of it.'
-			else
-				'You go to the stairwell that the gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations. A few of them take note of your slightly risky uniform and seem to approve of it.'
-			end
-			'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are hanging around.'
-			gs 'gschool_groups', 'gopniks'
-			act 'Leave': gt 'gschool_lessons', 'short_break'
+	if ((hotcat >= 8 and rand(1,5) = 1) or (hotcat >= 5 and rand(1,10) = 1)) and gschool_gropeday ! daystart:
+		!!It is more likely that somebody will grap the player''s butt the hooter she is.
+		menu_off = 1
+		gschool_gropeday = daystart
+		if $pantyworntype = 'none':
+			gs 'fame', 'pav', 'sex', 'small'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/buttgrab_nopanties.jpg"></center>'
+			'When you enter the hallway heading for the stairwell, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your naked ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you. You hear several classmates remark on your lack of panties.'
+			gs 'arousal', 'flash', 1, 'humiliation'
+			gs 'arousal', 'end'
+			gs 'stat'
 		else
-			if grupTipe = 4: grupvalue[4] -= 3 & gs 'fame', 'pav', 'sex', 1
-			gs 'gschool_socialchg', 'group_rel_change', 'gopniks', -1
-			gs 'npc_relationship', 'modify', 'A189', 'like'
-			if kotovLoveQW > 0 and kotovLoveQW['clo_comment'] = 0:
-				kotovLoveQW['clo_comment'] = 1
-				gs 'npc_relationship', 'modify', 'A9', 'dislike'
-				pcs_mood -= 10
-				gs 'stat'
-				
-				'You go to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. As you approach, Dan stands up and whistles. "Hey there slut, why don''t you come over here and suck my dick?" Several of the other gopniks laugh as well, a few of the guys comment about being next in line. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all.'
-				*nl
-				'Vitek stands up and shoves Dan up against the wall. "What did you say about my girl?"'
-				'Dan just swallows while everyone else shuts up. "Hey I was just joking, we all know she is your girl."'
-				'Vitek lets go of him. "Then watch your fucking mouth!" He turns towards you and walks over, grabbing you by the arm and dragging you over to the side. "Just what are you wearing? You''re dressed like a slut! Don''t wear this to school again. Now get out of here." He then shoves you away. You glance back, but know better than to tempt fate so you walk away.'
-				act 'Leave': gt 'gschool_lessons', 'short_break'
-			elseif kotovLoveQW > 0 and kotovLoveQW['clo_comment'] = 1:
-				gs 'npc_relationship', 'modify', 'A9', 'hate'
-				pcs_mood -= 10
-				gs 'stat'
-				
-				'You go to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. As you approach, everyone notices you and when Vitek sees you, he tenses up and angrily walks across to you. He grabs you roughly by the arm and drags you out of the stairwell. "What did I tell you about coming to school dressed like this? No girl of mine is going to walk around dressed like some slut. Now don''t come back to school dressed like this again!" He roughly shoves you into the wall and storms back to the other gopniks.'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boysex_tualet.jpg"></center>'
+			'When you enter the hallway heading for the stairwell, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you.'
+			gs 'arousal', 'flashlite', 1, 'humiliation'
+			gs 'arousal', 'end'
+			gs 'stat'
+		end
+		act 'Ignore it': gt 'gschool_chats', 'gopniks'
+		act 'Identify the perpetrator': gt 'gschool_events1', 'butt_grab'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/gopnik.jpg"></center>'
+		if PCloStyle2 = 4:
+			if PCloInhibit <= 10:
+				'<font color="blue">This uniform is very conservative. Only the nerds would approve of you wearing it.</font>'
+				if grupTipe = 4:
+					grupvalue[4] -= 10
+					gs 'gschool_socialchg', 'group_rel_change', 'gopniks', -5
+					gs 'npc_relationship', 'modify', 'A189', 5
+					
+					'You go to the stairwell that you and your fellow gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual.'
+					'At first, a couple of them stare at you and then more and more of them do. Finally, Dan laughs and Lavrenti speaks up. "What are you wearing?" They just seem stunned at your uniform. Anushka chimes in. "Please tell me you just lost some kind of bet." Several others comment, all expressing displeasure at your choice of uniform. After a few minutes of ridicule they finally lose interest in you, but you can tell you lost their respect and maybe more today.'
+				else
+					grupvalue[4] -= 5
+					gs 'gschool_socialchg', 'group_rel_change', 'gopniks', -2
+					
+					'You go to the stairwell that the gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations.'
+					'At first, a couple of them stare at you and then more and more of them do. Finally, Radomir speaks up. "Are you lost or something?" Paulina chimes in, pointing back the way you came. "The nerds are back that way, loser." Several others also comment, all expressing displeasure at your choice of uniform. You feel very unwelcome among them, which makes you uneasy. They are well known to bully their fellow students, maybe this was a bad idea.'
+				end
+				'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are all hanging around.'
+				gs 'gschool_groups', 'gopniks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
-			elseif grupTipe = 4:
-				'You go to the stairwell that you and your fellow gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. As you approach, Dan stands up and whistles. "Hey there slut, why don''t you come over here and suck my dick?" Several of the other gopniks laugh as well and a few of the guys comment about being next in line. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all.'
+			elseif PCloSkirt < 5 and PCloThinness < 5 and PCloBra = 0:
+				if grupTipe = 4:
+					'You go to the stairwell that you and your fellow gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual.'
+				else
+					'You go to the stairwell that the gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations.'
+				end
 				'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are hanging around.'
 				gs 'gschool_groups', 'gopniks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
-			else
-				grupvalue[4] -= 5
-				gs 'fame', 'pav', 'sex', 3
-				
-				'You go to the stairwell that the gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey there slut, why don''t you come over here and suck my dick?" Several of the other gopniks laugh as well and a few of the guys comment as well. "Like she came to see you Dan! She obviously came to throw herself at me." Radomir says. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all.'
+			elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
+				grupvalue[4] += 5
+				gs 'gschool_socialchg', 'group_rel_change', 'gopniks', 1
+				gs 'npc_relationship', 'modify', 'A143', 'like'
+				gs 'npc_relationship', 'modify', 'A144', 'love'
+				gs 'npc_relationship', 'modify', 'A189', 'like'
+				if grupTipe = 4:
+					'You go to the stairwell that you and your fellow gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. A few of them take note of your slightly risky uniform and seem to approve of it.'
+				else
+					'You go to the stairwell that the gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations. A few of them take note of your slightly risky uniform and seem to approve of it.'
+				end
+				'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are hanging around.'
 				gs 'gschool_groups', 'gopniks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
+			else
+				if grupTipe = 4: grupvalue[4] -= 3 & gs 'fame', 'pav', 'sex', 1
+				gs 'gschool_socialchg', 'group_rel_change', 'gopniks', -1
+				gs 'npc_relationship', 'modify', 'A189', 'like'
+				if kotovLoveQW > 0 and kotovLoveQW['clo_comment'] = 0:
+					kotovLoveQW['clo_comment'] = 1
+					gs 'npc_relationship', 'modify', 'A9', 'dislike'
+					pcs_mood -= 10
+					gs 'stat'
+					
+					'You go to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. As you approach, Dan stands up and whistles. "Hey there slut, why don''t you come over here and suck my dick?" Several of the other gopniks laugh as well, a few of the guys comment about being next in line. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all.'
+					*nl
+					'Vitek stands up and shoves Dan up against the wall. "What did you say about my girl?"'
+					'Dan just swallows while everyone else shuts up. "Hey I was just joking, we all know she is your girl."'
+					'Vitek lets go of him. "Then watch your fucking mouth!" He turns towards you and walks over, grabbing you by the arm and dragging you over to the side. "Just what are you wearing? You''re dressed like a slut! Don''t wear this to school again. Now get out of here." He then shoves you away. You glance back, but know better than to tempt fate so you walk away.'
+					act 'Leave': gt 'gschool_lessons', 'short_break'
+				elseif kotovLoveQW > 0 and kotovLoveQW['clo_comment'] = 1:
+					gs 'npc_relationship', 'modify', 'A9', 'hate'
+					pcs_mood -= 10
+					gs 'stat'
+					
+					'You go to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. As you approach, everyone notices you and when Vitek sees you, he tenses up and angrily walks across to you. He grabs you roughly by the arm and drags you out of the stairwell. "What did I tell you about coming to school dressed like this? No girl of mine is going to walk around dressed like some slut. Now don''t come back to school dressed like this again!" He roughly shoves you into the wall and storms back to the other gopniks.'
+					act 'Leave': gt 'gschool_lessons', 'short_break'
+				elseif grupTipe = 4:
+					'You go to the stairwell that you and your fellow gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. As you approach, Dan stands up and whistles. "Hey there slut, why don''t you come over here and suck my dick?" Several of the other gopniks laugh as well and a few of the guys comment about being next in line. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all.'
+					'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are hanging around.'
+					gs 'gschool_groups', 'gopniks'
+					act 'Leave': gt 'gschool_lessons', 'short_break'
+				else
+					grupvalue[4] -= 5
+					gs 'fame', 'pav', 'sex', 3
+					
+					'You go to the stairwell that the gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey there slut, why don''t you come over here and suck my dick?" Several of the other gopniks laugh as well and a few of the guys comment as well. "Like she came to see you Dan! She obviously came to throw herself at me." Radomir says. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all.'
+					gs 'gschool_groups', 'gopniks'
+					act 'Leave': gt 'gschool_lessons', 'short_break'
+				end
 			end
+		else
+			'You are using the school uniform cheat and are not wearing a uniform, therefore no one can react to your uniform.'
+			gs 'gschool_groups', 'gopniks'
+			act 'Leave': gt 'gschool_lessons', 'short_break'
 		end
-	else
-		'You are using the school uniform cheat and are not wearing a uniform, therefore no one can react to your uniform.'
-		gs 'gschool_groups', 'gopniks'
-		act 'Leave': gt 'gschool_lessons', 'short_break'
 	end
 end
 
-
 if $ARGS[0] = 'gopniks2':
 end
 
@@ -179,128 +213,150 @@ if $ARGS[0] = 'cooljocks':
 	*clr & cla
 	minut += 5
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/cooljocks.jpg"></center>'
-	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building.'
-	if PCloStyle2 = 4:
-		if PCloInhibit <= 10:
-			if fame['pav_sex'] > 0: gs 'fame', 'pav', 'sex', -1
-			grupvalue[1] -= 5
-			grupvalue[2] -= 3
-			gs 'npc_relationship', 'modify', 'A1', 'loathe'
-			gs 'npc_relationship', 'modify', 'A8', -1
-			gs 'npc_relationship', 'modify', 'A13', -1
-			gs 'npc_relationship', 'modify', 'A15', -1
-			gs 'npc_relationship', 'modify', 'A17', 'dislike'
-			if christinaQW['dompath'] < 6: gs 'npc_relationship', 'modify', 'A18', 'hate'
-			gs 'npc_relationship', 'modify', 'A19', -1
-			gs 'npc_relationship', 'modify', 'A22', 'dislike'
-			gs 'npc_relationship', 'modify', 'A23', 'dislike'
-			if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', -1
-			gs 'npc_relationship', 'modify', 'A139', -1
-			gs 'npc_relationship', 'modify', 'A140', -1
-			gs 'npc_relationship', 'modify', 'A147', -1
-			gs 'npc_relationship', 'modify', 'A148', -1
-			gs 'npc_relationship', 'modify', 'A149', -1
-			gs 'npc_relationship', 'modify', 'A165', -1
-			
-			if christinaQW['dompath'] >= 6:
-				'As you approach them, you notice some of them giving you a disapproving look as Lizaveta takes your picture and then starts texting, obviously sending the picture around. Vicky is smirking a bit and then whispers something to Vanya and Katja.'
-			else
-				'As you approach them, you notice some of them giving you a disapproving look and Christina starts to laugh. "What are you wearing? Did mommy dress you? I mean we are all glad she did, the more clothes you wear that hide that hideous body the better." Lariska and Lina add their own snide remarks similar to Christina''s and several other students laugh at her comments. Lizaveta takes your picture and then starts texting, obviously sending the picture around. Vicky is smirking a bit and then whispers something to Vanya and Katja.'
-			end
-			'Stasya glances at Bella. "My god, she is an absolute social disaster. Really no sense of style at all." Then she turns towards Andrey. "If I ever wore something like that, would you still love me?"'
-			'Andrey shakes his head. "Hell no, a man has to have his standards after all.", which just gets more and more of them to laugh.'
-			'Dimka steps forwards. "Maybe you''re lost? The nerds and outcasts are over that way." He points in the direction of the classroom the nerds and outcasts hang out in. "Perhaps you would find those who might appreciate your sense of... style there." Igor, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Marcus, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Veronika, Lazar and Erast either ignore what is going on or join in on mocking your clothes.'
-			gs 'gschool_groups', 'popular'
-			gs 'gschool_groups', 'jocks'
-			act 'Leave': gt 'gschool_lessons', 'short_break'
-		elseif PCloSkirt < 5 and PCloThinness < 5 and PCloBra = 0:
-			if PCloQuality >= 4:
-				grupvalue[1] += 1
-				grupvalue[2] += 1
-				gs 'npc_relationship', 'modify', 'A1', 1
-				gs 'npc_relationship', 'modify', 'A4', 1
-				gs 'npc_relationship', 'modify', 'A14', 1
-				gs 'npc_relationship', 'modify', 'A15', 1
-				gs 'npc_relationship', 'modify', 'A17', 1
-				gs 'npc_relationship', 'modify', 'A22', 1
-				gs 'npc_relationship', 'modify', 'A23', 1
-				if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 1
-				gs 'npc_relationship', 'modify', 'A139', 1
-				gs 'npc_relationship', 'modify', 'A140', 1
+	if ((hotcat >= 8 and rand(1,5) = 1) or (hotcat >= 5 and rand(1,10) = 1)) and gschool_gropeday ! daystart:
+		!!It is more likely that somebody will grap the player''s butt the hooter she is.
+		menu_off = 1
+		gschool_gropeday = daystart
+		if $pantyworntype = 'none':
+			gs 'fame', 'pav', 'sex', 'small'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/buttgrab_nopanties.jpg"></center>'
+			'When you enter the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your naked ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you. You hear several classmates remark on your lack of panties.'
+			gs 'arousal', 'flash', 1, 'humiliation'
+			gs 'arousal', 'end'
+			gs 'stat'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boysex_tualet.jpg"></center>'
+			'When you enter the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you.'
+			gs 'arousal', 'flashlite', 1, 'humiliation'
+			gs 'arousal', 'end'
+			gs 'stat'
+		end
+		act 'Ignore it and talk to the cool kids and jocks': gt 'gschool_chats', 'cooljocks'
+		act 'Identify the perpetrator': gt 'gschool_events1', 'butt_grab'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/cooljocks.jpg"></center>'
+		'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building.'
+		if PCloStyle2 = 4:
+			if PCloInhibit <= 10:
+				if fame['pav_sex'] > 0: gs 'fame', 'pav', 'sex', -1
+				grupvalue[1] -= 5
+				grupvalue[2] -= 3
+				gs 'npc_relationship', 'modify', 'A1', 'loathe'
+				gs 'npc_relationship', 'modify', 'A8', -1
+				gs 'npc_relationship', 'modify', 'A13', -1
+				gs 'npc_relationship', 'modify', 'A15', -1
+				gs 'npc_relationship', 'modify', 'A17', 'dislike'
+				if christinaQW['dompath'] < 6: gs 'npc_relationship', 'modify', 'A18', 'hate'
+				gs 'npc_relationship', 'modify', 'A19', -1
+				gs 'npc_relationship', 'modify', 'A22', 'dislike'
+				gs 'npc_relationship', 'modify', 'A23', 'dislike'
+				if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', -1
+				gs 'npc_relationship', 'modify', 'A139', -1
+				gs 'npc_relationship', 'modify', 'A140', -1
+				gs 'npc_relationship', 'modify', 'A147', -1
+				gs 'npc_relationship', 'modify', 'A148', -1
+				gs 'npc_relationship', 'modify', 'A149', -1
+				gs 'npc_relationship', 'modify', 'A165', -1
 				
 				if christinaQW['dompath'] >= 6:
-					'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah I like it, it looks very nice." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe at you in particular. Veronika is reading something and seems to be unaware of the whole conversation.'
+					'As you approach them, you notice some of them giving you a disapproving look as Lizaveta takes your picture and then starts texting, obviously sending the picture around. Vicky is smirking a bit and then whispers something to Vanya and Katja.'
 				else
-					'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah I like it, it looks very nice." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe at you in particular. '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be unaware of the whole conversation.'
+					'As you approach them, you notice some of them giving you a disapproving look and Christina starts to laugh. "What are you wearing? Did mommy dress you? I mean we are all glad she did, the more clothes you wear that hide that hideous body the better." Lariska and Lina add their own snide remarks similar to Christina''s and several other students laugh at her comments. Lizaveta takes your picture and then starts texting, obviously sending the picture around. Vicky is smirking a bit and then whispers something to Vanya and Katja.'
 				end
+				'Stasya glances at Bella. "My god, she is an absolute social disaster. Really no sense of style at all." Then she turns towards Andrey. "If I ever wore something like that, would you still love me?"'
+				'Andrey shakes his head. "Hell no, a man has to have his standards after all.", which just gets more and more of them to laugh.'
+				'Dimka steps forwards. "Maybe you''re lost? The nerds and outcasts are over that way." He points in the direction of the classroom the nerds and outcasts hang out in. "Perhaps you would find those who might appreciate your sense of... style there." Igor, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Marcus, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Veronika, Lazar and Erast either ignore what is going on or join in on mocking your clothes.'
 				gs 'gschool_groups', 'popular'
 				gs 'gschool_groups', 'jocks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
-			else
-				'Dimka, Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' Lina, Bella, Veronika, Lazar, Erast and Vanya are all gathered around the lockers.'
-				gs 'gschool_groups', 'popular'
-				gs 'gschool_groups', 'jocks'
-				act 'Leave': gt 'gschool_lessons', 'short_break'
-			end
-		elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
-			if PCloQuality >= 4:
-				gs 'gschool_socialchg', 'group_rel_change', 'cool kids', 1
-				grupvalue[1] += 2
-				gs 'gschool_socialchg', 'group_rel_change', 'jocks', 1
-				grupvalue[2] += 1
-				if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
-				
-				if christinaQW['dompath'] >= 6:
-					'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah I like it, it looks very nice." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe at you in particular. Veronika is reading something and seems to be unaware of the whole conversation.'
+			elseif PCloSkirt < 5 and PCloThinness < 5 and PCloBra = 0:
+				if PCloQuality >= 4:
+					grupvalue[1] += 1
+					grupvalue[2] += 1
+					gs 'npc_relationship', 'modify', 'A1', 1
+					gs 'npc_relationship', 'modify', 'A4', 1
+					gs 'npc_relationship', 'modify', 'A14', 1
+					gs 'npc_relationship', 'modify', 'A15', 1
+					gs 'npc_relationship', 'modify', 'A17', 1
+					gs 'npc_relationship', 'modify', 'A22', 1
+					gs 'npc_relationship', 'modify', 'A23', 1
+					if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 1
+					gs 'npc_relationship', 'modify', 'A139', 1
+					gs 'npc_relationship', 'modify', 'A140', 1
+					
+					if christinaQW['dompath'] >= 6:
+						'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah I like it, it looks very nice." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe at you in particular. Veronika is reading something and seems to be unaware of the whole conversation.'
+					else
+						'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah I like it, it looks very nice." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe at you in particular. '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be unaware of the whole conversation.'
+					end
+					gs 'gschool_groups', 'popular'
+					gs 'gschool_groups', 'jocks'
+					act 'Leave': gt 'gschool_lessons', 'short_break'
 				else
-					'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah looking sexy <<$pcs_nickname>>." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe to you in partucular. '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be unaware of the whole conversation.'
+					'Dimka, Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' Lina, Bella, Veronika, Lazar, Erast and Vanya are all gathered around the lockers.'
+					gs 'gschool_groups', 'popular'
+					gs 'gschool_groups', 'jocks'
+					act 'Leave': gt 'gschool_lessons', 'short_break'
+				end
+			elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
+				if PCloQuality >= 4:
+					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', 1
+					grupvalue[1] += 2
+					gs 'gschool_socialchg', 'group_rel_change', 'jocks', 1
+					grupvalue[2] += 1
+					if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
+					
+					if christinaQW['dompath'] >= 6:
+						'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah I like it, it looks very nice." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe at you in particular. Veronika is reading something and seems to be unaware of the whole conversation.'
+					else
+						'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah looking sexy <<$pcs_nickname>>." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe to you in partucular. '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be unaware of the whole conversation.'
+					end
+					gs 'gschool_groups', 'popular'
+					gs 'gschool_groups', 'jocks'
+					act 'Leave': gt 'gschool_lessons', 'short_break'
+				else
+					gs 'gschool_socialchg', 'group_rel_change', 'jocks', 1, 'male'
+					grupvalue[2] += 1
+					gs 'npc_relationship', 'modify', 'A3', 'love'
+					gs 'npc_relationship', 'modify', 'A5', 'love'
+					gs 'npc_relationship', 'modify', 'A8', 'love'
+					if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A146', 'like'
+					gs 'npc_relationship', 'modify', 'A147', 'like'
+					gs 'npc_relationship', 'modify', 'A148', 'like'
+					
+					'As you approach them, several of them give you once over, obviously noticing your uniform. Stasya smirks "Someone is trying hard to get the boys to look at her."'
+					'Hearing this, Bella gives you a closer look and says "It wouldn''t be so bad if it was a good quality."'
+					'Dimka adds in. "Now Bella, you know her family can''t afford the finer things in life." If not for the tone of his voice and the smirk, it would almost sound like he was defending you but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
+					gs 'gschool_groups', 'popular'
+					gs 'gschool_groups', 'jocks'
+					act 'Leave': gt 'gschool_lessons', 'short_break'
 				end
-				gs 'gschool_groups', 'popular'
-				gs 'gschool_groups', 'jocks'
-				act 'Leave': gt 'gschool_lessons', 'short_break'
 			else
-				gs 'gschool_socialchg', 'group_rel_change', 'jocks', 1, 'male'
-				grupvalue[2] += 1
-				gs 'npc_relationship', 'modify', 'A3', 'love'
-				gs 'npc_relationship', 'modify', 'A5', 'love'
-				gs 'npc_relationship', 'modify', 'A8', 'love'
+				gs 'fame', 'pav', 'sex', 5
+				gs 'gschool_socialchg', 'group_rel_change', 'cool kids', -1
+				grupvalue[1] -= 5
+				gs 'gschool_socialchg', 'group_rel_change', 'jocks', -1
+				grupvalue[2] -= 5
+				gs 'npc_relationship', 'modify', 'A1', 'hate'
+				gs 'npc_relationship', 'modify', 'A17', 'dislike'
+				if christinaQW['dompath'] < 6: gs 'npc_relationship', 'modify', 'A18', 'hate'
+				gs 'npc_relationship', 'modify', 'A22', 'hate'
 				if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
-				gs 'npc_relationship', 'modify', 'A146', 'like'
-				gs 'npc_relationship', 'modify', 'A147', 'like'
-				gs 'npc_relationship', 'modify', 'A148', 'like'
+				gs 'npc_relationship', 'modify', 'A139', 'dislike'
+				gs 'npc_relationship', 'modify', 'A140', 'dislike'
 				
-				'As you approach them, several of them give you once over, obviously noticing your uniform. Stasya smirks "Someone is trying hard to get the boys to look at her."'
-				'Hearing this, Bella gives you a closer look and says "It wouldn''t be so bad if it was a good quality."'
-				'Dimka adds in. "Now Bella, you know her family can''t afford the finer things in life." If not for the tone of his voice and the smirk, it would almost sound like he was defending you but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
-				gs 'gschool_groups', 'popular'
-				gs 'gschool_groups', 'jocks'
+				'As you approach, everyone is staring at you. Bella speaks up. "What on earth are you wearing? Forget to change out of your whoring clothes last night?" Several of the rest laugh and you can sense the general feeling of agreement from the rest.'
+				'Dimka smirks. "Maybe she messed up the wash and her uniform just shrunk and she was too stupid to notice?" and the others laugh even more.'
+				'Albina steps forward. "Get out of here with your whorish clothes! No one wants you around." and you hear several murmers of agreement from the rest. It looks like even Igor, Katja, Vicky, '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, Lina, Veronika, Lazar, Erast and Vanya appear to agree. They either give you the cold shoulder or refuse to meet your eyes. Feeling very unwelcome, you turn around and leave.'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			end
 		else
-			gs 'fame', 'pav', 'sex', 5
-			gs 'gschool_socialchg', 'group_rel_change', 'cool kids', -1
-			grupvalue[1] -= 5
-			gs 'gschool_socialchg', 'group_rel_change', 'jocks', -1
-			grupvalue[2] -= 5
-			gs 'npc_relationship', 'modify', 'A1', 'hate'
-			gs 'npc_relationship', 'modify', 'A17', 'dislike'
-			if christinaQW['dompath'] < 6: gs 'npc_relationship', 'modify', 'A18', 'hate'
-			gs 'npc_relationship', 'modify', 'A22', 'hate'
-			if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
-			gs 'npc_relationship', 'modify', 'A139', 'dislike'
-			gs 'npc_relationship', 'modify', 'A140', 'dislike'
-			
-			'As you approach, everyone is staring at you. Bella speaks up. "What on earth are you wearing? Forget to change out of your whoring clothes last night?" Several of the rest laugh and you can sense the general feeling of agreement from the rest.'
-			'Dimka smirks. "Maybe she messed up the wash and her uniform just shrunk and she was too stupid to notice?" and the others laugh even more.'
-			'Albina steps forward. "Get out of here with your whorish clothes! No one wants you around." and you hear several murmers of agreement from the rest. It looks like even Igor, Katja, Vicky, '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, Lina, Veronika, Lazar, Erast and Vanya appear to agree. They either give you the cold shoulder or refuse to meet your eyes. Feeling very unwelcome, you turn around and leave.'
+			'You are using the school uniform cheat and are not wearing a uniform, therefore no one can react to your uniform.'
+			gs 'gschool_groups', 'popular'
+			gs 'gschool_groups', 'jocks'
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		end
-	else
-		'You are using the school uniform cheat and are not wearing a uniform, therefore no one can react to your uniform.'
-		gs 'gschool_groups', 'popular'
-		gs 'gschool_groups', 'jocks'
-		act 'Leave': gt 'gschool_lessons', 'short_break'
 	end
 end
 

+ 16 - 625
locations/gschool_events.qsrc

@@ -1,5 +1,5 @@
 # gschool_events
-!2021/08/19
+!2022/02/09
 !! Only before class
 if $ARGS[0] = 'teacher_greet':
 	*clr & cla
@@ -1077,11 +1077,19 @@ if $ARGS[0] = 'break_events':
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 29:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirt_pulled_up.jpg"></center>'
-		'As you pass by some of the nerds talking, Dan walks by them as well. He reaches out and grabs the back of Natasha''s skirt and pulls it up, showing off her panty clad ass to everyone. She fights to pull her skirt out of his hand to no avail. Feofan tells him to let go and gets shoved into a locker for his trouble, but it does make Dan let go of Natasha''s skirt. Before you can say anything, a teacher looks out from one of the classrooms and asks what''s going on. Everyone says nothing and they go about their way, but the look Dan gives Feofan promises it might not be over.'
-		gs 'arousal', 'erotic', 1
-		gs 'arousal', 'end'
-		gs 'stat'
+		if NatbelQW['panty_stuff_day'] = daystart:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/buttgrab_nopanties.jpg"></center>'
+			'As you pass by some of the nerds talking, Dan walks by them as well. He reaches out and grabs the back of Natasha''s skirt and pulls it up, showing off her naked ass to everyone. She fights to pull her skirt out of his hand to no avail. Feofan tells him to let go and gets shoved into a locker for his trouble, but it does make Dan let go of Natasha''s skirt. Before you can say anything, a teacher looks out from one of the classrooms and asks what''s going on. Everyone says nothing and they go about their way, but the look Dan gives Feofan promises it might not be over.'
+			gs 'arousal', 'erotic_nudity', 1
+			gs 'arousal', 'end'
+			gs 'stat'
+		else 
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirt_pulled_up.jpg"></center>'
+			'As you pass by some of the nerds talking, Dan walks by them as well. He reaches out and grabs the back of Natasha''s skirt and pulls it up, showing off her panty clad ass to everyone. She fights to pull her skirt out of his hand to no avail. Feofan tells him to let go and gets shoved into a locker for his trouble, but it does make Dan let go of Natasha''s skirt. Before you can say anything, a teacher looks out from one of the classrooms and asks what''s going on. Everyone says nothing and they go about their way, but the look Dan gives Feofan promises it might not be over.'
+			gs 'arousal', 'erotic', 1
+			gs 'arousal', 'end'
+			gs 'stat'
+		end
 	elseif break_rand = 30:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtupback.jpg"></center>'
 		if christinaQW['dompath'] >= 6:
@@ -1132,7 +1140,7 @@ if $ARGS[0] = 'break_events':
 		end
 		act 'Leave': gt 'gschool_events', 'leave_break_events2'
 		if lernHome > 1:
-			act 'Follow Petka': gt 'gschool_events', 'follow_petka'
+			act 'Follow Petka': gt 'petkaev', 'follow_petka'
 		elseif petka_homework > 0:
 			'<br>You already done all your homework and you don''t need his help today.'
 		else
@@ -1158,232 +1166,6 @@ if $ARGS[0] = 'leave_break_events2':
 	end
 end
 
-if $ARGS[0] = 'follow_petka':
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/nerdtalk.jpg"></center>'
-	if petka_homework = 0:
-		'You follow Petka into the bathroom and as the door closes, he quickly turns around alarmed. When he sees you, he looks a little confused but also a little leary of you. "Hey this is the boys bathroom! You shouldn''t be in here."'
-		'You ignore him. "Petka, I was wondering if you could do me a favor. How about you give me your homework so I can copy it?"'
-		'He is already shaking his head before you even finish. "I can''t do that. That would be cheating and I could get expelled for helping you cheat! I''m sorry, but I can''t help you."'
-
-		act 'Oh well, you tried':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/nerdtalk.jpg"></center>'
-			'You sigh. Oh well, at least you tried. <i>Maybe I really will have to study to get my grades up,</i> you think to yourself as you leave the bathroom.'
-			gs 'gschool_events', 'leave_break_events'
-		end
-
-		gs 'willpower', 'misc', 'force', 'medium'
-		if will_cost <= pcs_willpwr and grupTipe = 1:
-			act 'Threaten his reputation (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'misc', 'force', 'medium'
-				gs 'willpower', 'pay', 'force'
-				gs 'stat'
-				petka_homework = 1
-				grupvalue[3] -= 5
-				grupvalue[1] += 3
-				npc_rel['A6'] -= 5
-				gs 'grades', 'homework', 'school', 'yes', 1, 2, 'A6'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homeworksuccess.jpg"></center>'
-				'You sigh "Well I guess I will just have to tell everyone I caught you jerking off to upskirt pictures of the girls on your phone."'
-				'He pales a bit at that. "I never did that! The guys will make fun of me or even beat me up!"'
-				'You shrug to him. "Sorry, I can''t help you." you say in a mocking tone.'
-				'He hangs his head for a moment, then nods. "OK, you can have my homework." he says as he pulls it out of his bag. Just please leave me alone.'
-				'You take the homework from him. "See how easy that was?" You leave with the homework to find a quiet place to copy it before class.'
-				act 'Take the homework': gt 'gschool_events', 'leave_break_events2'
-			end
-		elseif will_cost > pcs_willpwr and grupTipe = 1:
-			act 'Threaten his reputation (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
-
-		gs 'willpower', 'misc', 'force', 'medium'
-		if will_cost <= pcs_willpwr and (grupTipe = 2 or grupTipe = 4):
-			act 'Give him a swirly (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'misc', 'force', 'medium'
-				gs 'willpower', 'pay', 'force'
-				gs 'stat'
-				petka_homework = 1
-				grupvalue[3] -= 10
-				grupvalue[2] += 2
-				grupvalue[4] += 3
-				npc_rel['A6'] -= 10
-				gs 'grades', 'homework', 'school', 'yes', 1, 2, 'A6'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/swirlygb.jpg"></center>'
-				'You look at him, a bit surprised he would turn you down, but you have a solution for this. "No? Well OK then." For a moment he looks relieved, but as you step closer to him he panics. You grab him by his ear and start pulling him into one of the stalls. Just as you start to pull him into the stall, he grabs your hand and starts to pry your fingers off his ear.'
-				*nl
-				'You release his ear, but as you do you knee him hard in the balls, causing him to crumple to the floor with a gasp, holding his crotch. "Get up pussy." Grabbing him, you haul him up onto his hands and knees while he is still recovering from the hit. You shove him forward until his face is over the toilet bowl. "Ready to give me your homework yet?" you ask him.'
-				'He pleads with you and resists by placing his hands on the toilet bowl. "No! Let me go! Please!"'
-				*nl
-				'Maneuvering a bit, you get into a position where you can push down on his head and deliver another kick to his balls. He crumples as he cries out and you easily push his head down. You place one of your knees on his upper back while using one hand to force his head into the toilet. After a couple of dunks and him still refusing, you use your other hand to reach down the back of his pants. Clutching his underwear, you yank on them until you hear cloth tearing. Finally, he relents. "OK... OK! You... You can have my homework! Just, please... stop!" he pleads through what sounds like sobs.'
-				act 'Let him up':
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homeworksuccess.jpg"></center>'
-					'You let go of him and back off, letting him shakily get back on his feet. "Well?" you demand.'
-					'He grabs his pack and pulls out some papers, quickly handing them over. "Here, now please leave me alone..." he says as his voice cracks.'
-					'You smile at him and pat him on the cheek, causing him to flinch. It is hard to tell with the toilet water on his face if he is crying or not. "See, that wasn''t so hard was it? Next time you will know better." you say in a mocking tone.'
-					'He is on the verge of tears and just nods. You leave with the homework to find a quiet place to copy it before class.'
-					act 'Take the homework': gt 'gschool_events', 'leave_break_events2'
-				end
-			end
-		elseif will_cost > pcs_willpwr and (grupTipe = 2 or grupTipe = 4):
-			act 'Give him a swirly (<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', 'sex', 'self'
-		if will_cost <= pcs_willpwr:
-			act 'Bribe him with sex (<<will_cost>> Willpower)':
-				gs 'willpower', 'sex', 'self'
-				petka_homework = 2
-				gt 'gschool_events', 'homework_sex_bribe'
-			end
-		else
-			act 'Bribe him with sex (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
-	elseif petka_homework = 2:
-		'You follow Petka into the bathroom and as the door closes, he quickly turns around alarmed. When he sees you he looks a little eager, obviously hoping you want to repeat last time. "Do you need my homework again?" he asks you.'
-		'You nod your head. "Yes."'
-		'He licks his lips a bit and you can already see the bulge in his pants growing. "Same as last time?" he asks, sounding hopeful.'
-		'You nod your head as you walk over to him.'
-		act 'Change your mind': gt 'gschool_events', 'leave_break_events2'
-		act 'Bribe him with sex again': gt 'gschool_events', 'homework_sex_bribe'
-	else
-		gs 'grades', 'homework', 'school', 'yes', 1, 2, 'A6'
-		'You follow Petka into the bathroom and as the door closes, he quickly turns around alarmed. When he sees you he looks a little afraid and crest fallen. "What do you want this time?" he asks.'
-		'"The same thing as last time Petka... or do you need a reminder?" you reply.'
-		'He quickly pulls out his homework, obviously afraid of you. "Here, take it! Just please, leave me alone..."'
-		act 'Take the homework': gt 'gschool_events', 'leave_break_events2'
-	end
-end
-
-if $ARGS[0] = 'homework_sex_bribe':
-	*clr & cla
-	gs 'stat'
-	grupvalue[1] -= 3
-	grupvalue[2] -= 2
-	grupvalue[3] -= 3
-	grupvalue[4] -= 1
-	npc_rel['A6'] += 5
-	if npc_sex['A6'] = 0: npc_sex['A6'] = 1
-	gs 'grades', 'homework', 'school', 'yes', 1, 2, 'A2'
-	gs 'fame', 'pav', 'sex', 5
-	gs 'boystat', 'A6'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homework1.jpg"></center>'
-	'You walk over to him and start to undo your shirt and say to him seductively. "If you do this for me, I will do something for you."'
-	'His eyes get big as he looks down at your chest. "Like what?" he squeaks out.'
-	act 'Take off top':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homework2.jpg"></center>'
-		'You pull open your shirt and show him your bare breasts. "Like you do something for me, I can make you feel real good. So what do you say?"'
-		'He swallows hard as he stares at your tits and nods vigorously. You can see the bulge in his pants growing.'
-		'"Well you need to get me ready." you tell him as you walk over to the stall with your back turned to him. "Why don''t you use that tongue to get me all wet?"'
-		if $pantyworntype ! 'none': 'You pull down your panties, letting them drop to the floor around your ankles as he walks up behind you and kneels down.'
-		act 'Eat me':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homework3.jpg"></center>'
-			'You lean forward slightly, spreading your legs and with one hand spreading your ass cheeks to give him easier access to your pussy. He eagerly licks your pussy, he even licks your asshole. You are not sure if he is doing it on purpose or just doesn''t know what he is doing. It''s likely the latter as he isn''t very good at licking your pussy, but he sure is eager.'
-			gs 'arousal', 'cuni', 2, 'unknown'
-			gs 'arousal', 'rimming', 2, 'unknown'
-			minut -= 2
-			gs 'stat'
-			act 'Ride him cowgirl':
-				*clr & cla
-				gs 'boyStat', 'A6'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homeworkride1.jpg"></center>'
-				'Getting tired of his lackluster attempt to eat you out, you push his head away. "Get your cock out and lay on your back." you tell him.'
-				'He quickly lays on his back, unbuttoning his pants so his <<dick>>cm <<$dick_girth>> dick springs free. You take your clothes off as he gets in position. You walk over to him, straddle him and slowly lower yourself down on him, feeling his cock slide into you.'
-				'You start off slowly riding him, picking up speed as it starts to feel better and better.'
-				gs 'arousal', 'vaginal', 5, 'dom'
-				gs 'stat'
-				act 'Reverse cowgirl':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homeworkride2.jpg"></center>'
-					'It starts to feel really good, but looking into his longing eyes starts to bother you, so you turn around and start riding him reverse cowgirl style. This is even better, now you can just focus on your own pleasure and not worry about him as you use him. His breathing is becoming quicker and he is starting to grunt louder when he suddenly says "I''m about to cum."'
-					gs 'arousal', 'vaginal', 5, 'dom'
-					gs 'stat'
-					act 'Let him cum on your face':gt 'gschool_events', 'petra_homework_facial'
-				end
-			end
-			act 'Fuck me':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homeworkv1.jpg"></center>'
-				'Getting tired of his lackluster attempt to eat you out, you push his head away. "Get your cock out and come over here." you tell him.'
-				'He quickly unbuttons his pants so his <<dick>>cm <<$dick_girth>> dick springs free. You take your clothes off as you walk over to the sinks, partially bending over and placing one foot on the sink. "Come over here and fuck my pussy." He wastes no time and walks over behind you. It takes him a couple of tries to get his cock inside you as he keeps missing your hole, showing his inexperience.'
-				'Finally, with your help, he gets it lined up and slides his cock into your pussy, moaning loudly as he does. He quickly slides himself in balls deep and starts fucking you frantically like you imagine a virgin would.'
-				gs 'arousal', 'vaginal', 5
-				gs 'stat'
-				act 'Oh yes that''s it':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homeworkv2.jpg"></center>'
-					'What he lacks in skill, he almost makes up for in enthusiasm as he fucks you, although you can tell he is trying to restrain himself. Perhaps he is afraid of hurting you by being too rough? Either way it doesn''t take too long before he moans out "I''m about to cum."'
-					gs 'arousal', 'vaginal', 5
-					gs 'stat'
-					act 'Let him cum on your face':gt 'gschool_events', 'petra_homework_facial'
-				end
-				act 'You can fuck my ass':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homeworka1.jpg"></center>'
-					'His dick is rather on the small side, perhaps it would feel better in your ass. "I want you to fuck my ass now."'
-					gs 'arousal', 'auto_lube', 'anal'
-					'He breathes almost in your ear. "OK." He pulls out and tries to put his dick in your ass, failing until you grab his dick and help line it up. He finally slides his cock up your ass. This seems to really excite him, as it doesn''t take long at all until he moans out "I''m about to cum."'
-					gs 'arousal', 'anal', 5
-					gs 'stat'
-					act 'Let him cum on your face':gt 'gschool_events', 'petra_homework_facial'
-				end
-			end
-			act 'Fuck my ass':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homeworka1.jpg"></center>'
-				'Getting tired of his lackluster attempt to eat you out, you push his head away. "Get your cock out and fuck my ass." you tell him.'
-				'He quickly unbuttons his pants so his <<dick>>cm <<$dick_girth>> dick springs free. You take your clothes off before leaning against the side of the stall, partially bending over. You use one hand to spread your cheeks while your other hand helps guide his dick to your asshole.'
-				gs 'arousal', 'auto_lube', 'anal'
-				'With your help, he gets it lined up and slides his cock into your ass, moaning loudly as he does. He quickly slides himself in balls deep and starts fucking you frantically like you imagine a virgin would.'
-				gs 'arousal', 'anal', 5
-				gs 'stat'
-				act 'Pound my little ass':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homeworka2.jpg"></center>'
-					'After he pulls back and slips out of you one too many times, you decide to change positions. "Stop, let me change to a better position." He stops and waits while you lay down face first on the floor. You are a little thrilled at the idea of laying on the dirty floor while some guy fucks your ass. You reach back with both hands and spread your ass cheeks wide, glancing back at him. "Well, what are you waiting for?"'
-					'That is all the encouragement he needs and he quickly gets down on top of you. This time he doesn''t have any trouble shoving his dick back in your ass. He starts fucking your ass balls deep and very quickly he moans out "I''m about to cum."'
-					gs 'arousal', 'anal', 5
-					gs 'stat'
-					act 'Let him cum on your face': gt 'gschool_events', 'petra_homework_facial'
-				end
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'petra_homework_facial':
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homeworkcum.jpg"></center>'
-	'Hearing him say he is about to cum, you force him to pull out of you and as you get down on your knees, you tell him "You can jerk off on my face."'
-	'He stands over you and starts jerking his dick. After only a couple of jerks, you feel the first splatter of cum hit your face, quickly following by several more. Before long, half your face is covered in his cum. Once the cum shower finally stops, you get up and start getting dressed again. Seeing this, he puts his dick away and pulls out his homework from his pack.'
-	gs 'cum_call', 'face', 'A6'
-	gs 'arousal', 'foreplay', 2
-	gs 'arousal', 'end'
-	gs 'stat'
-	act 'Take the homework':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homeworksuccess.jpg"></center>'
-		'With his cum still on your face, you take the offered homework and smile to him. "See I knew we could work something out. Now get lost!"'
-		'He smiles at first, then looks a little alarmed when you tell him to get lost. He does what you tell him and quickly leaves the bathroom, leaving you alone.'
-		act 'Clean your face and leave':
-			pcs_makeup = 1
-			cumspclnt = 9
-			gs 'cum_cleanup'
-			cumspclnt = 11
-			gs 'cum_cleanup'
-			if pcs_sweat > 19 : pcs_sweat -= 5
-			gt 'gschool_events', 'leave_break_events2'
-		end
-	end
-end
-
 !!After school events
 if $ARGS[0] = 'afterschool_events':
 	*clr & cla
@@ -1880,397 +1662,6 @@ if $ARGS[0] = 'afterschool_classroom_events':
 	end
 end
 
-if $ARGS[0] = 'rand_scoolboy':
-	menu_off = 1
-	:scoolboy_loop
-	scoolboy = rand(1,5)
-	*clr & cla
-	if scoolboy = 1:
-		if DimaRudeBlock = 0 and rand(0,2) = 0:
-			$school_static_num = 'A1'
-		elseif rand(0,1) = 0:
-			$school_static_num = 'A4'
-		else
-			$school_static_num = 'A147'
-		end
-		$rand_boy = $npc_nickname[$school_static_num]	
-	elseif scoolboy = 3:
-		if (artQW ! 3 and artQW ! 20) and rand(0,2) = 0:
-			$school_static_num = 'A2'
-		elseif rand(0,1) = 0:
-			$school_static_num = 'A6'
-		else
-			$school_static_num = 'A152'
-		end
-		$rand_boy = $npc_nickname[$school_static_num]
-	elseif scoolboy = 4:
-		if fame['pav_sex'] >= 50 and kotovLoveQW <= 0:
-			gt 'gschool_events', 'rand_gopnic'
-		else
-			jump 'scoolboy_loop'
-		end
-	else
-		gs 'gschool_events', 'rand_boy_arg', 0, 1, 0, 0, 1, 0
-	end
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big<<mid($school_static_num, 2)>>.jpg"></center>'
-	if npc_gender[$school_static_num] = 0:
-		if scoolboy = 3:
-			'You can tell from the embarrassed look on his face and the admiring glances of his friends that <<$rand_boy>> was the one touching your ass. Looks like he scored some points in his group today.'
-		elseif scoolboy = 2:
-!!ToDo: Remove fedor		
-			'You can tell from his disappointed expression that <<$rand_boy>> was the one groping your ass. Perhaps he was expecting something firmer after hanging out with the athletic girls so much? Maybe you should work out more...'
-		elseif scoolboy = 1:
-			'Even though he tries to hide it as best he can, the proud grin on the face of <<$rand_boy>> tells you that he was the one groping your ass.'
-		elseif scoolboy = 4:
-!!ToDo: instead of random lets make it Vitek, Dan, or Vasily which uses group 1 in this pav_sex act. Or Roman, Lavrenti, Radomir or Arkadi then it is group two for the pav_sex act
-			'The brazen look on his face betrays <<$rand_boy>>. It must have been him touching your ass. Knowing him, he probably would''ve gone further if there weren''t so many people here.'
-		elseif scoolboy = 5:
-			'<<$rand_boy>> is trembling slightly, his eyes shifting back and forth as he awkwardly tries to not be noticed by you. It must''ve been him.'
-			'"<<$rand_boy>>, are you out of your mind!?" you cry out as the other boys burst out into laughter. You can see the panic in his face as he raises his hands in defense, rapidly apologizing:'
-			'"Please, I didn''t want to! They made me, I promise! I''m sorry!"'
-			'You stare him down for a few seconds and realize he''s not lying. You know <<$rand_boy>> already doesn''t have an easy time in school. You give the other guys a derogatory look as you let him off the hook. "Alright, I believe you. Just don''t do it again, okay?"'
-			'He thanks you and quickly takes his seat for the class, visibly relieved you didn''t report him.'
-			act 'Continue': gt 'gschool_events', 'leave_break_events2'
-			exit
-		else
-			'Wait a minute... you don''t recognize any of these people! You must be in the wrong classroom!'
-		end
-		if npc_rel[$school_static_num] <= 50 and npc_grupTipe[$school_static_num] ! 5:
-			act 'Ignore it':
-				grupvalue[1] -= 1
-				grupvalue[2] -= 1
-				grupvalue[3] -= 1	
-				grupvalue[4] -= 1
-				gt 'gschool_events', 'leave_break_events2'
-			end
-			gs 'willpower', 'misc', 'self', 'medium'
-			if will_cost <= pcs_willpwr:
-				act 'Slap him hard (<<will_cost>> Willpower)':
-					*clr & cla
-					gs 'willpower', 'pay', 'self'
-					gs 'stat'
-					npc_rel[$school_static_num] -= 5
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy1.jpg"></center>'
-					if mesec > 0:
-						'It''s bad enough he did it, it is worse because you are on your period. "You fucking pervert!" you shout angrily and slap him across the face as hard as you can. You shake the stinging out of your hand while he clutches his cheek in agony. When he finally pulls his hands away from his face, the outline of your hand is clearly visible on his cheek. That''s going to leave a bruise. The other boys laugh loudly. This is the best entertainment they''ve had during the break in a long time.'
-					else
-						'"You fucking pervert!" you shout angrily and slap him across the face as hard as you can. You shake the stinging out of your hand while he clutches his cheek in agony. When he finally pulls his hands away from his face, the outline of your hand is clearly visible on his cheek. That''s going to leave a bruise. The other boys laugh loudly. This is the best entertainment they''ve had during the break in a long time.'
-						if $rand_boy = 'Dimka':
-							'Dimka rubs his face and glares at those laughing then glares at you. "You''ll pay for that bitch!" With that he walks off.'
-						elseif scoolboy = 1 or scoolboy = 2:
-							'After rubbing his face he looks at you in disbelief. "What the fuck was that for? I was just messing with you." Then he walks off.'
-						elseif scoolboy = 4 and $rand_boy ! 'Roman':
-							if gruptipe = 4:
-								'As the others laugh at him, his eyes get hard and he raises his hand to slap you. However, your look back to him promises him a lot more than just a slap from you if he does. He seems to hesitate, then he finally snorts a laugh. He just gives you a look like he will get you back for this and then heads out.'
-							else
-								'As the others laugh at him, his eyes get hard and he slaps you back. Not as hard as he could, but hard enough that your face is really stinging. "Don''t you ever fucking slap me bitch!" he shouts as he storms off.'
-							end
-						end
-					end
-					act 'Continue': gt 'gschool_events', 'leave_break_events2'
-				end
-			else
-				act 'Slap him hard (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
-		elseif npc_rel[$school_static_num] > 50:
-			act 'Slap him playfully':
-				npc_rel[$school_static_num] -= 2
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy2.jpg"></center>'
-				'"<<$rand_boy>> ain''t so bad... but still, I can''t just let him do this."'
-				'You give him a playful slap in the face. It''s not hard enough to really hurt him, but enough to send a message. The other boys laugh loudly. This is the best entertainment they''ve had during the break in a long time.'
-				act 'Continue': gt 'gschool_events', 'leave_break_events2'
-			end
-			gs 'willpower', 'exhib', 'self'
-			if will_cost <= pcs_willpwr:
-				act 'Tease him (<<will_cost>> Willpower)':
-					*clr & cla
-					inhib_exp += 2
-					gs 'willpower', 'pay', 'self'
-					gs 'arousal', 'flash', -5
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
-					'<i><<$rand_boy>> is actually kind of cute...</i> you think to yourself.'
-					'You pretend the other boys aren''t there and step closer. "Come on <<$rand_boy>>. You know you only have to ask if you want to see more..." you smile sweetly as you slowly begin to lift your skirt. He looks down, eyes wide. Just before your skirt is high enough to reveal '+iif($pantyworntype ! 'none', 'your panties', 'your pussy')+', you drop it and skip backward, giggling.'
-					*nl
-					'"Pfft-! You really thought I was gonna give everyone a show like that? Keep dreaming." You give him a cute wink as you sit down and get ready for your next class.'
-					act 'Continue': gt 'gschool_events', 'leave_break_events2'
-				end
-			else
-				act 'Lift your skirt (<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 'Continue': gt 'gschool_events', 'leave_break_events2'
-		end
-	elseif npc_sex[$school_static_num] > 0:
-		'You notice the confident stares of <<$rand_boy>>. It must''ve been him.'
-		act 'Taunt him':
-			*clr & cla
-			pcs_horny += 50
-			gs 'boyStat', $school_static_num
-			gs'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy4.jpg"></center>'
-			'He''s kind of cute. You''re so horny right now, so you decide to tease him and see if you can push him into doing more. You put your finger in your mouth and quietly ask him in a lewd voice "Come on <<$rand_boy>>, is that all you have for me?"'
-			'His friends heard your question, and are now daring him to take you to the men''s room. He doesn''t seem so sure.'
-			act 'Tease him':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
-				'You can see him starting to get turned on, certain that this is going to turn out good for him. You lean in real close and whisper in his ear, but loud enough for others to hear. "This is what I have for you." You start sliding your skirt slowly up your thighs, with all of the boys watching. Just before it gets high enough to show them anything, you let it go and it drops back in place. "Which is absolutely nothing." you say with a giggle. As you walk away, you hear one of the boys talking to his friend.'
-				*nl
-				'"God so close. She is such a tease."'
-				act 'Continue': gt 'gschool_events', 'leave_break_events2'
-			end
-			act 'Drag him to the men''s room':
-				*clr & cla
-				grupvalue[1] -= 10
-				grupvalue[2] -= 10
-				grupvalue[3] -= 10
-				gs 'fame', 'pav', 'sex', 15
-				gs 'arousal', 'foreplay', 'exhibitionism', -5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet1.jpg"></center>'
-				'You give him a sweet smile and take him by the hand, pulling him into the men''s room. Slightly lifting up your skirt, you put his hand between your legs. The other boys have followed you and now you''re being fondled in front of a crowd.'
-				act 'Take his cock out of his pants': gt 'gschool_sex', 'rand_bj'
-			end
-			act 'Take him behind the school building':
-				grupvalue[1] -= 5
-				grupvalue[2] -= 5
-				grupvalue[3] -= 5
-				gs 'fame', 'pav', 'sex', 5
-				gt 'gschool_sex', 'rand_sex'
-			end
-			if katjaQW['school_sex'] = 1:
-				act 'Go to the back room with the guy':
-					grupvalue[1] -= 5
-					grupvalue[2] -= 5
-					grupvalue[3] -= 5
-					gs 'fame', 'pav', 'sex', 5
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/kiss.jpg"></center>'
-					'You remember the back room that Katja showed you. When you tell <<$rand_boy>> about it, he takes your hand and tells you to take him there. As soon as you close the door behind you, <<$rand_boy>> pounces on you and begins to kiss you.'
-					act 'Get on the couch':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom1.jpg"></center>'
-						'Feeling playful, you push him away and quickly move to the couch, your back turned towards him. You make a show of slowly lifting your skirt.'
-						if $pantyworntype = 'none':
-							'Since you''re not wearing panties, you reveal your bare pussy and puckered asshole to him, giving him a sly grin when you turn your head back. You innocently ask him "Do you like what you see?"'
-						elseif $pantyworntype ! 'none':
-							'You quickly take your panties off and throw them in a corner. You slap your bare ass as you show off your pussy and anus and innocently ask him "Do you like what you see?"'
-						end
-						act 'Get on your hands and knees':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom2.jpg"></center>'
-							'You lean forward as <<$rand_boy>> approaches. He greedily puts his hands on your ass, fondling your ass cheeks enthusiastically. His touch invokes shivers throughout your body. You''re so horny you don''t know what you''ll do if you don''t get some soon! Slowly but surely, he moves his hands towards your crack, and after a while two of his fingers are inside your dripping pussy.'
-							gs 'arousal', 'vaginal_finger', 5
-							gs 'stat'
-							act 'Lie down on your back':
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom3.jpg"></center>'
-								'As you turn to lie down on your back, his fingers never leave you. The squishing of your wet hole being fingered fills the room as he kisses you and teasingly runs his thumb over your clit. His fingers give you sweet pleasure, but you become frustrated once you see his evil grin: he has no intentions of actually making you orgasm this way.'
-								gs 'arousal', 'vaginal_finger', 5
-								gs 'stat'
-								act 'Beg him to fuck you':
-									*clr & cla
-									gs 'cum_call', '', $boy, 1
-									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom4.jpg"></center>'
-									$orgasm_or = 'yes'
-									$orgasm_txt = 'After a few minutes of being on the edge, you can''t hold back any more. You push his hand away and shift back onto your hands and knees, begging for him to fuck you. <<$rand_boy>> has a mischievous grin on his face, thoroughly amused that his constant teasing got you this desperate. Nevertheless, he obliges: he guides the head of his hard cock against your pussy lips and immediately rams it in. Not giving you any chance to recover, he pounds you like his life depends on it.'
-									'You moan loudly, perhaps a bit too loudly, because you soon find his hand covering your mouth, stifling your moans as he fucks you hard from behind.'
-									'The squeezing of your tight pussy around his dick sends him over the edge.'
-									gs 'arousal', 'vaginal', 10
-									'When he pulls out of you, a slow trickle of sperm leaks from your pussy.'
-									gs 'stat'
-									act 'Lick him clean':
-										*clr & cla
-										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom5.jpg"></center>'
-										'Realizing you have to get to class soon, you quickly scoot over and take his penis in your mouth. As you quickly lick him clean, you taste the mixture of his and your juices; it makes you feel kind of raunchy and you wouldn''t mind having another go if it wasn''t for class starting any minute now. You quickly straighten your clothes, hand him his pants and quickly check your hair before you both run to class.'
-										gs 'arousal', 'bj', 2
-										gs 'arousal', 'end'
-										gs 'stat'
-										act 'Continue': gt 'gschool_events', 'leave_break_events2'
-									end
-								end
-							end
-						end
-					end
-				end
-			end
-		end
-		!! apmeet=6 This closure molestation nerds, Well I think so from the code, who knows if there is no correct.
-		!! dimarudeblock=1 This video stolen from Nosov.
-		if (apmeet = 6 and (val(mid($school_static_num,2)) = 6 or val(mid($school_static_num,2)) = 2)) or (dimarudeblock = 1 and val(mid($school_static_num,2)) = 1):
-			*nl
-			'After all <<$rand_boy>> did with you, he''s still pinching your ass in school like that? He''s kinda cute, but still that''s just wrong!'
-			act 'Kick him in the balls':
-				*clr & cla
-				npc_rel[$school_static_num] -= 10
-				grupvalue[4] += 5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy8.jpg"></center>'
-				'You kick <<$rand_boy>> in the balls, sending him and all of his classmates the message that you will not put up with this behavior in school. You watch him writhe in pain on the floor for a second, before collecting your things and making your way to your next class.'
-				act 'Continue': gt 'gschool_events', 'leave_break_events2'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'rand_gopnic':
-	menu_off = 1
-	if rand(0,1) = 0:
-		r = 9
-	else
-		r = rand(154,156)
-	end
-	$school_static_num = 'A<<r>>'
-
-	if grupTipe = 4:
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big<<r>>.jpg"></center>'
-		'You step away from him, pulling out of his reach as you turn around. You point your finger at him. "Don''t make me hurt you! You know I will."'
-		'He laughs a bit and steps up closer again, crowding you a bit, but keeps his hands to himself. "Come on <<$pcs_nickname>> you know you want to have some fun, so stop acting like you are not all hot and bothered by this. We can help you with that itch."'
-		act 'Back off':
-			*clr & cla
-			grupvalue[4] += 5
-			inhib_exp += 2
-			'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/buttflash.mp4"></video></center>'
-			'You snort at him and look at his friends before looking back at him. You wiggle your middle finger at him, flipping him off while pretending you are wiggling your finger for another reason. "If I needed something that small to satisfy my itch, I could just use this." His friends howl with laughter as he fumes at you. You turn and walk away with a laugh, flashing your ass at them as you do, teasing them on what they are missing out on.'
-			act 'Walk away': gt 'gschool_events', 'leave_break_events2'
-		end
-		act 'Why not':
-			*clr & cla
-			if grupvalue[4] > 50:
-				grupvalue[4] -= 5
-				if grupvalue[4] < 50:grupvalue[4] = 50
-			end
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
-			'You are in the mood anyways, so why not? Hopefully it isn''t too quick. They lead you to the men''s room and one of the guys drives everyone else out; it''s just you and the gopniks in here now. One of them leans against the door to block anyone else from coming in while the rest all start unzipping their pants and pulling out their dicks.'
-			'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way.'
-			*nl
-			if fame['pav_slut'] > 250: 'On one wall you see written, in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
-			act 'Start sucking':
-				*clr & cla
-				if r = 9:
-					gs 'boyStat', 'A157'
-					gs 'cum_call', 'mouth', $boy,1
-					gs 'boyStat', 'A9'
-					gs 'cum_call', 'mouth', $boy,1
-					gs 'boyStat', 'A10'
-					gs 'cum_call', 'mouth', $boy,1
-					gs 'boyStat', 'A11'
-					gs 'cum_call', 'mouth', $boy,1
-				else
-					gs 'boyStat', 'A157'
-					gs 'cum_call', 'mouth', $boy,1
-					gs 'boyStat', 'A155'
-					gs 'cum_call', 'mouth', $boy,1
-					gs 'boyStat', 'A156'
-					gs 'cum_call', 'mouth', $boy,1
-					gs 'boyStat', 'A154'
-					gs 'cum_call', 'mouth', $boy,1
-				end
-				swallow += 4
-				'<center><video autoplay loop src="images/locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4"></video></center>'
-				'You kneel down and wrap your <<$pc_desc[''lips'']>> lips around <<$boydesc>>''s hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you''re not sucking with your hands.'
-				'Finally, you feel a jet of sperm hit your throat and <<$boydesc>> moans. "That''s right bitch! Swallow it all like a good little slut." <<$boydesc>> seems satisfied and tucks his cock back in his pants and swaps place with the one that was at the door, who comes over and pulls his cock out, ready to get his turn.'
-				*nl
-				'You immediately switch to the cock of one of the other guys standing next to you and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well, and soon you finish off the last two guys. As you get up off your knees, you hear one of them laugh. "You''re the best cock sucker we got <<$pcs_nickname>>!" said as they leave you alone in the bathroom, more horny than when you started. You say to yourself out loud. "Fucking assholes!" You then clean up and leave.'
-				gs 'arousal', 'bj', 20, 'group', 'sub'
-				gs 'arousal', 'end'
-				gs 'stat'
-				act 'Continue': gt 'gschool_events', 'leave_break_events2'
-			end
-		end
-	else
-		gs 'boystat', $school_static_num
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big<<r>>.jpg"></center>'
-		'You look at <<$boydesc>> with contempt "What the fuck do you want?" He''s not impressed in the slightest, your loose reputation undermining any authority you try to impose.'
-		act 'Continue':
-			*clr & cla
-			pcs_mood -= 20
-			gs'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy5.jpg"></center>'
-			'"I''ll show you what the fuck I want slut." <<$boydesc>> suddenly grabs you by the hair and presses your face against his desk. "What I want is your lips around my dick, right now. Everyone already knows you''re a <<$gnikname>>, so you better start acting like it or there will be consequences." He turns to his friends and says "Come on boys, this whore doesn''t understand her place in life. It''s about time we show her."'
-			gs 'gschool_events', 'rand_boy_arg1', 0, 1, 0, 0, 0, 0
-			if npc_rel[$school_static_num] > 50:
-				'As you try and pull away <<$rand_boy1>> comes over and pulls the gopnik off you and turns to him. "Leave her alone!"'
-				'The gopnik turns towards him and narrows his eyes. "Or what pussy?"'
-				'<<$rand_boy1>> steps up close, crowding him. "Or I will fucking kick your ass right here!" They start shoving each other, but before more can happen a teacher interupts. "What''s going on here? Break it up, all of you." You word a thank you to <<$rand_boy1>> and slip away.'
-				act 'Leave': gt 'gschool_events', 'leave_break_events2'
-			else
-				gs 'willpower', 'bj', 'resist'
-				if will_cost <= pcs_willpwr:
-					act 'Resist (<<will_cost>> Willpower)':
-						*clr & cla
-						gs 'willpower', 'pay', 'resist'
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/resistgop.jpg"></center>'
-						'You manage to pull away from him, but the others are blocking you. You back up, but eventually find your back against one of the walls and you turn your head away from him. The boy leans in close to you. "Just do as you''re told or this will be a lot worse for you."'
-						gs 'willpower', 'bj', 'resist'
-						if will_cost <= pcs_willpwr:
-							act 'Threaten to scream (<<will_cost>> Willpower)':
-								*clr & cla
-								gs 'willpower', 'pay', 'resist'
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/resistgop.jpg"></center>'
-								'"I''ll scream and when the teachers arrive, I will tell them that you tried to rape me." He fumes and leans in real close. "You''ll regret this slut! I promise." He relents and leaves and the others go with him, all giving you looks you would rather not think about.'
-								act 'Continue': gt 'gschool_events', 'leave_break_events2'
-							end
-						else
-							'<br>You don''t have enough willpower to resist.'
-						end
-						act 'Go to the men''s room with them':gt 'gschool_events', 'toilet_bj'
-					end
-				else
-					act 'Resist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
-				act 'Go to the men''s room with them': gt 'gschool_events', 'toilet_bj'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'toilet_bj':
-	*clr & cla
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
-	'You know perfectly well that the group of boys are not going to let you escape. You meekly let the boys drag you to the men''s room, hoping for a miracle to save you. It never comes. When you arrive at the men''s room, one of the guys drives everyone else out; it''s just you and the gopniks in here now. He goes outside and keeps watch while two of the others reach for their pants. Several more come in to watch.'
-	if fame['pav_slut'] > 250:
-		'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way. On one wall, you see written, in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
-	else
-		'The walls of the restroom are covered in crude texts, quite a few of them involving your classmates in some way.'
-	end
-	act 'Start sucking':
-		*clr & cla
-		if $boydesc = 'Vitek':
-			gs 'boyStat', 'A157'
-			gs 'cum_call', 'mouth', $boy,1
-			gs 'boyStat', 'A9'
-			gs 'cum_call', 'mouth', $boy,1
-			gs 'boyStat', 'A10'
-			gs 'cum_call', 'mouth', $boy,1
-			gs 'boyStat', 'A11'
-			gs 'cum_call', 'mouth', $boy,1
-		else
-			gs 'boyStat', 'A157'
-			gs 'cum_call', 'mouth', $boy,1
-			gs 'boyStat', 'A155'
-			gs 'cum_call', 'mouth', $boy,1
-			gs 'boyStat', 'A156'
-			gs 'cum_call', 'mouth', $boy,1
-			gs 'boyStat', 'A154'
-			gs 'cum_call', 'mouth', $boy,1
-		end
-		swallow += 4
-		'<center><video autoplay loop src="images/locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4"></video></center>'
-		'You know there''s only one way they will let you go, so you dutifully kneel down. <<$boydesc>> takes his cock out of his pants. A second gopnik stands to your right and takes his cock out too. You wrap your <<$pc_desc[''lips'']>> lips around <<$boydesc>>''s hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you''re not sucking with your hands.'
-		'Finally, you feel a jet of sperm hit your throat and <<$boydesc>> says in a menacing voice "Swallow it all, whore. If you miss a drop, you''re licking it up from the ground." You diligently swallow his sperm, doing your best to lick it all up from his dick and your lips. <<$boydesc>> seems satisfied and tucks his cock back in his pants and swaps place with the one that was at the door, who comes over and pulls his cock out, ready to get his turn.'
-		*nl
-		'You immediately switch to the cock of one of the other guys standing next to you and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside and you finish off the last two guys. As you get up off your knees, you hear one of them laugh. "Do you understand your place in life now? That place is right here, on your knees, whenever we say so. Got that?" You obediently nod, fully aware of the nasty taste of semen in the your mouth.'
-		gs 'arousal', 'bj', 20, 'group', 'sub'
-		gs 'arousal', 'end'
-		gs 'stat'
-		act 'Continue': gt 'gschool_events', 'leave_break_events2'
-	end
-end
-
 !!Sweet talk function
 !!I have a request for you, now that we have cha as a stat and spots that raise it can you adjust the sweet_talk I am thinking
 !!cha 1-20 = -20
@@ -2361,7 +1752,7 @@ if $ARGS[0] = 'sweet':
 		if hotcat < 5: Sweet_talk -= (hotcat - 5) * 5
 	end
 end
-
+!!is the below still used? I have been removing random checks I think I got most or all of them
 !!Random boy, arguments set to 1 mean included, groups are cool kids, jock, nerd, gopnik, outcast, teachers
 if $ARGS[0] = 'rand_boy_arg':
 	$school_static_num = func('gschool_events', 'random_pers', 0, ARGS[1], ARGS[2], ARGS[3], ARGS[4], ARGS[5], ARGS[6])

+ 1201 - 0
locations/gschool_events1.qsrc

@@ -0,0 +1,1201 @@
+# gschool_events1
+!2022/02/09
+
+if $ARGS[0] = 'butt_grab':
+	menu_off = 1
+	:scoolboy_loop
+	scoolboy = rand(1,5)
+	*clr & cla
+	if scoolboy = 1 and DimaRudeBlock = 0:
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
+		'Even though he tries to hide it as best he can, the proud grin on the face of Dimka tells you that he was the one groping your ass.'
+		act 'Ignore it':
+			gs 'npc_relationship', 'modify', 'A1', 'like'
+			grupvalue[1] -= 2
+			grupvalue[2] -= 3
+			grupvalue[3] += 1
+			grupvalue[4] -= 5
+			gt 'gschool_events', 'leave_break_events2'
+		end
+		gs 'willpower', 'misc', 'self', 'medium'
+		if will_cost <= pcs_willpwr:
+			act 'Slap him hard (<<will_cost>> Willpower)':
+				*clr & cla
+				grupvalue[1] -= 2
+				grupvalue[2] += 1
+				grupvalue[3] -= 1
+				grupvalue[4] += 3
+				gs 'npc_relationship', 'modify', 'A1', 'loathe'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy1.jpg"></center>'
+				if mesec > 0:
+					'It''s bad enough he did it, it is worse because you are on your period. "You fucking pervert!" you shout angrily and slap him across the face as hard as you can. You shake the stinging out of your hand while he clutches his cheek in agony. When he finally pulls his hands away from his face, the outline of your hand is clearly visible on his cheek. That''s going to leave a bruise. The other boys laugh loudly. This is the best entertainment they''ve had during the break in a long time.'
+				else
+					'"You fucking pervert!" you shout angrily and slap him across the face as hard as you can. You shake the stinging out of your hand while he clutches his cheek in agony. When he finally pulls his hands away from his face, the outline of your hand is clearly visible on his cheek. That''s going to leave a bruise. The other boys laugh loudly. This is the best entertainment they''ve had during the break in a long time.'
+					'Dimka rubs his face and glares at those laughing then glares at you. "You''ll pay for that bitch!" With that he walks off.'
+				end
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			end
+		else
+			act 'Slap him hard (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		if npc_rel['A1'] > 50:
+			act 'Slap him playfully':
+				*clr & cla
+				grupvalue[1] += 1
+				grupvalue[2] += 1
+				gs 'npc_relationship', 'modify', 'A1', 'dislike'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy2.jpg"></center>'
+				'Dimka ain''t so bad... but still, I can''t just let him do this.'
+				'You give him a playful slap in the face. It''s not hard enough to really hurt him, but enough to send a message. The other boys laugh loudly. This is the best entertainment they''ve had during the break in a long time.'
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			end
+			gs 'willpower', 'exhib', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Tease him (<<will_cost>> Willpower)':
+					*clr & cla
+					inhib_exp += 2
+					gs 'willpower', 'pay', 'self'
+					gs 'arousal', 'flash', -5
+					grupvalue[1] += 1
+					grupvalue[2] += 1
+					grupvalue[3] -= 1
+					grupvalue[4] += 1
+					gs 'npc_relationship', 'modify', 'A1', 'dislike'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
+					'<i><<$rand_boy>> is actually kind of cute...</i> you think to yourself.'
+					'You pretend the other boys aren''t there and step closer. "Come on Dimka. You know you only have to ask if you want to see more..." you smile sweetly as you slowly begin to lift your skirt. He looks down, eyes wide. Just before your skirt is high enough to reveal '+iif($pantyworntype ! 'none', 'your panties', 'your pussy')+', you drop it and skip backward, giggling.'
+					*nl
+					'"Pfft-! You really thought I was gonna give everyone a show like that? Keep dreaming." You give him a cute wink as you sit down and get ready for your next class.'
+					act 'Continue': gt 'gschool_events', 'leave_break_events2'
+				end
+			else
+				act 'Lift your skirt (<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 'Continue': gt 'gschool_events', 'leave_break_events2'
+		end
+		act 'Taunt him':
+			*clr & cla
+			grupvalue[1] += 1
+			grupvalue[2] += 1
+			grupvalue[3] -= 1
+			grupvalue[4] += 1
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy4.jpg"></center>'
+			'He''s kind of cute. You''re so horny right now, so you decide to tease him and see if you can push him into doing more. You put your finger in your mouth and quietly ask him in a lewd voice "Come on Dimka, is that all you have for me?"'
+			'His friends heard your question, and are now daring him to take you to the men''s room. He doesn''t seem so sure.'
+			act 'Tease him':
+				*clr & cla
+				gs 'npc_relationship', 'modify', 'A1', 'dislike'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
+				'You can see him starting to get turned on, certain that this is going to turn out good for him. You lean in real close and whisper in his ear, but loud enough for others to hear. "This is what I have for you." You start sliding your skirt slowly up your thighs, with all of the boys watching. Just before it gets high enough to show them anything, you let it go and it drops back in place. "Which is absolutely nothing." you say with a giggle. As you walk away, you hear one of the boys talking to his friend.'
+				'"God so close. She is such a tease."'
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			end
+		end
+	elseif scoolboy = 2:
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big8.jpg"></center>'
+		if pcs_vital >= 40:
+			'You can tell from his grin that Svyatoslav was the one groping your ass. "Nice, good to see all your working out is good for something at least." Which is followed by him laughing and a few of the other boys joining in with his laugh.'
+		else
+			'You can tell from his disappointed expression that Svyatoslav was the one groping your ass. Perhaps he was expecting something firmer after hanging out with the athletic girls so much? Maybe you should work out more...'
+		end
+		act 'Ignore it':
+			grupvalue[1] -= 2
+			grupvalue[2] -= 3
+			grupvalue[3] += 1
+			grupvalue[4] -= 5
+			gt 'gschool_events', 'leave_break_events2'
+		end
+		gs 'willpower', 'misc', 'self', 'medium'
+		if will_cost <= pcs_willpwr:
+			act 'Slap him hard (<<will_cost>> Willpower)':
+				*clr & cla
+				grupvalue[1] -= 1
+				grupvalue[2] += 1
+				grupvalue[3] -= 1
+				grupvalue[4] += 5
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				gs 'npc_relationship', 'modify', 'A8', 'hate'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy1.jpg"></center>'
+				if mesec > 0:
+					'It''s bad enough Svyatoslav did it, it is worse because you are on your period. "You fucking pervert!" you shout angrily and slap him across the face as hard as you can. You shake the stinging out of your hand while he clutches his cheek in agony. When he finally pulls his hands away from his face, the outline of your hand is clearly visible on his cheek. That''s going to leave a bruise. The other boys laugh loudly. This is the best entertainment they''ve had during the break in a long time.'
+				else
+					'"You fucking pervert!" you shout angrily and slap him across the face as hard as you can. You shake the stinging out of your hand while he clutches his cheek in agony. When he finally pulls his hands away from his face, the outline of your hand is clearly visible on his cheek. That''s going to leave a bruise. The other boys laugh loudly. This is the best entertainment they''ve had during the break in a long time.'
+					'After rubbing his face Svyatoslav looks at you in disbelief. "What the fuck was that for? I was just messing with you." Then he walks off.'
+				end
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			end
+		else
+			act 'Slap him hard (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		act 'Slap him playfully':
+			*clr & cla
+			grupvalue[1] += 1
+			grupvalue[2] += 1
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy2.jpg"></center>'
+			'Svyatoslav ain''t so bad... but still, I can''t just let him do this.'
+			'You give him a playful slap in the face. It''s not hard enough to really hurt him, but enough to send a message. The other boys laugh loudly. This is the best entertainment they''ve had during the break in a long time.'
+			act 'Continue': gt 'gschool_events', 'leave_break_events2'
+		end
+		gs 'willpower', 'exhib', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Tease him (<<will_cost>> Willpower)':
+				*clr & cla
+				inhib_exp += 2
+				gs 'willpower', 'pay', 'self'
+				gs 'arousal', 'flash', -5
+				grupvalue[1] += 1
+				grupvalue[2] += 1
+				grupvalue[3] -= 1
+				grupvalue[4] += 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
+				'<i>Svyatoslav is actually kind of cute...</i> you think to yourself.'
+				'You pretend the other boys aren''t there and step closer. "Come on Svyatoslav. You know you only have to ask if you want to see more..." you smile sweetly as you slowly begin to lift your skirt. He looks down, eyes wide. Just before your skirt is high enough to reveal '+iif($pantyworntype ! 'none', 'your panties', 'your pussy')+', you drop it and skip backward, giggling.'
+				*nl
+				'"Pfft-! You really thought I was gonna give everyone a show like that? Keep dreaming." You give him a cute wink as you sit down and get ready for your next class.'
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			end
+		else
+			act 'Lift your skirt (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		act 'Taunt him':
+			*clr & cla
+			grupvalue[1] += 1
+			grupvalue[2] += 1
+			grupvalue[3] -= 1
+			grupvalue[4] += 1
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy4.jpg"></center>'
+			'Svyatoslav is kind of cute. You''re so horny right now, so you decide to tease him and see if you can push him into doing more. You put your finger in your mouth and quietly ask him in a lewd voice "Come on Svyatoslav, is that all you have for me?"'
+			'His friends heard your question, and are now daring him to take you to the men''s room.'
+			act 'Tease him':
+				*clr & cla
+				grupvalue[1] += 2
+				grupvalue[2] += 1
+				grupvalue[3] -= 2
+				grupvalue[4] += 1
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
+				'You can see Svyatoslav starting to get turned on, certain that this is going to turn out good for him. You lean in real close and whisper in his ear, but loud enough for others to hear. "This is what I have for you." You start sliding your skirt slowly up your thighs, with all of the boys watching. Just before it gets high enough to show them anything, you let it go and it drops back in place. "Which is absolutely nothing." you say with a giggle. As you walk away, you hear one of the boys talking to his friend.'
+				'"God so close. She is such a tease."'
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			end
+			act 'Drag him to the men''s room':
+				*clr & cla
+				grupvalue[1] -= 10
+				grupvalue[2] -= 10
+				grupvalue[3] -= 10
+				grupvalue[4] -= 5
+				gs 'npc_relationship', 'modify', 'A8', 'love'
+				gs 'fame', 'pav', 'sex', 15
+				gs 'arousal', 'foreplay', 'exhibitionism', -5
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet1.jpg"></center>'
+				'You give Svyatoslav a sweet smile and take him by the hand, pulling him into the men''s room. Slightly lifting up your skirt, you put his hand between your legs. The other boys have followed you and now you''re being fondled in front of a crowd.'
+				act 'Take his cock out of his pants': gt 'gschool_sex', 'rand_bj'
+			end
+			act 'Take him to the old school building':
+				*clr & cla
+				grupvalue[1] -= 5
+				grupvalue[2] -= 5
+				grupvalue[3] -= 5
+				grupvalue[4] -= 1
+				gs 'npc_relationship', 'modify', 'A8', 'love'
+				gs 'fame', 'pav', 'sex', 5
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big8.jpg"></center>'
+				'You know almost no one ever goes into the old school building, other than kids looking to hook up. So you take him by the hand and lead him away and out of the school, he doesn''t complain one bit.'
+				act 'Continue': gt 'gschool_sex', 'rand_sex'
+			end
+			if katjaQW['school_sex'] = 1:
+				act 'Go to the back room with the guy':
+					*clr & cla
+					grupvalue[1] -= 5
+					grupvalue[2] -= 5
+					grupvalue[3] -= 5
+					grupvalue[4] -= 1
+					gs 'fame', 'pav', 'sex', 5
+					gs 'npc_relationship', 'modify', 'A8', 'love'
+					'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss.jpg"></center>'
+					'You remember the back room that Katja showed you. When you tell Svyatoslav about it, he takes your hand and tells you to take him there. As soon as you close the door behind you, Svyatoslav pounces on you and begins to kiss you.'
+					gs 'arousal', 'kiss', 2
+					gs 'stat'
+					act 'Get on the couch':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom1.jpg"></center>'
+						'Feeling playful, you push him away and quickly move to the couch, your back turned towards him. You make a show of slowly lifting your skirt.'
+						if $pantyworntype = 'none':
+							'Since you''re not wearing panties, you reveal your bare pussy and puckered asshole to him, giving him a sly grin when you turn your head back. You innocently ask him "Do you like what you see?"'
+						elseif $pantyworntype ! 'none':
+							'You quickly take your panties off and throw them in a corner. You slap your bare ass as you show off your pussy and anus and innocently ask him "Do you like what you see?"'
+						end
+						act 'Get on your hands and knees':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom2.jpg"></center>'
+							'You lean forward as Svyatoslav approaches. He greedily puts his hands on your ass, fondling your ass cheeks enthusiastically. His touch invokes shivers throughout your body. You''re so horny you don''t know what you''ll do if you don''t get some soon! Slowly but surely, he moves his hands towards your crack, and after a while two of his fingers are inside your dripping pussy.'
+							gs 'arousal', 'vaginal_finger', 2
+							gs 'stat'
+							act 'Lie down on your back':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom3.jpg"></center>'
+								'As you turn to lie down on your back, his fingers never leave you. The squishing of your wet hole being fingered fills the room as he kisses you and teasingly runs his thumb over your clit. His fingers give you sweet pleasure, but you become frustrated once you see his evil grin: he has no intentions of actually making you orgasm this way.'
+								gs 'arousal', 'vaginal_finger', 2
+								gs 'stat'
+								act 'Beg him to fuck you':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom4.jpg"></center>'
+									'After a few minutes of being on the edge, you can''t hold back any more. You push his hand away and shift back onto your hands and knees, begging for him to fuck you. Svyatoslav has a mischievous grin on his face, thoroughly amused that his constant teasing got you this desperate. Nevertheless, he obliges: he guides the head of his hard cock against your pussy lips and immediately rams it in. Not giving you any chance to recover, he pounds you like his life depends on it.'
+									'You moan loudly, perhaps a bit too loudly, because you soon find his hand covering your mouth, stifling your moans as he fucks you hard from behind.'
+									'The squeezing of your tight pussy around his dick sends him over the edge.'
+									'When he pulls out of you, a slow trickle of sperm leaks from your pussy.'
+									gs 'arousal', 'vaginal', 10
+									gs 'cum_call', 'vaginal', 'A8', 1
+									gs 'stat'
+									act 'Lick him clean':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom5.jpg"></center>'
+										'Realizing you have to get to class soon, you quickly scoot over and take his penis in your mouth. As you quickly lick him clean, you taste the mixture of his and your juices; it makes you feel kind of raunchy and you wouldn''t mind having another go if it wasn''t for class starting any minute now. You quickly straighten your clothes, hand him his pants and quickly check your hair before you both run to class.'
+										gs 'arousal', 'bj', 2
+										gs 'arousal', 'end'
+										gs 'stat'
+										act 'Continue': gt 'gschool_events', 'leave_break_events2'
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	elseif scoolboy = 3:
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big6.jpg"></center>'
+		'You can tell from the embarrassed look on his face and the admiring glances of his friends that Petka was the one touching your ass. Looks like he scored some points in his group today.'
+		act 'Ignore it':
+			grupvalue[1] -= 5
+			grupvalue[2] -= 5
+			grupvalue[3] += 1	
+			grupvalue[4] -= 10
+			gt 'gschool_events', 'leave_break_events2'
+		end
+		gs 'willpower', 'misc', 'self', 'medium'
+		if will_cost <= pcs_willpwr:
+			act 'Slap him hard (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				grupvalue[1] += 2
+				grupvalue[2] += 3
+				grupvalue[3] -= 1	
+				grupvalue[4] += 5
+				gs 'npc_relationship', 'modify', 'A6', 'dislike'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy1.jpg"></center>'
+				if mesec > 0:
+					'It''s bad enough he did it, it is worse because you are on your period. "You fucking pervert!" you shout angrily and slap him across the face as hard as you can. You shake the stinging out of your hand while he clutches his cheek in agony. When he finally pulls his hands away from his face, the outline of your hand is clearly visible on his cheek. That''s going to leave a bruise. The other boys laugh loudly. This is the best entertainment they''ve had during the break in a long time.'
+				else
+					'"You fucking pervert!" you shout angrily and slap him across the face as hard as you can. You shake the stinging out of your hand while he clutches his cheek in agony. When he finally pulls his hands away from his face, the outline of your hand is clearly visible on his cheek. That''s going to leave a bruise. The other boys laugh loudly. This is the best entertainment they''ve had during the break in a long time.'
+				end
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			end
+		else
+			act 'Slap him hard (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		act 'Slap him playfully':
+			npc_rel[$school_static_num] -= 2
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy2.jpg"></center>'
+			'Petka ain''t so bad... but still, I can''t just let him do this.'
+			'You give him a playful slap in the face. It''s not hard enough to really hurt him, but enough to send a message. The other boys laugh loudly. This is the best entertainment they''ve had during the break in a long time.'
+			act 'Continue': gt 'gschool_events', 'leave_break_events2'
+		end
+		gs 'willpower', 'exhib', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Tease him (<<will_cost>> Willpower)':
+				*clr & cla
+				inhib_exp += 2
+				gs 'willpower', 'pay', 'self'
+				gs 'arousal', 'flash', -5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
+				'<i><<$rand_boy>> is actually kind of cute...</i> you think to yourself.'
+				'You pretend the other boys aren''t there and step closer. "Come on Petka. You know you only have to ask if you want to see more..." you smile sweetly as you slowly begin to lift your skirt. He looks down, eyes wide. Just before your skirt is high enough to reveal '+iif($pantyworntype ! 'none', 'your panties', 'your pussy')+', you drop it and skip backward, giggling.'
+				*nl
+				'"Pfft-! You really thought I was gonna give everyone a show like that? Keep dreaming." You give him a cute wink as you sit down and get ready for your next class.'
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			end
+		else
+			act 'Lift your skirt (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		act 'Taunt him':
+			*clr & cla
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy4.jpg"></center>'
+			'He''s kind of cute. You''re so horny right now, so you decide to tease him and see if you can push him into doing more. You put your finger in your mouth and quietly ask him in a lewd voice "Come on Petka, is that all you have for me?"'
+			'His friends heard your question, and are now daring him to take you to the men''s room. He doesn''t seem so sure.'
+			act 'Tease him':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
+				'You can see him starting to get turned on, certain that this is going to turn out good for him. You lean in real close and whisper in his ear, but loud enough for others to hear. "This is what I have for you." You start sliding your skirt slowly up your thighs, with all of the boys watching. Just before it gets high enough to show them anything, you let it go and it drops back in place. "Which is absolutely nothing." you say with a giggle. As you walk away, you hear one of the boys talking to his friend.'
+				'"God so close. She is such a tease."'
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			end
+			act 'Drag Petka to the men''s room':
+				*clr & cla
+				grupvalue[1] -= 5
+				grupvalue[2] -= 5
+				grupvalue[3] -= 5
+				gs 'npc_relationship', 'modify', 'A6', 'like'
+				gs 'fame', 'pav', 'sex', 5
+				gs 'arousal', 'foreplay', 'exhibitionism', 2
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big6.jpg"></center>'
+				'You give him a sweet smile and take him by the hand, pulling him into the men''s room. Slightly lifting up your skirt, you put his hand between your legs. He starts to pull his hand away but you put it back, he turns bright red as he looks around. Then as you are about to pull him into the restroom he looks paniced and pulls away. "I... I... forgot... I have to do something." Then he rushes away in a panic, apparently the idea of doing something in front of others freaked him out. The rest of the boys and some of the girls laugh at him as he rushes off, though some of the sidelong glances you get, tells you, you have still damaged your rep with this stunt.'
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			end
+			act 'Take Petka to the old school building':
+				*clr & cla
+				grupvalue[1] -= 5
+				grupvalue[2] -= 5
+				grupvalue[3] -= 5
+				gs 'fame', 'pav', 'sex', 5
+				gs 'npc_relationship', 'modify', 'A6', 'like'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big6.jpg"></center>'
+				'You know almost no one ever goes into the old school building, other than kids looking to hook up. So you take him by the hand and lead him away and out of the school, he doesn''t complain one bit.'
+				act 'Continue': gt 'gschool_sex', 'rand_sex'
+			end
+			if katjaQW['school_sex'] = 1:
+				act 'Go to the back room with Petka':
+					*clr & cla
+					grupvalue[1] -= 5
+					grupvalue[2] -= 5
+					grupvalue[3] -= 5
+					gs 'fame', 'pav', 'sex', 5
+					gs 'npc_relationship', 'modify', 'A6', 'like'
+					'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss.jpg"></center>'
+					'You remember the back room that Katja showed you. You take Petka by the hand and lead him off, you can feel his sweaty palm, you can tell he is nervous. As soon as you close the door you turn towards him and start to kiss him. He shy and awkward at first but then starts to get into it, though he isn''t a very good kisser.'
+					gs 'arousal', 'kiss', 2
+					gs 'stat'
+					act 'Get on the couch':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom1.jpg"></center>'
+						'Feeling playful, you push him away and quickly move to the couch, your back turned towards him. You make a show of slowly lifting your skirt.'
+						if $pantyworntype = 'none':
+							'Since you''re not wearing panties, you reveal your bare pussy and puckered asshole to him, giving him a sly grin when you turn your head back. You innocently ask him "Do you like what you see?"'
+						elseif $pantyworntype ! 'none':
+							'You quickly take your panties off and throw them in a corner. You slap your bare ass as you show off your pussy and anus and innocently ask him "Do you like what you see?"'
+						end
+						act 'Get on your hands and knees':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom2.jpg"></center>'
+							'You lean forward, you glance back and see Petka looks like a deer in headlights, just totally stunned and unmoving. You wave him forward and he shakes his head a bit and smiles, then starts to approach you. He greedily puts his hands on your ass, fondling your ass cheeks enthusiastically. His touch invokes shivers throughout your body. You''re so horny you don''t know what you''ll do if you don''t get some soon! Slowly but surely, he moves his hands towards your crack, and after a while two of his fingers are inside your dripping pussy.'
+							gs 'arousal', 'vaginal_finger', 2
+							gs 'stat'
+							act 'Lie down on your back':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom3.jpg"></center>'
+								'As you turn to lie down on your back, his fingers never leave you. The squishing of your wet hole being fingered fills the room as he kisses you and teasingly runs his thumb over your clit. His fingers give you sweet pleasure, but you become frustrated once you see his evil grin: he has no intentions of actually making you orgasm this way.'
+								gs 'arousal', 'vaginal_finger', 2
+								gs 'stat'
+								act 'Beg him to fuck you':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom4.jpg"></center>'
+									'After a few minutes of being on the edge, you can''t hold back any more. You push his hand away and shift back onto your hands and knees, begging for him to fuck you. Petka clumsily pulls his dick out of his pants, then guides the head of his hard cock against your pussy lips and immediately rams it in.'
+									'You moan as he does but he moans even louder than you do, soon he is pounding you as hard and fast as he can, his moaning turns into grunting,you can tell he is about to cum already. After at most a couple of minutes he groans loudly as he buries himself balls deep  in you and just holds it for a bit. When he pulls out of you, a slow trickle of sperm leaks from your pussy.'
+									gs 'arousal', 'vaginal', 2
+									gs 'cum_call', 'vaginal', 'A6', 1
+									gs 'arousal', 'end'
+									gs 'stat'
+									act 'Lick him clean':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big6.jpg"></center>'
+										'He steps away and zips his pants back up, as he blushes bright red, he won''t even meet your eyes. "Sorry." You don''t know if he is apologizing for cumming in you or for being a two pump chump.'
+										'You decide not to say anything to him. Realizing you have to get to class soon, you quickly straighten your clothes and hair before you both run to class.'
+										act 'Continue': gt 'gschool_events', 'leave_break_events2'
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	elseif scoolboy = 4 and kotovLoveQW <= 0:
+		if rand(0,1) = 0:
+			'The brazen look on his face betrays Dan. It must have been him touching your ass. Knowing him, he probably would''ve gone further if there weren''t so many people here.'
+			act 'Continue': gt 'gschool_events1', 'rand_gopnic1'
+		else
+			'The brazen look on his face betrays Arkadi. It must have been him touching your ass. Knowing him, he probably would''ve gone further if there weren''t so many people here.'
+			act 'Continue': gt 'gschool_events1', 'rand_gopnic2'
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big7.jpg"></center>'
+		'Lesco is trembling slightly, his eyes shifting back and forth as he awkwardly tries to not be noticed by you. It must''ve been him.'
+		'"Lesco, are you out of your mind!?" you cry out as some of the gopnik boys burst out into laughter. You can see the panic in his face as he raises his hands in defense, rapidly apologizing:'
+		'"Please, I didn''t want to! They made me, I promise! I''m sorry!"'
+		'You stare him down for a few seconds and realize he''s not lying. You know Lesco already doesn''t have an easy time in school. You give the other guys a derogatory look as you let him off the hook. "Alright, I believe you. Just don''t do it again, okay?"'
+		'He thanks you and quickly takes his seat for the class, visibly relieved you didn''t report him.'
+		act 'Continue': gt 'gschool_events', 'leave_break_events2'
+	end
+end		
+
+if $ARGS[0] = 'rand_gopnic1':
+	menu_off = 1
+	if grupTipe = 4:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big10.jpg"></center>'
+		'You step away from Dan, pulling out of his reach as you turn around. You point your finger at him. "Don''t make me hurt you! You know I will."'
+		'He laughs a bit and steps up closer again, crowding you a bit, but keeps his hands to himself. "Come on <<$pcs_nickname>> you know you want to have some fun, so stop acting like you are not all hot and bothered by this. We can help you with that itch."'
+		act 'Back off':
+			*clr & cla
+			grupvalue[1] += 1
+			grupvalue[2] += 1
+			grupvalue[4] += 5
+			inhib_exp += 2
+			'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/buttflash.mp4"></video></center>'
+			'You snort at him and look at his friends before looking back at him. You wiggle your middle finger at him, flipping him off while pretending you are wiggling your finger for another reason. "If I needed something that small to satisfy my itch, I could just use this." His friends howl with laughter as he fumes at you. You turn and walk away with a laugh, flashing your ass at them as you do, teasing them on what they are missing out on.'
+			act 'Walk away': gt 'gschool_events', 'leave_break_events2'
+		end
+		act 'Why not':
+			*clr & cla
+			grupvalue[1] -= 10
+			grupvalue[2] -= 5
+			grupvalue[3] -= 10	
+			gs 'fame', 'pav', 'sex', 5
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
+			'You are in the mood anyways, so why not? Hopefully it isn''t too quick. They lead you to the men''s room and one of the guys drives everyone else out; it''s just you and the gopniks in here now. One of them leans against the door to block anyone else from coming in while the rest all start unzipping their pants and pulling out their dicks.'
+			'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way.'
+			*nl
+			if fame['pav_slut'] > 200: 'On one wall you see written, in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
+			act 'Start sucking':
+				*clr & cla
+				gs 'boyStat', 'A9'
+				gs 'cum_call', 'mouth', $boy,1
+				gs 'boyStat', 'A10'
+				gs 'cum_call', 'mouth', $boy,1
+				gs 'boyStat', 'A11'
+				gs 'cum_call', 'mouth', $boy,1
+				swallow += 3
+				'<center><video autoplay loop src="images/locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4"></video></center>'
+				'You kneel down and wrap your <<$pc_desc[''lips'']>> lips around Vitek''s hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you''re not sucking with your hands.'
+				'Finally, you feel a jet of sperm hit your throat and Vitek moans. "That''s right bitch! Swallow it all like a good little slut." Vitek seems satisfied and tucks his cock back in his pants and swaps place with the Vasily that was at the door, who comes over and pulls his cock out, ready to get his turn.'
+				*nl
+				'You immediately switch Dan''s cock who is standing next to you and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well, and soon you finish off the last Vasily. As you get up off your knees, you hear Dan laugh. "You''re the best cock sucker we got <<$pcs_nickname>>!" said as they leave you alone in the bathroom, more horny than when you started. You say to yourself out loud. "Fucking assholes!" You then clean up and leave.'
+				gs 'arousal', 'bj', 20, 'group', 'sub'
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			end
+		end
+	elseif fame['pav_slut'] > 250:
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big10.jpg"></center>'
+		'You look at Dan with contempt "What the fuck do you want?" He''s not impressed in the slightest, your loose reputation undermining any authority you try to impose.'
+		act 'Continue':
+			*clr & cla
+			pcs_mood -= 20
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy5.jpg"></center>'
+			'"I''ll show you what the fuck I want slut." Vitek suddenly grabs you by the hair and presses your face against a desk. "What I want is your lips around my dick, right now. Everyone already knows you''re a <<$gnikname>>, so you better start acting like it or there will be consequences." He turns to his friends and says "Come on boys, this whore doesn''t understand her place in life. It''s about time we show her."'
+
+			!!Make a list of possible rescuers. None is repeated several times to that there always is a large chance that no one comes to the rescue.
+			$availble_rescuers = 'none|none|none|none|erast'+iif(npc_rel['A3'] > 60, '|ivan','')+iif(npc_rel['A146'] > 50, '|marcus','')+iif(npc_rel['A149'] > 70, '|lazar','')+iif(npc_rel['A144'] > 50, '|nush','')
+
+			!!Choose a random person to come to the playeres reque, which includes the posiiblety that no one will.
+			$temperson = func('shortgs', 'rand_pick', 'delimit', 'string', $availble_rescuers)
+
+			killvar '$availble_rescuers'
+
+			if $temperson = 'ivan':
+				'As you try and pull away Ivan comes over and pulls Vitek off you and turns to him. "Leave her alone!"'
+				'The Vitek turns towards him and narrows his eyes. "You want to go for real instead of in the ring?"'
+				'Ivan steps up close, crowding him. "Anytime." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Ivan and slip away.'
+				act 'Leave': gt 'gschool_events', 'leave_break_events2'
+			elseif $temperson = 'marcus':
+				'As you try and pull away Marcus comes over and pulls the Vitek off you and turns to him. "Leave her alone!"'
+				'The Vitek turns towards him and narrows his eyes. "Or what pussy?"'
+				'Marcus steps up close, snorts. "You think you scare me? Back home I dealt with more dangerous assholes than you." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Marcus and slip away.'
+				act 'Leave': gt 'gschool_events', 'leave_break_events2'
+			elseif $temperson = 'lazar':
+				'As you try and pull away Lazar comes over and pulls the Vitek off you and turns to him. "Leave her alone!"'
+				'The Vitek turns towards him and narrows his eyes. "Or what pussy?"'
+				'Lazar steps up close, crowding him. "Or I will fucking kick your ass right here!" They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Lazar and slip away.'
+				act 'Leave': gt 'gschool_events', 'leave_break_events2'
+			elseif $temperson = 'erast':
+				'As you try and pull away Erast comes over and pulls the Vitek off you and turns to him. "Leave her alone!"'
+				'The Vitek turns towards him and narrows his eyes. "Or what pussy?"'
+				'Erast steps up close, crowding him, the only boy in school that can make Vitek look small as he looks down at Vitek. "Or I will make you." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Erast and slip away.'
+				act 'Leave': gt 'gschool_events', 'leave_break_events2'
+			elseif $temperson = 'nush':
+				'As you try and pull away Anushka comes over and steps between the two of you facing him. "Leave her alone!"'
+				'The Vitek looks down at her and narrows his eyes. "Mind your own fucking business Nush!"'
+				'Anushka scoffs at him. "I''m making it my business, now... back... the... fuck... off..." Vitek grabs her by her shoulders and just shoves her out of the way, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Anushka and slip away.'
+				act 'Leave': gt 'gschool_events', 'leave_break_events2'
+			else
+				gs 'willpower', 'bj', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'Resist (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/resistgop.jpg"></center>'
+						'You manage to pull away from him, but the others are blocking you. You back up, but eventually find your back against one of the walls and you turn your head away from him. The boy leans in close to you. "Just do as you''re told or this will be a lot worse for you."'
+						gs 'willpower', 'bj', 'resist'
+						if will_cost <= pcs_willpwr:
+							act 'Threaten to scream (<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'willpower', 'pay', 'resist'
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/resistgop.jpg"></center>'
+								'"I''ll scream and when the teachers arrive, I will tell them that you tried to rape me." He fumes and leans in real close. "You''ll regret this slut! I promise." He relents and leaves and the others go with him, all giving you looks you would rather not think about.'
+								act 'Continue': gt 'gschool_events', 'leave_break_events2'
+							end
+						else
+							act 'Threaten to scream (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						end
+						act 'Go to the men''s room with them':gt 'gschool_events1', 'toilet_bj1'
+					end
+				else
+					act 'Resist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
+				act 'Go to the men''s room with them': gt 'gschool_events1', 'toilet_bj1'
+			end
+			killvar 'temperson'
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big10.jpg"></center>'
+		if grupTipe = 1 or grupTipe = 2:
+			'You look at Dan with contempt "What the fuck pervert." He''s not impressed in the slightest by your attitude.'
+			act 'Continue':
+				*clr & cla
+				pcs_mood -= 20
+				gs'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
+				'Vitek suddenly grabs you by the hair and says. "Why don''t we go somewhere where you can put that mouth of yours to good use for a change."'
+
+				!!Make a list of possible rescuers. None is repeated several times to that there always is a large chance that no one comes to the rescue.
+				$availble_rescuers = 'none|none|none|none|erast'+iif(npc_rel['A3'] > 60, '|ivan','')+iif(npc_rel['A146'] > 50, '|marcus','')+iif(npc_rel['A149'] > 70, '|lazar','')+iif(npc_rel['A144'] > 50, '|nush','')
+
+				!!Choose a random person to come to the playeres reque, which includes the posiiblety that no one will.
+				$temperson = func('shortgs', 'rand_pick', 'delimit', 'string', $availble_rescuers)
+
+				killvar '$availble_rescuers'
+
+				if $temperson = 'ivan':
+					'As you try and pull away Ivan comes over and pulls Vitek off you and turns to him. "Leave her alone!"'
+					'The Vitek turns towards him and narrows his eyes. "You want to go for real instead of in the ring?"'
+					'Ivan steps up close, crowding him. "Anytime." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Ivan and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'marcus':
+					'As you try and pull away Marcus comes over and pulls the Vitek off you and turns to him. "Leave her alone!"'
+					'The Vitek turns towards him and narrows his eyes. "Or what pussy?"'
+					'Marcus steps up close, snorts. "You think you scare me? Back home I dealt with more dangerous assholes than you." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Marcus and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'lazar':
+					'As you try and pull away Lazar comes over and pulls the Vitek off you and turns to him. "Leave her alone!"'
+					'The Vitek turns towards him and narrows his eyes. "Or what pussy?"'
+					'Lazar steps up close, crowding him. "Or I will fucking kick your ass right here!" They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Lazar and slip away.'
+				elseif $temperson = 'erast':
+					'As you try and pull away Erast comes over and pulls the Vitek off you and turns to him. "Leave her alone!"'
+					'The Vitek turns towards him and narrows his eyes. "Or what pussy?"'
+					'Erast steps up close, crowding him, the only boy in school that can make Vitek look small as he looks down at Vitek. "Or I will make you." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Erast and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'nush':
+					'As you try and pull away Anushka comes over and steps between the two of you facing him. "Leave her alone!"'
+					'The Vitek looks down at her and narrows his eyes. "Mind your own fucking business Nush!"'
+					'Anushka scoffs at him. "I''m making it my business, now... back... the... fuck... off..." Vitek grabs her by her shoulders and just shoves her out of the way, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Anushka and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				else
+					act 'Flip him off':
+						*clr & cla
+						grupvalue[1] += 1
+						grupvalue[2] += 1
+						grupvalue[4] += 1
+						inhib_exp += 2
+						'<center><img <<$set_imgh>> src="images/locations/pc/reactions/fuckoff3.jpg"></center>'
+						'You sneer at him and look at his friends before looking back at him and flip him off. "As if I would stoop to letting your disgusting ass paw at me." His friends howl with laughter as he fumes at you. You turn and walk away with a laugh.'
+						act 'Walk away': gt 'gschool_events', 'leave_break_events2'
+					end
+					act 'Why not':
+						*clr & cla
+						grupvalue[1] -= 10
+						grupvalue[2] -= 5
+						grupvalue[3] -= 10	
+						gs 'fame', 'pav', 'sex', 10
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
+						'You are in the mood anyways, so why not? Hopefully it isn''t too quick. They lead you to the men''s room and one of the guys drives everyone else out; it''s just you and the gopniks in here now. One of them leans against the door to block anyone else from coming in while the rest all start unzipping their pants and pulling out their dicks.'
+						'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way.'
+						*nl
+						if fame['pav_slut'] > 200: 'On one wall you see written, in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
+						act 'Start sucking':
+							*clr & cla
+							gs 'boyStat', 'A9'
+							gs 'cum_call', 'mouth', $boy,1
+							gs 'boyStat', 'A10'
+							gs 'cum_call', 'mouth', $boy,1
+							gs 'boyStat', 'A11'
+							gs 'cum_call', 'mouth', $boy,1
+							swallow += 3
+							'<center><video autoplay loop src="images/locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4"></video></center>'
+							'You kneel down and wrap your <<$pc_desc[''lips'']>> lips around Vitek''s hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you''re not sucking with your hands.'
+							'Finally, you feel a jet of sperm hit your throat and Vitek moans. "That''s right bitch! Swallow it all like a good little slut." Vitek seems satisfied and tucks his cock back in his pants and swaps place with the Vasily that was at the door, who comes over and pulls his cock out, ready to get his turn.'
+							*nl
+							'You immediately switch Dan''s cock who is standing next to you and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well, and soon you finish off the last Vasily. As you get up off your knees, you hear Dan laugh. "You''re the best cock sucker we got <<$pcs_nickname>>!" said as they leave you alone in the bathroom, more horny than when you started. You say to yourself out loud. "Fucking assholes!" You then clean up and leave.'
+							gs 'arousal', 'bj', 20, 'group', 'sub'
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Continue': gt 'gschool_events', 'leave_break_events2'
+						end
+					end
+				end
+				killvar 'temperson'
+			end
+		else
+			'You look at Dan and the other gopniks with fear, you know this could go bad very easily. "Stop please, I don''t like it." He just laughs at what you say.'
+			act 'Wait to see what they do':
+				*clr & cla
+				pcs_mood -= 20
+				gs'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
+				'Vitek suddenly grabs you by the hair and says. "Why don''t we go somewhere where you can put that mouth of yours to good use for a change."'
+
+				!!Make a list of possible rescuers. None is repeated several times to that there always is a large chance that no one comes to the rescue.
+				$availble_rescuers = 'none|none|none|none|erast'+iif(npc_rel['A3'] > 60, '|ivan','')+iif(npc_rel['A146'] > 50, '|marcus','')+iif(npc_rel['A149'] > 70, '|lazar','')+iif(npc_rel['A144'] > 50, '|nush','')
+
+				!!Choose a random person to come to the playeres reque, which includes the posiiblety that no one will.
+				$temperson = func('shortgs', 'rand_pick', 'delimit', 'string', $availble_rescuers)
+
+				killvar '$availble_rescuers'
+
+				if $temperson = 'ivan':
+					'As you try and pull away Ivan comes over and pulls Vitek off you and turns to him. "Leave her alone!"'
+					'The Vitek turns towards him and narrows his eyes. "You want to go for real instead of in the ring?"'
+					'Ivan steps up close, crowding him. "Anytime." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Ivan and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'marcus':
+					'As you try and pull away Marcus comes over and pulls the Vitek off you and turns to him. "Leave her alone!"'
+					'The Vitek turns towards him and narrows his eyes. "Or what pussy?"'
+					'Marcus steps up close, snorts. "You think you scare me? Back home I dealt with more dangerous assholes than you." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Marcus and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'lazar':
+					'As you try and pull away Lazar comes over and pulls the Vitek off you and turns to him. "Leave her alone!"'
+					'The Vitek turns towards him and narrows his eyes. "Or what pussy?"'
+					'Lazar steps up close, crowding him. "Or I will fucking kick your ass right here!" They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Lazar and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'erast':
+					'As you try and pull away Erast comes over and pulls the Vitek off you and turns to him. "Leave her alone!"'
+					'The Vitek turns towards him and narrows his eyes. "Or what pussy?"'
+					'Erast steps up close, crowding him, the only boy in school that can make Vitek look small as he looks down at Vitek. "Or I will make you." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Erast and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'nush':
+					'As you try and pull away Anushka comes over and steps between the two of you facing him. "Leave her alone!"'
+					'The Vitek looks down at her and narrows his eyes. "Mind your own fucking business Nush!"'
+					'Anushka scoffs at him. "I''m making it my business, now... back... the... fuck... off..." Vitek grabs her by her shoulders and just shoves her out of the way, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Anushka and slip away.'
+				else
+					act 'Run off':
+						*clr & cla
+						grupvalue[1] -= 1
+						grupvalue[2] -= 2
+						grupvalue[3] += 1
+						grupvalue[4] -= 3
+						inhib_exp += 2
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall02.jpg"></center>'
+						'You manage to pull away from him and as soon as you do, you take off running down the hall from them. You hear them cry out as you run and hear them starting to chase you. You run past a classroom as a teacher comes out who yells at you to stop running but you don''t stop, then you hear the teacher yelling at those chasing you. You keep running until you don''t hear anything. Finally you stop and lean against the wall catching your breath, looking down the empty hall.'
+						act 'Walk away': gt 'gschool_events', 'leave_break_events2'
+					end
+					act 'Why not':
+						*clr & cla
+						grupvalue[1] -= 10
+						grupvalue[2] -= 5
+						grupvalue[3] -= 10	
+						gs 'fame', 'pav', 'sex', 10
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
+						'You are in the mood anyways, so why not? Hopefully it isn''t too quick. They lead you to the men''s room and one of the guys drives everyone else out; it''s just you and the gopniks in here now. One of them leans against the door to block anyone else from coming in while the rest all start unzipping their pants and pulling out their dicks.'
+						'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way.'
+						*nl
+						if fame['pav_slut'] > 200: 'On one wall you see written, in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
+						act 'Start sucking':
+							*clr & cla
+							gs 'boyStat', 'A9'
+							gs 'cum_call', 'mouth', $boy,1
+							gs 'boyStat', 'A10'
+							gs 'cum_call', 'mouth', $boy,1
+							gs 'boyStat', 'A11'
+							gs 'cum_call', 'mouth', $boy,1
+							swallow += 3
+							'<center><video autoplay loop src="images/locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4"></video></center>'
+							'You kneel down and wrap your <<$pc_desc[''lips'']>> lips around Vitek''s hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you''re not sucking with your hands.'
+							'Finally, you feel a jet of sperm hit your throat and Vitek moans. "That''s right bitch! Swallow it all like a good little slut." Vitek seems satisfied and tucks his cock back in his pants and swaps place with the Vasily that was at the door, who comes over and pulls his cock out, ready to get his turn.'
+							*nl
+							'You immediately switch Dan''s cock who is standing next to you and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well, and soon you finish off the last Vasily. As you get up off your knees, you hear Dan laugh. "You''re the best cock sucker we got <<$pcs_nickname>>!" said as they leave you alone in the bathroom, more horny than when you started. You say to yourself out loud. "Fucking assholes!" You then clean up and leave.'
+							gs 'arousal', 'bj', 20, 'group', 'sub'
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Continue': gt 'gschool_events', 'leave_break_events2'
+						end
+					end
+				end
+				killvar 'temperson'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'rand_gopnic2':
+	menu_off = 1
+	if grupTipe = 4:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
+		'You step away from Arkadi, pulling out of his reach as you turn around. You point your finger at him. "Don''t make me hurt you! You know I will."'
+		'He laughs a bit and steps up closer again, crowding you a bit, but keeps his hands to himself. "Come on <<$pcs_nickname>> you know you want to have some fun, so stop acting like you are not all hot and bothered by this. We can help you with that itch."'
+		act 'Back off':
+			*clr & cla
+			grupvalue[1] += 1
+			grupvalue[2] += 1
+			grupvalue[4] += 5
+			inhib_exp += 2
+			'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/buttflash.mp4"></video></center>'
+			'You snort at him and look at his friends before looking back at him. You wiggle your middle finger at him, flipping him off while pretending you are wiggling your finger for another reason. "If I needed something that small to satisfy my itch, I could just use this." His friends howl with laughter as he fumes at you. You turn and walk away with a laugh, flashing your ass at them as you do, teasing them on what they are missing out on.'
+			act 'Walk away': gt 'gschool_events', 'leave_break_events2'
+		end
+		act 'Why not':
+			*clr & cla
+			grupvalue[1] -= 10
+			grupvalue[2] -= 5
+			grupvalue[3] -= 10	
+			gs 'fame', 'pav', 'sex', 5
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
+			'You are in the mood anyways, so why not? Hopefully it isn''t too quick. They lead you to the men''s room and one of the guys drives everyone else out; it''s just you and the gopniks in here now. One of them leans against the door to block anyone else from coming in while the rest all start unzipping their pants and pulling out their dicks.'
+			'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way.'
+			*nl
+			if fame['pav_slut'] > 200: 'On one wall you see written, in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
+			act 'Start sucking':
+				*clr & cla
+				gs 'boyStat', 'A157'
+				gs 'cum_call', 'mouth', $boy,1
+				gs 'boyStat', 'A189'
+				gs 'cum_call', 'mouth', $boy,1
+				gs 'boyStat', 'A156'
+				gs 'cum_call', 'mouth', $boy,1
+				swallow += 3
+				'<center><video autoplay loop src="images/locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4"></video></center>'
+				'You kneel down and wrap your <<$pc_desc[''lips'']>> lips around Arkadi''s hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you''re not sucking with your hands.'
+				'Finally, you feel a jet of sperm hit your throat and Arkadi moans. "That''s right bitch! Swallow it all like a good little slut." Arkadi seems satisfied and tucks his cock back in his pants and swaps place with the Niko that was at the door, who comes over and pulls his cock out, ready to get his turn.'
+				*nl
+				'You immediately switch Roman''s cock who is standing next to you and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well, and soon you finish off the last Niko. As you get up off your knees, you hear Arkadi laugh. "You''re the best cock sucker we got <<$pcs_nickname>>!" said as they leave you alone in the bathroom, more horny than when you started. You say to yourself out loud. "Fucking assholes!" You then clean up and leave.'
+				gs 'arousal', 'bj', 20, 'group', 'sub'
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			end
+		end
+	elseif fame['pav_slut'] > 250:
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big10.jpg"></center>'
+		'You look at Arkadi with contempt "What the fuck do you want?" He''s not impressed in the slightest, your loose reputation undermining any authority you try to impose.'
+		act 'Continue':
+			*clr & cla
+			pcs_mood -= 20
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy5.jpg"></center>'
+			'"I''ll show you what the fuck I want slut." Roman suddenly grabs you by the hair and presses your face against a desk. "What I want is your lips around my dick, right now. Everyone already knows you''re a <<$gnikname>>, so you better start acting like it or there will be consequences." He turns to his friends and says "Come on boys, this whore doesn''t understand her place in life. It''s about time we show her."'
+
+			!!Make a list of possible rescuers. None is repeated several times to that there always is a large chance that no one comes to the rescue.
+			$availble_rescuers = 'none|none|none|none|erast'+iif(npc_rel['A3'] > 60, '|ivan','')+iif(npc_rel['A146'] > 50, '|marcus','')+iif(npc_rel['A149'] > 70, '|lazar','')+iif(npc_rel['A144'] > 50, '|nush','')
+
+			!!Choose a random person to come to the playeres reque, which includes the posiiblety that no one will.
+			$temperson = func('shortgs', 'rand_pick', 'delimit', 'string', $availble_rescuers)
+
+			killvar '$availble_rescuers'
+
+			if $temperson = 'ivan':
+				'As you try and pull away Ivan comes over and pulls Roman off you and turns to him. "Leave her alone!"'
+				'The Roman turns towards him and narrows his eyes. "Touch me again and I will fuck you up."'
+				'Ivan steps up close, crowding him. "I''d like to see you try." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Ivan and slip away.'
+				act 'Leave': gt 'gschool_events', 'leave_break_events2'
+			elseif $temperson = 'marcus':
+				'As you try and pull away Marcus comes over and pulls the Roman off you and turns to him. "Leave her alone!"'
+				'The Roman turns towards him and narrows his eyes. "Or what blackass?"'
+				'Marcus steps up close, snorts. "You think you scare me? Back home I dealt with more dangerous assholes than you." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Marcus and slip away.'
+				act 'Leave': gt 'gschool_events', 'leave_break_events2'
+			elseif $temperson = 'lazar':
+				'As you try and pull away Lazar comes over and pulls the Roman off you and turns to him. "Leave her alone!"'
+				'The Roman turns towards him and narrows his eyes. "Or what pussy?"'
+				'Lazar steps up close, crowding him. "Or I will fucking kick your ass right here!" They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Lazar and slip away.'
+				act 'Leave': gt 'gschool_events', 'leave_break_events2'
+			elseif $temperson = 'erast':
+				'As you try and pull away Erast comes over and pulls the Roman off you and turns to him. "Leave her alone!"'
+				'The Roman turns towards him and narrows his eyes. "You think just because your big you are scary? huh? I''ll fucking show you scary, so how about your make me big man."'
+				'Erast steps up close, crowding him. "I don''t want to hurt your... little man." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Erast and slip away.'
+				act 'Leave': gt 'gschool_events', 'leave_break_events2'
+			elseif $temperson = 'nush':
+				'As you try and pull away Anushka comes over and steps between the two of you facing him. "Leave her alone!"'
+				'The Roman looks down at her and narrows his eyes. "Mind your own fucking business slut! Unless you want a go instead"'
+				'Anushka scoffs at him and holds up her pinky finger. "If I wanted some dick, I''d want something bigger than you small fry." Roman grabs violently her by her shoulders, but before he can do anything Arkadi puts his hands on Roman''s shoulder and shakes his head no to him. Roman looks back at Anushka and glares at her. "Fuck it, slut isn''t worth it." But before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Anushka and slip away.'
+				act 'Leave': gt 'gschool_events', 'leave_break_events2'
+			else
+				gs 'willpower', 'bj', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'Resist (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/resistgop.jpg"></center>'
+						'You manage to pull away from him, but the others are blocking you. You back up, but eventually find your back against one of the walls and you turn your head away from him. The boy leans in close to you. "Just do as you''re told or this will be a lot worse for you."'
+						gs 'willpower', 'bj', 'resist'
+						if will_cost <= pcs_willpwr:
+							act 'Threaten to scream (<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'willpower', 'pay', 'resist'
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/resistgop.jpg"></center>'
+								'"I''ll scream and when the teachers arrive, I will tell them that you tried to rape me." He fumes and leans in real close. "You''ll regret this slut! I promise." He relents and leaves and the others go with him, all giving you looks you would rather not think about.'
+								act 'Continue': gt 'gschool_events', 'leave_break_events2'
+							end
+						else
+							act 'Threaten to scream (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						end
+						act 'Go to the men''s room with them':gt 'gschool_events1', 'toilet_bj2'
+					end
+				else
+					act 'Resist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
+				act 'Go to the men''s room with them': gt 'gschool_events1', 'toilet_bj2'
+			end
+			killvar 'temperson'
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big10.jpg"></center>'
+		if grupTipe = 1 or grupTipe = 2:
+			'You look at Arkadi with contempt "What the fuck pervert." He''s not impressed in the slightest by your attitude.'
+			act 'Wait to see what they do':
+				*clr & cla
+				pcs_mood -= 20
+				gs'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
+				'Roman suddenly grabs you by the hair and says. "Why don''t we go somewhere where you can put that mouth of yours to good use for a change."'
+
+				!!Make a list of possible rescuers. None is repeated several times to that there always is a large chance that no one comes to the rescue.
+				$availble_rescuers = 'none|none|none|none|erast'+iif(npc_rel['A3'] > 60, '|ivan','')+iif(npc_rel['A146'] > 50, '|marcus','')+iif(npc_rel['A149'] > 70, '|lazar','')+iif(npc_rel['A144'] > 50, '|nush','')
+
+				!!Choose a random person to come to the playeres reque, which includes the posiiblety that no one will.
+				$temperson = func('shortgs', 'rand_pick', 'delimit', 'string', $availble_rescuers)
+
+				killvar '$availble_rescuers'
+
+				if $temperson = 'ivan':
+					'As you try and pull away Ivan comes over and pulls Roman off you and turns to him. "Leave her alone!"'
+					'The Roman turns towards him and narrows his eyes. "Touch me again and I will fuck you up."'
+					'Ivan steps up close, crowding him. "I''d like to see you try." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Ivan and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'marcus':
+					'As you try and pull away Marcus comes over and pulls the Roman off you and turns to him. "Leave her alone!"'
+					'The Roman turns towards him and narrows his eyes. "Or what blackass?"'
+					'Marcus steps up close, snorts. "You think you scare me? Back home I dealt with more dangerous assholes than you." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Marcus and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'lazar':
+					'As you try and pull away Lazar comes over and pulls the Roman off you and turns to him. "Leave her alone!"'
+					'The Roman turns towards him and narrows his eyes. "Or what pussy?"'
+					'Lazar steps up close, crowding him. "Or I will fucking kick your ass right here!" They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Lazar and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'erast':
+					'As you try and pull away Erast comes over and pulls the Roman off you and turns to him. "Leave her alone!"'
+					'The Roman turns towards him and narrows his eyes. "You think just because your big you are scary? huh? I''ll fucking show you scary, so how about your make me big man."'
+					'Erast steps up close, crowding him. "I don''t want to hurt your... little man." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Erast and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'nush':
+					'As you try and pull away Anushka comes over and steps between the two of you facing him. "Leave her alone!"'
+					'The Roman looks down at her and narrows his eyes. "Mind your own fucking business slut! Unless you want a go instead"'
+					'Anushka scoffs at him and holds up her pinky finger. "If I wanted some dick, I''d want something bigger than you small fry." Roman grabs violently her by her shoulders, but before he can do anything Arkadi puts his hands on Roman''s shoulder and shakes his head no to him. Roman looks back at Anushka and glares at her. "Fuck it, slut isn''t worth it." But before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Anushka and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				else
+					act 'Flip him off':
+						*clr & cla
+						grupvalue[1] += 1
+						grupvalue[2] += 1
+						grupvalue[4] += 1
+						inhib_exp += 2
+						'<center><img <<$set_imgh>> src="images/locations/pc/reactions/fuckoff3.jpg"></center>'
+						'You sneer at him and look at his friends before looking back at him and flip him off. "As if I would stoop to letting your disgusting ass paw at me." His friends howl with laughter as he fumes at you. You turn and walk away with a laugh.'
+						act 'Walk away': gt 'gschool_events', 'leave_break_events2'
+					end
+					act 'Why not':
+						*clr & cla
+						grupvalue[1] -= 10
+						grupvalue[2] -= 5
+						grupvalue[3] -= 10	
+						gs 'fame', 'pav', 'sex', 10
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
+						'You are in the mood anyways, so why not? Hopefully it isn''t too quick. They lead you to the men''s room and one of the guys drives everyone else out; it''s just you and the gopniks in here now. One of them leans against the door to block anyone else from coming in while the rest all start unzipping their pants and pulling out their dicks.'
+						'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way.'
+						*nl
+						if fame['pav_slut'] > 200: 'On one wall you see written, in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
+						act 'Start sucking':
+							*clr & cla
+							gs 'boyStat', 'A157'
+							gs 'cum_call', 'mouth', $boy,1
+							gs 'boyStat', 'A189'
+							gs 'cum_call', 'mouth', $boy,1
+							gs 'boyStat', 'A156'
+							gs 'cum_call', 'mouth', $boy,1
+							swallow += 3
+							'<center><video autoplay loop src="images/locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4"></video></center>'
+							'You kneel down and wrap your <<$pc_desc[''lips'']>> lips around Arkadi''s hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you''re not sucking with your hands.'
+							'Finally, you feel a jet of sperm hit your throat and Arkadi moans. "That''s right bitch! Swallow it all like a good little slut." Arkadi seems satisfied and tucks his cock back in his pants and swaps place with the Niko that was at the door, who comes over and pulls his cock out, ready to get his turn.'
+							*nl
+							'You immediately switch Roman''s cock who is standing next to you and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well, and soon you finish off the last Niko. As you get up off your knees, you hear Arkadi laugh. "You''re the best cock sucker we got <<$pcs_nickname>>!" said as they leave you alone in the bathroom, more horny than when you started. You say to yourself out loud. "Fucking assholes!" You then clean up and leave.'
+							gs 'arousal', 'bj', 20, 'group', 'sub'
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Continue': gt 'gschool_events', 'leave_break_events2'
+						end
+					end
+					killvar 'temperson'
+				end
+			end
+		else
+			'You look at Arkadi and the other gopniks with fear, you know this could go bad very easily. "Stop please, I don''t like it." He just laughs at what you say.'
+			act 'Wait to see what they do':
+				*clr & cla
+				pcs_mood -= 20
+				gs'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
+				'Roman suddenly grabs you by the hair and says. "Why don''t we go somewhere where you can put that mouth of yours to good use for a change."'
+
+				!!Make a list of possible rescuers. None is repeated several times to that there always is a large chance that no one comes to the rescue.
+				$availble_rescuers = 'none|none|none|none|erast'+iif(npc_rel['A3'] > 60, '|ivan','')+iif(npc_rel['A146'] > 50, '|marcus','')+iif(npc_rel['A149'] > 70, '|lazar','')+iif(npc_rel['A144'] > 50, '|nush','')
+
+				!!Choose a random person to come to the playeres reque, which includes the posiiblety that no one will.
+				$temperson = func('shortgs', 'rand_pick', 'delimit', 'string', $availble_rescuers)
+
+				killvar '$availble_rescuers'
+
+				if $temperson = 'ivan':
+					'As you try and pull away Ivan comes over and pulls Roman off you and turns to him. "Leave her alone!"'
+					'The Roman turns towards him and narrows his eyes. "Touch me again and I will fuck you up."'
+					'Ivan steps up close, crowding him. "I''d like to see you try." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Ivan and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'marcus':
+					'As you try and pull away Marcus comes over and pulls the Roman off you and turns to him. "Leave her alone!"'
+					'The Roman turns towards him and narrows his eyes. "Or what blackass?"'
+					'Marcus steps up close, snorts. "You think you scare me? Back home I dealt with more dangerous assholes than you." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Marcus and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'lazar':
+					'As you try and pull away Lazar comes over and pulls the Roman off you and turns to him. "Leave her alone!"'
+					'The Roman turns towards him and narrows his eyes. "Or what pussy?"'
+					'Lazar steps up close, crowding him. "Or I will fucking kick your ass right here!" They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Lazar and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'erast':
+					'As you try and pull away Erast comes over and pulls the Roman off you and turns to him. "Leave her alone!"'
+					'The Roman turns towards him and narrows his eyes. "You think just because your big you are scary? huh? I''ll fucking show you scary, so how about your make me big man."'
+					'Erast steps up close, crowding him. "I don''t want to hurt your... little man." They start shoving each other, but before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Erast and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				elseif $temperson = 'nush':
+					'As you try and pull away Anushka comes over and steps between the two of you facing him. "Leave her alone!"'
+					'The Roman looks down at her and narrows his eyes. "Mind your own fucking business slut! Unless you want a go instead"'
+					'Anushka scoffs at him and holds up her pinky finger. "If I wanted some dick, I''d want something bigger than you small fry." Roman grabs violently her by her shoulders, but before he can do anything Arkadi puts his hands on Roman''s shoulder and shakes his head no to him. Roman looks back at Anushka and glares at her. "Fuck it, slut isn''t worth it." But before more can happen a teacher interrupts. "What''s going on here? Break it up, all of you." You word a thank you to Anushka and slip away.'
+					act 'Leave': gt 'gschool_events', 'leave_break_events2'
+				else
+					act 'Run off':
+						*clr & cla
+						grupvalue[1] -= 1
+						grupvalue[2] -= 2
+						grupvalue[3] += 1
+						grupvalue[4] -= 3
+						inhib_exp += 2
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall02.jpg"></center>'
+						'You manage to pull away from him and as soon as you do, you take off running down the hall from them. You hear them cry out as you run and hear them starting to chase you. You run past a classroom as a teacher comes out who yells at you to stop running but you don''t stop, then you hear the teacher yelling at those chasing you. You keep running until you don''t hear anything. Finally you stop and lean against the wall catching your breath, looking down the empty hall.'
+						act 'Walk away': gt 'gschool_events', 'leave_break_events2'
+					end
+					act 'Why not':
+						*clr & cla
+						grupvalue[1] -= 10
+						grupvalue[2] -= 5
+						grupvalue[3] -= 10	
+						gs 'fame', 'pav', 'sex', 10
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
+						'You are in the mood anyways, so why not? Hopefully it isn''t too quick. They lead you to the men''s room and one of the guys drives everyone else out; it''s just you and the gopniks in here now. One of them leans against the door to block anyone else from coming in while the rest all start unzipping their pants and pulling out their dicks.'
+						'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way.'
+						*nl
+						if fame['pav_slut'] > 200: 'On one wall you see written, in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
+						act 'Start sucking':
+							*clr & cla
+							gs 'boyStat', 'A157'
+							gs 'cum_call', 'mouth', $boy,1
+							gs 'boyStat', 'A189'
+							gs 'cum_call', 'mouth', $boy,1
+							gs 'boyStat', 'A156'
+							gs 'cum_call', 'mouth', $boy,1
+							swallow += 3
+							'<center><video autoplay loop src="images/locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4"></video></center>'
+							'You kneel down and wrap your <<$pc_desc[''lips'']>> lips around Arkadi''s hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you''re not sucking with your hands.'
+							'Finally, you feel a jet of sperm hit your throat and Arkadi moans. "That''s right bitch! Swallow it all like a good little slut." Arkadi seems satisfied and tucks his cock back in his pants and swaps place with the Niko that was at the door, who comes over and pulls his cock out, ready to get his turn.'
+							*nl
+							'You immediately switch Roman''s cock who is standing next to you and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well, and soon you finish off the last Niko. As you get up off your knees, you hear Arkadi laugh. "You''re the best cock sucker we got <<$pcs_nickname>>!" said as they leave you alone in the bathroom, more horny than when you started. You say to yourself out loud. "Fucking assholes!" You then clean up and leave.'
+							gs 'arousal', 'bj', 20, 'group', 'sub'
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Continue': gt 'gschool_events', 'leave_break_events2'
+						end
+					end
+					killvar 'temperson'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'toilet_bj1':
+	*clr & cla
+	menu_off = 1
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
+	'You know perfectly well that the group of boys are not going to let you escape. You meekly let the boys drag you to the men''s room, hoping for a miracle to save you. It never comes. When you arrive at the men''s room, one of the guys drives everyone else out; it''s just you and the gopniks in here now. He goes outside and keeps watch while two of the others reach for their pants. Several more come in to watch.'
+	if fame['pav_slut'] > 200:
+		'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way. On one wall, you see written, in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
+	else
+		'The walls of the restroom are covered in crude texts, quite a few of them involving your classmates in some way.'
+	end
+	act 'Start sucking':
+		*clr & cla
+		gs 'boyStat', 'A9'
+		gs 'cum_call', 'mouth', $boy,1
+		gs 'boyStat', 'A10'
+		gs 'cum_call', 'mouth', $boy,1
+		gs 'boyStat', 'A11'
+		gs 'cum_call', 'mouth', $boy,1
+		swallow += 3
+		'<center><video autoplay loop src="images/locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4"></video></center>'
+		'You know there''s only one way they will let you go, so you dutifully kneel down. Vitek takes his cock out of his pants. A Dan stands to your right and takes his cock out too. You wrap your <<$pc_desc[''lips'']>> lips around Vitek''s hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you''re not sucking with your hands.'
+		'Finally, you feel a jet of sperm hit your throat and Vitek says in a menacing voice "Swallow it all, whore. If you miss a drop, you''re licking it up from the ground." You diligently swallow his sperm, doing your best to lick it all up from his dick and your lips. Vitek seems satisfied and tucks his cock back in his pants and swaps place with Vasily who was at the door, Vasily comes over and pulls his cock out, ready to get his turn.'
+		*nl
+		'You immediately switch Dan''s cock and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside and you finish off Vasily. As you get up off your knees, you hear Dan laugh. "Do you understand your place in life now? That place is right here, on your knees, whenever we say so. Got that?" You obediently nod, fully aware of the nasty taste of semen in the your mouth.'
+		gs 'arousal', 'bj', 20, 'group', 'sub'
+		gs 'arousal', 'end'
+		gs 'stat'
+		act 'Continue': gt 'gschool_events', 'leave_break_events2'
+	end
+end
+
+if $ARGS[0] = 'toilet_bj2':
+	*clr & cla
+	menu_off = 1
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
+	'You know perfectly well that the group of boys are not going to let you escape. You meekly let the boys drag you to the men''s room, hoping for a miracle to save you. It never comes. When you arrive at the men''s room, one of the guys drives everyone else out; it''s just you and the gopniks in here now. He goes outside and keeps watch while two of the others reach for their pants. Several more come in to watch.'
+	if fame['pav_slut'] > 200:
+		'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way. On one wall, you see written, in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
+	else
+		'The walls of the restroom are covered in crude texts, quite a few of them involving your classmates in some way.'
+	end
+	act 'Start sucking':
+		*clr & cla
+		gs 'boyStat', 'A157'
+		gs 'cum_call', 'mouth', $boy,1
+		gs 'boyStat', 'A189'
+		gs 'cum_call', 'mouth', $boy,1
+		gs 'boyStat', 'A156'
+		gs 'cum_call', 'mouth', $boy,1
+		swallow += 3
+		'<center><video autoplay loop src="images/locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4"></video></center>'
+		'You know there''s only one way they will let you go, so you dutifully kneel down. Arkadi takes his cock out of his pants. A Roman stands to your right and takes his cock out too. You wrap your <<$pc_desc[''lips'']>> lips around Arkadi''s hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you''re not sucking with your hands.'
+		'Finally, you feel a jet of sperm hit your throat and Arkadi seems satisfied and tucks his cock back in his pants and swaps place with Niko who was at the door, niko comes over and pulls his cock out, ready to get his turn.'
+		*nl
+		'You immediately switch Roman''s cock and receive another mouthful as Roman says in a menacing voice "Swallow it all, whore. If you miss a drop, you''re licking it up from the ground." You diligently swallow his sperm, doing your best to lick it all up from his dick and your lips. He moves aside and you finish off Niko. As you get up off your knees, you hear Roman laugh. "Do you understand your place in life now? That place is right here, on your knees, whenever we say so. Got that?" You obediently nod, fully aware of the nasty taste of semen in the your mouth.'
+		gs 'arousal', 'bj', 20, 'group', 'sub'
+		gs 'arousal', 'end'
+		gs 'stat'
+		act 'Continue': gt 'gschool_events', 'leave_break_events2'
+	end
+end
+
+!!Sweet talk function
+!!I have a request for you, now that we have cha as a stat and spots that raise it can you adjust the sweet_talk I am thinking
+!!cha 1-20 = -20
+!!cha 21-40 = 0
+!!41-60 = +10
+!!61-80 = +20
+!!81-90 = +30
+!!91+ = +40
+!!so charisma matters on sweet talking
+if $ARGS[0] = 'sweet':
+	if $ARGS[1] = 'normal' or $ARGS[1] = '':
+		if class['school_grade_average'] >= 90:
+			Sweet_talk = 10
+		elseif class['school_grade_average'] >= 80:
+			Sweet_talk = 5
+		elseif class['school_grade_average'] >= 70:
+			Sweet_talk = 0
+		elseif class['school_grade_average'] >= 60:
+			Sweet_talk = -5
+		elseif class['school_grade_average'] >= 50:
+			Sweet_talk = -10
+		else
+			Sweet_talk = -20
+		end
+		if grupTipe = 1:
+			Sweet_talk += 10
+		elseif grupTipe = 2:
+			Sweet_talk += 5
+		elseif grupTipe = 3:
+			Sweet_talk += 20
+		elseif grupTipe = 4:
+			Sweet_talk -= 10
+		end
+		if pcs_chrsm < 20:
+			Sweet_talk -= 20
+		elseif pcs_chrsm < 40:
+!! no change
+		elseif pcs_chrsm < 60:
+			Sweet_talk += 10
+		elseif pcs_chrsm < 80:
+			Sweet_talk += 20
+		elseif pcs_chrsm < 90:
+			Sweet_talk += 30
+		else
+			Sweet_talk += 40
+		end
+		sweet_talk += rand(0,10)
+		if hotcat < 5: Sweet_talk += (hotcat - 5) * 5
+	elseif $ARGS[1] = 'sex':
+		if class['school_grade_average'] >= 90:
+			Sweet_talk = -20
+		elseif class['school_grade_average'] >= 80:
+			Sweet_talk = -10
+		elseif class['school_grade_average'] >= 70:
+			Sweet_talk = 0
+		elseif class['school_grade_average'] >= 60:
+			Sweet_talk = 5
+		elseif class['school_grade_average'] >= 50:
+			Sweet_talk = 10
+		else
+			Sweet_talk = 20
+		end
+!!I tweaked the stats, I think it was backwards before with the nerds have a -40 which would have made sex more likely not less likely. I think now it is correct nerds less likely to get sex and the others more likely to get sex
+		if grupTipe = 1:
+			Sweet_talk -= 10
+		elseif grupTipe = 2:
+			Sweet_talk -= 10
+		elseif grupTipe = 3:
+			Sweet_talk += 40
+		elseif grupTipe = 4:
+			Sweet_talk -= 20
+		end
+		if pcs_chrsm < 20:
+			Sweet_talk -= 20
+		elseif pcs_chrsm < 40:
+!! no change
+		elseif pcs_chrsm < 60:
+			Sweet_talk += 10
+		elseif pcs_chrsm < 80:
+			Sweet_talk += 20
+		elseif pcs_chrsm < 90:
+			Sweet_talk += 30
+		else
+			Sweet_talk += 40
+		end
+		Sweet_talk += rand(15,35)
+!!tweaked hotcat as well, this one the better looking Sveta is the more likely they will accept sex, it was backwards before I think.
+		if hotcat < 5: Sweet_talk -= (hotcat - 5) * 5
+	end
+end
+
+
+--- gschool_events1 ---------------------------------
+

+ 57 - 27
locations/gschool_gossip.qsrc

@@ -2,12 +2,10 @@
 
 if $ARGS[0] = 'morning':
 !!going to class
-	'While walking down the halls before class, you make your way past the other students. As you do, you overhear some of them talking about a variety of things, including some juicy gossip.'
-	*nl
-	if sveta_dyke_rumor = 25 or sveta_dyke_rumor = 20 or sveta_dyke_rumor = 15 or sveta_dyke_rumor = 10 or sveta_dyke_rumor = 5 or sveta_dyke_rumor = 1:
-		gs 'gschool_gossip', 'sveta_dyke_rumors'
+	if sveta_dyke_rumor = 30 or sveta_dyke_rumor = 24 or sveta_dyke_rumor = 18 or sveta_dyke_rumor = 12 or sveta_dyke_rumor = 6 or sveta_dyke_rumor = 1:
+		gs 'gschool_gossip', 'sveta_dyke_rumors', 'picture'
 	else
-		gs 'gschool_gossip', 'gossip'
+		gs 'gschool_gossip', 'gossip', 'picture'
 	end
 end
 
@@ -42,6 +40,13 @@ if $ARGS[0] = 'lesson':
 end
 
 if $ARGS[0] = 'gossip':
+	if $ARGS[1] = 'picture':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
+		'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to. As you do, you overhear some of them talking about a variety of things, including some juicy gossip.'
+		*nl
+	end
+
 	if soniaPS > 0 and soniaPS < 4 and rand(0,1+SoniaPS)= 0:
 		if soniaPS = 1:
 			if (soniaPSdays+7) < daystart:
@@ -129,17 +134,24 @@ if $ARGS[0] = 'gossip':
 		'The boys start discussing who they''d like to see in "that hot cheerleading outfit."'
 	else
 		if rand(0,1) = 0:
-			gs 'gschool_gossip', 'mixed'
+			gs 'gschool_gossip', 'mixed', $ARGS[1]
 		elseif rand(0,1) = 0:
-			gs 'gschool_gossip', 'boys'
+			gs 'gschool_gossip', 'boys', $ARGS[1]
 		else
-			gs 'gschool_gossip', 'girls'
+			gs 'gschool_gossip', 'girls', $ARGS[1]
 		end
 	end
 end
 
 
 if $ARGS[0] = 'mixed':
+	if $ARGS[1] = 'picture':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
+		'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to. As you do, you overhear some of them talking about a variety of things, including some juicy gossip.'
+		*nl
+	end
+	
 	chat_rand = rand(1,95)
 	if chat_rand = 1:
 		'"Man, this town is so boring! We really need to graduate soon, so we can go live in the city!"'
@@ -495,7 +507,7 @@ if $ARGS[0] = 'mixed':
 	elseif chat_rand = 95:
 	    'I really want to go down on Albina. Having those toned thighs squeeze my head in orgasm as I eat her pussy would be heaven!"'
 	else
-		gs 'gschool_gossip', 'mixed'
+		gs 'gschool_gossip', 'mixed', $ARGS[1]
 	end
 
 	if dimaRevenge = 4 and dimaRevChoice = 2 and hour >= 13:
@@ -506,6 +518,13 @@ if $ARGS[0] = 'mixed':
 end
 
 if $ARGS[0] = 'boys':
+	if $ARGS[1] = 'picture':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
+		'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to. As you do, you overhear some of them talking about a variety of things, including some juicy gossip.'
+		*nl
+	end
+
 	chat_rand = rand(1,45)
 	if chat_rand = 1:
 		'"Dude, you should''ve seen me in League of Legends yesterday. I totally carried my crappy team to victory!" His friend does not seem impressed and scoffs back "Man, I''ve seen you play before. You couldn''t carry a paper bag to the litter bin if your life depended on it."'
@@ -757,7 +776,7 @@ if $ARGS[0] = 'boys':
         '"No, I wear volleyball shorts because my ass is out of your league!" she answers before she stares him right in the eyes. "You have 3 seconds to get out of my sight. One..."'
         'He doesn''t need to be told twice and flees in a panic, his friends following close behind. You have never seen anyone run so fast in your life. Albina just smirks and turns back to what she was doing.'
 	else
-		gs 'gschool_gossip', 'boys'
+		gs 'gschool_gossip', 'boys', $ARGS[1]
 	end
 	if dimaRevenge = 4 and dimaRevChoice = 2 and hour >= 13:
 		!!in hallway!!
@@ -768,6 +787,13 @@ end
 
 
 if $ARGS[0] = 'girls':
+	if $ARGS[1] = 'picture':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girls_gossip1.jpg"></center>'
+		'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to. As you do, you overhear some of them talking about a variety of things, including some juicy gossip.'
+		*nl
+	end
+
 	chat_rand = rand(1,43)
 	if chat_rand = 1:
 		'"I quit volleyball."'
@@ -966,7 +992,7 @@ if $ARGS[0] = 'girls':
         '"Lizeveta. Although I also heard she sometimes skips class for a quicky in the bathrooms with some of the hot guys, so maybe she''s actually bi, like Anushka?"'
         '"Still. You mean to say I have a better chance at eating her amazing ass than any of the guys here?" a third one says and they all laugh.'
 	else	
-		gs 'gschool_gossip', 'girls'
+		gs 'gschool_gossip', 'girls', $ARGS[1]
 	end
 	if dimaRevenge = 4 and dimaRevChoice = 2 and hour >= 13:
 		!!in hallway!!
@@ -976,6 +1002,13 @@ if $ARGS[0] = 'girls':
 end
 
 if $ARGS[0] = 'Lizaveta':
+	if $ARGS[1] = 'picture':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girls_gossip2.jpg"></center>'
+		'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to. As you do, you overhear some of them talking about a variety of things, including some juicy gossip.'
+		*nl
+	end
+
 	chat_rand = rand(1, 48)
 	if chat_rand = 1:
 		'"I heard Andrey cheats on Stasya!"'
@@ -1148,42 +1181,39 @@ if $ARGS[0] = 'gosip':
 end
 
 if $ARGS[0] = 'sveta_dyke_rumors':
-	!!*clr & cla
-	!!menu_off = 1
-	!!minut += 3
-	!!gs 'stat'
-	if sveta_dyke_rumor = 25:
-		!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
+	if $ARGS[1] = 'picture':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
+		'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to. As you do, you overhear some of them talking about a variety of things, including some juicy gossip.'
+		*nl
+	end
+
+	if sveta_dyke_rumor = 30:
 		'Two boys are chatting in the hallway as you walk past. "Hey dyke, cock not good enough for you?"'
 		'His friend laughs. "Maybe no one has ever given her a good enough ride yet. Hey rug muncher, come and find out what a real man is like." They both laugh as you keep walking, but they follow you and make more crude comments. Several of your fellow students laugh or give you disgusted looks when they hear the boys comments.'
-	elseif sveta_dyke_rumor = 20:
-		!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
+	elseif sveta_dyke_rumor = 24:
 		'"Hey dyke," two boys say as you walk past them in the hallway. "I hear you''re creeping the other girls out. You know, if they kick you out of the girls locker room, you can always come over to the boys side."'
 		'"Yeah," says the other boy. "We can set you <i>straight</i> in there."'
 		'They follow you down the hall for awhile making crude jokes before finally losing interest.'
-	elseif sveta_dyke_rumor = 15:
-		!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
+	elseif sveta_dyke_rumor = 18:
 		'Two boys are chatting in the hallway as you walk past. "Did you hear about <<$pcs_nickname>>?" one of them asks.'
 		'"What? That she''s a dyke? Everyone knows that." his friend replies, glancing at you.'
 		'"No. Well sorta, but supposedly she was caught jilling off while spying on the other girls naked." The first one replies.'
 		'"Fuck, she''s a bigger dyke than Lera is... but damn that is kinda hot... and disgusting, fucking dykes." Eventually you walk far enough way to no longer be able to hear them as you head on your way.'
-	elseif sveta_dyke_rumor = 10:
-		!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
+	elseif sveta_dyke_rumor = 12:
 		'Two boys are chatting in the hallway as you walk past. "<<$pcs_nickname>> is such a dyke, she just won''t stop checking the other girls out in the shower." one of them says.'
 		'"I heard she was pretty much drooling while checking out Bella." his friend replies, glancing at you.'
 		'The first one laughs as he replies. "Well I can hardly blame her for that." Eventually you walk far enough way to no longer be able to hear them as you head on your way.'
-	elseif sveta_dyke_rumor = 5:
-		!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
+	elseif sveta_dyke_rumor = 6:
 		'Two boys are chatting in the hallway as you walk past. "<<$pcs_nickname>> has been at it again, caught checking out several of the other girls." one of them says.'
 		'"Damn, I guess she is a lez." Eventually you walk far enough way to no longer be able to hear them as you head on your way.'
 	else
-		!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boys_gossip.jpg"></center>'
 		'Two boys are chatting in the hallway as you walk past. "Did you hear about <<$pcs_nickname>>?" one of them asks the other as you walk past.'
 		'"What about her?" his friend replies, glancing at you.'
 		'"I heard she was checking the other girls out in the girls locker room after gym." The first one replies.'
 		'"Damn, think she''s a lesbian?" Eventually you walk far enough away to no longer hear them as you head on your way.'
 	end
-	!!act 'Continue on': gt 'gschool_events', 'leave_break_events2'
+	sveta_dyke_rumor +=1
 end
 
 --- gschool_gossip ---------------------------------

+ 9 - 11
locations/gschool_grounds.qsrc

@@ -24,11 +24,11 @@ if $ARGS[0] = 'main':
 	'Pavlovsk''s only school, where all the local children go for their education. Next to the school is the athletic field and a parking lot for the teachers, with a large grove of trees just beyond them.' 
 	'Hidden behind these trees is the old school building, which was supposed to be renovated and used for advance classes after the new one was built, but budget cuts meant the project was cancelled and now the old building stands empty and abandoned. It''s a popular spot for students to skip class or hang out outside of school.'
 
-	if ((hour = 6 and minut >= 30) or (hour >= 7 and hour < 18)) and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and suspended['on'] ! 1:
+	if ((hour = 6 and minut >= 30) or (hour >= 7 and hour < 18)) and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and suspended['on'] ! 1:
 		'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
-	if day = nyp_day and month = 12 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+	if day = nyp_day and month = 12 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 		if hour >= 14 and hour < 17:
 			'All of the boys and girls are standing near the school. Everyone did their best to look good today, wearing their nicest clothes. Someone calls out to you. "Hey <<$pcs_nickname>>, are you coming to the New Year''s Eve party or not? You haven''t paid the 1000 <b>₽</b> entry fee yet!"'
 
@@ -142,7 +142,7 @@ if $ARGS[0] = 'main':
 
 !!	act 'Go to the Principals Office': gt
 
-	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and SchoolBlock = 0 and suspended['on'] ! 1:
+	if week < 6 and hour >= 6 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and SchoolBlock = 0 and suspended['on'] ! 1:
 		if PCloStyle2 = 4 or Enable_sforma = 1:
 			if hour = 6:
 				if minut < 30:
@@ -189,7 +189,7 @@ if $ARGS[0] = 'main':
 
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint behind the school building': gs 'drugs', 'joint' & gt $loc, $loc_arg
 
-	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and SchoolBlock = 0: act 'Go to detention': gt 'gschool_detention', 'start'
+	if week = 6 and hour = 8 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and detention_set = 1 and SchoolBlock = 0: act 'Go to detention': gt 'gschool_detention', 'start'
 
 	if christinaQW['dompath'] = 4: gt 'gschool_grounds', 'KristinaFight'
 
@@ -288,7 +288,7 @@ if $ARGS[0] = 'main':
 			elseif fedorKozlovQW >= 10:
 				gs 'show_table', '<a href="exec: gt ''FedorEv'', ''Start''">Fedor</a>', '5'
 			end
-			if NikoVolkovQW = 5 and NikoDate = 1 and NikoDate_Day ! daystart or NikoEv = 11:
+			if NikoVolkovQW = 5 and NikoDate = 1 and NikoNextDate_day <= daystart or NikoEv = 11:
 				gs 'show_table', '<a href="exec: gt ''NikoEv'', ''Niko Dates''">Nikolai</a>', '5'
 			elseif NikoVolkovQW = 10 and NikoEv >= 17 and NikoEv <= 20 and NikoDate_Day ! daystart:
 				gs 'show_table', '<a href="exec: gt ''NikoEv2'', ''Events''">Nikolai</a>', '5'
@@ -349,11 +349,9 @@ if $ARGS[0] = 'sports':
 		act 'Go for a run (1 hour)':
 			*clr & cla
 			menu_off = 1
-			minut += 60
-			schoolrunday = daystart
-			fat -= rand(2, 7)
-			run_exp += rand(0, 2)
-			gs 'sweat', 'add', 20
+			gs 'exercise', 'tier1', 60, 'run_exp'
+			fat -= rand(0,4)
+			gs 'sweat', 'add', 5
 			gs 'stat'
 			if month > 2 and month < 9:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/runsummer.jpg"></center>'
@@ -368,7 +366,7 @@ if $ARGS[0] = 'sports':
 		'You could go for a run here if you were wearing sports clothes and shoes.'
 	end
 
-	if hour >= 9 and hour < 18 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0: 'With the school open, you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
+	if hour >= 9 and hour < 18 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0: 'With the school open, you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
 
 	if week = 6 and SchoolSorev = 2 and hour = 10 and SchoolBlock = 0:
 		*nl

+ 2 - 2
locations/gschool_jock_chats.qsrc

@@ -207,7 +207,7 @@ if $ARGS[0] = 'christina':
 				'Her face turns bright red with anger, and she hisses at you, "You fucking bitch. How did you get that?! If you show anybody..."'
 				'"I wont...if you tell Lariska it''s ok to hang out with me outside of school. I mean, I would hate to see these pictures fall into Lizaveta''s hands..."'
 				'Her face turns even more red, if that were possible. "Fine," she spits out. "But I swear, if I ever even hear about these pictures again, I will fucking break you into tiny pieces!"'
-				'"Oh, you wont, as long as you keep your word," you say with a fake smile that doesn''t quite reach your eyes. "Now do be a dear and let her know she is free to do whatever she wants outside of school, will you?'
+				'"Oh, you wont, as long as you keep your word," you say with a fake smile that doesn''t quite reach your eyes. "Now do be a dear and let her know she is free to do whatever she wants outside of school, will you?"'
 				'"Oh, and if you try and punish her for this, I will know," the threat clear on your face. Turning on your heels, you head off to your next class, smiling.'
 			else
 				christinaQW['dompath'] = 3
@@ -219,7 +219,7 @@ if $ARGS[0] = 'christina':
 				'Glaring at you, her hands balled into fists, she says quietly "What the fuck do you want from me, bitch?"'
 				'"Oh, I haven''t decided yet. When I do, I''ll let you know. I''m sure whatever I decide I want, you''ll give it to me without a fuss."'
 				'Her face turns even more red, if that were possible. "Fine," she spits out. "But I swear, if I ever even hear about these pictures again, I will fucking break you into tiny pieces!"'
-				'"Oh, you wont, as long as you keep your word," you say with a fake smile that doesn''t quite reach your eyes." Turning on your heels, you head off to your next class, smiling.'
+				'"Oh, you wont, as long as you keep your word," you say with a fake smile that doesn''t quite reach your eyes. Turning on your heels, you head off to your next class, smiling.'
 			end
 		elseif christinaQW['dompath'] = 3:
 			'Christina takes one look at you coming over to talk with her and says, "What now?"'

+ 4 - 3
locations/gschool_lessons.qsrc

@@ -41,9 +41,6 @@ if $ARGS[0] = 'morning':
 		elseif grupTipe = 3 and nerd_game['invite_day'] < daystart - week:
 			gt 'nerd_game_night', 'invite', 'morning'
 		else
-			'<center><b><font color="maroon">School Hallway</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
-			'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to.'
 			gs 'gschool_gossip', 'morning'
 			*nl
 			gs 'gschool_lessons', 'uniform_check'
@@ -371,6 +368,10 @@ if $ARGS[0] = 'grade_check':
 		'You''re only getting top marks in some of your classes, but only a few of your grades are bad and you''re not failing any classes. You should have no trouble getting into university, but improving your grades wouldn''t hurt.'
 	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10: 
 		'You''re only getting top marks in a few of your classes and are failing others. You should improve your grades if you want to get into university.'
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] = 13: 
+		'You''re only getting top marks in some of your classes and a lot of bad grades, but you''re not failing any classes. You need to improve your bad grades if you want to get into university.'
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 10: 
+		'You''re getting top marks in a few of your classes, but are failing some of the others. You should improve your grades if you want to get into university.'
 	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 6: 
 		'You''re getting top marks in a few of your classes, but are failing a lot of the others. You should improve your grades if you want to get into university.'
 	elseif class['school_grades_above_90'] > 0: 

+ 62 - 73
locations/gschool_sex.qsrc

@@ -1,5 +1,5 @@
 # gschool_sex
-!2021/05/02
+!2022/02/09
 !!After school bjs for gopnik friends
 if $ARGS[0] = 'suck':
 	menu_off = 1
@@ -119,85 +119,74 @@ if $ARGS[0] = 'afterschool':
 	menu_off = 1
 	gs 'boyStat', 'A3'
 	ivan_afterschool = 0
-	pcs_horny += 10
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/afterschool.jpg"></center>'
-	'You go back to where you and Katja made out with Ivan and find both of them already there talking. As soon as they see you, they both stop talking.'
-	'Katja has a suspicious grin on her face while you can already see the bulge of Ivan''s cock straining against his pants as he looks at you hungrily.'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan0.jpg"></center>'
+	'As school end you go and find Katja and the two of you head to the English classroom you told Ivan to meet you in. Once inside you close the door and take seats at the some of the desks and the two you start talking as you wait for Ivan to show up. As you wait Katja pulls out a small bottle of lube from her purse, which makes you both giggle.'
+	'It doesn''t take to long until the door opens and there is Ivan. He see''s the two of you and grins, he closes the door and strides over to the two of you. You can already see the bulge of Ivan''s cock straining against his pants as he looks at you both hungrily.'
 	*nl
-	'You can tell by Katja''s look that she planned something with Ivan and you find yourself eager to find out what it is as Katja waves you over. "Well what took you? We''ve been waiting for a few minutes, come on." Before you can even respond, she takes you both by the hand and leads you down the least used wing of the school to one of the classrooms that barely sees any activity.'
-	*nl
-	'Katja pulls you into the room as Ivan stops for a moment and looks back down the hall before coming in and closing the door.' 
+	'"Well what took you? We''ve been waiting for a few minutes, come on." Katja says to him.' 
 	act 'Continue':
 		*clr & cla
-		pcs_horny += 10
 		if dick > npc_throat['A14']: npc_throat['A14'] += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/doublebj.jpg"></center>'
-		'You and Katja begin kissing and pulling each other''s clothes off and within moments, you''re both naked. Breaking your kiss, you both look at Ivan, cheek to cheek. He stands there with his <<dick>>cm <<$dick_girth>> cock in his hand, stroking it as he watches the two of you.'
-		*nl
-		'Katja wastes no time. She walks over to him, pulling you along, and drops to her knees in front of him. She pulls his pants the rest of the way off as you kneel down beside her.'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan1.jpg"></center>'
+		'Katja gets out of the desk as Ivan stops next to the two of you, she drops down to her knees and starts unzipping his pants. You quickly join her, just in time to see his <<dick>>cm <<$dick_girth>> cock spring free, Katja starts stroking it once, as he looks down at the two of you.'
 		*nl
-		'She pulls his hand away and takes his <<dick>>cm <<$dick_girth>> cock into her mouth. He moans at once, even louder once she starts sucking him off, quickly offering you a turn. Licking your lips, you take Ivan''s cock into your mouth as well.'
-		'The two of you trade his cock back and forth between you.'
-		gs 'arousal', 'bj', 10, 'group'
-		act 'Katja wants more':
+		'She takes his cock into her mouth. He moans at once, even louder once she starts sucking him off, quickly offering you a turn. Licking your lips, you take Ivan''s cock into your mouth as well. The two of you trade his cock back and forth between you.'
+		gs 'arousal', 'bj', 3, 'group'
+		gs 'stat'
+		act 'Ivan fucks you':
 			*clr & cla
-			pcs_horny += 10
-			if npc_vag['A14'] < dick: npc_vag['A14'] += 1
-			if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/cowgirlmissionary.jpg"></center>'
-			'Pulling away from Ivan, Katja lays down on her back. She pulls you on top of her and you are straddling her face, looking down towards her legs. Her tongue immediately begins to lap at your pussy and you feel yourself getting wet.'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan2.jpg"></center>'
+			'Pulling away from Ivan, Katja lays down on her back on the teachers desk, with her legs spread wide. Ivan gets the idea and pulls you up, shoving your face in her pussy. Your tongue immediately begins to lap at her pussy and you feel her getting wet.'
 			*nl
-			'She spreads and lifts her legs up, inviting Ivan in and he wastes no time. Lowering himself between her legs, he slides his <<dick>>cm <<$dick_girth>> dick into her pussy and starts fucking her. You and Ivan start kissing while he fucks Katja and her tongue teases your wet pussy.'
-			'You and Katja are both moaning in pleasure as Ivan looks into your eyes and says "I want to fuck you now."'
-			gs 'arousal', 'cuni', 10, 'group'
-			act 'Ivan fucks you':
+			'Ivan grabs the bottle of lube, lubing up his dick and rubbing some of it on your asshole, as you keep eating Katja out. He rubs the tip of his lubed dick against your butthole making it slippery, then he slides his <<dick>>cm <<$dick_girth>> dick into your ass and starts fucking your butt. Several minutes of this goes by, Ivan isn''t to rough, he adjust his speed and depth based on your moans, making it feel good the whole time. You and Katja are both moaning in pleasure as she looks into his eyes and says "I want you to fuck me now."'
+			gs 'arousal', 'cuni_give', 3, 'group', 'lesbian'
+			gs 'arousal', 'anal', -3, 'group'
+			gs 'stat'
+			act 'Ivan fucks Katja':
 				*clr & cla
-				pcs_horny += 10
+				if npc_ass['A14'] < dick: npc_ass['A14'] += 1
+				if npc_ass['A14']*2 < dick: npc_ass['A14'] += 1
+				if katjaQW['anal_quest'] = 2: katjaQW['anal_quest'] = 3
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/69doggy.jpg"></center>'
-				'Ivan pulls out of Katja and gets up. You lean forward and begin to lick Katja''s soaking wet pussy, your tongue easily sliding inside her in place of Ivan''s dick. Ivan walks around and kneels down behind you, near Katja''s head.'
-				'Within seconds, you feel Ivan''s <<dick>>cm <<$dick_girth>> cock slide inside your wet pussy and he starts pounding you balls deep as Katja sucks his balls. Ivan fucks you for several more minutes while you eat Katja out. Her body begins to convulse as she starts having an orgasm.'
-				'Hearing her cum, Ivan beings to grunt and pick up the pace.'
-				gs 'arousal', 'cuni_give', 10, 'group'
-				gs 'arousal', 'vaginal', 10, 'group'
-				minut -= 10
-				act 'Surprise':
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan3.jpg"></center>'
+				'Ivan pulls out of you and pulls you from Katja, then he slides her off the desk as he flips her over effortlessly, until she is facing away bent over the desk. You kneel down next to them and hold Katja''s butt cheeks apart as Ivan lubes up her butt, then wasting no time he slides his dick up her ass as well. She hisses a bit and then moans deeply in pleasure. He fucks her butt for several more minutes before he pulls out and says. "Both of you up on the desk, lay on your backs."'
+				gs 'arousal', 'voyeur_sex', 3, 'group'
+				gs 'stat'
+				act 'Get on the desk':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/anal.jpg"></center>'
-					'After her orgasm, Katja slides under you. You''re face to face and laying on her stomach, your breasts squeezed together, as she begins to kiss you.'
-					*nl
-					'Ivan starts to pant. It sounds like he is starting to get close himself. Katja reaches up with both her hands and grabs your ass, pulling your cheeks as far apart as she can. Grunting as he fucks you, Ivan understands the invitation.'
-				    'Pulling out of your pussy and slipping his <<dick>>cm <<$dick_girth>> cock into your ass, he hardly misses a beat. In a single stroke, he plunges his <<dick>>cm <<$dick_girth>> dick balls deep into your ass. You gasp and moan in a mixture of surprise, pain and pleasure.'
-					*nl
-					'Looking down at Katja, your eyes lock and you realize now this is what she and Ivan had been talking about when you approached them earlier. You begin to pant while rubbing your clit.'
-					'Katja slides out from under you, kneels down next to you and watches Ivan roughly hammer your ass. You begin to cry out as your body spasms in an intense orgasm.'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan4.jpg"></center>'
+					'You both climb on the desk laying on your backs side by side with your legs spread wide for Ivan. He walks up and you feel his <<dick>>cm <<$dick_girth>> cock slide back into your ass, he picks up the pace and starts fucking you a little harder and faster this time. You glance over and see Katja staring at him as he fucks your ass and rubbing her own clit. Ivan keeps looking to her as she plays with herself.'
 					anal_slip += 4
-					gs 'arousal', 'anal', 10, 'group'
-					gs 'arousal', 'vaginal', 10, 'group'
-					minut -= 10
+					gs 'arousal', 'anal', 3, 'group'
 					act 'Happy ending':
 						*clr & cla
-						katjaQW['slut'] += 2
-						katjaQW['Horny'] = 0
-						sexpartkno = 1
-						spafinloc = 12
-						gs 'cum_manage'
-						orgasm += 1
-						gs 'arousal', 'end'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan5.jpg"></center>'
+						'He suddenly pulls out of you, leaving your ass filling empty suddenly. Within seconds, Ivan''s shoves cock slide inside Katja''s gapping asshole, she moans loudly as he starts fucking her again. You reach over and start rubbing her clit as he keeps fucking her. Ivan fucks her for several more minutes while you rub Katja''s clit. Her body begins to convulse as she starts having an orgasm.'
+						'Hearing her cum, Ivan beings to grunt and pick up the pace. Ivan starts to pant. It sounds like he is starting to get close himself. Katja reaches up with both her hands and grabs your ass, pulling your cheeks as far apart as she can. Grunting as he fucks you, Ivan understands the invitation.'
+						gs 'arousal', 'voyeur_sex', 3, 'group'
+						gs 'arousal', 'vaginal_finger_give', -3, 'group', 'lesbian'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katjacumkiss.jpg"></center>'
-						'Feeling you orgasm, Ivan redoubles his efforts and within minutes, he pulls out of you and begins shooting spurts of cum all over your ass and Katja''s face.'
-						'Ivan sits back on his heels, sweating as he catches his breath and watches Katja lick all his cum off your ass. Once she is done, you sit up next to her. Seeing the cum running down her face, you lean over and lick it up. You then kiss each other with your cum coated tongues, sharing Ivan''s sperm between you.'
-						'Watching this, Ivan only says one word. "Damn!"'
-						*nl
-						'You all start getting dressed and Ivan looks at the two of you. "Girls, we''ve got to do this again some time! What do you say?"'
-						'You look at each other and start giggling before Katja turns to look at him. "If you''re a good boy maybe. We''ll see." You both give him a look that promises, right or wrong, you want another go as badly as he does.'
-						'"I''m always good." he says with a laugh. He quickly finishes dressing and leaves, likely late for practice. Once he is gone, you and Katja look at each other and giggle, then leave as well.'
-						act 'Leave': gt 'gschool_grounds', 'main'
+						act 'Happy ending':
+							*clr & cla
+							katjaQW['slut'] += 2
+							katjaQW['Horny'] = 0
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan6.jpg"></center>'
+							'Ivan redoubles his efforts and within minutes, he pulls out of her ass. Katja slides off the desk first, you follow suit as he starts jerking off, soon you are both kneeling in front of him, just as he begins shooting spurts of cum all over your Katja''s tits and your own.'
+							'Once he finishes cumming Ivan sits in the teachers chair, sweating as he catches his breath and watches the two of you. Ivan only says one word. "Damn!"'
+							*nl
+							'You all start getting dressed and Ivan looks at the two of you. "Girls, we''ve got to do this again some time! What do you say?"'
+							'You look at each other and start giggling before Katja turns to look at him. "If you''re a good boy maybe. We''ll see." You both give him a look that promises, right or wrong, you want another go as badly as he does.'
+							'"I''m always good." he says with a laugh. He quickly finishes dressing and leaves, likely late for practice. Once he is gone, you and Katja look at each other and giggle, then leave as well.'
+							gs 'cum_call', 'breasts', 'A3', 1
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Leave': gt 'gschool_grounds', 'main'
+						end
 					end
 				end
 			end
@@ -507,7 +496,7 @@ if $ARGS[0] = 'rand_bj':
 			pose = 0
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet5.jpg"></center>'
 			'You pull away from his dick and get up. Leaning over a toilet and resting your hands on the wall, you invitingly shake your ass and encourage him. "Come on baby, I need you to fuck me right now! I''m so horny right now, please fuck me!"'
-			'Your classmates have totally quietened down now, no longer making any brash remarks. This is going to be a day to remember for them. Minutes ago, they were all hoping you would give <<$boydesc>> a rough time. Now they all want to be him.'
+			'Your classmates have totally quietened down now, no longer making any brash remarks. This is going to be a day to remember for them. Minutes ago, they were all hoping you would give him a hard time. Now they all want to be him.'
 			if $pantyworntype ! 'none':
 				act 'Remove panties':
 					*clr & cla
@@ -515,7 +504,7 @@ if $ARGS[0] = 'rand_bj':
 					'You don''t want your panties to get in the way and so quickly slide them down your legs and stuff them in your pocket.'
 					gs 'dinSex', 'wear_condom'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet4.jpg"></center>'
-					'<<$boydesc>> does not need any more encouragement and rubs his cock against your sopping fuckhole, slamming it in all the way on the first thrust. He then begins to fuck you in short, furious strokes and soon the room is filled with the sloppy sound of his balls slapping against your clit.'
+					'He does not need any more encouragement and rubs his cock against your sopping fuckhole, slamming it in all the way on the first thrust. He then begins to fuck you in short, furious strokes and soon the room is filled with the sloppy sound of his balls slapping against your clit.'
 					gs 'arousal', 'vaginal', 5
 					gs 'stat'
 					act 'Mount him':
@@ -532,7 +521,7 @@ if $ARGS[0] = 'rand_bj':
 			else
 				gs 'dinSex', 'wear_condom'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet4.jpg"></center>'
-				'<<$boydesc>> does not need any more encouragement and rubs his cock against your sopping fuckhole, slamming it in all the way on the first thrust. He then begins to fuck you in short, furious strokes and soon the room is filled with the sloppy sound of his balls slapping against your clit.'
+				'He does not need any more encouragement and rubs his cock against your sopping fuckhole, slamming it in all the way on the first thrust. He then begins to fuck you in short, furious strokes and soon the room is filled with the sloppy sound of his balls slapping against your clit.'
 				gs 'arousal', 'vaginal', 5
 				gs 'stat'
 				act 'Mount him':
@@ -553,11 +542,11 @@ if $ARGS[0] = 'rand_sex':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_scool1.jpg"></center>'
-	'You know there are some unfinished houses behind the school that are usually abandoned. You take <<$boydesc>> there, away from the curious eyes of his friends so you can have some alone time. Your pussy is soaking wet right now and you bend over, inviting him to ram his dick into you and fuck you good.'
+	'You take him to the old abandoned school, away from the curious eyes of his friends so you can have some alone time. Your pussy is soaking wet right now and you bend over, inviting him to ram his dick into you and fuck you good.'
 	act 'Spread your legs':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_scool2.jpg"></center>'
-		'<<$boydesc>>, being the gentleman that he is, isn''t just looking for a quick fuck. He lays you down on your back and puts his face between your legs, rubbing his fingers over your dripping pussy lips. Then he starts to kiss your lips, teasingly running his tongue over them between kisses. After he finds your clitoris a few times, your moans grow louder and you arch your back. He backs down just enough for you to not orgasm. For the next few minutes, he keeps edging you with an evil grin on his face, ignoring your begging.'
+		'He, being the gentleman that he is, isn''t just looking for a quick fuck. He lays you down on your back and puts his face between your legs, rubbing his fingers over your dripping pussy lips. Then he starts to kiss your lips, teasingly running his tongue over them between kisses. After he finds your clitoris a few times, your moans grow louder and you arch your back. He backs down just enough for you to not orgasm. For the next few minutes, he keeps edging you with an evil grin on his face, ignoring your begging.'
 		gs 'arousal', 'cuni', 10
 		gs 'stat'
 		act 'He fucks your pussy':
@@ -567,7 +556,7 @@ if $ARGS[0] = 'rand_sex':
 			gs 'cum_call', '', $boy, 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_scool3.jpg"></center>'
 			$orgasm_or = 'yes'
-			$orgasm_txt = 'Taking you upstairs to a window sill, <<$boydesc>> tells you to lay down on your back on the ledge. Once you oblige, he spreads your legs and slowly slides his cock into your dripping pussy, beginning to fuck you in low, long strokes. Every thrust puts him in a little deeper and when he bottoms out in you, he begins to fuck you in earnest. You''ve given into your pleasure a long time ago; you are nothing but putty in his hands, letting him fuck you however he wants as long as you get off on it. Before too long you reach your orgasm and grasp your arms tightly around his neck to keep yourself from falling out of the window. Your spasming pussy is milking his cock and you can tell he''s getting close.'
+			$orgasm_txt = 'Taking you upstairs to a window sill, he tells you to lay down on your back on the ledge. Once you oblige, he spreads your legs and slowly slides his cock into your dripping pussy, beginning to fuck you in low, long strokes. Every thrust puts him in a little deeper and when he bottoms out in you, he begins to fuck you in earnest. You''ve given into your pleasure a long time ago; you are nothing but putty in his hands, letting him fuck you however he wants as long as you get off on it. Before too long you reach your orgasm and grasp your arms tightly around his neck to keep yourself from falling out of the window. Your spasming pussy is milking his cock and you can tell he''s getting close.'
 			gs 'dinsex', 'vaginal_sex', 10
 			gs 'stat'
 			act 'Take his load in your mouth':
@@ -578,7 +567,7 @@ if $ARGS[0] = 'rand_sex':
 				gs 'arousal', 'end'
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_scool7.jpg"></center>'
-				'<<$boydesc>> pulls you up from the window sill and tells you to get down on your knees before him. "Open your mouth, <<$pcs_nickname>>." he says and you happily oblige. He shoves his dick inside your mouth and you enthusiastically begin to suck him off, wanting to feel him squirt his load. Unable to withstand your sweet torture any longer, <<$boydesc>> growls and you feel the squirts of his cum land on your tongue. It was too much for you and some of it dribbles down your chin and onto your chest, despite your best efforts to swallow it all.'
+				'He pulls you up from the window sill and tells you to get down on your knees before him. "Open your mouth, <<$pcs_nickname>>." he says and you happily oblige. He shoves his dick inside your mouth and you enthusiastically begin to suck him off, wanting to feel him squirt his load. Unable to withstand your sweet torture any longer, he growls and you feel the squirts of his cum land on your tongue. It was too much for you and some of it dribbles down your chin and onto your chest, despite your best efforts to swallow it all.'
 				*nl
 				'After he admires his handiwork for a second, he notices the time. "Oh crap! <<$pcs_nickname>>, we''re going to be late for class!"'
 				'You both quickly get dressed and run as fast as you can to make it to class on time.'
@@ -589,10 +578,10 @@ if $ARGS[0] = 'rand_sex':
 			*clr & cla
 			if analplugin = 1:
 				analplugin = 0
-				'<<$boydesc>> plays with your butt plug for a moment before pulling it out. Your anus gapes slightly from being filled for so long. He reassures you, "Don''t worry babe, I''ll be filling that soon enough."'
+				'He plays with your butt plug for a moment before pulling it out. Your anus gapes slightly from being filled for so long. He reassures you, "Don''t worry babe, I''ll be filling that soon enough."'
 			end
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_scool4.jpg"></center>'
-			'<<$boydesc>> wants something a little different today and carefully rubs the head of his dick against your anus. The head of his cock is quite large, and it''s quite difficult to get in. "He licked me so good he deserves this." you tell yourself.'
+			'He wants something a little different today and carefully rubs the head of his dick against your anus. The head of his cock is quite large, and it''s quite difficult to get in. "He licked me so good he deserves this." you tell yourself.'
 			'You whine from pain when his cock enters you and ask him to take it slow for a moment so you can get used to his size. He''s happy to oblige and rubs your pussy slowly in the meantime, occasionally darting a finger in. It feels so good! With him massaging you like this, you feel the pain subsiding quickly. It still hurts a little, but when he begins to move his hips you moan loudly - not from pain, but pleasure!'
 			gs 'arousal', 'anal', 5
 			gs 'stat'
@@ -600,7 +589,7 @@ if $ARGS[0] = 'rand_sex':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_scool5.jpg"></center>'
 				'After a few minutes of gentle ass fucking, he pulls you off the window ledge and gets on his back. You don''t need any invitation and straddle him before he''s even fully on the ground, guiding his cock back to your asshole. You control the pace now and you spit in your hand quickly and rub it on his dick before you slowly slide down on it. It''s still not completely pain-free. "No surprise given his size" you think to yourself.'
-				'<<$boydesc>> is definitely encouraged by your eagerness to put his cock back in your asshole. Even though you thought you could control the pace, he proves you wrong and begins to piston his hips against your stretched hole. You squirm, but the pleasant feelings start to take over again when he thrusts a few fingers into your pussy. He can feel his cock through the thin partition, rubbing it when his cock enters you once more.'
+				'He is definitely encouraged by your eagerness to put his cock back in your asshole. Even though you thought you could control the pace, he proves you wrong and begins to piston his hips against your stretched hole. You squirm, but the pleasant feelings start to take over again when he thrusts a few fingers into your pussy. He can feel his cock through the thin partition, rubbing it when his cock enters you once more.'
 				gs 'arousal', 'anal', 10
 				gs 'stat'
 				act 'Continue': 
@@ -1258,7 +1247,7 @@ if $ARGS[0] = 'femdom_petka_doggy':
 	'You grin. "Tell me you like taking my cock up your ass."'
 	'He moans in pleasure. "Yes, it feels so good."'
 	'You slap his ass and stop moving. "Beg me to fuck your ass."'
-	'He glances back at you. "Please fuck my ass" he begs. Since he is begging, you start really fucking his ass hard and fast. He both groans in pain and moans in pleause, but it sounds like the moans are louder.'
+	'He glances back at you. "Please fuck my ass" he begs. Since he is begging, you start really fucking his ass hard and fast. He both groans in pain and moans in pleasure, but it sounds like the moans are louder.'
 	gs 'arousal', 'anal_strap_give', 5, 'dom'
 	gs 'stat'
 	act 'Fuck your buttslut':

+ 3 - 3
locations/hookup.qsrc

@@ -447,7 +447,7 @@ if $ARGS[0] = 'bj_react1.2':
 						gs'hookup','generous_lick'
 					else
 						'"Saving yourself for marriage but still give blowjobs to strangers?" he asks pointedly.'
-						if StoryLine = 1: 
+						if mid($start_type,1,2) = 'sg': 
 							'"I don''t know," you shrug. "Ask my mom why it matters so much."'
 						else
 							'You shrug. "I''m still a virgin aren''t I?"'
@@ -507,7 +507,7 @@ if $ARGS[0] = 'bj_react2':
 						gs'hookup','generous_lick'
 					else
 						'"Saving yourself for marriage but still give blowjobs to strangers?" he asks pointedly.'
-						if StoryLine = 1: 
+						if mid($start_type,1,2) = 'sg': 
 							'"I don''t know. Ask my mom why it matters so much," you shrug.'
 						else
 							'You shrug. "I''m still a virgin aren''t I?"'
@@ -666,7 +666,7 @@ if $ARGS[0] = 'bj2':
 						'"Sorry, but I''m saving myself for marriage," you say apologetically, reaching for your clothes.'
 						if rand(0,1) = 1:
 							'"Saving yourself for marriage but still give blowjobs to strangers?" he asks pointedly.'
-							if StoryLine = 1: 
+							if mid($start_type,1,2) = 'sg': 
 								'"I don''t know. Ask my mom why it matters so much," you shrug.'
 							else
 								'You shrug. "I''m still a virgin aren''t I?"'

+ 1 - 1
locations/hookup_after.qsrc

@@ -1817,7 +1817,7 @@ if $ARGS[0] = 'sleep':
 		gs'sleep','simple'
 	end	
 	
-	if StoryLine = 1 and home_owned[2] = 1: sveta_punishment['no_come_home'] = 1
+	if mid($start_type,1,2) = 'sg' and home_owned[2] = 1: sveta_punishment['no_come_home'] = 1
 	gt'hookup_morning','morning'
 end
 --- hookup_after ---------------------------------

+ 2 - 2
locations/hookup_morning.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'morning':
 		'Your mind stirs and you slowly come to consciousness. Your first thoughts are...'
 		act'<i>Yawn</i>':gt'hookup_morning','yawn_wake'
 	end
-	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
+	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
 		act'School!':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
@@ -150,7 +150,7 @@ if $ARGS[0] = 'confused':
 		'"Yeah," you mumble back.'
 		gs'hookup_morning','wakeup'
 	end
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		act'Mom!':gt'hookup_morning','mom'
 	end
 end

+ 0 - 101
locations/hotel.qsrc

@@ -1,101 +0,0 @@
-# hotel
-
-if $ARGS[0] = 'foyer':
-	*clr & cla
-	nom_o[1] = 100
-	nom_o[2] = 1000
-	nom_o[3] = 10000
-	nom_o[4] = 100000
-	$loc = 'hotel'
-	$menu_loc = 'hotel'
-	$loc_arg = 'foyer'
-	$menu_arg = 'foyer'
-	menu_off = 0
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/industrial/casino/metrd.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
-
-	act 'Leave': minut += 5 & gt 'city_center'
-
-	act 'Go to the reception desk': gt 'hotel', 'reception'
-	
-	act 'Go to the lift': 
-		*clr & cla
-		minut += 1
-		gs 'stat'
-		msg 'Excuse me, but the elevator is not working'
-		gt 'hotel', 'foyer'
-	end
-end
-
-if $ARGS[0] = 'reception':
-	*clr & cla
-	menu_off = 1
-	minut += 1
-	gs 'stat'
-	'<right><img <<$set_imgh>> src="images/locations/city/industrial/casino/metrd.jpg"></right>'
-	'You walk up to the front reception and get greeted by a smiling young woman behind the counter.'
-	'"How can I help you?" she asks.'
-
-	act 'Go back to the foyer': minut += 1 & gt 'hotel', 'foyer'
-	
-	act 'See the room descriptions':
-		cla
-		minut += 1
-		gs 'stat'
-		'There are 4 types of rooms available:'
-		'1. Budget rooms, our most simplest rooms for the ones that just want a bed to sleep the night. There''s a public bathroom shared with the rest of the floor.'
-		'2. Standard rooms, our reasonably priced rooms. Every room has a private bathroom and a TV.'
-		'3. Suites, our luxurious room. Beside a private bathroom there''s also an extra livingroom.'
-		'4. Presidential Suite, our most prized room with all the modern necessities. Free room service included.'
-
-		act 'Continue': gt 'hotel', 'reception'
-	end
-
-	if tobiQW = 2000:
-		act 'Why is the hotel so crowded?':
-			cla
-			tobiQW = 2001
-			minut += 1
-			'"Why so the hotel so crowded today?" you ask.'
-			'"There''s an conference on indigenous languages, they meet every year and complain about their disappearing languages." she says laughing.'
-				act 'Move away': gt 'hotel', 'foyer'
-		end
-	end
-
-	act 'Rent a room':
-		cla
-		minut += 1
-		gs 'stat'
-		*nl
-		'"I would like to rent a room." you tell the girl at the counter.'
-		'"Unfortunately, we have no rooms available." she replies.'
-		act 'Move away': gt 'hotel', 'foyer'
-	end
-end
-
-
---- hotel ---------------------------------
-

+ 39 - 39
locations/hotel_anna.qsrc

@@ -69,7 +69,7 @@ if ARGS[0] = 1:
 			'"I''m grateful Miss Igorevna, I will have to think about it."'
 			'"I''m glad you came and please, call me Anna. Now I have things to do so you''ll have to leave for now." Anna Igorevna leads you to the door. "See you soon <<$pcs_nickname>>."'
 
-			act 'go away': gt'HotelHole'
+			act 'go away': gt'pav_hotel'
 		end
 	end
 end
@@ -157,7 +157,7 @@ if $ARGS[0] = '2a':
 				'"So you are a switch?"'
 				'Anna smiles, "Very astute <<$pcs_firstname>>, I am in my own time and sometimes professionally but my job now requires me to be Dominant. We will get to that in another chat our time is limited. Just remember both the sub and the Dom get pleasure from their roles and we''ll talk about some more fun stuff next time."'
 				'Anna politely leads you to the exit.'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 		end	
 	end
@@ -290,7 +290,7 @@ if $ARGS[0] = '3b':
 			'Anna presents you some toys to choose from:
 			<table border=1><tr><td><a href="exec:gs ''hotel_anna_gear'', ''toys_paddle''">Paddle</a></td><td><a href="exec:gs ''hotel_anna_gear'', ''toys_vacuum''">Vacuum cups</a></td><td><a href="exec:gs ''hotel_anna_gear'', ''toys_wheel''">Wattenburg wheel</a></td><td><a href="exec:gs ''hotel_anna_gear'', ''toys_wand''">Violet wand</a></td></tr>'
 
-			act 'go away': gt'HotelHole'
+			act 'go away': gt'pav_hotel'
 		end
 		act'Decline':
 			minut += 5
@@ -307,7 +307,7 @@ if $ARGS[0] = '3b':
 			end
 			'"I think it''s time for me to leave"'
 			'"Of course my dear, we can do this another time if you are ever interested." Anna leads you to the door.'
-			act 'Leave': gt'HotelHole'
+			act 'Leave': gt'pav_hotel'
 		end
 	end
 end
@@ -406,7 +406,7 @@ if $ARGS[0] = '4a':
 					!!Don''t forget to move the TR back when re adding this
 					!!'<td><a href="exec:gs ''hotel_anna_gear'', ''restraints_leash''">Collar and leash</a></td><td><a href="exec:gs ''hotel_anna_gear'', ''restraints_cuff''">Cuffs</a></td>'
 
-					act 'go away': gt'HotelHole'
+					act 'go away': gt'pav_hotel'
 				end
 				act'Skip the demo':
 					minut += 10
@@ -415,7 +415,7 @@ if $ARGS[0] = '4a':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna2restr4.jpg"></center>'
 					'"Thank you Anna but I should go."'
 					'"Of course dear, if you''ll forgive me getting in and out of this swing is a bit awkward so I won''t walk you to the door."'
-					act 'Leave': gt'HotelHole'
+					act 'Leave': gt'pav_hotel'
 				end
 			end
 		end
@@ -623,7 +623,7 @@ if ARGS[0] = 5:
 			cla
 			gs 'stat'
 			'<font color = #DC143C>"I''m sorry Anna, i think i''ve made a mistake."</font> You find your best excuse to explain Anna you don''t feel comfortable; she seems to understand your apologies, and she gave you a quick overview on what you will miss today. She explay about the order of a proper intercourse, and the different way to approach at it with the same results; also she gave you some tip again about D/s relationship and the correct way to refer to the partner and the behaviour that has to be assumed within the relationship. She doesn''t forget to remind you about the warm up and the aftercare. She cut quickly telling you that this is all she can teach you with words and that a practical session would be the best; since you were not agree this end your session. Anna doesn''t lose the chance to tell you that she will miss you for this session, without letting you feel the weight of your decision: it seems this doesn''t have an impact on your session and again she reassure you telling that you have to do what you are comfortable with. You quickly exchange your greeting and both of you return to their own things to do.  '
-			act 'go away': gt'HotelHole'
+			act 'go away': gt'pav_hotel'
 		end	
 	end
 end
@@ -741,13 +741,13 @@ if ARGS[0] = 7:
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start0a.jpg"></center>'
 					'<font color = blue> "Understandable. Well in that case we can only talk about how things are going in the world..." </font> Both you and Anna spend an hour speaking of various thing, sometimes the arguments drop on the BDSM but mostly it''s unrelated to it... . It seems that Anna couldn''t teach you nothing more without practice... . At the end she lead you to the exit letting you know she''s avaible for further experimentation... <font color = blue> "...and...if you want to return on our steps...feel free to pass anytime."</font> Then she give you two great kisses on your cheeck and you go on your own way...'
-					act'Thanks Anna, see you...': gt'HotelHole'
+					act'Thanks Anna, see you...': gt'pav_hotel'
 				end
 			end
 		end
 	end
 end
-!		act 'Listen': gt'HotelHole'
+!		act 'Listen': gt'pav_hotel'
 
 if ARGS[0] = 8:
 	!Conclusion of the introduction, Anna gives you the card and tells you to come meet her at 
@@ -928,7 +928,7 @@ if $ARGS[0] = 'Anna_sub_sessionN':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub9.jpg"></center>'
 			'<font color = blue>"Yes yes! Nice!...those colors suits you well..."</font> Anna complete the work, and you are "ready to sleep"; she moved the ropes from the front and  she secured your wirst with them, then she add a gag and a bandage around your eyes <font color = blue>"...and that''s if i want to read at night and sub wants to sleep..."</font> Anna explain all the gear you are now wearing and something more you were not able to try. At the end she free you from every restriction, and you are finally free to go.'
-			act'...': gt'Hotelhole'
+			act'...': gt'pav_hotel'
 		end
 	end
 	act'...N-no...': 
@@ -936,7 +936,7 @@ if $ARGS[0] = 'Anna_sub_sessionN':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub9.jpg"></center>'
 		'<font color = blue>"As you wish, in that case let me work...i need some time, i don''t want them to be tight."</font> She start putting some ropes to force your knees stay bend; after that she secure your wirst with another ropes and pass its ends through a big ring pending from the ceiling...<font color = blue>"Nice!...those colors suits you well!"</font>... She finished adding a gag and a bandage around your eyes <font color = blue>"...and that''s if i want to read at night and sub wants to sleep..."</font> Anna explain all the gear you are now wearing and something more you were not able to try. At the end of the session she free you from every restriction, and you are finally free to go.'
-		act'...': gt'Hotelhole'
+		act'...': gt'pav_hotel'
 	end
 end
 
@@ -951,14 +951,14 @@ if $ARGS[0] = 'Anna_sub_sessionD':
 		AnnaQW['sub'] += 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub8.jpg"></center>'
 		'<font color = blue> "...But i don''t want."</font><br><font color = #DC143C>"..."</font><br>Anna continue as nothing happened...<font color = blue>"...the gag will allow me to rest in peace, and if the sub snort, i can poke him/her pulling the rope..."</font><br><font color = #DC143C>...''...she...she...refuse...me...?...'' ...</font><br><font color = blue>"...and we finished for today."</font> Finally she free you from every restriction, and you are free to go.<br><font color = #DC143C>...''......'' ...</font>'
-		act'Leave': gt'Hotelhole'
+		act'Leave': gt'pav_hotel'
 	end
 	act'...': 
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub8.jpg"></center>'
 		'Anna continue carefully avoiding your breast area...<font color = blue>"...the gag will allow me to rest in peace, and if the sub snort, i can poke him/her pulling the rope..."</font><br><font color = #DC143C>...''...i don''t snort!...'' ...</font><br><font color = blue>"...and we finished for today."</font> Finally she free you from every restriction, and you are free to go.'
-		act'Leave': gt'Hotelhole'
+		act'Leave': gt'pav_hotel'
 	end
 end
 
@@ -1483,7 +1483,7 @@ if $ARGS[0] = 'Anna_hurt_end':
 				BDSM_Knowledge -= 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub8.jpg"></center>'
 				'<font color = blue> "...But i don''t want."</font>Anna pause for a moment and with a serious tone...<font color = blue>"I told you: never let your feeling takes unaware decisions."</font><br><font color = #DC143C>"...But...you... ."</font><br><font color = blue>"There''s no "but", neither "you" or "me". Is it worth to let feelings take decision instead of you? Are you willing to gain the trust of someone risking your healt for a crush or just because you feel guilty?"</font>. Anna got a point: a big one; you may have earned some trust in her today but it''s not her teaching... .</font><br><font color = #DC143C>...''...how...how many people should have answer me that way being at her place?...she gave me only reason to trust her...and i...i...'' ...</font><br>Anna continue as nothing happened...<font color = blue>"...and the gag will allow me to rest in peace..."</font>At the end free you from every restriction, and she let you to go; on your way back you reflect on your behaviour. <br><font color = #DC143C>...''...she''s right...another person could have take advantage of the situation...'' ...</font> The session you made today was all but scary; you regret to not trust her that time and you are sure that if something would have happened that day only you could have been the reason. But you know that you can earn back her trust...day by day... .'
-				act'Leave': gt'Hotelhole'
+				act'Leave': gt'pav_hotel'
 			end
 		end
 		act'...': 
@@ -1491,7 +1491,7 @@ if $ARGS[0] = 'Anna_hurt_end':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub8.jpg"></center>'
 			'Anna continue carefully avoiding your breast area...<font color = blue>"...the gag will allow me to rest in peace, and if the sub snort, i can poke him/her pulling the rope..."</font><br><font color = #DC143C>...''...'' ...</font><br><font color = blue>"...and we finished for today."</font> At the end free you from every restriction, and she let you to go; on your way back you reflect on your behaviour. Anna never forced you, and the session you made today was all but scary; you regret to not trust her that time and you are sure that if something would have happened that day only you could have been the reason. But you know that you can earn back her trust...day by day... .'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 	end
 end
@@ -1513,14 +1513,14 @@ if $ARGS[0] = 'Anna_end_brat':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/brat2a.jpg"></center>'
 			'<font color = blue> "..." </font><br><font color = #DC143C> "...y-you are kicking me out of your life...i-it was all my fault...and...b-but..." </font><br><font color = blue> "...It''s a secure environment, maybe a bit hard for you right now...but you will make the right choice. I''m sure... ." </font><br><font color = #DC143C> "...I-i..." </font><br><font color = blue> "It will cost a bit i won''t hide it, but if that''s your interest it will repay you; you''ll find all the info at the reception." </font><br>That''s it: the stone you had crushing on you is now a mountain you''ll never be able to carry...<font color = #DC143C> "...I-i...i...understand Miss Igorevna. I-it''s time for me to go." </font> You made to walk to the exit and Anna stand to lead you out...<br><font color = blue> "...Mistakes never comes from one single side... <<$pcs_nickname>> ... . Here''s the ticket, do not forget it." </font>. You cannot stay there or a single more second, you take the ticket and made your step through the door... ...yet... '
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		act'...':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/brat2b.jpg"></center>'
 			'<font color = blue> "...It''s a secure environment, maybe a bit hard for you right now...but you will make the right choice. I''m sure... ." </font><br><font color = #DC143C> "...I...i see...i''m out." </font><br>But Anna doesn''t stop to speak despite your words. <font color = blue> "It will cost a bit i won''t hide it, but if that''s your interest it will repay you; you''ll find all the info at the reception." </font><br>That''s it: the stone you had crushing on you is now a mountain you''ll never be able to carry...<font color = #DC143C> "...I...understand Ann... ." </font> You stop...your thoughts goes to the relationship with Anna that''s now stuck forever; how could you gain her trust again if you will not see her anymore? <font color = #DC143C> "...It''s time for me to go." </font> You cannot stay there for a single more second and made your step through the door forgetting all the good manners...<br><font color = blue> "The ticket, do not forget it." </font> Anna approach and gave you the ticket then she walk you out...<br><font color = #DC143C> "...Goodbye... Miss Igorevna." </font><br><font color = blue> "Goodbye... <<$pcs_nickname>> ... ." </font>.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 	end
 	act'...It seems a ticket...':
@@ -1533,14 +1533,14 @@ if $ARGS[0] = 'Anna_end_brat':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/brat2a.jpg"></center>'
 			'<font color = blue> "...It''s a secure environment, maybe a bit hard for you right now...but you will make the right choice. I''m sure... ." </font><br><font color = #DC143C> "..." </font><br>Anna doesn''t fill your silence and continue to speak... . <font color = blue> "It will cost a bit i won''t hide it, but if that''s your interest it will repay you; you''ll find all the info at the reception." </font><br>That''s it: she didn''t say directly but it''s pretty clear...<font color = #DC143C> "...I...i see...i''m out." </font> The relationship with Anna now is stuck forever; how could you gain her trust again if you will not see her anymore? <font color = #DC143C> "...You are kicking me out from your life... it''s...it''s better for me to go..." </font> Anna doesn''t stop you and walk you out... . You are forgetting the ticket she gave you, but she''s holding it in her hand and she pass it to you; then she turns and speak <br><font color = blue> "You would be aware of a kick of mine... ." </font>...<br>You don''t have much to say, you take the ticket and put it in your purse <font color = #DC143C> "...Goodbye... Miss Igorevna." </font><br><font color = blue> "Goodbye... <<$pcs_nickname>> ... ." </font>.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		act'...':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/brat2b.jpg"></center>'
 			'You have nothing to say, instead of speak you look at her expecting some other explanation, but she continue as nothing but ordinary happened. <font color = blue> "...It''s a secure environment, maybe a bit hard for you right now...but you will make the right choice. It will cost a bit i won''t hide it, but if that''s your interest it will repay you; you''ll find all the info at the reception." </font><br>That''s it: she didn''t say directly but it''s pretty clear...<font color = #DC143C> "...I...i see...i''m out." </font> The relationship with Anna now is stuck forever; how could you gain her trust again if you will not see her anymore? <font color = #DC143C> "... i have to go..." </font> Anna doesn''t stop you and walk you out... . You are forgetting the ticket she gave you, but she''s holding it in her hand and she pass it to you; then she turns and say  <br><font color = blue> "Here. Do not forget it." </font>...<br>You don''t have much to say, you take the ticket and put it in your purse... <font color = #DC143C> "...Goodbye... Miss Igorevna." </font><br><font color = blue> "Goodbye... <<$pcs_nickname>> ... ." </font>.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 	end
 	act'What does this have to do with BDSM?':
@@ -1553,14 +1553,14 @@ if $ARGS[0] = 'Anna_end_brat':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/brat2a.jpg"></center>'
 			'<font color = blue> "..." </font><br><font color = #DC143C> "...You sure have something else to teach me...why..." </font><br><font color = blue> "...It''s a secure environment, maybe a bit hard for you right now... you will make the right choice anyway. It will cost a bit i won''t hide it, but if that''s your interest it will repay you; you''ll find all the info at the reception." </font><br>That''s it: she didn''t say directly but it''s pretty clear...<font color = #DC143C> "...I...i see...." </font> You want to yell at her; at the same time you think you earned that treatment; you are stuck, as the relationship with Anna; how could you gain her trust again if you will not see her anymore? <font color = #DC143C> "...I...i..." </font> You make a run toward the door...<br><font color = blue> "<<$pcs_firstname>><<$pcs_lastname>>!" </font>...but Anna stop you and move toward you <font color = blue> "The ticket... ."</font>...<font color = blue> "...Do not forget it." </font>...<br>You don''t have much to say, all you want to do is running away; you take the ticket and move out... <font color = #DC143C> "..." </font><br><font color = blue> "...Goodbye... <<$pcs_nickname>>." </font>.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		act'...':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/brat2b.jpg"></center>'
 			'<font color = blue> "...It''s a secure environment, maybe a bit hard for you right now... you will make the right choice anyway. It will cost a bit i won''t hide it, but if that''s your interest it will repay you; you''ll find all the info at the reception." </font><br>That''s it: she didn''t say directly but it''s pretty clear...<font color = #DC143C> "...I...i...." </font> You are stuck, as the relationship with Anna; how could you gain her trust again if you will not see her anymore? <font color = #DC143C> "..." </font> You make a run toward the door...<br><font color = blue> "<<$pcs_firstname>><<$pcs_lastname>>!" </font>...but Anna stop you and move toward you <font color = blue> "The ticket... ."</font>...<font color = blue> "...Do not forget it." </font>...<br>You don''t have much to say, all you want to do is running away; you take the ticket and move out... <font color = #DC143C> "..." </font><br><font color = blue> "...Goodbye... <<$pcs_nickname>>." </font>.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 	end
 end
@@ -1580,14 +1580,14 @@ if $ARGS[0] = 'Anna_end_new':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/new2a.jpg"></center>'
 			'<font color = blue> "No my dear; as i said i cannot teach you nothing more right now. You could learn what you want in that place...if you are willing of course." </font><br><font color = #DC143C> "...I-it''s sound like an end..." </font><br><font color = blue> "...That''s depend on you." </font><br><font color = #DC143C> "...B-but there could be something else we can do together..." </font><br><font color = blue> "I''m quite busy actually, but you are free to pass and look for me of course...maybe we''ll go shopping finally...who knows."</font> Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something to do and lead you to the exit... .<br><font color = #DC143C> "...Goodbye Anna..." </font><br><font color = blue> "......Goodbye... <<$pcs_nickname>>." </font>.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		act'...':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/new2b.jpg"></center>'
 			'<font color = blue> "You could learn what you want in that place...if you are willing of course." </font><br><font color = #DC143C> "...I''m sure there''s something else you can teach me..." </font><br><font color = blue> "..." </font><br><font color = #DC143C> "...or that we can do together..." </font><br><font color = blue> "Uhhmmm ...maybe we''ll go shopping finally...who knows. Anyway i''m quite busy actually; you are free to pass and look for me of course..."</font> Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something to do and lead you to the exit... .<br><font color = #DC143C> "...Goodbye Anna..." </font><br><font color = blue> "......Goodbye... <<$pcs_nickname>>." </font>.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 	end
 	act'I see...you want me to take you out...':
@@ -1600,14 +1600,14 @@ if $ARGS[0] = 'Anna_end_new':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/new2a.jpg"></center>'
 			'<font color = blue> "..." </font><br><font color = #DC143C> "...and you''ve nothing more to teach me." </font><br><font color = blue> "I''m pretty sure you could learn some other tips in that place...if you are willing of course." </font><br><font color = #DC143C> "...I see is far beyond you..." </font><br><font color = blue> "..." </font><br><font color = #DC143C> "Well ... we could do something else together..." </font><br><font color = blue> "Uhhmmm ...maybe we''ll go shopping finally...who knows. Anyway i''m quite busy actually; you are free to pass and look for me of course..."</font> Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something else to do and lead you to the exit... .<br><font color = #DC143C> "Goodbye Anna, we''ll see again sometimes...maybe." </font><br><font color = blue> "......Goodbye... <<$pcs_nickname>>." </font>.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		act'...':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/new2b.jpg"></center>'
 			'<font color = blue> "....I''m pretty sure you could learn some other tips in that place...if you are willing of course." </font><br><font color = #DC143C> "...I see... . Well ... we could do something else together..." </font><br><font color = blue> "Uhhmmm ...maybe we''ll go shopping finally...who knows. Anyway i''m quite busy actually; you are free to pass and look for me of course..."</font> Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something else to do and lead you to the exit... .<br><font color = #DC143C> "Well ...then...goodbye Anna, stay well..." </font><br><font color = blue> "......Goodbye... <<$pcs_nickname>>." </font>.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		if Anna_see_adom >= 10:
 			act'Then it''s time for me to teach you something: on your hands and knees! NOW!':
@@ -1615,7 +1615,7 @@ if $ARGS[0] = 'Anna_end_new':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/new2c.jpg"></center>'
 				'<font color = blue> "..." </font><br><font color = #DC143C> "You show resistance...still; but it won''t last long...." </font><br><font color = blue> "...<<$pcs_nickname>>..." </font><br><font color = #DC143C> "...what? you''ve nothing more to teach me." </font><br><font color = blue> "...You could learn some new tips in that place, think about it...if you are willing of course." </font><br><font color = #DC143C> "...Ufff! ...We could spend some "funny" time and you stop when things are becoming interesting...It''s kind of annoying you know?" </font><br><font color = blue> "Uhhmmm ...maybe we''ll have some time to go shopping ...would you like that?. "</font><br><font color = #DC143C> "It''s not a bad idea actually, but you''ll have to earn it... ." </font><br><font color = blue> "Unfortunately i''m quite busy; you are free to pass another time and look for me of course..." </font>Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something else to do and lead you to the exit... .<br><font color = #DC143C> "Goodbye Anna, we''ll see again...maybe." </font><br><font color = blue> "......Goodbye... <<$pcs_nickname>>." </font>.'
-				act'Leave': gt'Hotelhole'
+				act'Leave': gt'pav_hotel'
 			end
 		end
 	end
@@ -1629,14 +1629,14 @@ if $ARGS[0] = 'Anna_end_new':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/new2a.jpg"></center>'
 			'<font color = blue> "..." </font><br><font color = #DC143C> "...You sure have something else to teach me..." </font><br><font color = blue> "As i said not right now... . I''m sure you will make the right choice anyway." </font><br><font color = #DC143C> "...That means we won''t see each other again...." </font><br><font color = blue>"That''s depend on you...and your wardrobe. We can go shopping sometimes...would you like that?. " </font><br>You are a little disappointed about how things turn to be with Anna, you expect all but not that she stop the meeting with you <font color = #DC143C> "..." </font><br><font color = blue> "Think about it; i''m quite busy lately but you are free to pass and look for me of course... " </font>Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something else to do and lead you to the exit... .<br><font color = #DC143C> "Goodbye Anna, i''ll look for you...thanks for your time." </font><br><font color = blue> "......Goodbye... <<$pcs_nickname>>." </font> ...and there''s this ticket...'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		act'...':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/new2b.jpg"></center>'
 			'<font color = blue> "I''m sure you will make the right choice anyway." </font><br><font color = #DC143C> "...We stop our chit chat...that way..." </font><br><font color = blue>"...We can go shopping sometimes...would you like that?. " </font><br>You are a little disappointed about how things turn to be with Anna, you expect all but not that she stop the meeting with you <font color = #DC143C> "..." </font><br><font color = blue> "Think about it; i''m quite busy lately but you are free to pass and look for me of course... " </font>Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something else to do and lead you to the exit... .<br><font color = #DC143C> "...Goodbye Anna, i''ll look for you...thanks for your time." </font><br><font color = blue> "......Goodbye... <<$pcs_nickname>>." </font> ...and there''s this ticket...'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 	end
 
@@ -1657,14 +1657,14 @@ if $ARGS[0] = 'Anna_end_pupil':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/pupil2a.jpg"></center>'
 			'<font color = blue> "No my dear, you''ve done nothing wrong, you would be aware if that was the case. If you want to learn something more about BDSM you could try that place, that''s it. ...If you are willing of course... ." </font><br><font color = #DC143C> "...I-it''s sound like an end..." </font><br><font color = blue> "...That''s depend on you." </font><br><font color = #DC143C> "...B-but there could be something else we can do together..." </font><br><font color = blue> "I''m quite busy actually, but you are free to pass and look for me of course...maybe we''ll go shopping finally...who knows."</font> Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something to do and lead you to the exit... .<br><font color = #DC143C> "...O-ok...Anna...goodbye ..." </font><br><font color = blue> "......Goodbye... <<$pcs_nickname>>." </font>. You left and Anna gave you two kiss on the cheecks; you are not sure if everything is fine, and you got a ticket in your purse...that''s not how you planned your visit.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		act'...':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/pupil2c.jpg"></center>'
 			'<font color = blue> "You could learn what you want in that place...if you are willing of course." </font><br><font color = #DC143C> "...I''m sure there''s something else you can teach me..." </font><br><font color = blue> "..." </font><br><font color = #DC143C> "...maybe...maybe we can do something together..." </font><br><font color = blue> "Uhhmmm ...we could go shopping finally...who knows. Anyway i''m quite busy actually; you are free to pass and look for me of course..."</font> Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something to do and lead you to the exit... .<br><font color = #DC143C> "... Goodbye ... Anna ..." </font><br><font color = blue> "......Goodbye... <<$pcs_nickname>>." </font>. You left and Anna gave you two kiss on the cheecks; you are not sure if everything is fine, and you got a ticket in your purse...that''s not how you planned your visit.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		if Anna_see_asub >= 10:
 			act'...B-but...t-there...t-there could...(deep breath)...there could be something...i...':
@@ -1672,7 +1672,7 @@ if $ARGS[0] = 'Anna_end_pupil':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/pupil2b.jpg"></center>'
 				'<font color = blue> "No." </font><br><font color = #DC143C> "...s-sorry?..." </font><br><font color = blue> "No." </font><br><font color = #DC143C> "..." </font> There''s no reason to reply...<br><font color = blue> "Think about it. You could learn what you want in that place...if you are willing of course." </font><br><font color = #DC143C> "..." </font><br><font color = blue> "I''m quite busy lately; you are free to pass and look for me of course... . Maybe we''ll go shopping finally...if you like the idea...who knows. "</font> Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something to do and lead you to the exit... .<br><font color = #DC143C> "...O-ok...Anna...goodbye ... thanks for the time you spent with me..." </font><br><font color = blue> "It was a pleasure for me too... . Goodbye <<$pcs_nickname>>." </font>. You left and Anna gave you two kiss on the cheecks; you are not sure if everything is fine, and you got a ticket in your purse...that''s not how you planned your visit.'
-				act'Leave': gt'Hotelhole'
+				act'Leave': gt'pav_hotel'
 			end
 		end
 	end
@@ -1686,14 +1686,14 @@ if $ARGS[0] = 'Anna_end_pupil':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/pupil2a.jpg"></center>'
 			'<font color = blue> "..." </font><br><font color = #DC143C> "...you have the last word on that for sure, but i''m pretty sure we didn''t explore all about BDSM..." </font><br><font color = blue> "...You could learn some other tips in that place...if you are willing of course." </font><br><font color = #DC143C> "...I see it''s too much even for you..." </font><br><font color = blue> "..." </font><br><font color = #DC143C> "...I cannot force you...still..." </font><br><font color = blue> "Uhhmmm ...maybe we''ll go shopping finally...who knows. Anyway i''m quite busy actually; you are free to pass and look for me of course..."</font> Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something else to do and lead you to the exit... .<br><font color = #DC143C> "Well...Anna...goodbye. It was a pleasure to spend some time with you..." </font><br><font color = blue> "It was a pleasure for me too... . Goodbye <<$pcs_nickname>>." </font>. You left and Anna gave you two kiss on the cheecks; you are not sure if everything is fine, and you got a ticket in your purse...that''s not how you planned your visit.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		act'...':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/pupil2c.jpg"></center>'
 			'<font color = blue> "...I''m pretty sure there are useful tips to learn in that place...if you are willing of course." </font><br><font color = #DC143C> "...I see..." </font><br><font color = blue> "..." </font><br><font color = #DC143C> "...So...we finished our chit chat. I won''t hide that i''ll miss something..." </font><br><font color = blue> "We could go shopping sometimes...who knows. Anyway i''m quite busy actually; you are free to pass and look for me of course..."</font> Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something else to do and lead you to the exit... .<br><font color = #DC143C> "Well...Anna...goodbye. It was a pleasure to spend some time with you..." </font><br><font color = blue> "It was a pleasure for me too... . Goodbye <<$pcs_nickname>>." </font>. You left and Anna gave you two kiss on the cheecks; you are not sure if everything is fine, and you got a ticket in your purse...that''s not how you planned your visit.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		if Anna_see_adom >= 10:
 			act'Then it''s time for me to teach you something: on your hands and knees! NOW!':
@@ -1701,7 +1701,7 @@ if $ARGS[0] = 'Anna_end_pupil':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/pupil2b.jpg"></center>'
 				'<font color = blue> "...Oh no! Everything but this...i''m too shy..." </font><br><font color = #DC143C> "You are quite difficult to break...isn''t it?" </font><br><font color = blue> "...<<$pcs_nickname>>..." </font><br><font color = #DC143C> "...Got it...i''m starting to learn when it''s useless with you... . It''s kind of frustrating you know?" </font><br><font color = blue> "Uhhmmm ...maybe we could relax going shopping sometimes...would you like that?. "</font><br><font color = #DC143C> "It''s not a bad idea actually, my wardrobe could see a renovation, i feel like i lack in something despite you..." </font><br><font color = blue> "Hehehe a woman''s wardrobe ALWAYS lack in something hehehe. Anyway, think about it, you could learn some useful tips in that place,...if you are willing of course." </font><br><font color = #DC143C> "We''ll see..." </font><br><font color = blue> "Unfortunately i''m quite busy lately; but feel free to pass another time and look for me of course..." </font>Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something else to do and lead you to the exit... .<br><font color = #DC143C> "Well...time to go. Goodbye Anna. It was a pleasure to spend some time with you." </font><br><font color = blue> "It was a pleasure for me too... . Goodbye <<$pcs_nickname>>." </font>.'
-				act'Leave': gt'Hotelhole'
+				act'Leave': gt'pav_hotel'
 			end
 		end
 	end
@@ -1715,14 +1715,14 @@ if $ARGS[0] = 'Anna_end_pupil':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/pupil2a.jpg"></center>'
 			'<font color = blue> "..." </font><br><font color = #DC143C> "...You sure have something else to teach me..." </font><br><font color = blue> "As i said not right now... . I''m sure you will make the right choice anyway.</font><br><font color = #DC143C> "...We ...we won''t see each other again...." </font><br><font color = blue>"What about going shopping sometimes...would you like that?. " </font><br>You expect all but not Anna stopping the meeting with you... <font color = #DC143C> "...going...shopping..." </font><br><font color = blue> "Think about that place...and a nice shop; i''m quite busy lately but you are free to pass and look for me of course... " </font>Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something else to do and lead you to the exit... .<br><font color = #DC143C> "...Goodbye Anna... .Thanks..." </font><br><font color = blue> "It was a pleasure... . Goodbye <<$pcs_nickname>>." </font>. You left and Anna gave you two kiss on the cheecks; you walk the hallway with a ticket in your purse...that''s not how you planned your visit.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		act'...':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/pupil2c.jpg"></center>'
 			'<font color = blue> "You will make the right choice anyway." </font><br><font color = #DC143C> "..." </font>You expect all but not Anna stopping the meeting with you..<br><font color = blue>"What''s that face? I know ...we should go shopping sometimes, would you like that?. " </font><br>. <font color = #DC143C> "...going...shopping..." </font><br><font color = blue> "Think about that place...and a nice shop; i''m quite busy lately but you are free to pass and look for me of course... " </font>Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something else to do and lead you to the exit... .<br><font color = #DC143C> "...Goodbye..." </font><br><font color = blue> "It was a pleasure to spend some time with you... . Goodbye <<$pcs_nickname>>." </font>. You left and Anna gave you two kiss on the cheecks; you walk the hallway with a ticket in your purse...that''s not how you planned your visit.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		if BDSM_Knowledge >= 10:
 			act'Impossible.':
@@ -1730,7 +1730,7 @@ if $ARGS[0] = 'Anna_end_pupil':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/pupil2c.jpg"></center>'
 				'<font color = blue> "Don''t you like the idea?" </font><br><font color = #DC143C> "...I''m sure we didn''t see all about BDSM...you...you sure have something else to teach me..." </font><br><font color = blue> "As i said not right now... ." </font><br><font color = #DC143C> "But...." </font><br><font color = blue> "I''m sure you will make the right choice."</font><br><font color = #DC143C> "..." </font><br><font color = blue> "Think about it. You''ll excuse me but i''m quite busy lately and i have to go right now; feel free to look for me some other times... " </font> She let you understand that she has something else to do and lead you to the exit... . <font color = blue> "...Your ticket." </font> <br>You took the ticket Anna pass you before leaving...<font color = #DC143C> "I...understand... . Goodbye Anna." </font><br><font color = blue> "It was a pleasure... . Goodbye <<$pcs_nickname>>." </font>. <br>You walk the hallway with a ticket in your purse...<font color = #DC143C>...'' ...no. i don''t understand... '' ...</font>...'
-				act'Leave': gt'Hotelhole'
+				act'Leave': gt'pav_hotel'
 			end
 		end
 	end
@@ -1746,14 +1746,14 @@ if $ARGS[0] = 'Anna_end_pupil':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/pupil2a.jpg"></center>'
 			'<font color = blue> "..." </font><br><font color = #DC143C> "...You sure have something else to teach me..." </font><br><font color = blue> "As i said not right now... . I''m sure you will make the right choice anyway.</font><br><font color = #DC143C> "...But but...we won''t see each other again...." </font><br><font color = blue>"What about going shopping sometimes...would you like that?. " </font><br>You expect all but not Anna stopping the meeting with you... <font color = #DC143C> "...going...shopping..." </font><br><font color = blue> "Think about that place...and a nice shop; i''m quite busy lately but you are free to pass and look for me of course... " </font>Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something else to do and lead you to the exit... .<br><font color = #DC143C> "...I...thanks...Anna...i think. ...Goodbye." </font><br><font color = blue> "... Goodbye <<$pcs_nickname>>." </font>. You left and Anna gave you two kiss on the cheecks... . <br>You walk the hallway with a ticket in your purse...<font color = #DC143C>...'' ...why?... '' ...</font>...'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 		act'...':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionend/pupil2c.jpg"></center>'
 			'<font color = blue> "You will make the right choice anyway." </font><br><font color = #DC143C> "..." </font>You expect all but not Anna stopping the meeting with you..<br><font color = blue>"What''s that face? I know ...we should go shopping sometimes, would you like that?. " </font><br>. <font color = #DC143C> "...going...shopping..." </font><br><font color = blue> "Think about that place...and a nice shop; i''m quite busy lately but you are free to pass and look for me of course... " </font>Anna stand up and pass you the paper...<font color = blue> "Do not forget your ticket." </font> She let you understand that she has something else to do and lead you to the exit... .<br><font color = #DC143C> "...Goodbye...Anna..." </font><br><font color = blue> "It was a pleasure to spend some time with you... . Goodbye <<$pcs_nickname>>." </font>. You left and Anna gave you two kiss on the cheecks; you walk the hallway with a ticket in your purse...that''s not how you planned your visit.'
-			act'Leave': gt'Hotelhole'
+			act'Leave': gt'pav_hotel'
 		end
 	end
 end

+ 112 - 112
locations/hotel_anna_gear.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'toys_paddle':
 		$anna_toys_image2
 		'"I think it''s time for me to leave."'
 		'"Of course my dear, maybe another time if you desire." Anna leads you to the door'
-		act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+		act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 	end
 	
 	gs 'hotel_anna_gear', 'toys_paddle_options'
@@ -57,7 +57,7 @@ if $ARGS[0] = 'toys_paddle_options':
 				'"See? Now you have a nice imprint on your butt!"'
 				'"Emmm... thank you Anna... I think it''s time to leave."'
 				'"It was a pleasure <<$pcs_nickname>>. We''ll continue another time." You put on your clothes and let Anna lead you to the exit.'
-				act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+				act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 			end
 		end
 	end
@@ -82,7 +82,7 @@ if $ARGS[0] = 'toys_paddle_options':
 				'Anna has a look, "That''s worked really well you can read it so clearly"'
 				'The word "SLUT" is imprinted on your butt. You admire it for a couple of minutes then redress.'
 				'"OK <<$pcs_nickname>>, it''s time for you to go, we can continue another time." Anna leads you to the door.'
-			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 		end
 	end
 	act'I would prefer to test on you... (dom)':
@@ -101,7 +101,7 @@ if $ARGS[0] = 'toys_paddle_options':
 			else
 				'"Mmmh, it seems mommy <<$pcs_nickname>> will need a lot of practice. Hehehe. Unfortunately for you i''ve got a steel butt from plenty of practice. Still, the main thing is that you get the idea and understand the process. That''s all for today come find me when you want to learn more." Anna leads you to the door.'
 			end
-			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 		end
 	end
 end
@@ -124,7 +124,7 @@ if $ARGS[0] = 'toys_vacuum':
 			gs 'stat'
 			$anna_toys_image5
 			'"Well, I told you I won''t force you and I''m faithful to my promise. Next time I''ll teach you about restraints and maybe another time you can try the vacuum cups if you desire."'
-			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 		end
 	end
 	act'Mmmh...no. But I''d like to see it in action':
@@ -138,7 +138,7 @@ if $ARGS[0] = 'toys_vacuum':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 			'"Well, I told you I won''t force you and I''m faithful to my promise. Next time I''ll teach you about restraints and maybe another time you can try the vacuum cups if you desire."'
-			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 		end
 	end
 	act'On me?':
@@ -156,7 +156,7 @@ if $ARGS[0] = 'toys_vacuum':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 		'"Well, I told you I won''t force you and i''m faithful to my promise. Next time I''l teach you about restraints and maybe another time you can try the vacuum cups if you desire."'
-		act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+		act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 	end
 end
 	
@@ -175,7 +175,7 @@ if $ARGS[0] = 'toys_vacuum2':
 		'After a little time Anna releases the pressure and removes the cup from her nipple.'
 		'"Thanks for the show Anna, it was... impressive."'
 		'Anna smiles, "Thank you it comes with experience. OK <<$pcs_nickname>> that''s all for today."'
-		act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+		act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 	end
 end
 
@@ -195,7 +195,7 @@ if $ARGS[0] = 'toys_vacuum3':
 		$anna_toys_image5
 		'Anna removes the cup from your nipple and you do the same with the other one.' 
 		'"Please, come find me when you want to learn some more <<$pcs_firstname>>."'
-		act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+		act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 	end
 end
 
@@ -236,7 +236,7 @@ if $ARGS[0] = 'toys_wheel':
 						$anna_toys_image4
 						'"I-i... mmmh... emmmh... good?"'
 						'"Well... I cannot guess as to your feelings... What can I say is that you have a really sensitive skin: I''ve used almost no strength to be honest... Anyway I don''t know if this is good for you: you are the only one who can answer that, and that depends on what are you looking for... Anyway we''re done for today, let me show you out you have things to do and I gotta do some housework."'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 					act'Mainly painful...':
 						*clr & cla
@@ -244,7 +244,7 @@ if $ARGS[0] = 'toys_wheel':
 						$anna_toys_image4
 						'"It hurts Anna! Well not only, but I fell mostly pain... is this bad?"'
 						'"Well... I cannot know your feelings... What can I say is that you have a really delicate skin: I''ve used almost no strength to be honest... Anyway how painful this is for you I can''t know: you are the only one who can know that, and that depends on what are you looking for... Anyway we''re done for today, let me lead to the exit you have things to do and I have other things to attend to."'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 					act'I-i...i''m not sure...':
 						*clr & cla
@@ -252,7 +252,7 @@ if $ARGS[0] = 'toys_wheel':
 						$anna_toys_image4
 						'You say while panting. "I-I... I don''t know Anna... I feel a lot... that''s for sure..."'
 						'"Well... i think you now have an idea about the mixed feelings we talked about. In time you will be able to more precisely what you are feeling if you want that is. Anyway we''ve done for today, let me lead to the exit you have things to do and I have a tight schedule today."'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 				end
 			end
@@ -261,7 +261,7 @@ if $ARGS[0] = 'toys_wheel':
 				gs 'stat'
 				$anna_toys_image2
 				'"As you wish. I told you I will not force this on you and I always keep my promises." The session finish and after you exchange few other words Anna leads you to the exit.'
-				act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+				act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 			end
 		end
 		act'Thank you for the offer Anna but i''m a little scared...':
@@ -269,7 +269,7 @@ if $ARGS[0] = 'toys_wheel':
 			gs 'stat'
 			$anna_toys_image2
 			'"As you wish. I told you I won''t make you do anything you don''t want to and I always keep my promises." The session finish and after you exchange few other words Anna leads you to the exit.'
-			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 		end
 	end
 	
@@ -302,7 +302,7 @@ if $ARGS[0] = 'toys_wheel':
 						AnnaQW['trust'] += 1
 						'"Well it has different uses, that''s for sure."'
 						'"Good! That was the main goal... Ok we''ve done for today, let me show you out, you got have homework to do and I have to do some housework."'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 					act'Meh...':
 						*clr & cla
@@ -310,7 +310,7 @@ if $ARGS[0] = 'toys_wheel':
 						$anna_toys_image2
 						'"It dosen''t really do anything for me..."'
 						'"Maybe, or maybe it''s something that simply isn''t for you. In other words YKINMK: Your Kink Is Not My Kink. In a BDSM relationship there''s never just one point of view; to have the maximal benefits from a BDSM relationship a good Dom should always consider a proper way to reward their Sub and the vice versa: a sub should always be faithful and consider their Dom''s wishes. That can includes something that their counterpart maybe doesn''t like; nonetheless it should be considered... and accepted, within limits of course. Ok we''re done for today, let show you out, you have school tomorrow and I have to get the laundry."'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 				end
 			end
@@ -331,7 +331,7 @@ if $ARGS[0] = 'toys_wheel':
 						AnnaQW['trust'] += 1
 						'"Well it have different use, that''s for sure."'
 						'"Good! That was the goal... Ok we''ve done for today, let show you out, you probably have dinner soon and I gotta get started on ours."'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 					act'I don''t think this is for me':
 						*clr & cla
@@ -339,7 +339,7 @@ if $ARGS[0] = 'toys_wheel':
 						$anna_toys_image2
 						'"Dosen''t really do anything for me."'
 						'"That''s fair. In other words YKINMK: Your Kink Is Not My Kink. In a BDSM relationship there''s never just one point of view; to have the maximum benefit from a BDSM relationship a good Dom should always consider a proper way to reward their Sub and vice versa: a sub should always be faithful and consider their Dom''s wishes. That can includes something that their counterpart maybe doesn''t like; nonetheless it should be considered... and accepted, within limits of course. Ok we''re done for today, let me show you out"'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 				end
 			end
@@ -348,7 +348,7 @@ if $ARGS[0] = 'toys_wheel':
 				gs 'stat'
 				$anna_toys_image5
 				'"As you wish. I told you I will not force anything you don''t want on you and I always keep my promises... Anyway the main things is that you have an idea. Ok we''re done for today." The session ends and after you exchange few words Anna leads you to the exit.'
-				act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+				act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 			end
 		end
 		act'I''d rather not':
@@ -356,7 +356,7 @@ if $ARGS[0] = 'toys_wheel':
 			gs 'stat'
 			$anna_toys_image2
 			'"Tha''s fair. Like I told you I won''t force this on you and I always keep my promises." The session ends and after you exchange few words, Anna leads you to the exit'
-			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 		end
 	end
 	act'On me?':
@@ -389,7 +389,7 @@ if $ARGS[0] = 'toys_wheel':
 						$anna_toys_image3
 						'"I-i... mmmh... emmmh... good?"'
 						'"Well... I must say that you have  really sensitive skin: i''ve used almost no strength at all... Anyway You should think about if this is what you are looking for and if it feels good for you... Anyway we''re done for today, let me lead to the door you gotta get home and I have to go get my daughter."'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 					act'Mostly painful...':
 						*clr & cla
@@ -397,7 +397,7 @@ if $ARGS[0] = 'toys_wheel':
 						$anna_toys_image2
 						'"It hurts Anna! Well not only pain... but that''s what I feel the most... is that bad?"'
 						'"I''d say  that you have very delicate skin: i''ve used almost no strength at all to be honest... So you need to ask yourself if feeling mostly pain is the sensation you are looking for... Anyway we''re done for today, let me lead to the door you probably got homework to do and I''ve got to get started on dinner."'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 					act'I-i...i''m not sure...':
 						*clr & cla
@@ -405,7 +405,7 @@ if $ARGS[0] = 'toys_wheel':
 						$anna_toys_image2
 						'You pant as you reply. "I-i... i don''t know Anna... i feel a lot... that''s for sure."'
 						'"Well... i think you have an idea about the mixed feelings I mentioned. So if being kept at a mixed balance between pain and pleasure is what you are looking for this might be just what you are looking for... Anyway we''re done for today, let me lead to the door your mother is probably wondering where you are and I got some laundry to do."'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 				end
 			end
@@ -414,7 +414,7 @@ if $ARGS[0] = 'toys_wheel':
 				gs 'stat'
 				$anna_toys_image2
 				'"I understand. I told you I won''t force this on you and I always keep my promises." The session ends and after you exchange few words Anna leads you to the exit.'
-				act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+				act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 			end
 		end
 		act'Thanks for the offer Anna but i''m a little scared...':
@@ -422,7 +422,7 @@ if $ARGS[0] = 'toys_wheel':
 			gs 'stat'
 			$anna_toys_image2
 			'"I understand. Like I told you I won''t make you do anyhing you don''t want to and I always keep my promises." The session ends and after you exchange few words Anna leads you to the door.'
-			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 		end
 	end
 end
@@ -463,21 +463,21 @@ if $ARGS[0] = 'toys_wand':
 						gs 'stat'
 						AnnaQW['trust'] += 1
 						'"Mmm... I see. Anyway you have nothing to worry about. Stimulation has its purpose after all, and how sensations could be feels can be totally different from person to person. But we have done enough for today, I don''t want to keep you here all evening. Let me show you out." You say thank you and go outside.'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 					act'Clit...':
 						*clr & cla
 						gs 'stat'
 						AnnaQW['trust'] += 1
 						'"Mmm... i see. Anyway there is nothing to worry about. Stimulation has its purpose after all, and how these sensations are felt are totally different from person to person. But we have done enough for today, you probably have some homework to do. Let me show you out." You say thank you and go outside.'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 					act'Both':
 						*clr & cla
 						gs 'stat'
 						AnnaQW['trust'] += 1
 						'"Interesting... A friend of mine would be really interested in that... it''s not everybody that gets so aroused by such a low current; I assume you got wet? Ok <<$pcs_nickname>>, I want you to know that''s normal and you shouldn''t worry. You are very sensitive to electro stimulation, This is one of the purposes of the violet wand. Okay I think that''s enough for today, let me show you out, we can continue this another time."'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 					act'Lie':
 						*clr & cla
@@ -486,7 +486,7 @@ if $ARGS[0] = 'toys_wand':
 						Anna_trust -= 1
 						'"No no! My hair reacts to the wand... it rises up! Yes... that''s it." You try to avoid being honest with Anna.'
 						'"Well assuming you are telling the truth... that''s totally normal as I was saying... but it''s not something that''s usually a surprise to people; it''s something that''s expected from playing with electricity. Anyway, if you are telling the truth then I must say you are really impressionable. But we''re done for today. Let me show you out." You shake her hand and leave.'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 				end
 				act'You don''t see this everyday...':
@@ -494,7 +494,7 @@ if $ARGS[0] = 'toys_wand':
 					gs 'stat'
 					$anna_toys_image2
 					'"That''s because you don''t often see these. And this was only a small taste of what it can offer but we''ll explore that another day. Let me lead show you out it''s getting late, and I need to get Lariska and I''m sure you have things to do." You shake her hand and head out the door.'
-					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 				end
 				act'Emmmh... what am I suppose to feel?':
 					*clr & cla
@@ -502,7 +502,7 @@ if $ARGS[0] = 'toys_wand':
 					$anna_toys_image2
 					Anna_see_abrat += 1
 					'"Don''t be silly... if that was enough to move your finger you definitely felt something. Never left yourself be led by the rush, especially in BDSM world. It''s easy to over estimate your limits, and that could be dangerous. As I said you must always, be honest with yourself. I think you''ve learned something new today so we''ll end it at that for today. Let me show you out, I gotta get started at dinner and you probably got homework." You shake her hand and leave.'
-					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 				end
 			end
 		end
@@ -511,7 +511,7 @@ if $ARGS[0] = 'toys_wand':
 			gs 'stat'
 			$anna_toys_image2
 			'"I understand, we can do this another time if you''d like, but next time come a little earlier so you don''t waste my time." You exchange few words with Anna and she shows you out.'
-			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 		end
 	end
 	
@@ -539,7 +539,7 @@ if $ARGS[0] = 'toys_wand':
 					AnnaQW['trust'] += 1
 					$anna_toys_image2
 					'"It''s certianly a unique little thing with the pleasure it can bring. And it can offer more than this, this was only a little demonstration... But I think that''s enough for today. Let me show you out, I have to do some laundry and you probably need to get home." You exchange an handshake and turn to your road.'
-					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 				end
 				act'Emmmh...what am i supposed to feel?':
 					*clr & cla
@@ -547,7 +547,7 @@ if $ARGS[0] = 'toys_wand':
 					Anna_see_abrat += 1
 					$anna_toys_image2
 					'"Playng the tough girl eh?. <<$pcs_nickname>>... if that was enough to move your finger you felt something for sure. Never let yourself be seduced by the rush, especially in the BDSM world. It''s easy to over estimate your limits, and that can be dangerous when we talk about BDSM. Always be honest with yourself and your partner: misjudgments could happen from both parts, and that has to be avoided, are we clear? We''ll end it at that. Let me show you to the door, You need to get home and eat something and I need to do some housework." You shake her hand and walk out of the apartment.'
-					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 				end
 			end
 		end
@@ -570,7 +570,7 @@ if $ARGS[0] = 'toys_wand':
 					AnnaQW['trust'] += 1
 					$anna_toys_image2
 					'"It''s certainly a unique little thing with the pleasure it can bring. This was only a little taste of what it can give you. But I think you''ve learned enough for today. Let me show you out, You need to get home before you mother starts to worry and I need to make some dinner." You shake her hand and leave the apartment.'
-					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 				end
 				act'Emmmh...what am I supposed to feel?':
 					*clr & cla
@@ -578,7 +578,7 @@ if $ARGS[0] = 'toys_wand':
 					Anna_see_abrat += 1
 					$anna_toys_image2
 					'"Such bravery. <<$pcs_nickname>>... don''t be silly... if that was enough to move your finger you felt something for sure. Never let yourself be seduced by the rush, especially in the BDSM world. It''s easy to over estimate your limits, and that can be dangerous when we talk about BDSM. Always be honest with yourself and your partner: misjudgments could happen from both parts, and that has to be avoided, are we clear? We''ll end it at that. Let me show you to the door, You need to get home and eat something and I need to do some housework." You shake her hand and walk out of the apartment.'
-					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 				end
 			end
 		end
@@ -587,7 +587,7 @@ if $ARGS[0] = 'toys_wand':
 			gs 'stat'
 			$anna_toys_image5
 			'"Understandable. Not all of these toys are for everyone... The main things is that you have an idea. Alright we''re done for today." You exchange few more words with Anna and she leads you out'
-			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 		end
 	end		
 
@@ -631,21 +631,21 @@ if $ARGS[0] = 'toys_wand':
 								gs 'stat'
 								AnnaQW['trust'] += 1
 								'"Mmm...I can understand that... Anyway you have nothing to be worried about. Stimulation is the purpose after all, and how sensations are felt can be totally different from person to person. I think we''ll end it for today, you probably have some chores to do. Let me show you out." You shake her hand and go outside.'
-								act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+								act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 							end
 							act'Clit...':
 								*clr & cla
 								gs 'stat'
 								AnnaQW['trust'] += 1
 								'"Mmm...feels nice dosen''t it?... Anyway you have nothing to be worried about. Stimulation is the purpose after all, and how sensations feel totally different from person to person. But I thinks that''s enough for today, I don''t want to waste your time and I got to get started on dinner. Let me show you out." You shake her hand and head outside.'
-								act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+								act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 							end
 							act'Both':
 								*clr & cla
 								gs 'stat'
 								AnnaQW['trust'] += 1
 								'"Interesting... A friend of mine would be really interested in that... i think you saw her once... You showed arousal in both your nipples and clit... and i assume you were wet? Ok <<$pcs_nickname>>, i want you to know that''s normal and you shouldn''t be embarrassed. You are really sensitive to electro stimulation, but do not forget that this is one of the purpose of the wand... i have to warn you that you can''t play with this without the right tools. Alright, I think we should end it here, we can continue another time... you got to get home... and... emmmh... I got something else to take care of."'
-								act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+								act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 							end
 							act'Lie':
 								*clr & cla
@@ -654,7 +654,7 @@ if $ARGS[0] = 'toys_wand':
 								$anna_toys_image2
 								'"No no! My hair it''s stands up! That''s all!."You try to avoid being honest with Anna.'
 								'"Well assuming you are telling the truth... that''s totally normal it''s not something that usually surprises people; it something that''s expected from playing with the wand. Anyway, if you are telling the truth you are really impressionable, i have to say. But we''re done for today. Let me show you out, you got homework to do and I have to do some laundry." You shake her hand and go outside'
-								act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+								act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 							end
 						end
 						act'It''s a bit weird...':
@@ -662,14 +662,14 @@ if $ARGS[0] = 'toys_wand':
 							gs 'stat'
 							$anna_toys_image2
 							'"The wand does have a unique way of stimulating. Well it can offer much more than this. This was only a little demonstration of what it can do... But I think this is enough for today, you learned something new so we''ll end it here, let me show you out, we can continue this next time." Anna leads you to the door, you shake her hand and go outside.'
-							act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+							act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 						end
 						act'Emmmh...what am i suppose to feel?':
 							*clr & cla
 							gs 'stat'
 							Anna_see_abrat += 1
 							'"That was enough to move your finger you felt something that''s for sure, don''t be silly. Never left yourself be blinded by the rush, especially in the BDSM world. It''s easy to over estimate your limits, and that can be dangerous. Always, be honest with yourself. I think that''s enough for today. Let me show you out, we can continue this another time." Anna leads you to the door, you shake her hand and go outside.'
-							act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+							act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 						end
 					end
 				end
@@ -677,7 +677,7 @@ if $ARGS[0] = 'toys_wand':
 					*clr & cla
 					gs 'stat'
 					'"As you wish. We can continue this another time." You exchange few more words with Anna and she leads you to the door, you shake her hand and go out into the residential area.'
-					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 				end
 			end
 			
@@ -685,7 +685,7 @@ if $ARGS[0] = 'toys_wand':
 				*clr & cla
 				gs 'stat'
 				'"As you wish. We can continue this another time." You exchange few more words with Anna and she leads you to the door, you shake her hand and go out into the residential area.'
-				act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+				act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 			end
 		end
 		act'Ok':	
@@ -712,21 +712,21 @@ if $ARGS[0] = 'toys_wand':
 						gs 'stat'
 						AnnaQW['trust'] += 1
 						'"That''s nothing to worry about. Stimulation is the purpose after all, and how sensations feel can be completely different from person to person. But I believe that''s enough for today. Let me show you to the door." Anna leads you to the door, you shake her hand and head outside to the residential area.'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 					act'Clit...':
 						*clr & cla
 						gs 'stat'
 						AnnaQW['trust'] += 1
 						'"And do you like it?. Stimulation is the purpose after all. The sensations felt can be totally different from one person to another. But I think we''ll end it at that for today. Let me show you out." Anna leads you to the door, you shake her hand and go outside and head towards the residential area.'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 					act'Both':
 						*clr & cla
 						gs 'stat'
 						AnnaQW['trust'] += 1
 						'"Interesting... A friend of mine would be really interested to hear about this... not everybody get''s so aroused by a little shock; you seemed to show both on your breasts and you clitoris, did you get wet?. Ok <<$pcs_nickname>>, I want you to know that''s normal and you shouldn''t worry. It just means you are really sensitive to electro stimulation, but don''t forget that this is the purpose of the wand. I believe we should say that''s enough for today, let me show you out, we can pick this up another time." Anna leads you to the door, you shake her hand and head out to the residential area.'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 					act'Lie':
 						*clr & cla
@@ -734,21 +734,21 @@ if $ARGS[0] = 'toys_wand':
 						Anna_trust -= 1
 						'"No no! It''s just my hair that stands up! Yes...that''s it." You try to avoid being honest with Anna.'
 						'"Well assuming you are telling the truth... that''s  normal. It''s not something that usually surprise people. Anyway, if you were telling the truth you are really impressionable, i have to say. But we''ll leave that for another day. Let''s head to the front door, you probably have homework to do." Anna leads you to the door, you shake her hand and go outside.'
-						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+						act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 					end
 				end
 				act'Never felt something like that before':
 					*clr & cla
 					gs 'stat'
 					'"The wand does have it''s own special way of stimulating. It can offer so much more than this. This was only a little demonstration of what it can do... But I think this is enough for today, you learned something new so we''ll end it here, let me show you out, we can continue this next time." Anna leads you to the door, you shake her hand and go to the residential area.'
-					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 				end
 				act'Emmmh...what am i suppose to feel?':
 					*clr & cla
 					gs 'stat'
 					Anna_see_abrat += 1
 					'"That was enough to move your finger so you definitely felt something that''s for sure. Don''t be blinded by the excitement, especially in BDSM world. It''s easy to over estimate your limits, and that is dangerous when we talk about BDSM. Always, be honest with yourself. That''s enough today. Let me follow you out." Anna leads you to the door, you shake her hand and head out the residential area.'
-					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+					act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 				end
 			end
 		end
@@ -756,7 +756,7 @@ if $ARGS[0] = 'toys_wand':
 			*clr & cla
 			gs 'stat'
 			'"As you wish. Don''t feel like I''m trying to push this on you, if you don''t want to that''s fine." The session ends and after you exchange few more words with Anna she leads you to the door'
-			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'HotelHole'
+			act 'Leave': gs 'hotel_anna_gear', 'toys_images_clear' & gt 'pav_hotel'
 		end
 	end
 end
@@ -839,7 +839,7 @@ if $ARGS[0] = 'restraints_rope':
 		'"Thank you Anna, but I don''t think I''m ready for this."'
 		'"Don''t worry <<$pcs_nickname>>, you are free to learn at your own pace and only do what you are comfortable with. Next time something a bit more exciting, if I can get it arranged in time."'
 		'"Thank you Anna, good bye."'
-		act 'Leave': gt'HotelHole'
+		act 'Leave': gt'pav_hotel'
 	end
 end
 
@@ -891,7 +891,7 @@ if $ARGS[0] = 'restraints_rope_sub1':
 		'"So this will give you an idea of how suspension feels, it also shows how versatile ropes are for BDSM play. Of course you still need to have a secure fixing to suspend someone from safely. This fixing point is good for 150kg so you are perfectly safe.'
 		'Right, We can continue this next time." Anna helps you down and you put your clothes back on, after a few words with Anna she sees you out. "Next time I hope to have something a little more exciting if I can get it arranged, see you then <<$pcs_nickname>>."'
 		'"Thank you Anna, goodbye."'
-		act 'Leave': gt'HotelHole'
+		act 'Leave': gt'pav_hotel'
 	end
 	act'Thanks Anna but I think that''s enough for today...':
 		*clr & cla
@@ -900,7 +900,7 @@ if $ARGS[0] = 'restraints_rope_sub1':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/Anna2restr5.jpg"></center>'
 		'"Of course dear. Restraints can be a bit overwhelming when you first try them and they are not for everyone." You put your clothes on, and after exchanging a few words with Anna she leads you to the door. "Next time I hope to have something a little more exciting if I can get it arranged, see you then <<$pcs_nickname>>."'
 		'"Thank you Anna, good bye.'
-		act 'Leave': gt'HotelHole'
+		act 'Leave': gt'pav_hotel'
 	end
 end
 
@@ -938,7 +938,7 @@ if $ARGS[0] = 'restraints_rope_dom':
 				'You feed the rope back through the hoop and help Anna out of the rope you tied around her.'
 				'"Don''t worry, we''ll get there." Anna says reassuringly as she puts her clothes back on, and after a brief chat she leads you to the door. "Next time I hope to have something a little more exciting if I can get it arranged, see you then <<$pcs_nickname>>."'
 				'"Thank you Anna, goodbye."'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 		end
 	end
@@ -972,7 +972,7 @@ if $ARGS[0] = 'restraints_harness':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/harness1.jpg"></center>'
 				'You slowly turn trying to put on a show on for Anna. "beautiful body. But we are not here to make you blush or feel uncomfortable. I don''t know how much you can feel the leather, but i can assure you that leather has its own unique appeal; it''s a matter on how feels to the skin, its smell... and other things you will eventually discover. I don''t think we''re gonna go any further today so we''ll call it a night. Let me get your clothes." Anna gives you your clothes and you put them on, after few words she walks you the door and you head out to the residential area.'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 			act'I think I''m done for today, I really have to go...':
 				*clr & cla
@@ -980,7 +980,7 @@ if $ARGS[0] = 'restraints_harness':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/Anna2restr5.jpg"></center>'
 				'"That''s okay... I hope you learned a little about the harness and what it brings. Here let me get your clothes." Anna gives you your clothes and you put them back on, Anna talks a little bit about different harnesses before you leave.'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 		end
 		act'Thank you Anna, but i have to go...':
@@ -990,7 +990,7 @@ if $ARGS[0] = 'restraints_harness':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 			'"Hope you don''t mind Anna, but I have to get home."'
 			'"Understandable. The main thing is you got the basic idea about the harness and what it can do. Here let me get your clothes." Anna gives you your clothes and you put them back on, Anna talks a little bit about her first experience with harnesses before you leave.'
-			act 'Leave': gt'HotelHole'
+			act 'Leave': gt'pav_hotel'
 		end
 	end
 	act'Why don''t you try it on so i can see how it looks on you?':
@@ -1013,7 +1013,7 @@ if $ARGS[0] = 'restraints_harness':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/harnessd1.jpg"></center>'
 				'"No... this is enough. I''m not a doll that you can just boss around."'
 				'"My dear I can assure you that wasn''t an order... anyway I won''t press you on it... you are free to do what you want. I think it''s best if we end it for today. The main thing is that you have an idea about the harness. Let me get your clothes." You put your clothes back on. After few words about today Anna reassures you there was no reason to be worried, and that your reaction was completely normal. Soon you finish discussing and you head out the door.'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 			act'Turn and tease':
 				*clr & cla
@@ -1025,7 +1025,7 @@ if $ARGS[0] = 'restraints_harness':
 				'You slowly turn swinging your back to tease Anna. "Mmmm... there''s no need to put a show on... but... ok: if that make you feel comfortable by all means... go on. Just remember, we don''t have all day <<$pcs_nickname>>."'
 				'"Ok ok... you''re no fun... but I got the message." You stop from teasing Anna.'
 				'"Don''t take it the wrong way... you can try to tease me on our free time if you''d like. But we are here for your session. I reckon by now you''ve gotten to feel the leather a bit and how nice it feels against your skin, it''s texture and smell, there really isn''t anything quite like leather. I think that''s enough for today. Let me get your clothes." Anna gives you your clothes and you redress yourself, and after a brief conversation you both say goodbye.'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 			act'We can stop here...':
 				*clr & cla
@@ -1033,7 +1033,7 @@ if $ARGS[0] = 'restraints_harness':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/Anna2restr5.jpg"></center>'
 				'"Tha''s okay... I think it best if we end it for today then. I hope you learned something from our session here today. Let me get you your clothes." Anna gives you your clothes and you redress. You chat a little bit about the harness before saying goodbye'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 		end
 		act'Thanks for your offer Anna, but I have to go...':
@@ -1042,7 +1042,7 @@ if $ARGS[0] = 'restraints_harness':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 			'"Hope you don''t mind Anna, but I really have to go."'
 			'"That''s fine, we can pick this up again next time. I hope that you got a little bit of an insight into what this harness can bring. You can take it off now and redress." You put your clothes back on, and after some small talk you say goodbye and leave.'
-			act 'Leave': gt'HotelHole'
+			act 'Leave': gt'pav_hotel'
 		end
 	end
 	act'On me?':
@@ -1073,7 +1073,7 @@ if $ARGS[0] = 'restraints_harness':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/harness1.jpg"></center>'
 					'You slowly turn as to put a show on for Anna. "As I said <<$pcs_nickname>> you have a great body. But we are not here to make you blush or feel uncomfortable. Now, do you feel how nice the the leather feels against your body? Just the smell of leather can be arousing to some you know. Nothing quite beats leather. I think we''ll end it there and continue next time. You can take the harness off now and get dressed." You put your clothes back on and talk a bit about leather harnesses before you say goodbye and go outside.'
-					act 'Leave': gt'HotelHole'
+					act 'Leave': gt'pav_hotel'
 				end
 				act'I think we''ve done for today, I have to go':
 					*clr & cla
@@ -1081,7 +1081,7 @@ if $ARGS[0] = 'restraints_harness':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/Anna2restr5.jpg"></center>'
 					'"Then I think we should wrap it up for today. I hope that you see what a wonderful addition a harness can bring to BDSM. You can get dressed again now." Anna gives you your clothes and you get dressed, after some small talk you both say goodbye and you head out to the residential area.'
-					act 'Leave': gt'HotelHole'
+					act 'Leave': gt'pav_hotel'
 				end
 			end
 			act'Thank you Anna, but i have to go...':
@@ -1091,7 +1091,7 @@ if $ARGS[0] = 'restraints_harness':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 				'"Hope you don''t mind Anna, I really have to get going."'
 				'"That''s okay, we can continue this another day then. I hope you''ve learned something here today." You get dressed before chatting a bit with Anna about school before you say goodbye and leave.'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 		end
 	end
@@ -1100,7 +1100,7 @@ if $ARGS[0] = 'restraints_harness':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 		'"As you wish. We''ll continue another time. Hopefully I''ve given you some things to think about tonight. Let me show you out." You chat a bit on the way to the door when you reach the door you kindly say goodbye and leave.'
-		act 'Leave': gt'HotelHole'
+		act 'Leave': gt'pav_hotel'
 	end
 end
 		
@@ -1146,7 +1146,7 @@ if $ARGS[0] = 'restraints_cuff':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff1.jpg"></center>'
 						'"I-i..."'
 						'"Well... if that left you speechless you felt something for sure. I won''t push things though the main thing is to improve your knowledge, so I think we''ll end it there. Just let me free you now." Anna smiles at you in a reassuring way; once free and with your panties on, you chat a little bit with Anna before you say goodbye and leave'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'C-can you free me now?':
 						*clr & cla
@@ -1156,7 +1156,7 @@ if $ARGS[0] = 'restraints_cuff':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff1.jpg"></center>'
 						'"Sure <<$pcs_nickname>> Just lay still and I''ll unlock the cuffs." Anna starts freeing your ankles and wrists.'
 						'"Just remember, I won''t force you to do anything you don''t want... the main things is to improve your knowledge about this, and I feel you learned something today." Anna smiles at you in a reassuring way. Once free and with your panties back on, she takes you to the front door where you say goodbye'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 				end
 			end
@@ -1187,7 +1187,7 @@ if $ARGS[0] = 'restraints_cuff':
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff2.jpg"></center>'
 							'"I-i..."'
 							'"Cat got your tounge? You definitely felt something then. I won''t push it though the main thing is that you learn, and you''ve certainly learned a bit today so we''ll stop for today. Let me unlock you so you can get dressed." Anna smiles at you in a reassuring way; once free and with your panties on, you talk a little bit about school before saying goodbye'
-							act 'Leave': gt'HotelHole'
+							act 'Leave': gt'pav_hotel'
 						end
 						act'C-can you free me now?':
 							*clr & cla
@@ -1197,7 +1197,7 @@ if $ARGS[0] = 'restraints_cuff':
 							end
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff1.jpg"></center>'
 							'"Of course <<$pcs_nickname>> wait a sec. Just lay still so I can unlock the cuffs." Anna starts freeing your ankles and wrists. "I want you to remember that i won''t push this on you... the main thing that you learn, and I''d say you''ve learned some today, now get dressed." She smiles at you in a reassuring way... Once free and with your panties back on, you thank Anna for tonight and say goodbye.'
-							act 'Leave': gt'HotelHole'
+							act 'Leave': gt'pav_hotel'
 						end
 					end
 				end
@@ -1205,7 +1205,7 @@ if $ARGS[0] = 'restraints_cuff':
 					cla
 					gs 'stat'
 					'"No worries." Anna smiles at you in a reassuring way. "If you don''t want to I will not force you. We''ll end it here, but I hope you''ve learned a little bit about cuffs and what they bring to BDSM. Now, I think it''t time you got home, you probably have homework to do." Anna leads you to the door and you say goodbye and leave.'
-					act 'Leave': gt'HotelHole'
+					act 'Leave': gt'pav_hotel'
 				end
 			end
 			act'I''m sorry Anna, i cannot do that...':
@@ -1214,7 +1214,7 @@ if $ARGS[0] = 'restraints_cuff':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuffn.jpg"></center>'
 				'"That''s okay." Anna smiles at you in a reassuring way.'
 				'"I''m not going to push you into doing things you don''t want to, We''ll wrap this up for now, but I hope you''ve learned a thing or two about cuffs and what they can be used for. Now you should get going home, it''s getting late and I got some housework to do." Anna leads you to the front door and you say goodbye and leave.'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 		end
 		act'On you? Sure...you got ropes too...this should be fun.':
@@ -1233,7 +1233,7 @@ if $ARGS[0] = 'restraints_cuff':
 				'"Cuffs have a meaning dear, and you need to learn all aspects of this. We are not a BDSM session now, this is an learning session and has no meaning unless you are willing to try. but as i said i won''t force you if you don''t want to."'
 				'"I think it''s best if we end it here today."'
 				'"Sure, we wrap ut. Let me lead show you out." You both walk out of the bedroom and down the hallway to the front door where you say goodbye.'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 			act'Mfffh...do not try anything. Was i clear?':
 				*clr & cla
@@ -1256,7 +1256,7 @@ if $ARGS[0] = 'restraints_cuff':
 						'"I thought it would be worse"'
 						'"Now that you''ve got a better understanding. Remember, what you learn from our sessions is entirely up to you. We are doing this to improve your knowledge, and we''ve learned a lot today I''d say so we''ll end it here."'
 						'You nod. "Okay" Anna smiles at you as she removes your cuffs; once free and with your panties back on, you chat a little bit about school before you say goodbye and leave.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'Can you free me now?':
 						*clr & cla
@@ -1265,7 +1265,7 @@ if $ARGS[0] = 'restraints_cuff':
 						'"Sure <<$pcs_nickname>>... just give me a moment." Anna starts freeing your ankles and wrists.'
 						'"Just remember <<$pcs_nickname>> I won''t force you to do anything you don''t want to... the main things is for you to learn, and and it seems you''ve learned enough today."'
 						'"Just get me out of this please." Anna smiles as she removes your cuffs. Once your arms and legs are free you hurriedly get dressed, you chat a little with Anna before she she walks you to the front door and say goodbye and walk out to the residential area.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 				end
 			end
@@ -1298,7 +1298,7 @@ if $ARGS[0] = 'restraints_cuff':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff2.jpg"></center>'
 						'"I-i..."'
 						'"No words... I suspect you really felt something. But I don''t think we should puss this much further... the main thing today is to improve your basic knowledge, and we''ve done that today. Now... let me loosen the cuffs." You nod. Anna smiles at you while freeing you; once freed and with your panties on, you chat a little bit about school before you leave.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'C-can you free me now?':
 						*clr & cla
@@ -1309,7 +1309,7 @@ if $ARGS[0] = 'restraints_cuff':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff1.jpg"></center>'
 						'"Sure <<$pcs_nickname>>... just let me get undo the straps." Anna start freeing your ankles and wrists.'
 						'"I want you to remember that I won''t make you do anything you don''t want to... the main things is that you learn, and I think you''ve learned enough for today." She smiles and removes the cuffs... Once freed and with your panties on, chat a little thanking her for teaching you before you leave.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 				end
 			end
@@ -1319,7 +1319,7 @@ if $ARGS[0] = 'restraints_cuff':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuffn.jpg"></center>'
 				'"No worries." Anna smiles at you in a reassuring way.'
 				'"Let me just get these cuffs off you. Ok, then I think we''re done for today; I hope you''ve learned a little bit more about BDSM. Let me walk you out" Anna leads you to the front and you walk out to the residential area.'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 		end
 	end
@@ -1328,7 +1328,7 @@ if $ARGS[0] = 'restraints_cuff':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/annaintro1.jpg"></center>'
 		'"Alright. If you don''t want to I can understand that and I won''t force you. Just think about some of the things you''ve seen here today okay? Now, let me show you out." Anna leads you to the front door and you leave.'
-		act 'Leave': gt'HotelHole'
+		act 'Leave': gt'pav_hotel'
 	end
 end
 		
@@ -1362,7 +1362,7 @@ if $ARGS[0] = 'restraints_leash':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakfine.jpg"></center>'
 					'"I''m happy to hear it... anyway we should stop for now. The walk ends. "We shouldn''t get carried away, this is a practice session after all, so <<$pcs_nickname>> I hope it has been instructive for you, you should have a better idea about the collar and the leash. You can get dressed now, and we''ll continue next time"'
 					'"Thank you Anna." You get dressed and and chat a little about collars before saying goodbye and leaving.'
-					act 'Leave': gt'HotelHole'
+					act 'Leave': gt'pav_hotel'
 				end
 				act'S-stop...':
 					*clr & cla
@@ -1370,7 +1370,7 @@ if $ARGS[0] = 'restraints_leash':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakstop.jpg"></center>'
 					'You loose all interest in completing the walk. "Uh? Oh... ok." The walk ends. Anna immediately stops as soon as she sees you no longer want to continue. she dosen''t tighten her grip, the only tightness you feel is from the sudden stop. "I assume it was too much for you. I think we should end it here, you should get dressed <<$pcs_nickname>>."'
 					'"Y-yes..." You weren''t able to complete your sentence feeling too much shame from the walk. As soon as you put clothes back on you exchange few words with Anna. She reassures you about the session and your feelings, telling again that there''s no reason to worry as it''s only a learning session. You finally finish the chat and leave for today.'
-					act 'Leave': gt'HotelHole'
+					act 'Leave': gt'pav_hotel'
 				end
 				act'...':
 					*clr & cla
@@ -1381,7 +1381,7 @@ if $ARGS[0] = 'restraints_leash':
 					'"What''s wrong?" You are too ashamed to lift your head: you are soaking wet.'
 					'"M-my... my pussy." Anna immediately realizes what you are talking about.'
 					'"Oh... I see." As if this is totally normal Anna reassures you. "Don''t worry... this can be a highly arousing situation: no matter what end of the leash you''re on. It''s totally natural, but I think we''ll end it there, you''ve learned enough for today. Let me go get your clothes." You put your clothes back on while trying to focus on something else. She reassures you about the session and your feelings. after a brief chat and given yourself time to calm down you say goodbye and leave the apartment.'
-					act 'Leave': gt'HotelHole'
+					act 'Leave': gt'pav_hotel'
 				end
 			end
 		end
@@ -1404,7 +1404,7 @@ if $ARGS[0] = 'restraints_leash':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakfine.jpg"></center>'
 					'"I''m happy to hear it... But we should stop for now." The walk ends. "We shouldn''t drag this on too long, this is for you to learn after all, so <<$pcs_nickname>> I hope it has been a learning experience for you, hopefully you should have a better idea about the collar and the leash. You can get dressed now, and we''ll follow up on this next time"'
 					'"Thank you Anna."You get dressed and and chat a little about collars before saying goodbye and leaving.'
-					act 'Leave': gt'HotelHole'
+					act 'Leave': gt'pav_hotel'
 				end
 				act'S-stop...':
 					*clr & cla
@@ -1412,7 +1412,7 @@ if $ARGS[0] = 'restraints_leash':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakstop.jpg"></center>'
 					'You freeze up completely. "Uh? Oh... ok."</font> Anna stops the walk as soon as she sees you don''t want to continue. she dosen''t tighten her grip, the only tightness you feel is from when you stopped moving. "I suppose it got to be too much for you. It''s probably best if we end it here, you should get dressed <<$pcs_nickname>>."'
 					'"Y-yes..." You weren''t able to complete your sentence feeling too much shame from the walk. As soon as you put clothes back on you exchange few words with Anna. She reassures you about the session and your feelings, telling again that there''s no reason to worry as it''s only a learning session. When you finish the chat you say goodbye and leave for today.'
-					act 'Leave': gt'HotelHole'
+					act 'Leave': gt'pav_hotel'
 				end
 			end
 			act'Don''t...':
@@ -1420,7 +1420,7 @@ if $ARGS[0] = 'restraints_leash':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashownoend.jpg"></center>'
 				'You shake your head. "Well <<$pcs_nickname>>... in that case we should end it for today. Hopefully I''ve given you some things to think about... and we''ve made some steps forward." She unclips the leash from your collar. "Move your hair so I can get the collar off." Anna removes the collar and gives you back your clothes. Once your clothes are back on you chat a little with Anna; she reassures you that there is no hidden motive. after a little while you say your thanks and head out of the apartment towards the residential area.'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 		end
 		act'Change your mind':
@@ -1432,7 +1432,7 @@ if $ARGS[0] = 'restraints_leash':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashownoend.jpg"></center>'
 			'"I-i... can''t I''m sorry Anna."'
 			'"Well <<$pcs_nickname>>... in that case we''ll call it a day. The main thing is that you learn... and we''ve made progress." She removes the least from your collar. "Move your hair out of the way so it dosen''t get stuck." Anna removes collar gives you your dress. As soon you''re dressed you talk a bit with Anna; she reassures you about the session saying there''s no underlying meaning and that the session is purely instructional. You feel she has no intention to make you do anything you don''t want to. Once your little chat is over Anna follows you to the front door where you say goodbye and head to the residential area.'
-			act 'Leave': gt'HotelHole'
+			act 'Leave': gt'pav_hotel'
 		end
 	end
 	act'If there''s no real meaning...why don''t you let me put the collar on you?':
@@ -1459,7 +1459,7 @@ if $ARGS[0] = 'restraints_leash':
 					'"So <<$pcs_nickname>>, how does it feel to be walking your slave around naked, it''s exhilarating isn''t it?"'
 					'"I''ve never heard of a puppy talking."'
 					'"Right..." You walk Anna for a little. "That''s it we should stop for now."'
-					act 'Leave': gt'HotelHole'
+					act 'Leave': gt'pav_hotel'
 				end
 			end
 		end
@@ -1493,7 +1493,7 @@ if $ARGS[0] = 'restraints_leash':
 						'"Happy to hear it''s not a big deal for you. I think that''s enough for today." The walkie ends. "Even doing a simple practice session with no meaning could be hard we won''t go much furher, I hope <<$pcs_nickname>> I hope this little session has been informative for you; hopefully you got some better idea about the collar and the leash."'
 						'"Just... don''t try anything okay?"'
 						'"Of course not, this is your show, eventually you will decide for yourself what the sessions mean. Well, now that we''re done you can change back into your regular clothes and I''ll see you next time." You get dressed and say goodbye to Anna before you leave.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'Stop!':
 						*clr & cla
@@ -1503,7 +1503,7 @@ if $ARGS[0] = 'restraints_leash':
 						'"I guess it became too much for you... Alright; you can put back your clothes <<$pcs_nickname>> we''re done for today."'
 						'"This was a big mistake."'
 						'"If you think so...then that''s what it was. It seems to have been very instructive though and we learn when we make mistakes." You weren''t able to reply, ashamed by the session; you only want this to end. Anna reassures you about the session and your feelings, saying you did nothing wrong and that it''s okay. Once you''ve gotten dressed again you say goodbye to Anna, hurrying towards the door to leave.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'Meh...':
 						*clr & cla
@@ -1517,7 +1517,7 @@ if $ARGS[0] = 'restraints_leash':
 						'"Are you mocking me?"'
 						'"Don''t be silly <<$pcs_nickname>>... you decide for yourself what you want to do, and you wanted to try this. Now we know you don''t really feel anything about this so we''ve learned something. Since that''s done I think we''ll call it for today."'
 						'"Baf!" Once you''ve gotten your clothes back on you thank Anna for today and leave the apartment.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 				end
 			end
@@ -1542,7 +1542,7 @@ if $ARGS[0] = 'restraints_leash':
 						'"Glad to hear it''s not too big a problem... anyway, we should stop for now." The walk ends. "Well <<$pcs_nickname>> I assume it was an instructive session; you should have a better idea about collar, leash, submission and petplay."'
 						'"Just... don''t get any ideas okay?"'
 						'"Don''t worry I won''t. let''s wrap it up and let me get you clothes, we''ll continue next time." You get dressed and chat a bit with Anna before saying goodbye'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'Stop!':
 						*clr & cla
@@ -1552,7 +1552,7 @@ if $ARGS[0] = 'restraints_leash':
 						'"It can be too much in the beginning... Let''s get your clothes back on we''re done for today."'
 						'"I shouldn''t have done this."'
 						'"It''s not all bad you know, we have made progress and you''ve learned a bit today. Nothing to be ashamed of." You can''t bring yourself to answer, wanting only to go home. Anna tells you that there is nothing to worry about. Once you''ve gotten dressed you say goodbye and hurry out the door.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'I don''t know':
 						*clr & cla
@@ -1565,7 +1565,7 @@ if $ARGS[0] = 'restraints_leash':
 						'"Well, maybe we''ll try something else next time, you might be more dominant something you really aren''t right now."'
 						'"Are you mocking me?"'
 						'"Just saying my dear <<$pcs_nickname>>.. .We went down this road hoping to learn, and we''ve learned this isn''t exactly for you so we''ll stop there for today, let''s get that collar off and you can put your clothes back on." Once you''ve gotten your clothes back on you thank Anna for tonight and say goodbye.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 				end
 				act'This was a mistake. it''s too much.':
@@ -1581,7 +1581,7 @@ if $ARGS[0] = 'restraints_leash':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashownoend.jpg"></center>'
 				'"I think I''ll have to pass"'
 				'"That''s okay <<$pcs_nickname>> we can continue next time. I hope you''ve learned a little bit though." Anna removes the collar and leash and gives you your clothes, once you''ve gotten dressed you chat a little bit about school and life at home before you leave.'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 		end
 		act'Ok I''ll do it. But I''m not putting on a show...':
@@ -1610,7 +1610,7 @@ if $ARGS[0] = 'restraints_leash':
 						end
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashlingfine.jpg"></center>'
 						'"I''m happy to hear it wasn''t a problem for you. Ok <<$pcs_nickname>> i hope it was an instructive session; you should have a better idea about collar, leash, submission and petplay. now we''ll end it here for today, let me remove the collar and get your clothes." You get dressed and after a brief chat you leave Anna''s apartment.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'Stop!':
 						*clr & cla
@@ -1620,7 +1620,7 @@ if $ARGS[0] = 'restraints_leash':
 						'"Sometimes it can get a bit too much, let me get this collar off and get your clothes <<$pcs_nickname>> we''re done for today."'
 						'"I shouldn''t have done this."'
 						'"It''s okay, we wanted to you to learn about this and we''ve learned more today, there''s nothing to worry about." You try to answer but you can''t find the words, you just want to go home. Anna removes the collar and gives you your clothes, once you''ve gotten dressed you say goodbye to Anna before hurrying out the door.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'Meh...':
 						*clr & cla
@@ -1631,7 +1631,7 @@ if $ARGS[0] = 'restraints_leash':
 						'"Nothing. are you sure?"'
 						'"Really dosen''t feel like it."'
 						'"That''s okay, perhaps being in the submissive state of this isn''t your thing, or maybe this just isn''t the right setting. But in any case we''ll end it here for today, let me get that collar and you can get dressed." Once you''ve gotten your clothes back on you thank her for taking the time to try and teach you before you leave.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 				end
 			end
@@ -1654,7 +1654,7 @@ if $ARGS[0] = 'restraints_leash':
 						end
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashlingfine.jpg"></center>'
 						'"Glad to hear it wasn''t too bad for you, let''s end it here for today." The walk ends. "Now, as you already know this is a learning session, this dosen''t mean anything between us. what you take from this is entirely up to you, but I hope you''ve learned a little bit about what it''s like for the submissive to be led by their master or mistress. Anyways, let''s get that collar off so you can get dressed." You put your clothes back on and after a brief talk about the role of being submissive you say goodbye and leave.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'Stop!':
 						*clr & cla
@@ -1663,7 +1663,7 @@ if $ARGS[0] = 'restraints_leash':
 						'Your body freezes completely, feeling the collar yank against your neck. "What?" Anna drops the leash immediately letting it fall. "Are you okay <<$pcs_nickname>>? I think we''ve gone far enough for today."'
 						'"I shouldn''t have done this."'
 						'"It''s okay, maybe this part of it isn''t for you, we''ve learned something today so focus on that." You find yourself unable to answer feeling only embarrassed and wanting to hide. Anna removes your collar and tells you again that it''s okay and you shouldn''t think too much into it. Once you''ve gotten your clothes you say goodbye to Anna, wanting to get away from all this as soon as possible.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'Meh...':
 						*clr & cla
@@ -1674,7 +1674,7 @@ if $ARGS[0] = 'restraints_leash':
 						'"Nothing? Are you sure?"'
 						'"Yeah, I''m not really feeling it"'
 						'"Well, that really depends on perspective dosen''t it, we have learned today that this dosen''t really do anything for you. you can always find some way to learn for everything you do. But we''ll end it here so this dosen''t turn into a school lecture, let me get that collar off so you can get dressed". After getting dressed you thank Anna for her time today and walk out of the apartment.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 				end
 				act'Now hold on!':
@@ -1691,7 +1691,7 @@ if $ARGS[0] = 'restraints_leash':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashlingno.jpg"></center>'
 				'"I''m not so sure I wanna do this anymore"'
 				'"That''s okay <<$pcs_nickname>> you are in charge here today, you say stop, we stop. Hopefully you''ve learned a little bit and maybe that''ll is enough for today." Anna helps you remove the collar and gives you your dress. After getting dressed you exchange few words with Anna; you tell her again that even if there''s no underlying meaning this is just too much for you; she doesn''t seem to criticize your decision, and listens to you with kind eyes. Once you''ve finished talking you say goodbye and go out to the residential area.'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 		end
 	end
@@ -1724,7 +1724,7 @@ if $ARGS[0] = 'restraints_leash':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakfine.jpg"></center>'
 						'"I''m happy to hear you feel it''s going well but, I think it''s best if we stop for today.</font> The walk ends<font color = blue>"This was a good start, seems like you learned a lot today which is good. Now, let me get that collar off so you can get dressed"</font><br><font color = #DC143C>"Thank you Anna"</font> You get dressed  and thank Anna for her time, she smiles and leads you to the front door.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'I...don''t like it...':
 						*clr & cla
@@ -1733,7 +1733,7 @@ if $ARGS[0] = 'restraints_leash':
 						'You sit on the floor not moving. Anna immediately lets go of her grip on the leash. "I assume it was too much for you <<$pcs_nickname>>, that''s okay, it happens. Let''s get that collar off and get your clothes we''re done for today."'
 						'"I''m sorry Anna, but I don''t think this is for me."'
 						'"I understand <<$pcs_nickname>>, it can be hard sometimes doing this." Anna watches as you get dressed telling you that you shouldn''t feel any shame over what happened. Once you''re fully dressed you thank her and you walk out of her apartment.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'...':
 						*clr & cla
@@ -1744,7 +1744,7 @@ if $ARGS[0] = 'restraints_leash':
 						'"What''s wrong <<$pcs_nickname>> is there a problem with the collar or something?" You just stare at the floor unable to answer: you are soaking wet.'
 						'"M-my... my pussy." You force out. Anna immediately realizes what you are talking about.'
 						'"Oh... I got scared for a moment there." As if this is totally normal Anna reassures you. "Don''t worry... for some this is a highly arousing situation: it doesn''t matter the role. It''s totally natural, but I think it''s better for you to go home now so you can focus on something else, you''ve learned enough for today." Anna removes your collar and you get dressed. After a brief conversation you thank her for understanding and you hurry out the door'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 				end
 			end
@@ -1764,7 +1764,7 @@ if $ARGS[0] = 'restraints_leash':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakfine.jpg"></center>'
 						'"Glad to hear it''s not too bad, but let''s stop for today.</font> The walk ends...<font color = blue>"Now, remember this is a learning session, this dosen''t mean anything between us. you choose what to take from this, but I hope you''ve learned a little bit about what it''s like for the submissive to be led by their master or mistress. Anyways, let''s get that collar off so you can get dressed"</font> After getting redressed you talk a little with Anna about the role of being the submissive before you say goodbye and leave.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 					act'I...don''t like this...':
 						*clr & cla
@@ -1774,7 +1774,7 @@ if $ARGS[0] = 'restraints_leash':
 						'"I''m guessing this isn''t what you''re looking for then. Maybe it''s best we stop for today <<$pcs_nickname>> what do you say?"'
 						'"I''m sorry Anna, but I dont''t think this is for me."'
 						'"That''s okay, we''re making progress either way" Anna reassures you about the session saying maybe we should try something different next time. Once you''ve gotten the collar off and gotten dressed, you thank Anna for her time and leave.'
-						act 'Leave': gt'HotelHole'
+						act 'Leave': gt'pav_hotel'
 					end
 				end
 				act'Don''t...':
@@ -1782,7 +1782,7 @@ if $ARGS[0] = 'restraints_leash':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashownoend.jpg"></center>'
 					'You shake your head unable to speak. "Okay <<$pcs_nickname>>. you''ve learned a little today but we''re stopping for today." Anna unhooks the leash and removes your collar. As soon as you''ve gotten dressed you exchange few words with Anna; she talks session and your feelings, saying that what you felt is perfectly natural. When you are done chatting Anna thanks you for stopping by today and leads you out.'
-					act 'Leave': gt'HotelHole'
+					act 'Leave': gt'pav_hotel'
 				end
 			end
 			act'Change your mind':
@@ -1791,7 +1791,7 @@ if $ARGS[0] = 'restraints_leash':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashownoend.jpg"></center>'
 				'"I-i... can''t I''m sorry Anna i have to go."'
 				'"Okay <<$pcs_nickname>>...let''s wrap up for today. Hopefully we''ve made some steps forward today." Anna moves removes the leash and the collar, and gives you your clothes. As soon as you''ve gotten dressed you chat a little bit with Anna, she reminds you that you control the situation and can decide when to stop. When you''re done chatting you thank her and say goodbye before leaving out towards the residential area.'
-				act 'Leave': gt'HotelHole'
+				act 'Leave': gt'pav_hotel'
 			end
 		end
 		act'I want you to try the collar':
@@ -1812,7 +1812,7 @@ if $ARGS[0] = 'restraints_leash':
 					gs 'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionhotel/leash.mp4"></video></center>'
 					'"Not so difficult is it? Just remember to keep a firm grip and have a firm tone so the submissive knows who''s in charge. not just to the submissive mind you but also if there are anyone else around." You continue walk Anna for a little. "That''s it we should stop now."'
-					act 'Leave': gt'HotelHole'
+					act 'Leave': gt'pav_hotel'
 				end
 			end
 		end
@@ -1824,7 +1824,7 @@ if $ARGS[0] = 'restraints_leash':
 			'"Well <<$pcs_nickname>>... in that case we''re done for today. Hopefully you''ve gotten some things to think about tonight."'
 			'"I''m sorry."'
 			'"That''s okay <<$pcs_nickname>> we''ll continue another day, let me show you out." You both chat a little as you walk to the door, when you reach the door you say goodbye and leave.'
-			act 'Leave': gt'HotelHole'
+			act 'Leave': gt'pav_hotel'
 		end
 	end
 	act'Leave':
@@ -1834,7 +1834,7 @@ if $ARGS[0] = 'restraints_leash':
 		'"That''s okay <<$pcs_nickname>>. We''ll pick this up some other time, let me show you out." You walk towards the door through the hallway chatting as you go. "Hopefully you''ve gotten something to think about before bedtime tonight."'
 		'"I hope so too."'
 		'"Here we are, now hope to see you again soon."you smile to Anna and say goodbye before you leave out towards the residential area.'
-		act 'Leave': gt'HotelHole'
+		act 'Leave': gt'pav_hotel'
 	end
 end
 

+ 1 - 1
locations/hunterLoveSex.qsrc

@@ -3056,7 +3056,7 @@ if $ARGS[0] = 'din_hunters_sex_misionary_bonus':
 	i = rand(1,4)
 	j = rand(1,3)
 	h = rand(1,3)
-	if pcs_agil > 50 and musle >= salo:'Throw legs <a href="exec:gt ''hunterLoveSex'', ''din_hunters_sex_misionary_bonus1''">head</a> .'
+	if pcs_agil > 50 and strenbuf >= salo:'Throw legs <a href="exec:gt ''hunterLoveSex'', ''din_hunters_sex_misionary_bonus1''">head</a> .'
 	*pl
 	if h < 3:'Having had enough of this position he asks you...'
 	if h = 3:'Suddenly <<$boydesc>> begins to move even faster and you realize that he is already on edge and ready...'

+ 8 - 8
locations/hunters.qsrc

@@ -532,15 +532,15 @@ if $ARGS[0] = 'start':
 				*clr & cla
 				gs 'cum_call', 'face', $boy, 1
 				if $clothingworntype = 'nude':gs 'cum_call', 'stomach', $boy, 1
-				if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):gs 'cum_call', 'clothes_hidden', $boy, 1
+				if ($clothingworntype ! 'nude' and PCloswimwear = 0):gs 'cum_call', 'clothes_hidden', $boy, 1
 				gs 'boyStat', 'A174'
 				gs 'cum_call', 'face', $boy, 1
 				if $clothingworntype = 'nude':gs 'cum_call', 'stomach', $boy, 1
-				if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):gs 'cum_call', 'clothes_hidden', $boy, 1
+				if ($clothingworntype ! 'nude' and PCloswimwear = 0):gs 'cum_call', 'clothes_hidden', $boy, 1
 				gs 'boyStat', 'A172'
 				gs 'cum_call', 'face', $boy, 1
 				if $clothingworntype = 'nude':gs 'cum_call', 'stomach', $boy, 1
-				if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):gs 'cum_call', 'clothes_hidden', $boy, 1
+				if ($clothingworntype ! 'nude' and PCloswimwear = 0):gs 'cum_call', 'clothes_hidden', $boy, 1
 				huntersKnowSlut = 2
 				huntslutsex += rand(9,12)
 				gs 'stat'
@@ -2129,7 +2129,7 @@ if $ARGS[0]='huntersgroupOia':
 	minut += 5
 	pose = 1
 	gs 'cum_call', 'face', $boy, 1
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'): gs 'cum_call', 'clothes_hidden', $boy, 1
+	if ($clothingworntype ! 'nude' and PCloswimwear = 0): gs 'cum_call', 'clothes_hidden', $boy, 1
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hantersgroupo1.'+rand(0,1)+'.jpg"></center>'
 	'You''re kneeling down eagerly awaiting the men to finish, hoping they''ll cover your face with their sprem. The men cum simultaneously, grunting loudly, shooting their spunk all over your face. They leave you behind sitting on a blanket craving for more...'
@@ -2145,7 +2145,7 @@ if $ARGS[0]='huntersgroupOsa':
 	minut += 5
 	pose = 1
 	gs 'cum_call', 'face', $boy, 1
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):
+	if ($clothingworntype ! 'nude' and PCloswimwear = 0):
 		gs 'cum_call', 'clothes_hidden', $boy, 1
 	else
 		gs 'cum_call', 'stomach', $boy, 1
@@ -2419,7 +2419,7 @@ if $ARGS[0]='huntersgroupOsend':
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'cum_call', 'face', $boy, 1
 	if $clothingworntype = 'nude':gs 'cum_call', 'stomach', $boy, 1
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):gs 'cum_call', 'clothes_hidden', $boy, 1
+	if ($clothingworntype ! 'nude' and PCloswimwear = 0):gs 'cum_call', 'clothes_hidden', $boy, 1
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hantersgroupoend1.'+rand(0,2)+'.jpg"></center>'
 	'Not wanting to get you pregnant, <<$boydesc>> starts jerking off his cock in front of you...'
 
@@ -2442,7 +2442,7 @@ if $ARGS[0]='huntersgroupOaend':
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'cum_call', 'face', $boy, 1
 	if $clothingworntype = 'nude':gs 'cum_call', 'stomach', $boy, 1
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):gs 'cum_call', 'clothes_hidden', $boy, 1
+	if ($clothingworntype ! 'nude' and PCloswimwear = 0):gs 'cum_call', 'clothes_hidden', $boy, 1
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hantersgroupoend1.'+rand(0,2)+'.jpg"></center>'
 	'Making you kneel down, <<$boydesc>> starts masturbating in front of your face...'
 
@@ -2464,7 +2464,7 @@ if $ARGS[0]='huntersgroupOiend':
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
 	gs 'cum_call', 'face', $boy, 1
 	if $clothingworntype = 'nude':gs 'cum_call', 'stomach', $boy, 1
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):gs 'cum_call', 'clothes_hidden', $boy, 1
+	if ($clothingworntype ! 'nude' and PCloswimwear = 0):gs 'cum_call', 'clothes_hidden', $boy, 1
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hantersgroupoend1.'+rand(0,2)+'.jpg"></center>'
 	'<<$boydesc>> tells you that he wants you kneeling down, cause he wants to cover your face with his spunk...'
 

+ 1 - 1
locations/huntersex.qsrc

@@ -1018,7 +1018,7 @@ if $ARGS[0] = 'doubleloveOralCum12':
 	gs 'cum_call', 'face', $boy, 1
 	lubonus = 0
 	if $clothingworntype = 'nude':gs 'cum_call', 'stomach', $boy, 1
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):gs 'cum_call', 'clothes_hidden', $boy, 1
+	if ($clothingworntype ! 'nude' and PCloswimwear = 0):gs 'cum_call', 'clothes_hidden', $boy, 1
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/doubleloveoralcum12.'+rand(1,3)+'.jpg"></center>'
 	'You are on your knees in front of the boys with an open mouth.'

+ 8 - 2
locations/igor_schedule.qsrc

@@ -43,7 +43,10 @@ if SchoolAtestat = 0 and kanikuli = 0:
 			end
 		end
 	elseif week = 6:
-		if hour < 8:
+		if igor_DimaNos_day = daystart:
+			!! Igor is at a date with Dimka wont be availebel whole day.
+			locat['igor']  = 11
+		elseif hour < 8:
 			!!Bedroom - Asleep
 			locat['igor']  = 1
 		elseif hour = 8 and minut < 30:
@@ -131,7 +134,10 @@ else
 			end
 		end
 	elseif week = 6:
-		if hour < 8:
+		if igor_DimaNos_day = daystart:
+			!! Igor is at a date with Dimka wont be availebel whole day.
+			locat['igor']  = 11
+		elseif hour < 8:
 			!!Bedroom - Asleep
 			locat['igor']  = 1
 		elseif hour = 8 and minut < 30:

+ 1 - 1
locations/ilyroom.qsrc

@@ -17,7 +17,7 @@ act 'Leave':
 	gt 'city_industrial'
 end
 
-if StoryLine = 0 or altQS = 1:
+if $start_type[1] ! 'nomagic':
 	if poverKAR = 1:
 		'As you approach the door, you hear a faint rustling behind you. You turn and see Gustav. He walks up to you and says, "This is Ilyushkin''s apartment. Take this camera and film. Now we''ll get him."'
 

+ 41 - 61
locations/intro_city.qsrc

@@ -1,9 +1,9 @@
 # intro_city
 
-music_loop = 0
-CLOSE ALL
 gs 'themes', 'indoors'
+killvar '$start_type'
 $start_type = 'city'
+$start_type[1] = 'nomagic'
 
 if $ARGS[0] = 'start':
 
@@ -63,59 +63,37 @@ if $ARGS[0] = 'start':
 	pcs_sleep = 100
 	willpowermax = 100
 
-	$start_type = 'nt'
-	NTstart = 1
+	gs 'set_home', 1
 	
 	gt 'intro_city', 'city_intro'
 end
 
 if $ARGS[0] = 'city_intro':
+	$loc = 'intro_city'
+	$loc_arg = '2'
 	!! Intro to starting city
 	!!variables for apartment living
 	pcs_hairlng = 100
-	!!Default Names
-	$pcs_firstname = 'Svetlana'
-	$pcs_lastname = 'Lebedev'
-	$pcs_nickname = 'Sveta'
-
-	!!Player names are set here
-	$temp_firstname = '<<$pcs_firstname>>'
-	$pcs_firstname = input("What is your first name? (Leave blank for Svetlana)")
-	if $pcs_firstname = '':$pcs_firstname = '<<$temp_firstname>>'
-	killvar '$temp_firstname'
-
-	$temp_lastname = '<<$pcs_lastname>>'
-	$pcs_lastname = input("What is your family name? (Leave blank for Lebedev)")
-	if $pcs_lastname = '':$pcs_lastname = '<<$temp_lastname>>'
-	killvar '$temp_lastname'
-
-	$temp_nickname = '<<$pcs_nickname>>'
-	$pcs_nickname = input("What is your nickname? (Leave blank for Sveta)")
-	if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
-	killvar '$temp_nickname'
-
 	*clr & cla
 	!!pic of apartment or Gazelle?
-	'The big day has finally arrived! Your family piled into your stepfather''s Gazelle pickup and you all traveled from your hometown, Pavlovsk, to the big city of St. Petersburg. Today is the day you move into your own apartment and start this new phase of your life.'
+	'The big day has finally arrived! Your family piled into your stepfather''s Gazelle pickup and you all traveled from your hometown, Pavlovsk, to St. Petersburg. Today is the day you move into your own apartment and start this new phase of your life.'
 	'You think back to your school days and what kind of student you were...'
 
-	act 'Continue': gt 'intro_city', 'vlad_intro'
+	act 'Continue': gt 'intro_city_select', 'start'
 end
 
 if $ARGS[0] = '2':
-	$loc = 'intro_city'
-	$loc_args = '2'
 !!	Just hair and eye color here for now; the dialog will be update as more options are added
 	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
 	'<center><b>Allows you to alter hair and eyes, use to match fixed profile picture if in use.</b></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/character_creation_2.jpg"></center>'
-	'As you look in the mirror, your face comes into focus. Some aspects of your appearance are already set, you can define the others now.'
+	'As you look in the mirror, your face comes into focus. While some aspects of your appearance are already set, you can define the others now.'
 	'You are fairly tall.'
 	*nl
 	'<center>Customize your:</center>'
 	'<center><a href="exec:gs ''intro_customization'', ''hair''"><img src="images/system/1_openings/shared/icon_hair.png"></a> <a href="exec:gs ''intro_customization'', ''eyes''"><img src="images/system/1_openings/shared/icon_eye.png"></a></center>'
 	
-	act 'Done': gt 'intro_city', 'city_intro'
+	act 'Done': gt 'intro_city', 'vlad_intro'
 end
 
 if $ARGS[0] = 'vlad_intro':
@@ -125,7 +103,7 @@ if $ARGS[0] = 'vlad_intro':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big28.jpg"></center>'
 	!!basic desc of Vlad, maybe a preset is used somewhere in game already? If not already in the intro (I think it is.)
-	'Having spent almost an hour in the cramped truck, you jump out as soon as you arrive. Vlad gets out and stretches a bit, before heading to the back of the Gazelle to start unloading your stuff.'
+	'Having spent almost an hour in the cramped truck, you jump out as soon as you arrive. Vladimir gets out and stretches before heading to the back of the Gazelle to start unloading your stuff.'
 
 	act 'Check Kolka': gt 'intro_city', 'kolka_intro'
 end
@@ -135,8 +113,8 @@ if $ARGS[0] = 'kolka_intro':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 	!!basic desc of Kolka, maybe a preset is used somewhere in game already? If not already in the intro (I think it is.)
-	'Your brother, caught up in the excitement of seeing the city, tries to slide past Vlad unnoticed but is called back to help unload. He sighs and shuffles his feet a bit before turning around to help his dad get your stuff.'
-	'Giving him a smile to encourage him, you thank him for helping. Your effort pays off, his chest puffs out a bit as he starts to help his father.'
+	'Your brother, caught up in the excitement of seeing the city, tries to slide past Vladimir unnoticed, but is called back to help unload. He sighs and shuffles his feet before turning around to help.'
+	'Giving him an encouraging smile, you thank him for helping. Your effort pays off, his chest puffing out as he starts to help his father.'
 
 	act 'Head inside': gt 'intro_city', 'anya_intro'
 end
@@ -147,14 +125,14 @@ if $ARGS[0] = 'anya_intro':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big33.jpg"></center>'
 	!!basic desc of Anya, maybe a preset is used somewhere in game already? If not already in the intro (I think it is.)
 	'Your sister comes up to you, links her arm with yours, and pulls you forward. "Come on, <<$pcs_nickname>>! I want to see this place."'
-	'Already knowing the answer, you ask anyway "Why don''t you have your own apartment then?"'
+	'Already knowing the answer, you ask anyway. "Why don''t you have your own apartment then?"'
 	'"I''m comfortable where I am right now. When I''m ready, maybe I will."'
 	'Rolling your eyes, you let her keep pulling on your arm.'
 
 	act 'Enter the apartment': gt 'intro_city', 'apartment_intro'
 end
 
-if $ARGS[0] = 'apartment_intro'
+if $ARGS[0] = 'apartment_intro':
 	$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'
@@ -162,9 +140,9 @@ if $ARGS[0] = 'apartment_intro'
 	!! Intro to apartment
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/home/korr.jpg"></center>'
-	'Once you get inside you look around, already trying to decide where things should go. Anya sees this, and laughing, drags you through each room to check them out.'
-	'By the time you''re done Kolka and Vladimir have started bringing boxes in. "Your <<$npc_nickname[''A29'']>> is staying outside for a bit to keep an eye on your stuff. I don''t think she likes the neighborhood much," he says with a shrug.'
-	'Both you and Anya pick up the boxes they set down and take them to the rooms they were labeled for, while your brother and stepfather bring it all inside.'
+	'Once inside you look around, already trying to decide where things should go. Anya sees this, and laughing, drags you through each room to check them out.'
+	'By the time you''re done, Kolka and Vladimir have started bringing boxes in. "Your <<$npc_nickname[''A29'']>> is staying outside to keep an eye on your stuff. I don''t think she likes the neighborhood much," he says with a shrug.'
+	'You and Anya pick up the boxes they set down and take them to the rooms they were labeled for while your brother and stepfather bring it all inside.'
 
 	act 'Greet <<$npc_nickname[''A29'']>>': gt 'intro_city', 'mom_intro'
 end
@@ -173,32 +151,32 @@ if $ARGS[0] = 'mom_intro':
 	!! Intro to Mom - answer sets relationship level
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
-	'Your <<$npc_nickname[''A29'']>> comes inside finally, carrying food she made ahead of time to feed everybody.'
-	'"<<$pcs_nickname>>, this is a pretty rough neighborhood. You need to be really careful of those boys outside. The sooner University starts the better, so you can get out of here. I don''t know why you couldn''t just wait until summer ended to move to the city."'
-	act 'I will be fine (neutral response)':
+	'Your <<$npc_nickname[''A29'']>> finally comes inside, carrying food she made ahead of time for everyone.'
+	'"<<$pcs_nickname>>, this is a pretty rough neighborhood. You need to be really careful of those boys outside. The sooner university starts and you can get out of here, the better. I don''t know why you couldn''t just wait until summer ended to move to the city."'
+	act 'Tell her what she wants to hear':
 		gs 'npc_relationship', 'set', 'A29', '50'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
-		'"Everything will be fine, <<$npc_nickname[''A29'']>>. I will look into university prices and decide then."'
-		'She gives you a hug before going to the kitchen to start setting up everybody with a plate of food.'
+		'"Everything will be fine, <<$npc_nickname[''A29'']>>. I''ll look into university prices and decide then."'
+		'She gives you a hug before going to the kitchen to start preparing lunch.'
 
 		act 'Have lunch': gt 'intro_city', 'lunch_break'
 	end
-	act 'Give it a rest (angry response)':
+	act 'Snap at her':
 		gs 'npc_relationship', 'set', 'A29', '30'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
-		'"Just stop <<$npc_nickname[''A29'']>>! I''m an adult now, and I will do whatever I want with who I want!"'
-		'Her eyes flash in anger, but she doesn''t say anything. She goes to the kitchen to start setting up everybody with a plate of food.'
+		'"Just stop <<$npc_nickname[''A29'']>>! I''m an adult now, and I''ll do whatever I want with whoever I want!"'
+		'Her eyes flash in anger, but she doesn''t say anything. She then heads into the kitchen to prepare lunch.'
 
 		act 'Have lunch': gt 'intro_city', 'lunch_break'
 	end
-	act 'Don''t worry (loving response)':
+	act 'Appreciate her concern':
 		gs 'npc_relationship', 'set', 'A29', '70'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
-		'"I know, don''t worry so much <<$npc_nickname[''A29'']>>. I will be very careful, I promise. It''s only for a few months."'
-		'She gives you a big hug before going to the kitchen to start setting up everybody with a plate of food.'
+		'"I know, don''t worry so much <<$npc_nickname[''A29'']>>. I''ll be very careful, I promise. It''s only for a few months."'
+		'She gives you a hug before going to the kitchen to prepare lunch.'
 
 		act 'Have lunch': gt 'intro_city', 'lunch_break'
 	end
@@ -210,12 +188,12 @@ if $ARGS[0] = 'lunch_break':
 	if npc_rel['A29'] >= 60:
 		'<<$npc_nickname[''A29'']>> hands you a plate with a big smile as you all sit down at your kitchen table.'
 	elseif npc_rel['A29'] <= 30:
-		'Lunch is a little tense at first, but for the most part everybody is used to you and your <<$npc_nickname[''A29'']>> fighting.'
+		'Lunch is a little tense at first, but everyone is used to you and your <<$npc_nickname[''A29'']>> fighting.'
 	else
-		'<<$npc_nickname[''A29'']>> hands plates of food as you all sit down at your kitchen table.'
+		'<<$npc_nickname[''A29'']>> hands out plates of food as you all sit down at your kitchen table.'
 	end
-	'Before long, you are all laughing and joking with each other as you eat. You are still looking forward to being on your own, but you know times like this meal will become pretty rare once they head home.'
-	'Once the meal is done and <<$npc_nickname[''A29'']>> cleans up the mess, everybody stands up to say goodbye.'
+	'Before long, you''re all laughing and joking with each other as you eat. You''re still looking forward to being on your own, but you know times like this will become pretty rare once they head home.'
+	'Once everyone is finished and <<$npc_nickname[''A29'']>> clears up, they all prepare to say goodbye.'
 
 	act 'Say goodbye to your family': gt 'intro_city', 'family_goodbye'
 end
@@ -224,30 +202,32 @@ if $ARGS[0] = 'family_goodbye':
 	!! Say goodbye to your family
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/home/korr.jpg"></center>'
-	'Anya gives a big hug, congratulates you on getting your own place, and then steps back to give the rest of your family room to do the same. Your brother gives you an awkward hug and whispers to text him what it''s like before stepping back too.'
-	'Vladimir comes over and hugs you too, tells you how proud he is to be your stepfather and to call if you need anything.'
+	'Anya gives a hug and congratulates you on getting your own place. Your brother gives you an awkward hug and whispers to text him what it''s like living on your own.'
+	'Vladimir then comes over and hugs you too, telling you how proud he is to be your stepfather and to call if you need anything.'
 	if npc_rel['A29'] >= 60:
-		'Your <<$npc_nickname[''A29'']>> finishes what she is doing and comes over, tears in her eyes. Wrapping you in a big hug, she reminds you again to stay away from the boys outside, before joining the rest of the family by the door.'
+		'Your <<$npc_nickname[''A29'']>> finishes what she''s doing and comes over, tears in her eyes. Wrapping you in a hug, she again reminds you to stay away from the boys outside before joining the rest of the family by the door.'
 	elseif npc_rel['A29'] <= 30:
-		'Your <<$npc_nickname[''A29'']>> finishes what she is doing and comes over and gives you an awkward hug, saying she is sorry for fighting with you on your big day, before joining the rest of the family by the door.'
+		'Your <<$npc_nickname[''A29'']>> finishes what she''s doing and gives you an awkward hug, apologising for fighting with you before joining the rest of the family by the door.'
 	else
-		'Your <<$npc_nickname[''A29'']>> finishes what she is doing and comes over and gives you a hug and reminds you to stay away from the boys outside, before joining the rest of the family by the door.'
+		'Your <<$npc_nickname[''A29'']>> finishes what she''s doing and comes over and gives you a hug, again reminding you to stay away from the boys outside before joining the rest of the family by the door.'
 	end
 	*nl
-	'They all wave and head out, leaving you alone for the first time. You spend some time unpacking your stuff, before you stop and stretch, deciding you can finish later.'
+	'They all wave and head out, leaving you alone for the first time. You spend some time unpacking your stuff before you stop and stretch, deciding you can finish later.'
 
 	act 'Continue': gt 'intro_city', 'welcome_intro'
 end
 
 if $ARGS[0] = 'welcome_intro':
+	gs 'intro_initialization_city'
 	!! Welcome to Girl Life speech
+	MagikDostup = 1
 	showstat 1
 	showobjs 1
 	gs 'obj_din', 'old'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/system/1_openings/5_city/city_start.jpg"></center>'
 	'Welcome to Girl Life. You are finally free of your parents and ready to face all the freedoms and challenges that entails. Your options are nearly unlimited and now it''s time to go out and discover them all.'
-	'Don''t forget to enroll in university during August, if that''s a goal you want to pursue.'
+	'Don''t forget to enroll in university during August if that''s a goal you want to pursue.'
 
 	act 'Start the game': gt 'korr'
 end

+ 1 - 2
locations/intro_city_m.qsrc

@@ -1,8 +1,7 @@
 # intro_city_m
 
-music_loop = 0
-CLOSE ALL
 gs 'themes', 'indoors'
+killvar '$start_type'
 $start_type = 'city_m'
 
 'Not yet available!!'

Diff do ficheiro suprimidas por serem muito extensas
+ 220 - 306
locations/intro_city_select.qsrc


+ 117 - 227
locations/intro_city_tg.qsrc

@@ -1,45 +1,44 @@
 # intro_city_tg
 
-music_loop = 0
-CLOSE ALL
 gs 'themes', 'indoors'
+killvar '$start_type'
 $start_type = 'city_tg'
+$start_type[1] = 'tg'
 
 if $ARGS[0] = 'start':
 	menu_off = 1
 	'<center><b><font color="maroon">Apartment</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/1.jpg"></center>'
-	'You wake up to the sound of your alarm clock. You hear Luda, your wife, mumbling next to you, "Don''t want to, it''s too early." She pulls her blanket up and rolls over. You reach over and turn the clock off.'
+	'You wake up to the sound of your alarm clock and hear Luda, your wife, mumbling next to you. "Don''t want to, it''s too early." She pulls her blanket up and rolls over. You reach over and turn the clock off.'
 	*nl
-	'<i>There are days when I just want to keep on sleeping</i>, you think to yourself. <i>But I can''t, not today.</i>'
+	'<i>There are days when I just want to keep sleeping,</i> you think to yourself. <i>But I can''t, not today.</i>'
 	act 'Go to the bathroom':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/mikhail_2.jpg"></center>'
-		'Quietly, so that you don''t wake up your daughter, you go to the bathroom and take care of your morning routine.'
+		'Being careful not to wake up your daughter, you head to the bathroom and take care of your morning routine.'
 		act 'Leave the apartment':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/3.jpg"></center>'
-			'In a parking lot near your house sits your car. You unlock it with the remote key and climb in.'
+			'Your car sits in a parking lot near your house. You unlock it with the remote key and climb in.'
 			act 'Go to work':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/4.jpg"></center>'
-				'You turn the key and the engine roars to life. As you drive to work the roads are filled with traffic, but it''s the morning rush hour, so it''s no surprise. You drive for what feels like an eternity, give or take an hour, but you eventually reach the office. The music on the radio was pleasant, at least.'
+				'You turn the key and the engine roars to life. The morning rush hour means that the roads are filled with traffic as you head to work. You drive for what feels like an eternity, but you eventually reach the office. The music on the radio was pleasant, at least.'
 				act 'Park at the office':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/5.jpg"></center>'
-					'You pull into a parking lot near the building and manage to find a good spot. You greet the security guard on your way in to the building, and then go upstairs to your office. Shortly after you sit down at your desk and boot up your computer, your boss''s secretary comes in and hands you a folder with several travel documents.'
+					'You pull into a parking lot near the building and manage to find a good spot. You greet the security guard on your way in before heading upstairs to your office. Shortly after you sit down at your desk and boot up your computer, your boss''s secretary comes in and hands you a folder with several travel documents.'
 					*nl
-					'"Am I going on a business trip or something?" you ask her.'
+					'"Am I going on a business trip or something?" you inquire.'
 					*nl
-					'"Yes, the director said it had something to do with a construction project, out in the middle of nowhere, but that''s pretty much all I know," Oksana says.'
+					'"Yes, the director said it had something to do with a construction project out in the middle of nowhere. That''s pretty much all I know," she replies.'
 					*nl
 					'After she leaves, you read over the travel documents and fill them out. Time to go to the director.'
 					act 'Go and see your boss':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_roman.jpg"></center>'
 						'You head into the directors'' office, greet him and hand him the papers to sign. The director, Roman Gromov, scans through the text before signing off on it with a broad, sweeping stroke.'
-						*nl
-						'"Ms. Glavbukh is in her office. Go get some travel money while I make a few calls. We''ll discuss your trip when you get back."'
+						'"Ms. Glavbukh is in her office. Get some travel money while I make a few calls. We''ll discuss your trip when you get back."'
 						act 'Go to the chief accountant':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_marina.jpg"></center>'
@@ -47,21 +46,17 @@ if $ARGS[0] = 'start':
 							act 'Return to the director':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_roman.jpg"></center>'
-								'Roman is busy talking on the phone when you re-enter the his office, he gestures for you to sit down on one of the chairs across from him.'
-								*nl
-								'"Yes, I understand... yes. I will send Mikhail over ASAP, he''ll represent me... Yes... Tell your men to work on some other parts of the project in the meantime. Have Igor guard the pit and let no one make any fuss, and make sure nobody gets wind of this and, you know, try to halt the construction... Okay, we''ll keep in touch."'
-								*nl
-								'Roman hangs up and turns to you.'
+								'Roman is busy talking on the phone when you re-enter the his office. He gestures for you to sit down on one of the chairs across from him.'
 								*nl
-								'"Last night, while excavating for the foundations, the workers stumbled upon something; one of the excavators dug into a hollow space of some sort. Luckily Igor was on site and he halted the excavation.'
+								'"Yes, I understand... yes. I''ll send Mikhail over ASAP, he''ll represent me... Yes... Tell your men to work on some other parts of the project in the meantime. Have Igor guard the pit and let no one make any fuss, and make sure nobody gets wind of this and, you know, try to halt the construction... Okay, we''ll keep in touch."'
 								*nl
+								'Roman hangs up and turns to you. "Last night, while excavating for the foundations, the workers stumbled upon something; one of the excavators dug into a hollow space of some sort. Luckily, Igor was on site and halted the excavation.'
 								'"It''s not clear what exactly it is, yet. Maybe an abandoned bunker or a cave. But in any case, if there are any more chambers under the foundation, we might not be able to build on the land. So what I want you to do, is to go to the construction site, figure out exactly what the problem is and solve this whole mess as quickly as possible."'
 								act 'Remind him of the correct procedures':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_roman.jpg"></center>'
-									'"Firstly we need to talk to..." you start to say, but are quickly interrupted by your boss.'
-									*nl
-									'"Mikhail, do you realize what''s at stake here? We''re near the end of our credit line, we still have unfinalized agreements on the project''s contract, and we already have guys digging the pit. If there is a too big hole under the foundation, and we can''t build on the site, that could bankrupt the company. So this mysterious structure must be addressed immediately and I have to hold the fort here and keep a lid on things."'
+									'"Firstly we need to talk to..." you start to say, but are quickly interrupted.'
+									'"Mikhail, do you realize what''s at stake here? We''re near the end of our credit line, we still have unfinalized agreements on the project''s contract, and we already have guys digging the pit. If there''s a huge hole under the foundation and we can''t build on the site, that could bankrupt the company. So this mysterious structure must be addressed immediately and I have to hold the fort here and keep a lid on things."'
 									act 'Doesn''t look like you have a choice': gt 'intro_city_tg', 'roadPRE'
 								end
 							end
@@ -77,82 +72,62 @@ if $ARGS[0] = 'roadPRE':
 	music_loop = 0
 	CLOSE ALL
 	'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/4.jpg"></center>'
-	'You leave the office and from your car phone your wife Luda. You explain the situation to her and as soon as you finish the call, you drive off to the construction site.'
+	'You leave the office and phone Luda in your car. You explain the situation to her and drive off to the construction site.'
 	act 'Drive':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_working.jpg"></center>'
-		'You''ve been on the highway for hours before you arrive at the town near the site, leaving you feeling tired. But before you can check into a hotel and get some sleep, you need to get an understanding of the magnitude of the problem you''re dealing with. You follow the directions to the site. Igor calls on the way and tells you that you won''t have to go through a security check.'
-		*nl
-		'You arrive and park your car at the site. You see Igor waving at you from a distance and you walk up to him.'
+		'You''re on the highway for hours before you arrive at the town near the site, leaving you feeling tired. Before you can check into a hotel and get some sleep, you need to get an understanding of the magnitude of the problem you''re dealing with. You follow the directions to the site, Igor calling on the way and telling you that you won''t have to go through a security check.'
+		'You arrive and park your car at the site. You see Igor waving at you from a distance and walk up to him.'
 		act 'Greet Igor':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_igor.jpg"></center>'
-			'Igor greets you. He is obviously concerned about the situation and without delay leads you to the pit''s fenced-off entrance. It rained earlier so the ground is all muddy, you''re going to have to clean your shoes when you get back to the hotel.'
-			*nl
+			'Igor greets you. He''s obviously concerned about the situation and leads you to the pit''s fenced-off entrance without delay. It rained earlier, so the ground is soft and muddy.'
 			'"The ladder''s over there," Igor informs you, while pointing to your left.'
-			*nl
 			'You reach the hole in the ground and peek inside using the small flashlight from your keychain. "There seems to be a floor about 5 meters down."'
-			*nl
-			'"Well, what do you think Mikhail? Shall we go down?" Igor says with a faint glimmer of adventure in his eyes.'
+			'"Well, what do you think Mikhail? Shall we go down?" Igor asks with a faint glimmer of adventure in his eyes.'
 			act 'Descend':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_cave_1.jpg"></center>'
-				'Igor hands you a powerful flashlight and tells the guard to get the ladder over here. Igor is the first one to go down, once he reaches the bottom, he holds the ladder so you can safely climb down as well.'
-				*nl
-				'The cave smells musty and looks all gloomy, but you can breathe freely and the light from your flashlight illuminates the walls. You shoot a beam of light into the corridor and in the distance see something that resembles a door.'
-				*nl
-				'"Damn. If any historians hear about this, they''ll be all over this construction site." Igor mutters.'
-				*nl
+				'Igor hands you a powerful flashlight and tells the guard bring a ladder over. Igor heads down first and you quickly follow him.'
+				'The cave smells musty and looks gloomy, but you can breathe freely and the light from your flashlight illuminates the walls. You shoot a beam of light into the corridor and see something that resembles a door in the distance.'
+				'"Damn. If any historians hear about this, they''ll be all over this place!" Igor mutters.'
 				'You walk up to the door and see drawings on it. Most of them resemble people, but with other stick figures as well.'
 				act 'Open the door':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_cave_3.jpg"></center>'
-					'You lean against the door, it''s stiff but you manage to push it open.'
-					*nl
-					'"Oh shit...! Take a look over there. Human bones." Igor says nervously.'
-					*nl
+					'You lean against the door. It''s stiff, but you manage to push it open.'
+					'"Oh shit! Take a look over there!" Igor exclaims nervously.'
 					'You take a look at what Igor is pointing at and see a pile of human bones with a skull on top.'
-					*nl
-					'"A tomb, I suppose." Igor mutters looking apprehensive.'
-					*nl
-					'"Probably", you nod. "We can''t rule anything out just yet."'
+					'"A tomb, I suppose..." he mutters while looking apprehensive.'
+					'"Probably," you nod. "We can''t rule anything out just yet."'
 					act 'Go further':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_cave_5.jpg"></center>'
-						'Further into the cave, you reach a room that resembles some kind of archive, filled with dozens of old, dusty scrolls inside of racks built into the walls.'
-						*nl
-						'Igor takes one of the scrolls and carefully unrolls it. "What the hell? Look at this, it must be some kind of ancient language," Igor says. "I''ll take one with me, and see what I can find out about these, maybe I can get it deciphered. So we''ll know what we are dealing with."'
-						*nl
-						'Looking around, you notice another door on the other side of the chamber, you walk over and open it.'
+						'Further into the cave, you reach a room that resembles some kind of archive, filled with dozens of old, dusty scrolls inside racks built into the walls.'
+						'Igor takes one of the scrolls and carefully unrolls it. "What the hell? Look at this, it must be some kind of ancient language," he says. "I''ll take one with me and see what I can find out about these. Maybe I can get it deciphered so we know what we''re dealing with."'
+						'Looking around, you notice another door on the other side of the chamber and walk over and open it.'
 						act 'Enter the room':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_cave_altar.jpg"></center>'
-							'There''s an altar in the center of the room, on it there are various pots, several gold amulets and even some stone figures. You continue looking around the room curiously, trying to figure out what it''s purpose was.'
-							*nl
-							'Looking closely at the altar, you notice a strange little amulet placed at the very top.'
+							'There''s an altar in the center of the room with pots, several gold amulets and even stone figures scattered around it. You continue looking around the room curiously, trying to figure out what it''s purpose was.'
+							'Looking closely at the altar, you notice a strange little amulet placed at the top.'
 							act 'Examine the amulet':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/system/1_openings/shared/item_amulet.jpg"></center>'
-								'You pick up the strange amulet and examine it. <i>This is clearly very old</i>, you think to yourself.'
-								*nl
-								'While holding the amulet, you realize that it''s getting warm, almost hot. Suddenly you feel heat coursing through your entire body. You feel a surge of strength inside you. It''s like you just finished a long jog, but without the fatigue.'
-								*nl
-								'Igor enters the room with one of the scrolls in his hands. "Huh. Interesting little room.", he says, glancing over the altar. "Well, we have to make a decision: either we fill the catacombs up to the brink with cement or we let someone into these rooms. Who knows what all this stuff is, maybe it''s worth more than it looks."'
+								'You pick up the strange amulet and examine it. <i>This is clearly very old</i> you think to yourself.'
+								'While holding the amulet, you realize that it''s getting warm, almost hot, before you feel heat coursing through your entire body and feel a surge of strength inside you. It''s like you just finished a long jog, but without the fatigue.'
+								'Igor enters the room with one of the scrolls in his hands. "Huh. Interesting little room," he observes while glancing over the altar. "Well, we have to make a decision: either we fill these catacombs up with cement or we let someone in to study them. Who knows what all this stuff is. Maybe it''s worth more than it looks?"'
 								act 'Consult you boss':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_cave_altar.jpg"></center>'
-									'"I''ve got to think about it and consult the director before we do anything." You reply and without thinking about it, you put the small amulet into your pocket.'
-									*nl
-									'"Well, one thing''s for sure, you won''t get reception down here. Let''s go outside." Igor tells you.'
+									'"I''ve got to think about it and consult the director before we do anything," you reply and, without thinking about it, stuff the small amulet in your pocket.'
+									'"Well, one thing''s for sure. You won''t get reception down here. Let''s head outside," Igor replies while motioning for you to leave.'
 									act 'Go back to the surface':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_working.jpg"></center>'
-										'You walk together with Igor out of the strange chambers and up the ladder, back to the surface.'
-										*nl
-										'"We must have been down there longer than I thought, it''s already late. There will only be security on site now so there''s nothing we can do here until the morning, you should go to the hotel." Igor says.'
-										*nl
-										'With a hasty goodbye to Igor, you make your way back to your car.'
-										'<i>Damn</i>, you think, <i>tomorrow''s going to be a stressful day.</i>'
+										'You walk out of the strange chambers and climb back up the ladder to the surface.'
+										'"We must have been down there longer than I thought, it''s already late. There will only be security on site now, so there''s nothing we can do here until morning. You should go to the hotel." Igor informs you.'
+										'With a hasty goodbye, you make your way back to your car. <i>Damn!</i> you think. <i>Tomorrow''s going to be a stressful day.</i>'
 										act 'Go to the hotel': gt 'intro_city_tg', 'otelPRE'
 									end
 								end
@@ -166,91 +141,69 @@ if $ARGS[0] = 'roadPRE':
 end
 
 if $ARGS[0] = 'otelPRE':
-	$temp_firstname = '<<$pcs_firstname>>'
-	$temp_lastname = '<<$pcs_lastname>>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/6.jpg"></center>'
 	'Your trip to the hotel is quite uneventful compared to your tomb raiding adventure.'
-	*nl
-	'You park your car and go to the receptionist to get a room. There are only double rooms available, but it''s going on the company card, so that just means you''ll get a bigger room. You swipe your company card and take your room key.'
+	'You park your car and go to the receptionist to get a room. There are only double rooms available, but it''s going on the company card, so that just means you''ll get a bigger room. You swipe the card and take your room key.'
 	act 'Head upstairs to your room':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/7.jpg"></center>'
-		'Lying down on one of the beds, you start to wonder just who built that crypt and what it''s purpose was. Your thoughts drift to that amulet you found. The way that thing you touched half an hour ago is still making you feel wonderful baffles you.'
+		'Lying down on one of the beds, you start to wonder just who built that crypt and what it''s purpose was as your thoughts drift to the amulet you found. The way that thing is still making you feel wonderful baffles you.'
 		act 'Call the director':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/7.jpg"></center>'
-			'You dial Romans'' number and after a few rings, he picks up. You report to him the details of what you found at the site with Igor: an ancient tomb, human bones, scrolls in a mysterious language and the altar in that room.'
-			*nl
-			'The director stays silent while you give your report. A few moments later, he decides that it would be best to stop the construction. He tells you to stay and keep watch over the site until further notice.'
-			*nl
-			'You put the phone away. <i>Looks like this trip is going to last longer than expected</i>, you think to yourself.'
+			'You dial Roman''s number and after a few rings, he picks up. You inform him of what you found at the site: an ancient tomb, human bones, scrolls in a mysterious language and a strange altar.'
+			'Roman stays silent while you give your report. He decides that it would be best to stop the construction and tells you to stay and keep watch over the site until further notice.'
+			'You put the phone down. <i>Looks like this trip is going to last longer than expected,</i> you think to yourself.'
 			act 'Go to bed':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/7.jpg"></center>'
 				'It doesn''t take you long to drift off to sleep'
 				*nl
-				'Images begin to form in your mind and you soon find yourself in a middle of a dream. The amulet stands before you and out of it comes a ghost of some sort. Before you even realize what you are doing, you find yourself staring deep into the ghost''s eyes which then turn into two planet earths.'
-				*nl
+				'Images begin to form in your mind and you soon find yourself in a middle of a dream. The amulet stands before you and out of it comes a ghost of some sort. Before you even realize what you are doing, you find yourself staring deep into the ghost''s eyes, which turn into two Earths.'
 				'"Looking at the world most just see the mundane, but there is more to it, much more and now you see that too. You have the potential to shape it all, but first, you have company."'
 				*nl
-				'Suddenly your senses return and you are aware of the hotel room around you, you can tell you are not alone.'
+				'You suddenly return to your senses and become aware of not only the room around you, but that you''re not alone.'
 				act 'Open your eyes':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_reinhold.jpg"></center>'
-					'As you open your eyes, you see a man standing in your room. He is wearing a long black coat and his face looks weary; he is unshaven and reminds you of most police detectives in Hollywood films.'
-					*nl
-					'"Where is the amulet?" he approaches you.'
+					'As you open your eyes, you see a man standing in your room. He is wearing a long black coat and his face looks weary; he is unshaven and reminds you of scruffy Hollywood police detectives.'
+					'"Where is the amulet?" he asks as he approaches you.'
 					act 'Ask who he is':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_reinhold.jpg"></center>'
-						'"Who are you?" you ask puzzledly. The man''s sudden appearance and a sense you never knew you had tell you something about him, that he is not of the world you know.'
-						*nl
-						'"Listen, don''t cause any problems now. Give me the amulet, close the construction site, and all will be fine. After all that place belongs to us," he says in a firm voice.'
-						*nl
+						'"Who are you?" you ask, puzzled. The man''s sudden appearance and a sense you never knew you had tells you something about him; that he is not of this world.'
+						'"Don''t cause any problems now. Give me the amulet, close the construction site and all will be fine. After all, that place belongs to us," he says in a firm voice.'
 						'<i>Belongs to us?</i> His response leaves you bewildered, wondering who he is and what this is all about.'
-						*nl
-						'"Well, how about I give you a small taste of my power." the man says, and out of nowhere comes a burning desire to give him the amulet.'
+						'"Well, how about I give you a small taste of my power?" the man asks, and out of nowhere comes a burning desire to give him the amulet.'
 						act 'Give him the amulet':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/7.jpg"></center>'
-							'You get out of the bed and give him the stone figure you had put in your pocket earlier. The man takes it, steps back, and without warning, something in his eyes begins to spin like a whirlwind, causing your own eyes to blur as if he was hypnotizing you. A few seconds later your vision clears with the man having somehow disappeared into thin air.'
-							*nl
-							'You rub your eyes, "What the hell is going on here? Was that a dream?. No, it can''t be. I wouldn''t walk around in a dream. I think." You say to no one in particular then check your pocket, the amulet is indeed gone. You sit down on the bed trying to make sense of what just happened.'
-							*nl
+							'You get out of the bed and give him the stone figure you had put in your pocket earlier. The man takes it, steps back, and without warning, something in his eyes begins to spin like a whirlwind, causing your own eyes to blur as if he was hypnotizing you. A few seconds later, your vision clears with the man having somehow disappeared into thin air.'
+							'You rub your eyes. "What the hell is going on here? Was that a dream? No, it can''t be. I wouldn''t walk around in a dream. I think," you say to yourself before checking your pocket. The amulet is indeed gone. You sit down on the bed, trying to make sense of what just happened.'
 							'While lost in thought, you hear a knock on the door. You get up to open the door, not even thinking why you would have visitors this late at night.'
-							'"...Who''s there?", you ask, still confused.'
 							*nl
-							'A woman''s voice responds that she''s the hotel receptionist and that she needs to talk to you on an urgent matter.'
+							'"...Who''s there?" you ask, still confused.'
+							'A woman''s voice responds that she''s the hotel receptionist and that she needs to talk to you about an urgent matter.'
 							act 'Answer the door':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
 								'You open the door, but don''t recall the woman in front of you being at the reception desk; the woman from earlier didn''t have red hair and glasses. After entering the room she quickly examines the place, before locking her eyes on you.'
-								*nl
-								'"Mikhail, right?" You nod.'
-								*nl
-								'"Last night you went to a certain place and took out something very valuable and powerful." the woman speaks to you.'
+								'"Mikhail, right?" she asks and you nod.'
+								'"You went to a certain place last night and took something very valuable, and very powerful..." she continues.'
 								act 'Another one?':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
-									'<i>Again?</i>'
-									*nl
-									'You sigh, irritated that not only have you been disturbed in the middle of the night, but these idiots apparently cannot even agree among themselves which one of them should disturb you.'
-									*nl
+									'You sigh, irritated that not only have you been disturbed in the middle of the night, but these idiots apparently can''t even agree amongst themselves which one should be disturbing you.'
 									'"Listen, you''re starting to bother me. That other guy already showed up asking for the damn amulet."'
-									*nl
 									'She looks at you with surprise. "What? Someone already came here? Who was it?"'
 									act 'Tell her':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
-										'"It was some man in a navy cloak with ginger hair and a light beard, he didn''t tell me his name. He already took the amulet." You answer.'
-										*nl
-										'The girl''s face drops. "Damn it!" She looks into your eyes. "Okay... Mikhail, we have to go somewhere else, there are too many people that might get hurt here. Gustav, come here!" The girl calls out to the corridor.'
-										*nl
-										'A tall man enters the room'
-										StoryLine = 0
+										'"It was some guy in a navy cloak with ginger hair and a light beard. He didn''t tell me his name. He already took the amulet."'
+										'The girl''s face drops. "Damn it!" She looks into your eyes. "Okay... Mikhail, we have to go somewhere else. There are too many people that might get hurt here. Gustav, come here!" The girl calls out to the corridor and a tall man enters the room.'
 										MagikDostup = 0
 										$pcs_firstname = 'Mikhail'
-										$pcs_lastname = 'Kuznetsov'
+										$pcs_lastname = 'Ivanov'
 										age = 35
 										vidage = 35
 										year = 2016
@@ -284,7 +237,7 @@ if $ARGS[0] = 'otelPRE':
 										act 'Prepare to fight':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_gustav.jpg"></center>'
-											'The man has a large tattoo across the left side of his face. He too has red hair'
+											'The man has a large tattoo across the left side of his face. He too has red hair.'
 											$boy = 'Gustav'
 											gs 'fight','initFight',1
 
@@ -309,90 +262,67 @@ if $ARGS[0] = 'tatianaPRE':
 	$pcs_lastname = '<<$temp_lastname>>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
 	'You wake up in an unfamiliar room. Standing near you is the same red-haired girl that entered your hotel room.'
-	*nl
-	'"Ah, you''re awake," she chirps. "I told this jerk Gustav that he should have treated you more carefully, but he''s bad at listening. As a result I had to use some magic to stabilize you, he almost knocked you out permanently."'
-	*nl
-	'"While you were unconscious I did some research on you. Turns out the Amulet of Power passed to you. Must have happened when you touched it. Unfortunately, Reinhold, the guy in your room, he''s probably realized by now that the amulet no longer has the power and now he''s out to hunt you down."'
+	'"Ah, you''re awake," she chirps. "I told this jerk Gustav that he should have treated you more carefully, but he''s bad at listening. As a result, I had to use some magic to stabilize you. He almost knocked you out permanently."'
+	'"While you were unconscious, I did some research on you. Turns out the Amulet of Power passed to you. Must have happened when you touched it. Unfortunately, Reinhold, the guy in your room, he''s probably realized by now that the amulet no longer has the power and now he''s out to hunt you down."'
 	act 'What''s going on?':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
 		'"What the hell is going on?" you respond. You try to move your hands, but you''re tied to the bed.'
+		'"I''ll start from the beginning," the girl says. "Magic exists and is real. Millenia ago, the world was not the same. The fae creatures who possess natural magic lived in balance, but the succubus were free to breed with whomever they wished."'
+		'"They bred with humans, and with that human magicians were born. The Sidhe, as the most powerful of the fae, feared the increasing number of human magicians and cast a very powerful spell to bind the succubus to them. This prevented either from being able to reproduce without the other."'
+		'"All magicians have some of that original fae blood in there bodies and it is through that that they are able to connect with the world of magic." The redhead adjusts her glasses. "Most of the world simply ignores magic or are protected from it by magic''s natural desire to remain hidden."'
+		'"But last night, there was a powerful burst of magical energy, strong enough to be clearly seen by any with magical connections. Can you guess where this surge came from? Yeah, that cave you found. Apparently the surge occurred when you opened the seal to the archive. Anyway, that was when we started to search. That source of power is desired by many, but it is extremely dangerous and in the wrong hands could do untold horrors."'
 		*nl
-		'"Um, okay, I''ll start from the beginning," the girl says. "Magic exists and is real. Ages ago the world was not the same, the fae creatures who possess natural magic lived in balance but the succubus were free to breed with whom ever they wished."'
-		*nl
-		'"They breed with humans with that human magicians were born. The Sidhe as the most powerful of the fae feared the increasing numbers of human magicians and cast a very powerful spell to bind the succubus to them, this prevented either from being able to reproduce without the other."'
-		*nl
-		'"All magicians have some of that original fae blood in there bodies and it is through that that they are able to connect with the world of magic."'
-		*nl
-		'The redhead adjusts her glasses. "Most of the world simply ignore magic or are protected from it by magic''s natural desire to remain hidden."'
-		*nl
-		'"But last night there was a powerful burst of magical energy, strong enough to be clearly seen by any with magical connections. Can you guess where this surge came from? Yeah, that cave you found. Apparently the surge occurred when you opened the seal to the archive. Anyway, that was when we started to search, that source of power is desired by many, but it is extremely dangerous and in the wrong hands could do untold horrors."'
-		*nl
-		'She stops for a few seconds for you process that information. It seems really far fetched.'
-		*nl
+		'She stops for a few seconds for you process the information. It seems really far fetched.'
 		'"As you can figure out, Reinhold wanted to prevent the amulet being misused, but he was not very thorough and didn''t check you over."'
 		act 'So, the whole world is just an illusion?':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
-			'"So magic exists and is used by all these people and creatures, but the rest of us just don''t see it, or convince ourselves it didn''t happen?" You ask.'
-			*nl
-			'The girl nods. "Yes. You''re a quick study. Machines, apartments, television and the Internet, all this really does exist and is in the form in which people see it. But if I say, hurl a fireball, then people might see that I threw a grenade or shot from a flamethrower. The human mind can''t process magic, so it blocks it as a way to protect the person from going crazy."'
-			*nl
-			'"Hence such things as little green men, UFOs, poltergeists, spontaneous combustion, are when people encounter a difficult to hide phenomenon and the conclusion is flawed. In some cases, if someone''s mind can not cope with the spell they witness, they can be driven crazy and then no one believes them."'
+			'"So magic exists and is used by all these people and creatures, but the rest of us just don''t see it, or convince ourselves it didn''t happen?"'
+			'The girl nods. "Yes. You''re a quick study. Machines, apartments, television and the Internet. All this really does exist and is in the form in which people see it. But if I say, hurl a fireball, then people might see that I threw a grenade or shot from a flamethrower. The human mind can''t process magic, so it blocks it as a way to protect the person from going crazy."'
+			'"Hence such things as little green men, UFOs, poltergeists and spontaneous combustion are when people encounter a difficult to hide phenomenon and the conclusion is flawed. In some cases, if someone''s mind can''t cope with the spell they witness, they can be driven insane."'
 			act 'And who are you?':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
 				'"And who are you?" you ask.'
-				*nl
-				'The girl smiled. "Me? I''m Tatiana, a young mage with an keen interest in magical phenomenon. I specialize in the treatment of mutations, and magic relating to the body. I have little combat skill, so I rely on the services of Gustav to provide some muscle. He''s a Mutant, his mutation is due to magical exposure and it gives him unmatched physical strength and he is a great tracker."'
-				*nl
+				'The girl smiles. "Me? I''m Tatiana, a young mage with a keen interest in magical phenomenon. I specialize in the treatment of mutations, and magic relating to the body. I have little combat skill, so I rely on the services of Gustav to provide some muscle. He''s a Mutant due to magical exposure. It gives him unmatched physical strength and he is a great tracker."'
 				'"The two of us run a detective agency for cover and money, but our real objective is studying magic and its effects."'
-				act 'What do you want form me?':
+				act 'What do you want from me?':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
-					'"What do you want form me?" you ask.'
-					*nl
-					'"Hmm, well... the amulet obviously," Tatiana replies. "When I looked for you, I was hoping to get that object of power to study but Reinhold got to you first. The amulet will now be pretty much useless anyway, as its power passed on to you."'
-					*nl
-					'"But this is not good for you. You may think that since you have the amulets'' power, you can do anything. But in reality, you''re helpless without the skill to use it. Reinhold easily overpowered your will and forced you to obey, and Gustav beat you like a puppy."'
-					act 'What is this amulet? Where did it come from?':
+					'"What do you want from me?" you ask.'
+					'"Well, the amulet obviously," Tatiana replies. "When I looked for you, I was hoping to get that object of power to study, but Reinhold got to you first. The amulet will now be pretty much useless anyway, as its power passed on to you."'
+					'"But this is not good for you. You may think that since you have the amulet''s power, you can do anything. But in reality, you''re helpless without the skill to use it. Reinhold easily overpowered your will and forced you to obey, and Gustav beat you like a puppy."'
+					act 'What is this amulet?':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
 						'"And what is this amulet? Where did it come from?" you ask.'
-						'Tatiana thinks about it for a few moments. "It was made by the trickster Rikudo, one of the most powerful ancient magicians before he died, he taunted the only living mage who could control its immense power by cursing him to be stuck in a female form and making it only activate for a male mage."'
-						*nl
-						'"Great. So I''ve been thrown into this mess by the dead owner of that ancient tomb. Hang on I''m not a mage, how could the power be transferred to me?"'
-						*nl
-						'"It seems that its long time underground has caused it to malfunction and its power has entered your body. The bad news is it is far too powerful and will kill you." At this you are filled with fear and start to struggle against your bindings.'
+						'Tatiana thinks about it for a few seconds. "It was made by the trickster Rikudo, one of the most powerful ancient magicians before he died, he taunted the only living mage who could control its immense power by cursing him to be stuck in a female form and making it only activate for a male mage."'
+						'"Great. So I''ve been thrown into this mess by the dead owner of that ancient tomb. Hang on! I''m not a mage, so how could the power be transferred to me?"'
 						*nl
-						'"You are lucky Reinhold didn''t realize this, he would have stopped you from accidentally wielding the power and killing yourself and who knows how many others by killing you in that hotel room. I have another way to save you, but you''re not going to like it."'
-						*nl
-						'You don''t say anything, so she continues, "I can feel the aura of power emanating from you, by drawing from that I can perform a powerful magic spell that will transform you into someone who is protected from the masculine alignment of the power."'
-						act 'Uh, I do not understand, what are you suggesting?':
+						'"It seems that its long time underground caused it to malfunction and its power has entered your body. The bad news is it is far too powerful and will kill you." Her words fill you with fear and you start to struggle against your bindings.'
+						'"You''re lucky Reinhold didn''t realize this. He would have stopped you from accidentally wielding the power and killing yourself and who knows how many others by killing you in that hotel room. I have another way to save you, but you''re not going to like it."'
+						'You don''t say anything, so she continues. "I can feel the aura of power emanating from you. By drawing from that, I can perform a powerful magic spell that will transform you into someone who is protected from the masculine alignment of the power."'
+						act 'I don''t understand':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
-							'"Uh, I do not understand, what are you suggesting?" you ask her.'
-							*nl
-							'Tatiana runs a hand through her hair and giggles. "I''ll make you a pretty, young girl and the power will lie dormant saving you from blowing up a city or something."'
+							'"Uh, I do not understand. What are you suggesting?"'
+							'Tatiana runs a hand through her hair and giggles. "I''ll make you a pretty, young girl and the power will lie dormant, saving you from blowing up a city or something."'
 							*nl
-							'Your eyes widen in shock.'
-							*nl
-							'"Well, there is another way, I can just stop your heart and let your power dissolve into nature, but you will die. I''m not Reinhold, I can take this risk and I don''t want to kill you. Maybe with more time doing research I can work out another solution, but I cannot leave you like this."'
+							'Your eyes widen in shock. "Well, there is another way. I can just stop your heart and let your power dissolve into nature, but you will die. I''m not Reinhold, I can take this risk and I don''t want to kill you. Maybe with more time doing research, I can work out another solution, but I can''t leave you like this."'
 							act 'What about your family?':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
-								'"Hey, I do not want to be a woman. I have a family, a wife, a daughter", you tell her, afraid.'
-								*nl
-								'Tatiana smiles. "Well the choice is simple, either you die or live without a penis for the time being."'
-								*nl
-								'"As for your family, not to worry. I''ll arrange everything. We will fabricate your death to get Reinhold off your back. To make your transition easier I''ll cover your memory of the family, they will only be ghostly memories, you won''t even remember where you lived. Don''t worry, I won''t erase your entire memory and leave you a useless vegetable."'
+								'"Hey, I don''t want to be a woman. I have a family! A wife and daughter!" you protest.'
+								'Tatiana smiles. "Well the choice is simple. You either die or live without a penis for the time being. As for your family, not to worry. I''ll arrange everything. We''ll fabricate your death to get Reinhold off your back. To make your transition easier, I''ll cover your memory of your family. They will only be ghostly memories, you won''t even remember where you lived. Don''t worry, I won''t erase your entire memory and leave you a useless vegetable."'
 								act 'There must be another way!':
+									$loc = 'intro_city_tg'
+									$loc_arg = 'custom'
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
-									'"There must be another way!" you panic. You tug at the restraints on the bed.'
-									*nl
-									'Tatiana''s face becomes serious. "Do not argue. It is the only way available to me. You will need a to use a new name, think it over in your dreams and tell me when you wake up, otherwise I will give you a pretty name. Now go to sleep." Says Tatiana as she puts her hand on your chest. Your vision immediately fades.'
-									act 'Sleep': gt 'intro_city_tg', 'custom'
+									'"There must be another way!" you panic while tugging at the restraints on the bed.'
+									'Tatiana''s face turns serious. "Do not argue. It''s the only way available to me. You''ll need to use a new name, so think it over in your dreams and tell me when you wake up, otherwise I''ll give you a pretty name. Now go to sleep." She puts her hand on your chest and your vision immediately fades. You dream about a girl you never knew and what she did at school...'
+									act 'Dream': gt 'intro_city_select', 'start'
 								end
 							end
 						end
@@ -405,11 +335,11 @@ end
 
 if $ARGS[0] = 'custom':
 	$loc = 'intro_city_tg'
-	$loc_args = 'custom'
+	$loc_arg = 'custom'
 !!	This is to bypass the next part if the avatar system was used
 !!	It will be changed to bypass the head options, once more body options are added
 
-!!	Just hair and eye color here for now; the dialog will be update as more options are added
+!!	Just hair and eye color here for now; the dialog will be updated as more options are added
 	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/character_creation_2.jpg"></center>'
 	'As you drift in unconsciousness, an impression of a woman forms in your mind. Many aspects of her appearance are indistinct, but there are some things you can make out.'
@@ -426,86 +356,46 @@ end
 if $ARGS[0] = 'sleepPRE':
 	killobj
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
-	'"You''re awake?." Tatiana says looking into your eyes.'
+	'"You''re awake?" Tatiana asks while looking into your eyes.'
 	act 'Look at yourself':
 		cla
 		*clr
 		clr
 		'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/8.jpg"></center>'
 		'"Fuck," you say and immediately shut your mouth again. Your voice... it''s so feminine. Tatiana giggles.'
+		'"This is the first time I''ve changed someone''s gender, therefore I just <i>had</i> to see your reaction. Totally worth it. But you turned out beautiful. For a first try anyway. I miscalculated something. Due to the sharp hormonal change, you have bad acme on your face and I failed to change your eyes and lips. On the bright side, your body will change much faster than one of a natural born woman. That means it will be easier to gain and lose weight and change facial features. All in all, you turned quite well."' 
+		'"By the way, your new ''equipment'' down there is fully functional, so if you don''t want to be a mother, you should think about using contraceptives."'
 		*nl
-		'"This is the first time I changed the gender of a person, therefore I just HAD to see your reaction. Totally worth it. But you turned out beautiful. For a first try that is of course. I miscalculated something, for example due to sharp hormonal change you have bad acme on your face and I failed to change your eyes and lips. On the bright side, your body will change much faster than one of a natural born woman. That means it will be easier to gain and lose weight and change facial features. All in all you turned quite well. By the way, your new ''equipment'' down there is fully functional, so if you don''t want to be a mother, you should think about using contraceptives."'
-		*nl
-		'You angrily look at Tatiana, "So you think I''m a complete woman? On the outside I''ll look like one, but guess what, I''m still the 34-years-old me."'
-		*nl
-		'"Well, yes. I won''t argue about that." Tatiana agrees. "It''s your life and you decide what you do with it, but for the time being, you cannot go back to your old life, so deal with it. On a side note, I already took care of an alibi. Today Mikhail crashed his car into the pit and died, it''s on the news." With these words, Tatiana picked up the remote and turned on the TV.'
-
-		!!Default Names
-		$pcs_firstname = 'Svetlana'
-		$pcs_lastname = 'Lebedev'
-		$pcs_nickname = 'Sveta'
-
-		!!Player names are set here
-		if $temp_firstname = '':
-			$temp_firstname = 'Svetlana'
-		else
-			$temp_firstname = '<<$pcs_firstname>>'
-		end
-		$pcs_firstname = input("What is your first name? (Leave blank for Svetlana)")
-		if $pcs_firstname = '':$pcs_firstname = '<<$temp_firstname>>'
-		killvar '$temp_firstname'
-
-		
-		if $temp_lastname = '':
-			$temp_lastname = 'Lebedev'
-		else
-			$temp_lastname = '<<$pcs_lastname>>'
-		end
-		$pcs_lastname = input("What is your family name? (Leave blank for Lebedev)")
-		if $pcs_lastname = '':$pcs_lastname = '<<$temp_lastname>>'
-		killvar '$temp_lastname'
-
-		if $temp_nickname = '':
-			$temp_nickname = 'Sveta'
-		else
-			$temp_nickname = '<<$pcs_nickname>>'
-		end
-		$pcs_nickname = input("What is your nickname? (Leave blank for Sveta)")
-		if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
-		killvar '$temp_nickname'
+		'You angrily glare at Tatiana. "So that makes me a woman now? On the outside maybe, but guess what? I''m still a 34 year old man on the inside!"'
+		'"Well, yes. I won''t argue about that." Tatiana agrees. "It''s your life and you decide what you do with it, but for the time being, you can''t go back to your old life, so deal with it. On a side note, I already took care of an alibi. Mikhail crashed his car into the pit and died, it''s on the news." Tatiana picks up a remote and turns on the TV.'
 
 		act 'Watch TV':
 			cla
 			*clr
 			clr
 			'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/9.jpg"></center>'
-			'On TV there is a news report about a businessman, who drove his car into a hole at a construction site. The man died later in hospital without regaining consciousness.'
-			*nl
-			'You look at Tatiana, with a bewildered look. She has an enigmatic smile, "Well, I''m still a magician and that''s something that I can do. Reinhold has definitely lost the trail. The body that ''died'' behind the wheel of the BMW was a perfect copy of your old self, from your absorbed amulet energy down to the placement of every single hair."'
-			*nl
-			'"Anyways, here are your new legal documents, including a new passport. Starting today, you are <<$pcs_nickname>> <<$pcs_lastname>>, 18 years old, female and live in the city. Nobody knows you, but you at least have an apartment to call home. This is a gift to you from Gustav. Here are the keys to it. Now get up, you''ve got to go to your new home and start a new life."'
+			'There is a news report about a businessman who drove his car into a hole at a construction site. He died in hospital without regaining consciousness.'
+			'You look at Tatiana, bewildered. She has an enigmatic smile on her face. "Well, I''m still a magician and that''s something that I can do. Reinhold has definitely lost the trail. The body in that car was a perfect copy of your old self, from your absorbed amulet energy down to the placement of every single hair."'
+			'"Anyways, here are your new legal documents, including a new passport. Starting today, you are <<$pcs_nickname>> <<$pcs_lastname>>, an 18 year old girl who lives in the city. Nobody knows you, but you at least have an apartment to call home. This is a gift to you from Gustav. Here are the keys. Now get up, you''ve got to go to your new home and start a new life."'
 			*nl
-			'Gustav, the redhead with a tattoo on his face enters the room. He looks at you and says, "I''ll take you."'
+			'Gustav, the redhead with a tattoo on his face, enters the room. He looks at you. "Come on, I''ll take you."'
 			act 'Go with Gustav':
 				cla
 				*clr
 				clr
 				'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_gustav.jpg"></center>'
-				'Gustav silently takes you to the garage and you enter the black jeep. Gustav gets behind the wheel and drives you into the city. You silently speculate about what to do now.'
-				*nl
-				'After a few minutes, while keeping his eyes on the road, Gustav speaks. "I''m sorry I beat you up. I have trouble controlling myself during a fight. You had a large build and for a second I thought you might be dangerous for me, so I ended up hitting you with my full force."'
-				*nl
-				'You look at him. "Forget it. Listen Gustav... what do I do now?"'
-				*nl
-				'Gustav nods and says, "Well, I would advise you to start by buying food, all sorts of washing powders, laundry detergents and dishes. There are very few supplies already in the apartment, but they''ll only last you a day or two. There''s no TV either. Then get a job. Not far from your new home is a small café, if I remember correctly there was a vacant waitress position not too long ago. You should talk to the owner of the café about the job. Don''t forget to monitor your health, keep your mood up and have a clear mind."'
-				*nl
-				'"Now your mind is very weak, if you don''t take care of yourself you will go crazy. You need to eat well, sleep regularly, have fun, do not generally become depressive or else you end up in a madhouse. Don''t go looking for Tatiana, you will not find her anyway, and secondly, if we need to contact you, we will find you."'
+				'Gustav silently takes you to the garage and you enter his black jeep. Gustav gets behind the wheel and drives you into the city. You silently speculate about what to do now.'
+				'After a few minutes, while keeping his eyes on the road, Gustav speaks. "I''m sorry I beat you up. I have trouble controlling myself during a fight. You had a large build and for a second I thought you might be dangerous, so I ended up hitting you with my full force."'
 				*nl
-				'You arrived at some five-story Khrushchev era buildings. Gustav stops the car and points a finger at the entrance. "Your apartment number 69, Tatiana already gave you the key. Now go. Remember don''t just give up, not everyone gets an entirely new chance at life. Tatiana and me will keep an eye out for you."'
+				'You look at him. "Forget it. Listen Gustav... What do I do now?"'
+				'Gustav nods. "Well, I would advise you to start by buying food, all sorts of washing powders, laundry detergent and dishes. There are a few supplies already in the apartment, but they''ll only last you a day or two. There''s no TV either. Then get a job. Not far from your new home is a small café. If I remember correctly, there was a vacant waitress position there not too long ago. You should talk to the owner about the job. Don''t forget to monitor your health, keep your mood up and have a clear mind."'
+				'"Your mind is very weak. If you don''t take care of yourself you will go crazy. You need to eat well, sleep regularly and have fun. Don''t become depressed or else you''ll end up in a madhouse. Don''t go looking for Tatiana; you won''t find her. Secondly, if we need to contact you, we will find you."'
 				*nl
-				'Also, you might want to steer clear of those Gopnik, they might just look like petty criminals having a drink, but they have connections and you''re just a pretty young girl now.'
+				'You arrive at some old Soviet era buildings. Gustav stops the car and points a finger at the entrance. "You''re in apartment 69. Tatiana already gave you the key, so go. Don''t just give up. Not everyone gets an entirely new chance at life. Tatiana and I will keep an eye out for you."'
+				'"Also, you might want to steer clear of those gopniks. They might just look like petty criminals having a drink, but they have connections and you''re just a pretty young girl now.'
 
-				act 'Out of the car':
+				act 'Get out of the car':
+					gs 'intro_initialization_city'
 					cla
 					showstat 1
 					showobjs 1
@@ -513,7 +403,7 @@ if $ARGS[0] = 'sleepPRE':
 					cla
 					*clr
 					'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/start_tf.jpg"></center>'
-					'Welcome to the Transformation start! Although you have lost your masculinity and your old life, but new possibilities are opening up before your eyes, not least aided in your newfound knowledge of the magical nature of the world!'
+					'Welcome to the Transformation start! Although you''ve lost your masculinity and your old life, new possibilities are opening up before your eyes, not least aided in your newfound knowledge of the magical nature of the world!'
 					act 'Begin': gt 'city_residential'
 				end
 			end

+ 126 - 121
locations/intro_customization.qsrc

@@ -7,12 +7,10 @@ if $ARGS[0] = 'start':
 	!act 'Set attributes': gt 'intro_customization','modatt'
 	!act 'Set skills': gt 'intro_customization','modskl'
 	act 'Set appearance':gt 'intro_customization','modapp'
-	act 'Set relationships': gt 'intro_customization','modrel'
 	act 'Set purse': gt 'intro_customization','modpur'
 	act 'Set items': gt 'intro_customization','modite'
 	act 'Set money (<<money>>₽)': money = input 'Set Cash Amount' & gt'intro_customization','start'
-	if custom_csb ! 1: act 'Return to preset character menu': gt 'intro_sg_select', 'charselect'
-	if start < 10:
+	if mid($start_type,1,2) = 'sg':
 		gs 'intro_sg_select_custom', 'start'
 	else
 		act 'Confirm these options':
@@ -21,13 +19,7 @@ if $ARGS[0] = 'start':
 				dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
 				gs 'obj_din', 'old'
 			end
-			if $start_type = 'sg':
-				gt 'intro_sg', 'four'
-			elseif $start_type = 'sg_m':
-				gt 'intro_sg_m', 'four'
-			else
-				gt 'intro_sg_tg', 'intro_7'
-			end
+			gt $loc, $loc_arg
 		end
 	end
 end
@@ -164,14 +156,14 @@ if $ARGS[0] = 'modrel_setup2':
 	dynamic 'if <<$ARGS[1]>> < 0: <<$ARGS[1]>> = 0'
 	dynamic 'if <<$ARGS[1]>> > 100: <<$ARGS[1]>> = 100'
 	dynamic 'x = <<$ARGS[1]>>'
-	'<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $loc_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $loc_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $loc_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $loc_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $loc_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 100 & gt ''intro_customization'', $loc_arg">100</a></TD>'
+	$table_display += '<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 100 & gt ''intro_customization'', $locM_arg">100</a></TD>'
 end
 
 if $ARGS[0] = 'modrel_setup3':
 	dynamic 'if <<$ARGS[1]>> < 50: <<$ARGS[1]>> = 50'
 	dynamic 'if <<$ARGS[1]>> > 200: <<$ARGS[1]>> = 200'
 	dynamic 'x = <<$ARGS[1]>>'
-	'<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/200)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $loc_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $loc_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $loc_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $loc_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $loc_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 200 & gt ''intro_customization'', $loc_arg">200</a></TD>'
+	$table_display += '<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/200)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 200 & gt ''intro_customization'', $locM_arg">200</a></TD>'
 end
 
 !!Values reversed just for inhib use
@@ -179,31 +171,31 @@ if $ARGS[0] = 'modrel_setup4':
 	dynamic 'if <<$ARGS[1]>> < 0: <<$ARGS[1]>> = 0'
 	dynamic 'if <<$ARGS[1]>> > 100: <<$ARGS[1]>> = 100'
 	dynamic 'x = 100-<<$ARGS[1]>>'
-	'<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 100 & gt ''intro_customization'', $loc_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> += 10 & gt ''intro_customization'', $loc_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $loc_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $loc_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 10 & gt ''intro_customization'', $loc_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 0 & gt ''intro_customization'', $loc_arg">100</a></TD>'
+	$table_display += '<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 100 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> += 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 0 & gt ''intro_customization'', $locM_arg">100</a></TD>'
 end
 
 if $ARGS[0] = 'modite_cos':
-	$loc_arg = 'modite_cos'
+	$locM_arg = 'modite_cos'
 	'<center><b>Cosmetic items</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'kosmetica', 'Cosmetics'
 	gs 'intro_customization', 'modrel_setup2', 'stanok', 'Razors (number of shaves)'
 	gs 'intro_customization', 'modrel_setup2', 'krem', 'Sunblock'
 	gs 'intro_customization', 'modrel_setup2', 'hscrunch', 'Hair scrunchies'
 	gs 'intro_customization', 'modrel_setup2', 'hpingrip', 'Hair pins'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	!act 'Shampoo (<<shampoo>>/100)': gs 'intro_customization','setval3' & shampoo = nstat & gt 'intro_customization','modite_cos'
 	act 'Return': gt'intro_customization','modite'
 end
 
 if $ARGS[0] = 'modite_pha':
-	$loc_arg = 'modite_pha'
+	$locM_arg = 'modite_pha'
 	'<center><b>Pharmaceutical items</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'prezik', 'Condoms'
 	gs 'intro_customization', 'modrel_setup2', 'pregtest', 'Pregnancy tests'
 	gs 'intro_customization', 'modrel_setup2', 'tabletki', 'Birth control pills'
@@ -216,19 +208,22 @@ if $ARGS[0] = 'modite_pha':
 	gs 'intro_customization', 'modrel_setup2', 'fatdel', 'Weight loss pills'
 	gs 'intro_customization', 'modrel_setup2', 'tampon', 'Tampons'
 	gs 'intro_customization', 'modrel_setup2', 'sanpad', 'Sanitary napkins'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	act 'Return': gt'intro_customization','modite'
 end
 
 if $ARGS[0] = 'modite_mis':
-	$loc_arg = 'modite_mis'
+	$locM_arg = 'modite_mis'
 	'<center><b>Misc items</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'siga', 'Cigarettes'
 	gs 'intro_customization', 'modrel_setup2', 'dur', 'Cocaine'
 	gs 'intro_customization', 'modrel_setup2', 'pranik', 'Tea Biscuits'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_customization','modite'
 end
@@ -411,12 +406,10 @@ end
 
 if $ARGS[0] = 'modatt':
 	*clr & cla
-	$loc_arg = 'modatt'
+	$locM_arg = 'modatt'
 	'<center><b>Attributes</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
-	gs 'intro_customization', 'modrel_setup3', 'willpowermax', 'Willpower'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_stren', 'Strength'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_agil', 'Agility'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_vital', 'Endurance'
@@ -429,6 +422,9 @@ if $ARGS[0] = 'modatt':
 	gs 'intro_customization', 'modrel_setup2', 'pcs_grades', 'Grades'
 	gs 'intro_customization', 'modrel_setup4', 'pcs_inhib', 'Inhibition'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_heels', 'Heels'
+	gs 'intro_customization', 'modrel_setup3', 'willpowermax', 'Willpower'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	nl
 
@@ -449,15 +445,16 @@ end
 
 if $ARGS[0] = 'modskl_men':
 	*clr & cla
-	$loc_arg = 'modskl_men'
+	$locM_arg = 'modskl_men'
 	'<center><b>Mental Skills</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	if MagikDostup = 0: gs 'intro_customization', 'modrel_setup2', 'pcs_splcstng', 'Spell Casting'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_humint', 'People skills'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_persuas', 'Persuasion'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_observ', 'Observation'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	nl
 
@@ -468,11 +465,10 @@ end
 
 if $ARGS[0] = 'modskl_spo':
 	*clr & cla
-	$loc_arg = 'modskl_spo'
+	$locM_arg = 'modskl_spo'
 	'<center><b>Sport Skills</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_jab', 'Jabs'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_punch', 'Power Strikes'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_kick', 'Kicks'
@@ -486,6 +482,8 @@ if $ARGS[0] = 'modskl_spo':
 	gs 'intro_customization', 'modrel_setup2', 'pcs_chess', 'Chess'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_icesktng', 'Ice Skating'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_gaming', 'Gaming'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	nl
 
@@ -496,17 +494,18 @@ end
 
 if $ARGS[0] = 'modskl_bea':
 	*clr & cla
-	$loc_arg = 'modskl_bea'
+	$locM_arg = 'modskl_bea'
 	'<center><b>Beauty skills</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_makupskl', 'Makeup Skills'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_danc', 'Modern Dancing'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_dancero', 'Erotic Dancing'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_dancpol', 'Pole Dancing'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_cheer', 'Cheerleading'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_mdlng', 'Modelling'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	nl
 
@@ -517,16 +516,17 @@ end
 
 if $ARGS[0] = 'modskl_art':
 	*clr & cla
-	$loc_arg = 'modskl_art'
+	$locM_arg = 'modskl_art'
 	'<center><b>Artistic Skills</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_vokal', 'Singing'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_instrmusic', 'Instrumental Music'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_photoskl', 'Photography'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_artskls', 'Artistic Skills'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_perform', 'Performance'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	nl
 
@@ -537,17 +537,18 @@ end
 
 if $ARGS[0] = 'modskl_job':
 	*clr & cla
-	$loc_arg = 'modskl_job'
+	$locM_arg = 'modskl_job'
 	'<center><b>Job Skills</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_compskl', 'Computer Skills'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_comphckng', 'Hacking'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_hndiwrk', 'Handy-work'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_sewng', 'Tailoring'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_servng', 'Serving'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_medcn', 'Medicine'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	nl
 
@@ -559,56 +560,58 @@ end
 if $ARGS[0] = 'hair':
 	cls
 	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
-	*nl
-	if pcs_hairlng <= 1:
-		$hair = 'You have <a href="exec:pcs_hairlng = 31 & gs ''begin'', ''hair''">very short</a>,'
-	elseif pcs_hairlng <= 31:
-		$hair = 'You have <a href="exec:pcs_hairlng = 81 & gs ''begin'', ''hair''">short</a>,'
-	elseif pcs_hairlng <= 81:
-		$hair = 'You have <a href="exec:pcs_hairlng = 161 & gs ''begin'', ''hair''">chin length</a>,'
-	elseif pcs_hairlng <= 161:
-		$hair = 'You have <a href="exec:pcs_hairlng = 261 & gs ''begin'', ''hair''">shoulder length</a>,'
-	elseif pcs_hairlng <= 261:
-		$hair = 'You have <a href="exec:pcs_hairlng = 401 & gs ''begin'', ''hair''">breast length</a>,'
-	elseif pcs_hairlng <= 401:
-		$hair = 'You have <a href="exec:pcs_hairlng = 601 & gs ''begin'', ''hair''">back length</a>,'
-	elseif pcs_hairlng <= 601:
-		$hair = 'You have <a href="exec:pcs_hairlng = 801 & gs ''begin'', ''hair''">hip length</a>,'
-	elseif pcs_hairlng <= 801:
-		$hair = 'You have <a href="exec:pcs_hairlng = 1001 & gs ''begin'', ''hair''">ass length</a>,'
+	if player_avatar = 1:
+		'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
 	else
-		$hair = 'You have <a href="exec:pcs_hairlng = 1 & gs ''begin'', ''hair''">extremely long</a>,'
-	end
-
-	if pcs_haircol = 0 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">black</a> hair.'& $hair2 = 'black hair' & $hair3 = 'black hair'
-	if pcs_haircol = 1 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">brown</a> hair.'& $hair2 = 'brown hair' & $hair3 = 'brown hair'
-	if pcs_haircol = 2 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">red</a> hair.'& $hair2 = 'Red hair' & $hair3 = 'red hair'
-	if pcs_haircol = 3 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">blonde</a> hair.'& $hair2 = 'blond hair' & $hair3 = 'blond hair'
-	if pcs_haircol = 0 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">black</a> hair.'& $hair2 = 'curls' & $hair3 = 'black curls'
-	if pcs_haircol = 1 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">brown</a> hair.'& $hair2 = 'curls' & $hair3 = 'brown curls'
-	if pcs_haircol = 2 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">red</a> hair.'& $hair2 = 'curls' & $hair3 = 'red hair'
-	if pcs_haircol = 3 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">blonde</a> hair.' &$hair2 = 'curls' & $hair3 = 'blond curls'
-	'<center>Adjust your hair to match your avatar. Please note that, at present, hair choices are overridden by your starting personality choice (e.g. volleyball players will always have straight blond hair).</center>'
+		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+	end
 	*nl
-	nathcol = pcs_haircol
+	
 	if player_avatar = 1:
-		if avatar_hair = 1:
-			'<center>Please note that this choice is given only once and you will not be able to change it without starting a new game!</center>'
-			'<center>You have <i><<$av_hair>>.</i> <a href="exec:avatar_hair = 0 & gs ''begin'', ''hair''">Revert to default</a>.</center>'
-		else
-			'<center><i><<$hair>></i> You may also <a href="exec:gs ''begin'', ''hair_input'' & gs ''begin'', ''hair''">manually enter a description</a></center>.'
-		end
+		'<center>Adjust your hair to match your avatar.</center>'
+		'<center>Please note that this choice is given only once and you will not be able to change it without starting a new game!</center>'
+	end
+
+	*nl
+
+	if pcs_hairlng > 1000:
+		$hair = 'You have <a href="exec:pcs_hairlng = 1 & gs ''intro_customization'', ''hair''">extremely long</a> hair,'
+	elseif pcs_hairlng > 800:
+		$hair = 'You have <a href="exec:pcs_hairlng = 1001 & gs ''intro_customization'', ''hair''">ass length</a> hair,'
+	elseif pcs_hairlng > 600:
+		$hair = 'You have <a href="exec:pcs_hairlng = 801 & gs ''intro_customization'', ''hair''">hip length</a> hair,'
+	elseif pcs_hairlng > 400:
+		$hair = 'You have <a href="exec:pcs_hairlng = 601 & gs ''intro_customization'', ''hair''">back length</a> hair,'
+	elseif pcs_hairlng > 260:
+		$hair = 'You have <a href="exec:pcs_hairlng = 401 & gs ''intro_customization'', ''hair''">breast length</a> hair,'
+	elseif pcs_hairlng > 160:
+		$hair = 'You have <a href="exec:pcs_hairlng = 261 & gs ''intro_customization'', ''hair''">shoulder length</a> hair,'
+	elseif pcs_hairlng > 80:
+		$hair = 'You have <a href="exec:pcs_hairlng = 161 & gs ''intro_customization'', ''hair''">chin length</a> hair,'
+	elseif pcs_hairlng > 30:
+		$hair = 'You have <a href="exec:pcs_hairlng = 81 & gs ''intro_customization'', ''hair''">short</a> hair,'
+	else
+		$hair = 'You have <a href="exec:pcs_hairlng = 31 & gs ''intro_customization'', ''hair''">very short</a> hair,'
 	end
-	if $start_type = 'sg':
-		act'<center><b>Done</b></center>': gt 'intro_sg', 'four'
-	elseif $start_type = 'sg_m':
-		act'<center><b>Done</b></center>': gt 'intro_sg_m', 'six'
-	elseif $start_type = 'sg_tg':
-		act'<center><b>Done</b></center>': gt 'preCSB', 'intro_6_looks'
+
+	*nl
+
+	if pcs_haircol = 0 and curly <= 0:$hair += ' it is <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''intro_customization'', ''hair''">straight</a> and <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">black</a>.'& $hair2 = 'black hair' & $hair3 = 'black hair'
+	if pcs_haircol = 1 and curly <= 0:$hair += ' it is <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''intro_customization'', ''hair''">straight</a> and <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">brown</a>.'& $hair2 = 'brown hair' & $hair3 = 'brown hair'
+	if pcs_haircol = 2 and curly <= 0:$hair += ' it is <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''intro_customization'', ''hair''">straight</a> and <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">red</a>.'& $hair2 = 'Red hair' & $hair3 = 'red hair'
+	if pcs_haircol = 3 and curly <= 0:$hair += ' it is <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''intro_customization'', ''hair''">straight</a> and <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">blonde</a>.'& $hair2 = 'blond hair' & $hair3 = 'blond hair'
+	if pcs_haircol = 0 and curly > 0:$hair += ' it is <a href="exec:defcurly = 0 & curly = 0 & gs ''intro_customization'', ''hair''">curly</a> and <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">black</a>.'& $hair2 = 'curls' & $hair3 = 'black curls'
+	if pcs_haircol = 1 and curly > 0:$hair += ' it is <a href="exec:defcurly = 0 & curly = 0 & gs ''intro_customization'', ''hair''">curly</a> and <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">brown</a>.'& $hair2 = 'curls' & $hair3 = 'brown curls'
+	if pcs_haircol = 2 and curly > 0:$hair += ' it is <a href="exec:defcurly = 0 & curly = 0 & gs ''intro_customization'', ''hair''">curly</a> and <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">red</a>.'& $hair2 = 'curls' & $hair3 = 'red curls'
+	if pcs_haircol = 3 and curly > 0:$hair += ' it is <a href="exec:defcurly = 0 & curly = 0 & gs ''intro_customization'', ''hair''">curly</a> and <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">blonde</a>.' &$hair2 = 'curls' & $hair3 = 'blond curls'
+
+	if player_avatar = 1:
+		'<center><i><<$hair>></i> You may also <a href="exec:gs ''intro_customization'', ''hair_input'' & gs ''intro_customization'', ''hair''">manually enter a description</a> if you would prefer.</center>'
 	else
-		act'<center><b>Done</b></center>': gt 'preCUST', 'TGStart'
+		'<center><i><<$hair>></i></center>'
 	end
+	nathcol = pcs_haircol
+	act'<center><b>Done</b></center>': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'pcs_haircol':
@@ -624,7 +627,11 @@ end
 if $ARGS[0] = 'lip':
 	cls
 	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
+	if player_avatar = 1:
+		'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+	end
 	*nl
 	if pcs_lip = 0:$pcs_lip = 'you have thin<<$pcs_lipbalm>> lips.' & $liptalk = 'thin lips' & $liptalk2 = 'thin lips' & $liptalk3 = 'thin lips'
 	if pcs_lip = 1:$pcs_lip = 'You have normal<<$pcs_lipbalm>> lips.' & $liptalk = 'soft lips' & $liptalk2 = 'delicate lips' & $liptalk3 = 'tender lips'
@@ -635,9 +642,9 @@ if $ARGS[0] = 'lip':
 	*nl
 	'<center><i><<$pcs_lip>></i></center>'
 	*nl
-	if pcs_lip < 4:'<center><a href="exec:pcs_lip += 1 & gs ''begin'', ''lip''">Bigger lips</a></center>'
-	if pcs_lip > 0:'<center><a href="exec:pcs_lip -= 1 & gs ''begin'', ''lip''">Smaller lips</a></center>'
-	act'<center><b>Done</b></center>': gt'$loc','$loc_args'
+	if pcs_lip < 4:'<center><a href="exec:pcs_lip += 1 & gs ''intro_customization'', ''lip''">Bigger lips</a></center>'
+	if pcs_lip > 0:'<center><a href="exec:pcs_lip -= 1 & gs ''intro_customization'', ''lip''">Smaller lips</a></center>'
+	act'<center><b>Done</b></center>': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'eyes':
@@ -660,28 +667,26 @@ if $ARGS[0] = 'eyes':
 	if pcs_lashes = 1:$pcs_lashes = 'with normal eyelashes'
 	if pcs_lashes = 2:$pcs_lashes = 'with long eyelashes'
 	if pcs_eyesize > 3:pcs_eyesize = 3
-	if pcs_eyesize = 0:$glaza = 'You have small <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = '<<$pcs_eyecol>> eyes' & $glaza3 = '<<$glacol2>> eyes'
-	if pcs_eyesize = 1:$glaza = 'You have expressive <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'expressive <<$pcs_eyecol>> eyes' & $glaza3 = 'expressive <<$glacol2>> eyes'
-	if pcs_eyesize = 2:$glaza = 'You have large <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'big <<$pcs_eyecol>> eyes' & $glaza3 = 'high <<$glacol2>> eyes'
-	if pcs_eyesize = 3:$glaza = 'You have huge <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'great <<$pcs_eyecol>> eyes' & $glaza3 = 'great <<$glacol2>> eyes'
+	if pcs_eyesize = 0:$glaza = 'You have small <a href="exec:gs ''intro_customization'', ''eye color'' & gs ''intro_customization'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = '<<$pcs_eyecol>> eyes' & $glaza3 = '<<$glacol2>> eyes'
+	if pcs_eyesize = 1:$glaza = 'You have expressive <a href="exec:gs ''intro_customization'', ''eye color'' & gs ''intro_customization'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'expressive <<$pcs_eyecol>> eyes' & $glaza3 = 'expressive <<$glacol2>> eyes'
+	if pcs_eyesize = 2:$glaza = 'You have large <a href="exec:gs ''intro_customization'', ''eye color'' & gs ''intro_customization'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'big <<$pcs_eyecol>> eyes' & $glaza3 = 'high <<$glacol2>> eyes'
+	if pcs_eyesize = 3:$glaza = 'You have huge <a href="exec:gs ''intro_customization'', ''eye color'' & gs ''intro_customization'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'great <<$pcs_eyecol>> eyes' & $glaza3 = 'great <<$glacol2>> eyes'
 
 	if player_avatar = 1:
-		'<center>Adjust your eyes and eyelashes to match your avatar. Please note, glasses choice may be overridden by your starting personality choice (e.g. bookworms/nerds will always start with glasses).</center>'
-	else
-		'<center>Please note, glasses choice may be overridden by your starting personality choice (e.g. bookworms/nerds will always start with glasses).</center>'
+		'<center>Adjust your eyes and eyelashes to match your avatar.</center>'
 	end	
 	*nl
 	'<center><i><<$glaza>></i></center>'
 	*nl
-	if pcs_lashes < 2:'<center><a href="exec:pcs_lashes += 1 & gs ''begin'', ''eyes''">Lengthen lashes</a></center>'
-	if pcs_lashes > 0:'<center><a href="exec:pcs_lashes -= 1 & gs ''begin'', ''eyes''">Shorten lashes</a></center>'
-	if pcs_eyesize < 3:'<center><a href="exec:pcs_eyesize += 1 & gs ''begin'', ''eyes''">Larger eyes</a></center>'
-	if pcs_eyesize > 0:'<center><a href="exec:pcs_eyesize -= 1 & gs ''begin'', ''eyes''">Smaller eyes</a></center>'
-	if glass = 0:'<center><a href="exec:glass = 1 & gs ''begin'', ''eyes''">Wear glasses</a></center>'
-	if glass = 1:'<center><a href="exec:glass = 0 & gs ''begin'', ''eyes''">Remove glasses</a></center>'
+	if pcs_lashes < 2:'<center><a href="exec:pcs_lashes += 1 & gs ''intro_customization'', ''eyes''">Lengthen lashes</a></center>'
+	if pcs_lashes > 0:'<center><a href="exec:pcs_lashes -= 1 & gs ''intro_customization'', ''eyes''">Shorten lashes</a></center>'
+	if pcs_eyesize < 3:'<center><a href="exec:pcs_eyesize += 1 & gs ''intro_customization'', ''eyes''">Larger eyes</a></center>'
+	if pcs_eyesize > 0:'<center><a href="exec:pcs_eyesize -= 1 & gs ''intro_customization'', ''eyes''">Smaller eyes</a></center>'
+	if glass = 0:'<center><a href="exec:glass = 1 & gs ''intro_customization'', ''eyes''">Wear glasses</a></center>'
+	if glass = 1:'<center><a href="exec:glass = 0 & gs ''intro_customization'', ''eyes''">Remove glasses</a></center>'
 	
 	
-	act'<center><b>Done</b></center>': gt'$loc','$loc_args'
+	act'<center><b>Done</b></center>': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'eye color':
@@ -735,24 +740,24 @@ if $ARGS[0] = 'birthday':
 	end
 
 	*nl
-	'<center><a href="exec:birthday += 5 & gs ''begin'', ''birthday''">+5 Days</a></center>'
-	'<center><a href="exec:birthday += 1 & gs ''begin'', ''birthday''">+1 Day</a></center>'
-	'<center><a href="exec:birthday -= 1 & gs ''begin'', ''birthday''">-1 Day</a></center>'
-	'<center><a href="exec:birthday -= 5 & gs ''begin'', ''birthday''">-5 Days</a></center>'
-	'<center><a href="exec:birthmonth = 1 & gs ''begin'', ''birthday''">January</a></center>'
-	'<center><a href="exec:birthmonth = 2 & gs ''begin'', ''birthday''">February</a></center>'
-	'<center><a href="exec:birthmonth = 3 & gs ''begin'', ''birthday''">March</a></center>'
-	'<center><a href="exec:birthmonth = 4 & gs ''begin'', ''birthday''">April</a></center>'
-	'<center><a href="exec:birthmonth = 5 & gs ''begin'', ''birthday''">May</a></center>'
-	'<center><a href="exec:birthmonth = 6 & gs ''begin'', ''birthday''">June</a></center>'
-	'<center><a href="exec:birthmonth = 7 & gs ''begin'', ''birthday''">July</a></center>'
-	'<center><a href="exec:birthmonth = 8 & gs ''begin'', ''birthday''">August</a></center>'
-	'<center><a href="exec:birthmonth = 9 & gs ''begin'', ''birthday''">September</a></center>'
-	'<center><a href="exec:birthmonth = 10 & gs ''begin'', ''birthday''">October</a></center>'
-	'<center><a href="exec:birthmonth = 11 & gs ''begin'', ''birthday''">November</a></center>'
-	'<center><a href="exec:birthmonth = 12 & gs ''begin'', ''birthday''">December</a></center>'
-
-	act'<center><b>Done</b></center>': $locM, $loc_argsM
+	'<center><a href="exec:birthday += 5 & gs ''intro_customization'', ''birthday''">+5 Days</a></center>'
+	'<center><a href="exec:birthday += 1 & gs ''intro_customization'', ''birthday''">+1 Day</a></center>'
+	'<center><a href="exec:birthday -= 1 & gs ''intro_customization'', ''birthday''">-1 Day</a></center>'
+	'<center><a href="exec:birthday -= 5 & gs ''intro_customization'', ''birthday''">-5 Days</a></center>'
+	'<center><a href="exec:birthmonth = 1 & gs ''intro_customization'', ''birthday''">January</a></center>'
+	'<center><a href="exec:birthmonth = 2 & gs ''intro_customization'', ''birthday''">February</a></center>'
+	'<center><a href="exec:birthmonth = 3 & gs ''intro_customization'', ''birthday''">March</a></center>'
+	'<center><a href="exec:birthmonth = 4 & gs ''intro_customization'', ''birthday''">April</a></center>'
+	'<center><a href="exec:birthmonth = 5 & gs ''intro_customization'', ''birthday''">May</a></center>'
+	'<center><a href="exec:birthmonth = 6 & gs ''intro_customization'', ''birthday''">June</a></center>'
+	'<center><a href="exec:birthmonth = 7 & gs ''intro_customization'', ''birthday''">July</a></center>'
+	'<center><a href="exec:birthmonth = 8 & gs ''intro_customization'', ''birthday''">August</a></center>'
+	'<center><a href="exec:birthmonth = 9 & gs ''intro_customization'', ''birthday''">September</a></center>'
+	'<center><a href="exec:birthmonth = 10 & gs ''intro_customization'', ''birthday''">October</a></center>'
+	'<center><a href="exec:birthmonth = 11 & gs ''intro_customization'', ''birthday''">November</a></center>'
+	'<center><a href="exec:birthmonth = 12 & gs ''intro_customization'', ''birthday''">December</a></center>'
+
+	act'<center><b>Done</b></center>': gt $locM, $locM_arg
 end
 
 --- intro_customization ---------------------------------

+ 10 - 16
locations/intro_initialization.qsrc

@@ -64,23 +64,12 @@ gs 'telefon', 'setup'
 
 VersionCheck = 5030
 
-if $start = 'city':
-	birthyear = year - age
-	birthmonth = 4
-	birthday = 1
-	pcs_dob = birthyear * 10000
-	pcs_dob += (birthmonth * 100)
-	pcs_dob += birthday
-else
-
-	pcs_dob = birthyear * 10000
-	pcs_dob += (birthmonth * 100)
-	pcs_dob += birthday
+pcs_dob = birthyear * 10000
+pcs_dob += (birthmonth * 100)
+pcs_dob += birthday
 
-	age = year - ((pcs_dob - (pcs_dob mod 10000)) / 10000)
-	if ((month * 100) + day) < pcs_dob mod 10000: age -= 1
-		
-end
+age = year - ((pcs_dob - (pcs_dob mod 10000)) / 10000)
+if ((month * 100) + day) < pcs_dob mod 10000: age -= 1
 
 if age < 17:
 	vidage = age
@@ -476,6 +465,11 @@ else
 	cyccustom = 1
 end
 
+!!re-initialize appearance to get correct values
+gs 'AppearanceSystem', 'UpdateBaseAppearnce'
+gs 'body', 'RegularUpdate'
+gs 'AppearanceSystem'
+
 pcs_horny = 0
 killvar 'opPRE'
 killvar 'tgs_skipinto'

+ 141 - 30
locations/intro_initialization_city.qsrc

@@ -93,22 +93,19 @@ nathcol = pcs_haircol
 pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1
 oldsavepcs_haircol = 1
 
-gs 'body_shape', 'initial'
+gs 'body', 'initial'
 
 !! Adding underwear and default shoes and assigning them
 
-if $ARGS[1] ! 'CSB' and goth_clothing ! 1:
-	cheap_panties[1] = 1
-	cheap_bras[1] = 1
-	$pantyworntype = 'cheap'
-	pantywornnumber = 1
-	$braworntype = 'cheap'
-	brawornnumber = 1
-	gm_shoe[6] = 1
-	danilovich_shoe[21] = 1
-	$shoeworntype = 'gm'
-	shoewornnumber = 6
-end
+cheap_panties[1] = 1
+cheap_bras[1] = 1
+$pantyworntype = 'cheap'
+pantywornnumber = 1
+$braworntype = 'cheap'
+brawornnumber = 1
+gm_shoe[6] = 1
+$shoeworntype = 'gm'
+shoewornnumber = 6
 
 !!	Starting clothing set
 cheap_panties[12] = 1
@@ -123,6 +120,7 @@ gm_outfits_b[30] = pcs_hips
 cats_dress[1] = 1
 cats_dress_h[1] = 100
 cats_dress_b[1] = pcs_hips
+
 if goth_clothing = 1:
 	kats_panties[28] = 1
 	kats_bras[28] = 1
@@ -132,27 +130,44 @@ if goth_clothing = 1:
 	brawornnumber = 28
 	danilovich_outfits[91] = 1
 	danilovich_outfits_h[91] = 100
-	danilovich_shoe[21] = 1
-	gm_shoe[9] = 1
 	shoewornnumber = 9
 	$shoeworntype = 'gm'
+	dolls_dress[7] = 1
+	dolls_dress_h[7] = 100
+	dolls_dress_b[7] = pcs_hips
+	dolls_shoe[1] = 1
+	bomba_dress[4] = 1
+	bomba_dress_h[4] = 100
+	bomba_dress_b[4] = pcs_hips
+	bomba_dress[23] = 1
+	bomba_dress_h[23] = 100
+	bomba_dress_b[23] = pcs_hips
 	bomba_outfits[16] = 1
 	bomba_outfits_h[16] = 100
 	bomba_outfits_b[16] = pcs_hips
-	bomba_outfits[37] = 1
-	bomba_outfits_h[37] = 100
-	bomba_outfits_b[37] = pcs_hips
+	bomba_outfits[31] = 1
+	bomba_outfits_h[31] = 100
+	bomba_outfits_b[31] = pcs_hips
 	sportsclothingnumber = 91
-	gs 'clothing', 'wear', 'bomba_outfits', 37
+	gs 'clothing', 'wear', 'bomba_dress', 4
 elseif pcs_inhib < 5:
 	gm_outfits[30] = 1
 	gm_outfits_h[30] = 100
 	gm_outfits_b[30] = pcs_hips
+	gm_outfits[2] = 1
+	gm_outfits_h[2] = 100
+	gm_outfits_b[2] = pcs_hips
+	gm_outfits[54] = 1
+	gm_outfits_h[54] = 100
+	gm_outfits_b[54] = pcs_hips
+	coco_outfits[5] = 1
+	coco_outfits_h[5] = 100
+	coco_outfits_b[5] = pcs_hips
 	danilovich_outfits[81] = 1
 	danilovich_outfits_h[81] = 100
-	cats_dress[1] = 1
-	cats_dress_h[1] = 100
-	cats_dress_b[1] = pcs_hips
+	cats_dress[14] = 1
+	cats_dress_h[14] = 100
+	cats_dress_b[14] = pcs_hips
 	sportsclothingnumber = 81
 	gs 'clothing', 'wear', 'cats_dress', 1
 elseif pcs_inhib < 10:
@@ -161,6 +176,15 @@ elseif pcs_inhib < 10:
 	gm_outfits_b[15] = pcs_hips
 	danilovich_outfits[76] = 1
 	danilovich_outfits_h[76] = 100
+	flamingos_outfits[9] = 1
+	flamingos_outfits_h[9] = 100
+	flamingos_outfits_b[9] = pcs_hips
+	nerdvana_outfits[38] = 1
+	nerdvana_outfits_h[38] = 100
+	nerdvana_outfits_b[38] = pcs_hips
+	gm_office[11] = 1
+	gm_office_h[11] = 100
+	gm_office_b[11] = pcs_hips
 	gm_dress[4] = 1
 	gm_dress_h[4] = 100
 	gm_dress_b[4] = pcs_hips
@@ -175,6 +199,15 @@ elseif pcs_inhib < 15:
 	gm_dress[7] = 1
 	gm_dress_h[7] = 100
 	gm_dress_b[7] = pcs_hips
+	gm_dress[16] = 1
+	gm_dress_h[16] = 100
+	gm_dress_b[16] = pcs_hips
+	dolls_outfits[12] = 1
+	dolls_outfits_h[12] = 100
+	dolls_outfits_b[12] = pcs_hips
+	dolls_outfits[3] = 1
+	dolls_outfits_h[3] = 100
+	dolls_outfits_b[3] = pcs_hips
 	sportsclothingnumber = 106
 	gs 'clothing', 'wear', 'gm_dress', 7
 elseif pcs_inhib < 20:
@@ -183,83 +216,155 @@ elseif pcs_inhib < 20:
 	gm_outfits_b[55] = pcs_hips
 	danilovich_outfits[102] = 1
 	danilovich_outfits_h[102] = 100
+	danilovich_outfits[64] = 1
+	danilovich_outfits_h[64] = 100
+	flamingos_dress[109] = 1
+	flamingos_dress_h[109] = 100
+	flamingos_dress_b[109] = pcs_hips
+	gm_outfits[99] = 1
+	gm_outfits_h[99] = 100
+	gm_outfits_b[99] = pcs_hips
 	gm_dress[7] = 1
 	gm_dress_h[7] = 100
 	gm_dress_b[7] = pcs_hips
 	sportsclothingnumber = 43
-	gs 'clothing', 'wear', 'gm_dress', 7
+	gs 'clothing', 'wear', 'gm_outfits', 99
 elseif pcs_inhib < 25:
 	gm_outfits[58] = 1
 	gm_outfits_h[58] = 100
 	gm_outfits_b[58] = pcs_hips
+	gm_outfits[181] = 1
+	gm_outfits_h[181] = 100
+	gm_outfits_b[181] = pcs_hips
+	bomba_outfits[1] = 1
+	bomba_outfits_h[1] = 100
+	bomba_outfits_b[1] = pcs_hips
+	flamingos_dress[59] = 1
+	flamingos_dress_h[59] = 100
+	flamingos_dress_b[59] = pcs_hips
 	danilovich_outfits[87] = 1
 	danilovich_outfits_h[87] = 100
 	gm_dress[39] = 1
 	gm_dress_h[39] = 100
 	gm_dress_b[39] = pcs_hips
 	sportsclothingnumber = 1
-	gs 'clothing', 'wear', 'gm_dress', 39
+	gs 'clothing', 'wear', 'flamingos_dress', 59
 elseif pcs_inhib < 30:
 	gm_outfits[91] = 1
 	gm_outfits_h[91] = 100
 	gm_outfits_b[91] = pcs_hips
 	danilovich_outfits[96] = 1
 	danilovich_outfits_h[96] = 100
+	flamingos_dress[89] = 1
+	flamingos_dress_h[89] = 100
+	flamingos_dress_b[89] = pcs_hips
+	fashionista_outfits[17] = 1
+	fashionista_outfits_h[17] = 100
+	fashionista_outfits_b[17] = pcs_hips
+	scandalicious_dress[2] = 1
+	scandalicious_dress_h[2] = 100
+	scandalicious_dress_b[2] = pcs_hips
 	gm_dress[57] = 1
 	gm_dress_h[57] = 100
 	gm_dress_b[57] = pcs_hips
 	sportsclothingnumber = 48
-	gs 'clothing', 'wear', 'gm_dress', 57
+	gs 'clothing', 'wear', 'flamingos_dress', 89
 elseif pcs_inhib < 35:
 	gm_outfits[95] = 1
 	gm_outfits_h[95] = 100
 	gm_outfits_b[95] = pcs_hips
 	danilovich_outfits[48] = 1
 	danilovich_outfits_h[48] = 100
+	scandalicious_dress[18] = 1
+	scandalicious_dress_h[18] = 100
+	scandalicious_dress_b[18] = pcs_hips
+	dolls_outfits[36] = 1
+	dolls_outfits_h[36] = 100
+	dolls_outfits_b[36] = pcs_hips
+	cats_dress[67] = 1
+	cats_dress_h[67] = 100
+	cats_dress_b[67] = pcs_hips
 	gm_dress[63] = 1
 	gm_dress_h[63] = 100
 	gm_dress_b[63] = pcs_hips
 	sportsclothingnumber = 40
-	gs 'clothing', 'wear', 'gm_dress', 63
+	gs 'clothing', 'wear', 'dolls_outfits', 36
 elseif pcs_inhib < 40:
 	gm_outfits[124] = 1
 	gm_outfits_h[124] = 100
 	gm_outfits_b[124] = pcs_hips
 	danilovich_outfits[45] = 1
 	danilovich_outfits_h[45] = 100
+	scandalicious_dress[45] = 1
+	scandalicious_dress_h[45] = 100
+	scandalicious_dress_b[45] = pcs_hips
+	cats_dress[203] = 1
+	cats_dress_h[203] = 100
+	cats_dress_b[203] = pcs_hips
+	cats_outfits[196] = 1
+	cats_outfits_h[196] = 100
+	cats_outfits_b[196] = pcs_hips
 	gm_dress[89] = 1
 	gm_dress_h[89] = 100
 	gm_dress_b[89] = pcs_hips
 	sportsclothingnumber = 45
-	gs 'clothing', 'wear', 'gm_dress', 89
+	gs 'clothing', 'wear', 'cats_dress', 203
 elseif pcs_inhib < 45:
 	gm_outfits[131] = 1
 	gm_outfits_h[131] = 100
 	gm_outfits_b[131] = pcs_hips
 	danilovich_outfits[38] = 1
 	danilovich_outfits_h[38] = 100
+	scandalicious_dress[7] = 1
+	scandalicious_dress_h[7] = 100
+	scandalicious_dress_b[7] = pcs_hips
+	market_outfits[2] = 1
+	market_outfits_h[2] = 40
+	market_outfits_b[2] = pcs_hips
+	cats_dress[219] = 1
+	cats_dress_h[219] = 100
+	cats_dress_b[219] = pcs_hips
 	gm_dress[109] = 1
 	gm_dress_h[109] = 100
 	gm_dress_b[109] = pcs_hips
 	sportsclothingnumber = 38
-	gs 'clothing', 'wear', 'gm_dress', 109
+	gs 'clothing', 'wear', 'market_outfits', 2
 elseif pcs_inhib < 50:
 	gm_outfits[145] = 1
 	gm_outfits_h[145] = 100
 	gm_outfits_b[145] = pcs_hips
 	danilovich_outfits[17] = 1
 	danilovich_outfits_h[17] = 100
+	scandalicious_dress[96] = 1
+	scandalicious_dress_h[96] = 100
+	scandalicious_dress_b[96] = pcs_hips
+	market_outfits[10] = 1
+	market_outfits_h[10] = 40
+	market_outfits_b[10] = pcs_hips
+	nerdvana_outfits[60] = 1
+	nerdvana_outfits_h[60] = 100
+	nerdvana_outfits_b[60] = pcs_hips
 	gm_dress[123] = 1
 	gm_dress_h[123] = 100
 	gm_dress_b[123] = pcs_hips
 	sportsclothingnumber = 143
-	gs 'clothing', 'wear', 'gm_dress', 123
+	gs 'clothing', 'wear', 'scandalicious_dress', 96
 else
 	gm_outfits[149] = 1
 	gm_outfits_h[149] = 100
 	gm_outfits_b[149] = pcs_hips
 	danilovich_outfits[15] = 1
 	danilovich_outfits_h[15] = 100
+	scandalicious_dress[46] = 1
+	scandalicious_dress_h[46] = 100
+	scandalicious_dress_b[46] = pcs_hips
+	scandalicious_outfits[16] = 1
+	scandalicious_outfits_h[16] = 100
+	scandalicious_outfits_b[16] = pcs_hips
+	market_outfits[12] = 1
+	market_outfits_h[12] = 40
+	market_outfits_b[12] = pcs_hips
+	market_outfits
 	gm_dress[149] = 1
 	gm_dress_h[149] = 100
 	gm_dress_b[149] = pcs_hips
@@ -267,8 +372,9 @@ else
 	scandalicious_bikinis_h[55] = 60
 	scandalicious_bikinis_b[55] = pcs_hips
 	sportsclothingnumber = 15
-	gs 'clothing', 'wear', 'gm_dress', 149
+	gs 'clothing', 'wear', 'scandalicious_dress', 46
 end
+
 if swim_start = 99:
 	allure_swimsuit[99] = 1
 	allure_swimsuit_h[99] = 60
@@ -372,6 +478,11 @@ else
 	cyccustom = 1
 end
 
+!!re-initialize appearance to get correct values
+gs 'AppearanceSystem', 'UpdateBaseAppearnce'
+gs 'body', 'RegularUpdate'
+gs 'AppearanceSystem'
+
 pcs_horny = 0
 killvar 'opPRE'
 killvar 'tgs_skipinto'

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff