1
0

100 Коммитууд 52d8208738 ... 4eecaafd59

Эзэн SHA1 Мессеж Огноо
  KevinSmarts 4eecaafd59 Merge remote-tracking branch '3xpurt/master' 5 жил өмнө
  julzor 9deaedd166 [fixes] kat appears only if the temperature is high enough in nudelake 5 жил өмнө
  julzor db58b38546 [fixes] removed a ' that broke the code in lake 5 жил өмнө
  julzor 57aeb72b8e [added] menu variables at the start of a date 5 жил өмнө
  3xpurt 1443167701 [fixed] copy paste error in gadforestlost 5 жил өмнө
  KevinSmarts 7e91b914b4 Merge remote-tracking branch '3xpurt/master' 5 жил өмнө
  3xpurt ee1f7d58a4 [changed] being mauled to death by wolves no longer appears to be a choice. 5 жил өмнө
  3xpurt 5832d406b1 [changed] reduced saunawhore debt from 100k to 40k, which is twice that of Sveta's sale price. 100k is far too grindy, especially considering player incurs more debt while working. 5 жил өмнө
  KevinSmarts cad164794a Merge remote-tracking branch '3xpurt/master' 5 жил өмнө
  3xpurt e2e81ba438 [fixed] another breast pump 'can't do that here' in bedrPar. 5 жил өмнө
  KevinSmarts 150fcd8787 [fixes] typo spotted by Jeep91 5 жил өмнө
  3xpurt 6e429751ea [fixed] massage breasts action no longer appears when unusable. 5 жил өмнө
  3xpurt 947524d889 [merged] most the text of sovietmercader's gadukino changes. 5 жил өмнө
  KevinSmarts c6752af94a Merge remote-tracking branch '3xpurt/master' 5 жил өмнө
  KevinSmarts ccba05bf20 Merge remote-tracking branch 'hornguy6/master' 5 жил өмнө
  KevinSmarts 41f7746995 Merge remote-tracking branch '3xpurt/master' 5 жил өмнө
  KevinSmarts 0335b04319 [fixes] inhibitionism cheat setup to use the same method as the others but in reverse to match the displayed values. 5 жил өмнө
  3xpurt c619ec3a13 [fixed] pcs_inhib values in gadforest, miroslava and gadriver. 5 жил өмнө
  hornguy6 ae0ae58526 [fixed] wrong number range for random image call 5 жил өмнө
  3xpurt a8ab2dfa80 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 жил өмнө
  3xpurt 829b41161d [revert] village content commit #51c2ea69 as discussed. 5 жил өмнө
  KevinSmarts 2be5af6687 Merge remote-tracking branch '3xpurt/master' 5 жил өмнө
  hornguy6 b3ab2c6620 [fixed] missing $ sign in name call 5 жил өмнө
  3xpurt df0193986c [fixed] missing colon in young_shop 5 жил өмнө
  hornguy6 dfd3c0127a [fixed] greater than symbol instead of less than 5 жил өмнө
  hornguy6 ca3e3fc5a9 [fixed] missing image call 5 жил өмнө
  hornguy6 840da901f7 [fixed] missing colon 5 жил өмнө
  hornguy6 27cd1417dc [changed] 5 жил өмнө
  3xpurt 043c31bddb [fixed] excessive spacing in lakecafe 5 жил өмнө
  3xpurt dd77608f02 [fixed] missing and in gadforest_event 5 жил өмнө
  3xpurt 1f2ce82fd4 [fixed] bug with lakecafe location mame (odd) 5 жил өмнө
  3xpurt 831b24b506 [added] new "modern grey" night mode (less dark) and changed night mode selection to themes. 5 жил өмнө
  KevinSmarts f28a329725 Merge remote-tracking branch '3xpurt/master' 5 жил өмнө
  KevinSmarts 4bc5d2e103 Merge remote-tracking branch 'sovietmercader/master' 5 жил өмнө
  3xpurt ba21f406b8 [fixed] reversed variables for saunawhore in sauna. 5 жил өмнө
  3xpurt e96c3e0e63 [fixed] no underwear stat_display messages for no underwear. 5 жил өмнө
  KevinSmarts 91f44210f1 Merge remote-tracking branch '3xpurt/master' 5 жил өмнө
  KevinSmarts 1843329c1f Merge remote-tracking branch 'Milky_boobs/master' 5 жил өмнө
  sovietmercader 51c2ea69ff [changed] village mira and mitka quests rework 5 жил өмнө
  3xpurt 543b84d86f [fixed] infinite kissing and foreplay in mirasex. 5 жил өмнө
  3xpurt 479c7c6f9e [changed] miroslava, to allow to take Mira to the meadow again if you missed the dialogue with her the first time. 5 жил өмнө
  sandra_schulz 4f34abf01b [Added] updated the brother lessons to reflect svetas lactation. 5 жил өмнө
  KevinSmarts 5195c5140f [fixes] Missing subfolder in image link 5 жил өмнө
  3xpurt c005c8da36 [fixed] clothing _attribute_cheap item number. 5 жил өмнө
  3xpurt 58e8807ae3 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 жил өмнө
  KevinSmarts cfc02020c7 [fixes] just a contingency to help with the rare broken outfit when applying last worn outfit. 5 жил өмнө
  3xpurt c0b3dd5280 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 жил өмнө
  KevinSmarts 236bfe061d Merge remote-tracking branch 'julzor/master' 5 жил өмнө
  KevinSmarts b12221e9a9 [added] New clothing item for the swamp storyline 5 жил өмнө
  3xpurt 204ac22262 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 жил өмнө
  julzor 4437ba4f94 Merge branch 'master' of https://git.catrenelle.com/3xpurt/glife 5 жил өмнө
  julzor 3412969c9b Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 жил өмнө
  KevinSmarts 4c0c7e6ba2 Merge remote-tracking branch 'julzor/master' 5 жил өмнө
  3xpurt a77093b2d5 [fixed] stripping for exhibitionist level 1 at gadriver and gadforest. 5 жил өмнө
  3xpurt 2e41866c66 [removed] unused variable in Miroslava and ran cleanup. 5 жил өмнө
  3xpurt cdc8932a1a [changed] drinking at swampspring to current format. 5 жил өмнө
  3xpurt 44fba8963f [fixed] gadforest_event giving wrong clothing during hunter rescue when player is supposed to be naked. 5 жил өмнө
  3xpurt 040f3c88db [fixed] more formatting and grammar changes for bedrpar, gadhouse, preSYS intros (thanks to my wife). 5 жил өмнө
  julzor ee7955acc0 Merge branch 'master' of https://git.catrenelle.com/3xpurt/glife 5 жил өмнө
  3xpurt 8a04c4278e [fixed] burger, cafe_parco, gkafe, lakecafe, ParkKafe now properly deduct funds for "Eat and Run" 5 жил өмнө
  3xpurt 9a00c730bc [changed] standardised apparel menus across all clothing stores. budgetclothes, butik, dolls, NewCloShop, shop, sportShop, young_shop 5 жил өмнө
  julzor 79876df80f [added] milk bottles and nipplebalm to the city pharmacy 5 жил өмнө
  3xpurt a7e4b701a2 [changed] alarm clock to be more user friendly in budilnik. Alarm on/off and time set to main alarm page. Now only exits when you want it to. 5 жил өмнө
  3xpurt 5b90dd5c81 [fixed] cheatmenu_din displaying image toolbar settings without having enabled the image toolbar. 5 жил өмнө
  3xpurt ed6bd4e130 [changed] both schoolgirl starts to have optional start locations, no longer dependant on month (gadukino, pavlovsk). preALT preSYS 5 жил өмнө
  julzor 3fdd582f81 [fixes] [text edit] more alko values and some text edits in gdkin 5 жил өмнө
  julzor bd1c15c9a4 [fixes] dead end panties 5 жил өмнө
  julzor 0ca140887e [fixes] the gynaecologist is available in gpoli if sveta has visible signs of a STD 5 жил өмнө
  julzor 8b9c332992 [fixes] changed more pav_slut conditions 5 жил өмнө
  julzor 299b5fe4f4 [added] cheat to always be happy 5 жил өмнө
  julzor ceac425774 [fixes] two dead ends in bras 5 жил өмнө
  julzor de5e9d6280 [added] menu_variables to gevent and pod_whore 5 жил өмнө
  julzor 23ea329b86 Merge branch 'master' of https://git.catrenelle.com/3xpurt/glife 5 жил өмнө
  julzor 8365e8c939 [fixes] adjusted the text so that it is displayed correctly, $rnd_client_torgtext was missing from the dialog in pod_whore 5 жил өмнө
  julzor 0def8a2e39 [changed] you can decline the cigarette in the hallway and just chat with the boys 5 жил өмнө
  3xpurt e57771f3c4 [fixed] Volleyball coach using wrong name (Michael to Mikhail as it is in npcstatic2) 5 жил өмнө
  3xpurt 917650d0b3 [fixed] translation of TF start Michael to Mikhail in begin, preTG, tobiQW 5 жил өмнө
  3xpurt 9098ded704 [changed] bedrPar, Cheatmenu_din, preCUST, preSYS, preTG: player name is now set in preSYS during game start. Name is now stored and set correctly during character creation. 5 жил өмнө
  julzor 23bf84afee [added] menu variables to gdkin, gopskver, gskver, kotovdom, kotovsex, zsoft_gopskverGorSlut 5 жил өмнө
  julzor 4615108bb9 [fixes] the flags bimbocl and bimbosh are now set to 0 if you are switching to non-bimbo clothes 5 жил өмнө
  3xpurt a9727fcd3c [fixed] forgot to set the default name in mother nickname selection for bedrPar and preSYS 5 жил өмнө
  julzor 327ad4206b [fixes] dimkas boystat for the fight arnt called 5 жил өмнө
  julzor cfd148cbbb [fixes] wrong skirt length 5 жил өмнө
  julzor 790daa7e8a [added] menu variables and menu_off 0 and 1 to poli, gpoli 5 жил өмнө
  julzor 23095b4c08 [fixes] fixed several problem in artemEv that resulted in a schizophrenic artem who kisses sveta and at the same time tells her he doesn't want to kiss her 5 жил өмнө
  julzor d74e9ce7ec [fixes] missing gs 'stats', clr and cla, missing payment for the clown event in hotelhole 5 жил өмнө
  julzor 6e4b4599ac [fixes] moved some actions to their correct position 5 жил өмнө
  julzor d14038908c [fixes] missing comma in abduction 5 жил өмнө
  julzor b7e4caa7d0 [fixes] deleting an outfit was sending the player to the wrong location 5 жил өмнө
  julzor e5ed0f4993 [fixes] alko fix in mother, removed some unnecessary code in gdksex 5 жил өмнө
  KevinSmarts bc26290db1 [fixes] Hardcoded $metka 5 жил өмнө
  KevinSmarts 6f0a8438b2 Merge commit '1c0d902403dd06c1d81e27e4fe6dbab9fca1efde' 5 жил өмнө
  julzor 148bd15b1b [fixes] decreased the chance for anal in experiment and fixed some broken links, replaced all '' with *nl 5 жил өмнө
  KevinSmarts 9c73fb10fa [fixes] Made reading a book in the experiment more interesting and added the nerd check plaus some skill learning. 5 жил өмнө
  Your Name 1c0d902403 - fixed location beeig overwritten wrongfully 5 жил өмнө
  julzor 95f00178c8 [text edit] small text edits and typos 5 жил өмнө
  KevinSmarts c6fa4f8148 Merge remote-tracking branch 'julzor/master' 5 жил өмнө
  julzor 555a7db339 [fixes] more alko fixes, added a missing cla and a small text edit in gdkin 5 жил өмнө
  julzor d68b65eb68 [fixes] alko values 5 жил өмнө
  sovietmercader 37134c44b6 [fixed] hunter rescue recalculated in all forest locations when lost 5 жил өмнө
100 өөрчлөгдсөн 3215 нэмэгдсэн , 2361 устгасан
  1. 90 48
      locations/Cheatmenu_din.qsrc
  2. 6 7
      locations/Gaddvor.qsrc
  3. 77 1
      locations/Gadhouse.qsrc
  4. 6 6
      locations/Gadsarai.qsrc
  5. 125 129
      locations/HotelHole.qsrc
  6. 16 0
      locations/HotelRoom.qsrc
  7. 1 1
      locations/HotelWork.qsrc
  8. 4 0
      locations/IrinaRoom.qsrc
  9. 4 0
      locations/MartinSex.qsrc
  10. 4 0
      locations/MartinSex2.qsrc
  11. 4 0
      locations/MartinSex3.qsrc
  12. 4 0
      locations/MartinTalk.qsrc
  13. 38 26
      locations/Meadow.qsrc
  14. 80 75
      locations/Miroslava.qsrc
  15. 18 12
      locations/MiroslavaHome.qsrc
  16. 3 3
      locations/NatBelHome.qsrc
  17. 5 1
      locations/NewCloShop.qsrc
  18. 16 16
      locations/NikoDates.qsrc
  19. 1 1
      locations/Nudelake.qsrc
  20. 3 2
      locations/ParkKafe.qsrc
  21. 4 0
      locations/Peterroom.qsrc
  22. 13 14
      locations/Snpc.qsrc
  23. 2 2
      locations/VolleyTrenerSpeak.qsrc
  24. 2 2
      locations/VoltrenerSexShower.qsrc
  25. 4 4
      locations/Voltrenersex.qsrc
  26. 1 1
      locations/_attributes_average.qsrc
  27. 6 0
      locations/_attributes_cheap.qsrc
  28. 5 2
      locations/_body_image.qsrc
  29. 2 2
      locations/abduction.qsrc
  30. 9 1
      locations/anushapt.qsrc
  31. 20 13
      locations/artemEv.qsrc
  32. 22 22
      locations/artemhome.qsrc
  33. 8 8
      locations/backwater.qsrc
  34. 4 0
      locations/bank.qsrc
  35. 4 0
      locations/barbershop.qsrc
  36. 4 0
      locations/bass.qsrc
  37. 4 0
      locations/bedr.qsrc
  38. 4 0
      locations/bedr2x.qsrc
  39. 60 31
      locations/bedrPar.qsrc
  40. 4 0
      locations/bedrPar2.qsrc
  41. 1 1
      locations/begin.qsrc
  42. 8 10
      locations/bicycle.qsrc
  43. 5 5
      locations/bras.qsrc
  44. 5 0
      locations/brother.qsrc
  45. 217 32
      locations/brother_lessons.qsrc
  46. 16 11
      locations/budgetclothes.qsrc
  47. 10 11
      locations/budilnik.qsrc
  48. 52 0
      locations/buklinik.qsrc
  49. 6 2
      locations/burger.qsrc
  50. 16 10
      locations/butik.qsrc
  51. 4 0
      locations/butoilet.qsrc
  52. 2 2
      locations/cafe_parco.qsrc
  53. 4 0
      locations/carF.qsrc
  54. 3 3
      locations/cikl.qsrc
  55. 4 0
      locations/clener.qsrc
  56. 4 0
      locations/cloakroom.qsrc
  57. 27 9
      locations/clothing.qsrc
  58. 17 13
      locations/clothing_QV.qsrc
  59. 47 47
      locations/clothing_descriptions.qsrc
  60. 16 0
      locations/club.qsrc
  61. 4 0
      locations/dachain.qsrc
  62. 4 0
      locations/dachaogr0.qsrc
  63. 4 0
      locations/danceclass.qsrc
  64. 62 115
      locations/dateF.qsrc
  65. 93 181
      locations/dateM.qsrc
  66. 4 0
      locations/dima.qsrc
  67. 128 207
      locations/dimaRevenge.qsrc
  68. 1 16
      locations/din_van.qsrc
  69. 23 23
      locations/dinsister.qsrc
  70. 7 3
      locations/dolls.qsrc
  71. 4 0
      locations/dom_gor.qsrc
  72. 4 0
      locations/dorm.qsrc
  73. 4 0
      locations/downlibrary.qsrc
  74. 1 4
      locations/exercise.qsrc
  75. 4 0
      locations/exhibitionistshop.qsrc
  76. 178 131
      locations/experiment.qsrc
  77. 4 0
      locations/fight.qsrc
  78. 12 0
      locations/fit.qsrc
  79. 5 0
      locations/food_menu.qsrc
  80. 282 209
      locations/foto.qsrc
  81. 149 45
      locations/foto_models.qsrc
  82. 1 1
      locations/gLakeNude.qsrc
  83. 1 1
      locations/gLakeNudeForest.qsrc
  84. 103 44
      locations/gadfield.qsrc
  85. 198 125
      locations/gadforest.qsrc
  86. 178 163
      locations/gadforest_event.qsrc
  87. 142 87
      locations/gadforestlost.qsrc
  88. 61 25
      locations/gadforestswamp.qsrc
  89. 45 42
      locations/gadprostitutes.qsrc
  90. 160 166
      locations/gadriver.qsrc
  91. 26 21
      locations/gadukino.qsrc
  92. 48 46
      locations/gadukino_event.qsrc
  93. 1 1
      locations/gdk.qsrc
  94. 4 0
      locations/gdkbibl.qsrc
  95. 62 72
      locations/gdkin.qsrc
  96. 4 0
      locations/gdkkru.qsrc
  97. 16 26
      locations/gdksex.qsrc
  98. 5 1
      locations/gdksport.qsrc
  99. 4 0
      locations/gdktoilet.qsrc
  100. 28 20
      locations/gevent.qsrc

+ 90 - 48
locations/Cheatmenu_din.qsrc

@@ -95,6 +95,17 @@ $cheatmenu['noSleep'] = {
 	end
 }
 
+$cheatmenu['noMood'] = {
+	if cheatNoMood = 0:
+		cheatNoMood = 1
+		dynamic $cheatmenu['permanent']
+		exit
+	elseif cheatNoMood = 1:
+		cheatNoMood = 0
+		dynamic $cheatmenu['permanent']
+	end
+}
+
 $cheatmenu['noFat'] = {
 	if cheatNoFat = 0:
 		cheatNoFat = 1
@@ -287,6 +298,8 @@ $cheatmenu['permanent'] = {
 	if cheatNoDrink = 1:$cheatNoDrink = 'Currently ON'
 	if cheatNoSleep = 0:$cheatNoSleep = 'Currently OFF'
 	if cheatNoSleep = 1:$cheatNoSleep = 'Currently ON'
+	if cheatNoMood = 0:$cheatNoMood = 'Currently OFF'
+	if cheatNoMood = 1:$cheatNoMood = 'Currently ON'
 	if cheatNoFat = 0:$cheatNoFat = 'Currently OFF'
 	if cheatNoFat = 1:$cheatNoFat = 'Currently ON'
 	if cheatHealth = 0:$cheatHealth = 'Currently OFF'
@@ -317,6 +330,7 @@ $cheatmenu['permanent'] = {
 	'Never eat: <a href="exec:dynamic $cheatmenu[''noEat'']"><<$cheatNoEat>></a>'
 	'Never drink: <a href="exec:dynamic $cheatmenu[''noDrink'']"><<$cheatNoDrink>></a>'
 	'Never sleep: <a href="exec:dynamic $cheatmenu[''noSleep'']"><<$cheatNoSleep>></a>'
+	'Always happy: <a href="exec:dynamic $cheatmenu[''noMood'']"><<$cheatNoMood>></a>'
 	'Never lose or gain weight: <a href="exec:dynamic $cheatmenu[''noFat'']"><<$cheatNoFat>></a>'
 	'Disable STDs: <a href="exec:dynamic $cheatmenu[''health'']"><<$cheatHealth>></a>'
 	'Never get addicted: <a href="exec:dynamic $cheatmenu[''addict'']"><<$NarkImmune>></a>'
@@ -423,18 +437,21 @@ $cheatmenu['avatar_hair_set'] = {
 }
 
 $cheatmenu['rename'] = {
+	!! player name is set in preSYS.qsrc
+	$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'
 
-	if $pcs_firstname = '':$pcs_firstname = 'Svetlana'
-
-	$pcs_lastname = input("What is your last name? (Leave blank for Lebedev)")
-
-	if $pcs_lastname = '':$pcs_lastname = 'Lebedev'
+	$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'
 
-	!!!0.2.6 addition
+	$temp_nickname = '<<$pcs_nickname>>'
 	$pcs_nickname = input("What is your nickname? (Leave blank for Sveta)")
-
-	if $pcs_nickname = '':$pcs_nickname = 'Sveta'
+	if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
+	killvar '$temp_nickname'
 }
 
 $cheatmenu['looks'] = {
@@ -678,6 +695,16 @@ $cheatmenu['setStat'] = {
 	dynamic $cheatmenu['stats']
 }
 
+$cheatmenu['setStat1'] = {
+	temp_input = input("Set your <<$ARGS[1]>> level:")
+	dynamic "
+		<<$ARGS[0]>>_lvl = 100 - temp_input
+		<<$ARGS[0]>>_lvlst = 100 - temp_input
+	"
+	killvar 'temp_input'
+	dynamic $cheatmenu['stats']
+}
+
 $cheatmenu['setAttrs'] = {
 	loop_index = 0
 	:set_attrs_loop
@@ -720,6 +747,16 @@ $cheatmenu['printStatLinks'] = {
 	*pl '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>''" >Set</a>'
 }
 
+$cheatmenu['printStatLinks1'] = {
+	*p '<a href="exec:<<$ARGS[0]>>_lvl = 0 & <<$ARGS[0]>>_lvlst = 0 & dynamic $cheatmenu[''stats'']" >Max</a>  '
+	*p '<a href="exec:<<$ARGS[0]>>_lvl -= 1 & <<$ARGS[0]>>_lvlst = <<$ARGS[0]>>_lvl & dynamic $cheatmenu[''stats'']" >+1</a> '
+	*p '<a href="exec:<<$ARGS[0]>>_lvl -= 10 & <<$ARGS[0]>>_lvlst = <<$ARGS[0]>>_lvl & dynamic $cheatmenu[''stats'']" >+10</a> '
+	*p '<a href="exec:<<$ARGS[0]>>_lvl += 1 & <<$ARGS[0]>>_lvlst = <<$ARGS[0]>>_lvl & dynamic $cheatmenu[''stats'']" >-1</a> '
+	*p '<a href="exec:<<$ARGS[0]>>_lvl += 10 & <<$ARGS[0]>>_lvlst = <<$ARGS[0]>>_lvl & dynamic $cheatmenu[''stats'']" >-10</a>  '
+	*p '<a href="exec:<<$ARGS[0]>>_lvl = 100 & <<$ARGS[0]>>_lvlst = 100 & dynamic $cheatmenu[''stats'']" >Min</a>  '
+	*pl '<a href="exec:dynamic $cheatmenu[''setStat1''], ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>''" >Set</a>'
+}
+
 $cheatmenu['stats'] = {
 	gs 'stat'
 	*clr & cla
@@ -765,7 +802,7 @@ $cheatmenu['stats'] = {
 	if MagikDostup = 0: *p 'Magic (<<magik_lvl>>): ' & dynamic $cheatmenu['printStatLinks'], 'magik', 'Magic'
 	*nl
 	*pl'<b>Sexual:</b>'
-	*pl 'Inhibition level (<<100 - pcs_inhib>>): <a href="exec:inhib_lvl = 0 & inhib_lvlst = 0 & dynamic $cheatmenu[''stats'']" >Max</a>  <a href="exec:inhib_lvl -= 1 & inhib_lvlst = inhib_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:inhib_lvl -= 10 & inhib_lvlst = inhib_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:inhib_lvl += 1 & inhib_lvlst = inhib_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:inhib_lvl += 10 & inhib_lvlst = inhib_lvl & dynamic $cheatmenu[''stats'']" >-10</a>  <a href="exec:inhib_lvl = 100 & inhib_lvlst = 100 & dynamic $cheatmenu[''stats'']" >Min</a>'
+	*pl 'Inhibition level (<<100 - inhib_lvl>>): ' & dynamic $cheatmenu['printStatLinks1'], 'inhib', 'Inhibition'
 	if pcs_dom < 0 or sub < 0: pcs_dom = 0 & sub = 0
 	if pcs_dom > 100: pcs_dom = 100
 	if sub > 100: sub = 100
@@ -1549,11 +1586,13 @@ $cheatmenu['display'] = {
 		'Force Image Width: Currently OFF - <a href="exec:set_imgh = 0 &set_imgh=input(''Enter the width of the images'') & dynamic $cheatmenu[''display'']">Turn ON</a>'
 	end
 	*nl
-	if night_mode = 1:
-		'Night Mode: Currently ON - <a href="exec:night_mode = 0 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Turn OFF</a>'
-	else
-		'Night Mode: Currently OFF - <a href="exec:night_mode = 1 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Turn ON</a>'
-	end
+	!night_mode 0: dynamic
+	!night_mode 1: black
+	!night_mode 2: grey
+	if night_mode = 0:'Girl Life Theme Selection: Dynamic | <a href="exec:night_mode = 1 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Pitch Black</a> | <a href="exec:night_mode = 2 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Modern Grey</a>'
+	if night_mode = 1:'Girl Life Theme Selection: <a href="exec:night_mode = 0 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Dynamic</a> | Pitch Black | <a href="exec:night_mode = 2 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Modern Grey</a>'
+	if night_mode = 2:'Girl Life Theme Selection: <a href="exec:night_mode = 0 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Dynamic</a> | <a href="exec:night_mode = 1 & dynamic $cheatmenu[''display''] & gs ''$menu_obnovit''">Pitch Black</a> | Modern Grey'
+	'<font color="grey">Dynamic theme (default) will change colour based on the game hour.</font>'
 	*nl
 	if Enable_faceturn = 1:
 		'Always show face: Currently ON - <a href="exec:Enable_faceturn = 0 & dynamic $cheatmenu[''display'']">Turn OFF</a>'
@@ -1655,40 +1694,43 @@ $cheatmenu['status'] = {
 		'Show image toolbar: Currently OFF - <a href="exec:Enable_showstatimg = 1 & dynamic $cheatmenu[''status''] & gs ''stat''">Turn ON</a>'
 	end
 	*nl
-	!control image toolbar position
-	'<center><B>Image Toolbar Settings</B></center>'
-	$stat_temp_text = '<br>Image toolbar position: <B>'
-	if Enable_statimg_loc = 0:
-		$stat_temp_text += 'Middle'
-	elseif Enable_statimg_loc = 1:
-		$stat_temp_text += 'Top'
-	elseif Enable_statimg_loc = 2:
-		$stat_temp_text += 'Bottom'
-	else
-		$stat_temp_text += 'ERROR! please reset it'
-	end
-	$stat_temp_text += '</B>. You can move it to '
-	if Enable_statimg_loc ! 0:$stat_temp_text += ' <a href="exec:Enable_statimg_loc=0 & dynamic $cheatmenu[''status''] & gs ''stat''">Middle</a>'
-	if Enable_statimg_loc ! 1:$stat_temp_text += ' <a href="exec:Enable_statimg_loc=1 & dynamic $cheatmenu[''status''] & gs ''stat''">Top</a>'
-	if Enable_statimg_loc ! 2:$stat_temp_text += ' <a href="exec:Enable_statimg_loc=2 & dynamic $cheatmenu[''status''] & gs ''stat''">Bottom</a>'
-
-	$stat_temp_text
-	killvar 'stat_temp_text'
-	!End control image toolbar position
-	if set_statimgh > 0: set_statimgw = 0
-	if set_statimgw > 0: set_statimgh = 0
-	if set_statimgh <= 0 and set_statimgw <= 0: $set_statimgh = ''
-	if set_statimgh > 0:
-		'Force Image toobar height: <a href="exec:set_statimgw=0 & set_statimgh=input(''Enter the height of the images'') & dynamic $cheatmenu[''status''] & gs ''stat''"><<set_statimgh>></a>: Currently ON - <a href="exec:set_statimgh=0 & dynamic $cheatmenu[''status''] & gs ''stat''">Turn OFF</a>'
-		$set_statimgh = 'height = <<set_statimgh>>'
-	else
-		'Force Image toobar height: Currently OFF - <a href="exec:set_statimgw=0 & set_statimgh=input(''Enter the height of the images'') & dynamic $cheatmenu[''status''] & gs ''stat''">Turn ON</a>'
-	end
-	if set_statimgw > 0:
-		'Force Image toobar width: <a href="exec:set_statimgh=0 & set_statimgw=input(''Enter the width of the images'') & dynamic $cheatmenu[''status''] & gs ''stat''"><<set_statimgw>></a>: Currently ON - <a href="exec:set_statimgw=0 & dynamic $cheatmenu[''status''] & gs ''stat''">Turn OFF</a>'
-		$set_statimgh = 'width = <<set_statimgw>>'
-	else
-		'Force Image toobar width: Currently OFF - <a href="exec:set_statimgh=0 & set_statimgw=input(''Enter the width of the images'') & dynamic $cheatmenu[''status''] & gs ''stat''">Turn ON</a>'
+	if Enable_showstatimg = 1:
+		!control image toolbar position
+		'<center><B>Image Toolbar Settings</B></center>'
+		$stat_temp_text = '<br>Image toolbar position: <B>'
+		if Enable_statimg_loc = 0:
+			$stat_temp_text += 'Middle'
+		elseif Enable_statimg_loc = 1:
+			$stat_temp_text += 'Top'
+		elseif Enable_statimg_loc = 2:
+			$stat_temp_text += 'Bottom'
+		else
+			$stat_temp_text += 'ERROR! please reset it'
+		end
+		$stat_temp_text += '</B>. You can move it to '
+		if Enable_statimg_loc ! 0:$stat_temp_text += ' <a href="exec:Enable_statimg_loc=0 & dynamic $cheatmenu[''status''] & gs ''stat''">Middle</a>'
+		if Enable_statimg_loc ! 1:$stat_temp_text += ' <a href="exec:Enable_statimg_loc=1 & dynamic $cheatmenu[''status''] & gs ''stat''">Top</a>'
+		if Enable_statimg_loc ! 2:$stat_temp_text += ' <a href="exec:Enable_statimg_loc=2 & dynamic $cheatmenu[''status''] & gs ''stat''">Bottom</a>'
+
+
+		$stat_temp_text
+		killvar 'stat_temp_text'
+		!End control image toolbar position
+		if set_statimgh > 0: set_statimgw = 0
+		if set_statimgw > 0: set_statimgh = 0
+		if set_statimgh <= 0 and set_statimgw <= 0: $set_statimgh = ''
+		if set_statimgh > 0:
+			'Force Image toobar height: <a href="exec:set_statimgw=0 & set_statimgh=input(''Enter the height of the images'') & dynamic $cheatmenu[''status''] & gs ''stat''"><<set_statimgh>></a>: Currently ON - <a href="exec:set_statimgh=0 & dynamic $cheatmenu[''status''] & gs ''stat''">Turn OFF</a>'
+			$set_statimgh = 'height = <<set_statimgh>>'
+		else
+			'Force Image toobar height: Currently OFF - <a href="exec:set_statimgw=0 & set_statimgh=input(''Enter the height of the images'') & dynamic $cheatmenu[''status''] & gs ''stat''">Turn ON</a>'
+		end
+		if set_statimgw > 0:
+			'Force Image toobar width: <a href="exec:set_statimgh=0 & set_statimgw=input(''Enter the width of the images'') & dynamic $cheatmenu[''status''] & gs ''stat''"><<set_statimgw>></a>: Currently ON - <a href="exec:set_statimgw=0 & dynamic $cheatmenu[''status''] & gs ''stat''">Turn OFF</a>'
+			$set_statimgh = 'width = <<set_statimgw>>'
+		else
+			'Force Image toobar width: Currently OFF - <a href="exec:set_statimgh=0 & set_statimgw=input(''Enter the width of the images'') & dynamic $cheatmenu[''status''] & gs ''stat''">Turn ON</a>'
+		end
 	end
 
 	!<a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[''status''] & gs ''stat''"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png"></a>

+ 6 - 7
locations/Gaddvor.qsrc

@@ -1,12 +1,13 @@
 # Gaddvor
 
 if $ARGS[0]='':
-	
 	music_loop = 0
-	
 	$metka = ''
 	$loc = 'Gaddvor'
 	$location_type = 'public_outdoors'
+	$menu_loc = 'Gaddvor'
+	$menu_arg = ''
+	menu_off = 0
 	killvar '$locclass'
 	gs 'stat'
 	CLOSE ALL
@@ -57,7 +58,7 @@ if $ARGS[0]='':
 		act 'Enter your grandparents'' house':minut += 1 & gt 'Gadhouse'
 		act 'Enter the banya':minut += 1 & gt 'Gadbana'
 	end
-	
+
 	if $clothingworntype = 'nude':
 		*nl
 		'You are naked and can only go into your grandparent''s house to get dressed or go to the banya.'
@@ -71,13 +72,12 @@ if $ARGS[0]='':
 		if meadow > 0 and hour >= 6 and hour < 20 and month >= 4 and month <= 10:act 'Go to the meadow':minut += 20 & gt 'Meadow', 'start'
 		act '<b>Go to Gadukino</b>':minut += 5 & gt 'gadukino'
 
-		!removed from 1.2.5
 		if hour >= 17 and hour < 20:
 			if mitkaday!daystart:'<a href="exec:gt ''mitka''">Mitka</a> is hanging out near the barn in your grandparents'' backyard, he is following you while taking a smoke.'
 		elseif hour >= 20 and sunWeather = 1:
 			'Several <a href="exec:gt ''mitkabuh''">young men</a> are sitting near your grandparents'' backyard, drinking moonshine and talking loudly.'
 		end
-		!125s
+
 		mira_temp = rand(1,5)
 		if mira_temp = 3 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 1 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
 			*clr & cla
@@ -94,7 +94,7 @@ if $ARGS[0]='':
 	end
 end
 
-if $ARGS[0]='chickens':
+if $ARGS[0] = 'chickens':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens1.jpg"></center>'
 	'Ordinary chickens clucking about their pen.'
@@ -118,7 +118,6 @@ if $ARGS[0]='chickens':
 	end
 	act 'Leave': gt'Gaddvor'
 end
-!!125e
 
 --- Gaddvor ---------------------------------
 

+ 77 - 1
locations/Gadhouse.qsrc

@@ -179,6 +179,10 @@ if $ARGS[0] = 'Main':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -358,7 +362,7 @@ if $ARGS[0] = 'Main':
 
 	gs 'events', 'read'
 	gs 'subkid'
-	
+
 	if gobelen>0:'You have <<gobelen>> completed tapestries.'
 	if pcs_sewng >= 40 and tkan > 0:'You have enough fabric for <<tkan>> lessons.'
 	if pcs_sewng >= 40 and tkan <= 0:'You do not have any fabric.'
@@ -651,5 +655,77 @@ if $ARGS[0]='villagecat':
 	act 'Leave Boniface alone':minut += 2 & gt 'Gadhouse', 'Start'
 end
 
+if $ARGS[0] = 'intro':
+	cla & *clr
+	$metka = ''
+	$loc = 'Gadhouse'
+	$temp_nickname = '<<$npc_nickname[''A29'']>>'
+	monthbabkapay = month
+	menu_off = 1
+	hour = 6
+	gs 'stat'
+	'<center><H4>Your Grandparents'' Cottage</H4></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
+	*nl
+	'All of a sudden you hear a familiar voice yell out, "<<$pcs_nickname>>, time to get up. You can''t spend the whole day laying around!"'
+	wait 2000
+	$npc_nickname['A29'] = input('<center>What name do you address your mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
+	if $npc_nickname['A29'] = '':$npc_nickname['A29'] = '<<$temp_nickname>>'
+	killvar '$temp_nickname'
+
+	act 'Continue':
+		cla & *clr
+		minut += 2
+		gs 'stat'
+		'<center><H4>Your Grandparents'' Cottage</H4></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
+		*nl
+		'You tiredly open your eyes seeing your <<$npc_nickname[''A29'']>> standing over you, "Fifteen more minutes..."'
+		'Your <<$npc_nickname[''A29'']>> lets out a loud sigh, "No, up now!" as she yanks the cover off...'
+		'"<<$npc_nickname[''A29'']>>!" you exclaim, as you feel a slight cold breeze hit your body.'
+		'"Listen!, I''m heading back to Pavlovsk this morning, and I don''t want to hear excuses, <<$pcs_nickname>>. The summer holidays will be over soon and you need to get used to waking up early, for when school starts. So, from now on set your alarm, so you can wake up at a reasonable time." <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
+		act 'Get up':
+			cla & *clr
+			minut += 2
+			gs 'stat'
+			'<center><H4>Your Grandparents'' Cottage</H4></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
+			*nl
+			'As soon as you get off your now coverless bed, your <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "Summer is almost over, you can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
+			'"What are you going to do when school starts, or when you get a job? You better get into the habit of setting your alarm so you can wake up bright and early."'
+			act 'Continue':
+				cla & *clr
+				minut += 2
+				gs 'stat'
+				'<center><H4>Your Grandparents'' Cottage</H4></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
+				*nl
+				'You let out an exasperated sigh, "Yeah, yeah I know, you told me that already. So, how early are we talking?"'
+				'Your <<$npc_nickname[''A29'']>> shoots you a sharp look and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right...Anya used to wake up at 06:00 for school. Besides, while you are staying at your grandparents house, you should be up extra early helping them tend to the farm, this isn''t a holiday camp!"'
+				act 'Continue':
+					cla & *clr
+					minut += 2
+					gs 'stat'
+					'<center><H4>Your Grandparents'' Cottage</H4></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
+					*nl
+					'"You want me to wake up that early?!" You huff. "Can''t I wake up at like... 07:00?"'
+					'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns you before making her way outside. "Oh, don''t forget; when you get back to Pavlovsk, you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month," she adds quickly.'
+					act 'But why do I--':
+						cla & *clr
+						minut += 2
+						gs 'stat'
+						'<center><H4>Your Grandparents'' Cottage</H4></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
+						*nl
+						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" <<$npc_nickname[''A29'']>> says as she storms off towards your grandparent''s outside door. "Don''t forget to talk to your grandparent''s and ask if they need help!" she says loudly. Without waiting for your response, she closes the door, and with that, she''s gone.'
+
+						act 'I understand...':gt 'budilnik', 'start'
+					end
+				end
+			end
+		end
+	end
+end
 --- Gadhouse ---------------------------------
 

+ 6 - 6
locations/Gadsarai.qsrc

@@ -515,7 +515,7 @@ if $ARGS[0] = 'cow':
 			if cow_field = 1:'You lead Dawn to the field, where you let the shepherds take over.'
 			if graze_cow = 1:'You lead Dawn to the field, where you grandfather awaits you. It''s his turn to keep an eye on the cows.'
 
-			act 'Further':gt'gadfield','cow'
+			act 'Continue':gt'gadfield','cow'
 		end
 	end
 
@@ -561,7 +561,7 @@ if $ARGS[0] = 'horse':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
 			'You took Desperado by the bridle and led it to the field. There, you let it run free in the paddock area, and went on with your business.'
 
-			act 'Further':gt'gadfield','field'
+			act 'Continue':gt'gadfield','field'
 		end
 	end
 	if horse_river = 1 and sunWeather = 1 and temper >= 15:
@@ -576,7 +576,7 @@ if $ARGS[0] = 'horse':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
 			'You took Desperado by the bridle and led it to the river.'
 
-			act 'Further':gt'Gadriver', 'Gadbitch'
+			act 'Continue':gt'gadriver', 'gadbitch'
 		end
 	end
 	if comb_horse = 1:
@@ -592,7 +592,7 @@ if $ARGS[0] = 'horse':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/comb_horse.jpg"></center>'
 			'You groom Desperado for an hour. When finished, you''re satisfied with the result. Desperado is looking as healthy as ever.'
 
-			act 'Further':gt 'Gadsarai','horse'
+			act 'Continue':gt 'Gadsarai','horse'
 		end
 	end
 
@@ -620,7 +620,7 @@ if $ARGS[0] = 'mira_dog':
 		'"Okay Mira, I''m feeling mercyfull today. You can consider yourself forgiven." you say, removing Mira''s collar.'
 		'The girl looks nervously at you for a few moments, then quickly gets dressed and runs home.'
 
-		act 'Further':gt'Gadsarai'
+		act 'Continue':gt'Gadsarai'
 	end
 	act 'Go':gt'Gadsarai'
 end
@@ -635,7 +635,7 @@ if know_no_bandit = 0:
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/know_no_pirat.jpg"></center>'
 	'"Where''s Bandit? The bastard probably ran away, you sadly thought, looking at an empty dog house, remembering the beloved dog fondly.'
-	act 'Further':gt $loc, $metka
+	act 'Continue':gt $loc, $metka
 end
 }
 !125e

+ 125 - 129
locations/HotelHole.qsrc

@@ -179,7 +179,8 @@ act 'Kill some time in the hotel lobby':
 end
 
 if $ARGS[0] = 'Pavlin' :
-	cls
+	*clr & cla
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/Pavlin.jpg"></center>'
 	'Varsonofy Krestovoz is a small time gangster who makes his money by whoring out vulnerable women in Pavlovsk. Few people know his name as he is usually called Pavlin (the Peacock).'
 	if npc_rel['A217'] = -1:'Pavlin killed your unborn baby, you truly hate him. You should go find some help if you don''t want these negative feelings to completely take over your personality.'
@@ -188,58 +189,52 @@ if $ARGS[0] = 'Pavlin' :
 	if npc_rel['A217']>=40 and npc_rel['A217']<60:'You and Pavlin have a normal relationship.'
 	if npc_rel['A217']>=60 and npc_rel['A217']<80:'You and Pavlin have a good relationship.'
 	if npc_rel['A217']>=80:'You and Pavlin have a great relationship.'
+	act 'Move away':gt'HotelHole','skip_resepevent'
 	if npc_rel['A217'] >=40:
 		act 'Have a chat':
-				cls
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/Pavlin.jpg"></center>'
 				minut += 10
 				if pavchat ! daystart:npc_rel['A217'] += 2
 				pavchat = daystart
 				talkrand = RAND(0,6)
-				gs'stat'
+				gs 'stat'
 				if talkrand = 0:
 					'Pavlin complains to you how hard it is to find decent girls in a hellhole like Pavlovsk.'
 					'...'
 					'"Actually <<$pcs_firstname>>, you are the first decent girl to work for me since I set up shop here 2 years a go."'
 					'You smile and thank him for the compliment.'
-				end
-				if talkrand = 1:
+				elseif talkrand = 1:
 					'You tell Pavlin you love going to the city and spend your money at the shopping center.'
 					'You ask him if he wants to join you the next time you go.'
 					'"I am sorry <<$pcs_firstname>>, I can never go back to the city."'
 					'Pavlin takes a sip from his beer and suddenly he looks very depressed.'
 					'It looks like you really hit a nerve there. You wonder what that''s about.'
-				end
-				if talkrand = 2:
+				elseif talkrand = 2:
 					'Pavlin tells you a story from his childhood.'
 					'"My father used to beat me every day. One day when I was 12 after another savage beating I asked my mother to do something about it. The bitch started giving me another beating and then locked me out in my underpants on the balcony for 2 hours."'
 					'"This was in the middle of January, so I got lucky I didn''t freeze to death that day."'
 					'It seems he had a very rough childhood.'
-				end
-				if talkrand = 3:
+				elseif talkrand = 3:
 					'Pavlin tells you a story from his childhood.'
 					'"My father frequently brought working girls to the house for punishment. If they were lucky he just beat them up. If their mistake was worse he would involve my mother and she ..."'
 					'"Let''s just say that these girls would never go against my father''s wishes again once my mother was done with them."'
 					'"I always felt sorry for these girls at the time and did not want to watch, but they always forced me."'
 					'It seems he had a very rough childhood.'
-				end
-				if talkrand = 4:
+				elseif talkrand = 4:
 					'Pavlin tells you how he got in this business.'
 					'"I basically followed into my father''s footsteps. When I was 19 I ran my first girl on the streets of Saint Petersburg."'
 					'"Too bad she had a nasty habit of always talking back to me."'
 					'"Knocking out her teeth helped a lot with that, too bad that made her too ugly to be profitable, ha ha ha."'
 					'Pavlin let out an evil laugh, you don''t think that was a joke.'
-				end
-				if talkrand = 5:
+				elseif talkrand = 5:
 					'Pavlin tells you a story from his childhood.'
 					'"One day, when I was 6 years old I accidently broke one of my mother''s crystal figurines."'
 					'"That day she hit me over the head with her heels, you can still see the scar."'
 					'Pavlin moves his head towards you and moves his hair away. You indeed see a big scar on his scalp.'
 					'"After that she refused to feed me for 2 weeks, so I had to get by with scraps I found in the garbage."'
 					'It seems he had a very rough childhood.'
-				end
-				if talkrand = 6:
+				elseif talkrand = 6:
 					'It looks like Pavlin is drunk.'
 					'"You will never disobey me? right <<$pcs_firstname>> ? "'
 					'"Your face is so pretty, I really don''t want to mess that up"'
@@ -252,8 +247,9 @@ if $ARGS[0] = 'Pavlin' :
 	end
 	if npc_rel['A217'] > 29 and proshotelday ! daystart and ClownQW ! 1:
 		act 'The circus is in town':
-			cls
+			*clr & cla
 			minut += 1
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/Pavlin.jpg"></center>'
 			'<<$pcs_firstname>>, have you heard, the circus is in town.'
 			'You look at Pavlin with a surprising look. "I didn''t know you were a fan of the circus. You want to go see a show or something?"'
@@ -262,35 +258,35 @@ if $ARGS[0] = 'Pavlin' :
 			'I actually have 2 performers waiting on a girl right now. I called a girl but she is still 10 minutes out. They are getting restless because they need to start their next show soon. Do you think you can take them?'
 			act 'No thanks':
 				cla
+				*nl
 				'"No, thanks. I''ll just take a regular customer today"'
 				'"No problem, one regular john, coming right up. You can go ahead to the usual room."'
 				act 'Perform your duty':gt 'hotel_resep', 'pavgenpros'
 			end
 			act 'Sure, sounds like fun':
 				cla
-				cls
+				*nl
 				'"Ok, you can go ahead to room 312. They are expecting you"'
 				'Pavlin gives you the key for the hotel room.'
 				act 'Go to room 312':gt 'HotelHole','clown'
 			end
-
 		end
 	end
 	if npc_rel['A217'] > 19 and proshotelday ! daystart and storyline = 1 and TwinQW ! 3:
 		act 'Fake Twins':
-			cls
+			*clr & cla
 			minut += 1
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/Pavlin.jpg"></center>'
 			'"<<$pcs_firstname>>, I got a guy who is willing to pay a LOT of money for a threesome with a set of twins. Do you happen to know a pair of twins who''d be down to make some quick cash?" Pavlin asks, looking hopeful.'
 			'You think for a moment before responding. "No I don''t. However, a lot of people say my sister and I look alike. Maybe if I wear my hair like hers and we put on enough make up we could pass as twins."'
 			'"That''s a great idea! Do you think she would be willing to do this?" Pavlin asks, suddenly very excited at the prospect.'
-			'<br>'
 			if sisterLesb < 2:
 				'"What? No, I was just saying we look alike, I wouldn''t dare propose an idea like this to her."'
 				'"THEN WHY BRING HER UP, YOU STUPID CUNT?" Pavlin''s excitement quickly dissolves to rage as he raises his hand up, ready to strike.'
 				'You brace for the hit, closing your eyes tightly. The slap never comes however, and you open your eyes to see Pavlin has backed off. You''re confused at first, but notice that the people in the lobby are looking at the two of your after his little outburst.'
 				'You quickly stand up and leave him be.'
-				''
+				*nl
 				'You probably shouldn''t bring up this topic anymore... unless you have a more positive response to this request.'
 				TwinJourQW = 1
 				act 'Back to lobby': gt 'HotelHole'
@@ -306,8 +302,9 @@ if $ARGS[0] = 'Pavlin' :
 	end
 	if pavlevent = 1 and pavldaystart2 ! daystart :
 		act 'Discuss the beating':
-			cls
+			*clr & cla
 			minut += 1
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/Pavlin.jpg"></center>'
 			if pavldaystart = daystart:
 				PavlinQW = 5
@@ -317,7 +314,7 @@ if $ARGS[0] = 'Pavlin' :
 				else
 					'"You are lucky we are in a public place right now or I would fucking murder you!"'
 				end
-					'"Go away <<$pcs_firstname>>, I am too angry right now, we can discuss this later"'
+				'"Go away <<$pcs_firstname>>, I am too angry right now, we can discuss this later"'
 
 				pavldaystart2 = daystart
 			elseif pavtalk = 0:
@@ -354,13 +351,15 @@ if $ARGS[0] = 'Pavlin' :
 				pavlevent = 2
 				pavldaystart2 = daystart
 			end
-			act '<B>Move away</B>':gt'HotelHole','skip_resepevent'
+			act 'Move away':gt'HotelHole','skip_resepevent'
 		end
 	end
 	if npc_rel['A217'] > 39 and proshotelday ! daystart and preghumdone ! 1:
 		act 'Special Request':
+			*clr & cla
 			minut += 1
-			'<br>'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/Pavlin.jpg"></center>'
 			'"<<$pcs_firstname>>, today I received a request for a pregnant girl. A Pregnant Girl! How the hell am I going to find a girl that is pregnant and willing to do this shit." he says, shaking his head.'
 			if knowpreg = 1 and pregtime >= 90:
 				cla
@@ -373,40 +372,36 @@ if $ARGS[0] = 'Pavlin' :
 					'"He told me he is really in to pissing pregnant chicks." You cringe at the idea.'
 					'"Fucking degenerates, right? But he''s offering a boatload of cash! Are you really up for it?"'
 				end
-				act '<<$pitfs>><b>Of course I am, for the right price....</b><<$pitfe>>': gt 'HotelHole','PregBDSM'
+				act '"Of course I am, for the right price..."': gt 'HotelHole','PregBDSM'
 			end
 			if knowpreg = 1 and pregtime < 90:
+				cla
 				'"Actually I am pregnant but unfortunately not really showing yet."'
 				'"That''s great, Once you are showing come to me again and I''ll introduce you."'
-				cla
 				act 'Ok': gt 'HotelHole','Pavlin'
 			end
 			if knowpreg = 0:
-
-				'Pavlin looks at your body and you know what he is thinking.'
-				'"Yeah that''s definitly tough, good luck with that." You say before quickly leaving'
 				cla
+				'Pavlin looks at your body and you know what he is thinking.'
+				'"Yeah that''s definitly tough, good luck with that." You say before quickly leaving.'
 				act 'Back to lobby': gt 'HotelHole'
 			end
-
 		end
-
 	end
-	act '<B>Move away</B>':gt'HotelHole','skip_resepevent'
 end
 
 if $ARGS[0] = 'PregBDSM' :
+	*clr & cla
 	minut +=10
 	gs 'npcgeneratec', 0
 	gs 'boyStat', $npclastgenerated
-	*clr & cla
 	gs 'stat'
 	'"That shouldn''t be a problem. With what he''s willing to pay, you''ll be able to put that kid of yours through college."'
 	'Pavlin steps away to make the call and, 10 minutes later, the customer shows up.'
-	' '
+	*nl
 	'He introduces himself as <<$boydesc>> "Very nice Pavlin. This is exactly what I was looking for." He says while hungrily eyeing your pregnant body.'
 	'Pavlin and <<$boydesc>> have a short discussion about your price.'
-	' '
+	*nl
 	'Pavlin goes over to the desk girl and comes back with a key." We have full access to the hotel basement for the next 2 hours, so let''s get on with it."'
 	act 'To the Basement':
 		*clr & cla
@@ -416,17 +411,17 @@ if $ARGS[0] = 'PregBDSM' :
 		gs 'pain', 3, 'nipples', 'spank'
 		gs 'stat'
 		'When the three of you arrive in the basement Pavlin goes and sits himself on a stool in the corner of the room while the man takes you to a table in the center.'
-		' '
+		*nl
 		'He hands you a set of leather wrist cuffs, a matching collar, and a pair of heels.'
 		'"Undress and wear these." the man says, curtly.'
 		'While you are busy undressing and equipping your new accessories, he lays out a series of whips and crops. He turns to you and, with a happy grin, says "Please, choose one for us to enjoy."'
 		'"<<$pitfs>>Ok, this might be a little heavier than I expected.<<$pitfe>> "You think, beginning to second guess your decision.'
 		'You look at Pavlin with pleading eyes, but receive no sympathy in return. You realize it''s too late to back out now. You examine the foreign whips and choose the one you think would be the least painful; a thin one that appears light in weight, figuring that the heavier ones would cause much more pain.'
-		' '
+		*nl
 		'<<$boydesc>> approaches you and starts caressing your swollen belly and breasts.'
-		' '
+		*nl
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/pregBDSM1.jpg"></center>'
-		''
+		*nl
 		'Suddenly he takes your arms and attaches your leather bracelets to a chain hanging above your head.'
 		'"<<$pitfs>>Wait a minute, no one said anything about being tied up.<<$pitfe>>" You think as panic begins to creep into your mind.'
 		'Without warning you feel the whip lash across your back.'
@@ -447,13 +442,14 @@ if $ARGS[0] = 'PregBDSM' :
 		'.....SNAP....'
 		'Two more hits slice sharply across your sensitive nipples, eliciting one big scream after another.'
 		'The torment continues for what feels like an eternity. The client alternates randomly between striking yours breasts, back, and buttocks. But the worst by far is when he zeroes in on your quivering pussy. As the instrument slaps viciously across your labia you scream and beg, tears streaming down your tortured face, mascara straining your cheeks. When the whip lands directly on your clit you feel like passing out and vomiting at the same time, your stomach twisting in agony.'
-		' '
+		*nl
 		'The horrible man finally steps away. "Ok, whore, enough screaming." You look at the man with pathetic, pleading eyes. You can feel heat radiating from every lash, every point of impact burns relentlessly.'
 		'"Lets''s use that little mouth of yours for something even more fun." He says, unbuttoning his pants and exposing his rock hard member.'
 		act 'Continue':
 			*clr & cla
 			gs 'arousal', 'bj', 30, 'rough','sub','humiliation'
 			gs 'arousal','end'
+			gs 'stat'
 			if pcs_dom => 5:
 				pcs_dom -5
 			else
@@ -468,7 +464,7 @@ if $ARGS[0] = 'PregBDSM' :
 			'He spits in your face and slaps your cheek, the sound echoing through the deserted basement.'
 			'"<<$pitfs>>Motherfucker, If I could I would slap the shit out of you! No, I have to stay strong and think about the money for my child.<<$pitfe>>"'
 			'You notice the whip still clutched in his hand and start sucking with all your skill, praying he doesn''t decide to use it again. Thoughts of your unborn child and the situation you are in creep into your mind as you pleasure your captor. The tears well up in your eyes once more.'
-			' '
+			*nl
 			'"Well, well, it looks like our fat bitch is not happy here. I know how to remedy that, let''s take a little walk."'
 			'<<$boydesc>> pulls his slathered cock from your mouth and attaches a chain to your collar. He steps away and tugs the leash hard, the force pulling you onto your hands and knees.'
 			'You have no choice but to follow him around on all fours. Your heavy baby-belly sways as you crawl across the dirty cement floor, feeling more degraded by the step.'
@@ -479,21 +475,21 @@ if $ARGS[0] = 'PregBDSM' :
 			'"I asked you a question, slut!" The man bellows.'
 			'"Yes sir, much better!" you say obediently, wiping away a tear.'
 			'Your new master marches you around in circles for a few minutes, laughing as you attempt to keep up with his pace.'
-			' '
+			*nl
 			'"Now, use this" He pushes a small metal bowl towards you with his foot.'
 			'You look up at him confused. The bowl is empty and you''re unsure what he expects you to do with it.'
 			'"This is the piggy''s new toilet! Show me how house-broken you are or I will beat you senseless!" The customer explains, raising the whip for you to see it.'
 			'His threat is enough to get you moving. "<<$pitfs>>Ok, this should be easy enough, With this kid pushing against my bladder I always need to piss anyway. Maybe the sicko will finally be satisfied after this.<<$pitfe>>"'
-			' '
+			*nl
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/pregBDSM3.jpg"></center>'
-			' '
+			*nl
 			'You carefully squat over the bowl, cradling your belly with one hand. You relax your bladder and feel a torrent of piss begin streaming out of you. For the first time since this all started you feel a bit of relief. "Geez, I guess I really had to go." You think as the stream comes to an end, leaving the bowl nearly filled to the brim. Your cheeks flush in embarrassment of this strange man watching you pee.'
 			'"That''s a good doggy" <<$boydesc>> laughs.'
 			act 'Continue':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/pregBDSM5.jpg"></center>'
-				' '
+				*nl
 				'" Oh but what is that? You spilled some." <<$boydesc>> suddenly grabs a fistful of your hair and pushes your head towards the bowl.'
 				'"<<$pitfs>>No no no, not that! Anything but that!<<$pitfe>>"'
 				'You try to resist and stiffen your neck, attempting to push your head back up. The smell of your own piss wafts into your nostrils, hot and bitter.'
@@ -509,19 +505,18 @@ if $ARGS[0] = 'PregBDSM' :
 					else
 						sub = sub + 20 - pcs_dom
 					end
-					gs 'stat'
 					'"<<$pitfs>>Ok baby, I am doing this for you.<<$pitfe>>" You think as you place a hand on your hefty belly and stop resisting.'
-					' '
+					*nl
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/pregBDSM6.jpg"></center>'
-					' '
+					*nl
 					'<<$boydesc>> pushes your head into the bowl and you start lapping at the disgusting liquid. The sour taste seems to permeate every orifice of your head, stinging with its hot, tart bouquet. Your stomach seizes as you feel the gag reflex try to kick in, but you force it away and continue licking and slurping at your waste.'
 					'"So, my little piss slut, how does it taste?" The deviant asshole inquires, mock interest evident in his tone.'
 					'"<<$pitfs>>Awful, I think I am going to puke.<<$pitfe>>" You wish you could say.'
 					'"It tastes great sir, thank you for this sir." You lie submissively, telling him what he wants to hear.'
 					'"Great! I knew a disgusting pig slut like you would enjoy it. Now for you final reward."'
-					' '
+					*nl
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/pregBDSM4.jpg"></center>'
-					' '
+					*nl
 					'The client pushes you on the ground and slides his dick back into your mouth. He starts furiously fucking your face, showing no concern for your comfort.'
 					'Your throat aches from the abuse, and you are ashamed but thankful to have the taste of cock in your mouth once again. Anything to help dull the awful urine taste is welcome at this point.'
 					'The man continues relentlessly face-fucking you until he finally erupts and cums buckets into your mouth. The taste of his semen finally seems to fully nullify the sour flavor that coated your taste buds before.'
@@ -529,9 +524,10 @@ if $ARGS[0] = 'PregBDSM' :
 					'Suddenly his whole demeanor has changed and he starts treating you like a person instead of a mindless sex toy. He reaches towards you and gives you a loving peck on the cheek.'
 					'"Come on let me help you." <<$boydesc>> helps you to your feet, careful to help you regain your balance in your delicate state. He then assists you with taking off the bracelets and collar before putting your regular clothes back on.'
 					gs 'cum_call','mouth', $npclastgenerated
+					gs 'stat'
 					act 'Go to Pavlin':
 						*clr & cla
-						''
+						*nl
 						'"Wow I can''t believe you actually did that shit. It was disgusting. You really are the best girl I''ve got."'
 						'Here is your reward. You certainly deserve it. Pavlin hands you a huge pile of cash.'
 						'You start counting it and find that it is almost 28,000 <b>₽</b>.'
@@ -547,25 +543,25 @@ if $ARGS[0] = 'PregBDSM' :
 				end
 				act 'No, I can''t do this, let me go':
 					*clr & cla
-					gs 'stat'
 					gs 'pain', 9, 'head', 'hit'
 					gs 'pain', 9, 'tummy', 'kick'
+					gs 'stat'
 					'You start shaking your head violently and wrestle yourself free from his grip with all your strength. You roll away and break down crying on the floor.'
 					'"What the hell Pavlin? You told me she was up for it. This is the last time I try one of your girls" <<$boydesc>> quickly zips his cock away, collects his stuff, and leaves the room in a huff of anger.'
-					' '
+					*nl
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/Pavlin_violent4.jpg"></center>'
-					' '
+					*nl
 					'You look up from the floor and you no longer see Pavlin''s eyes; you see a monster. You can practically feel the rage radiating from him as he marches towards you, fists clenched.'
 					'You scramble to your feet as quickly as you''re able and try to reason with him. "Pavlin, I''m so sorr-" You can''t even complete one sentence before you feel your nose explode under his fist.'
 					'"You fucking CUNT! Do you know how much money you just cost me?!?!" He screams!'
 					'You feel blood pouring from your nose and down your face. The metallic taste is bitter as it pools inside mouth. You attempt to shake the dizziness from your head, but a second punch slams into your jaw.'
 					'"After everything I''ve done for you, this is how you repay me?!?"'
 					'You stumble back and look at Pavlin with watery eyes. You see his clenched hand rise again, so you cover your head for protection and close your eyes, bracing for impact.'
-					' '
+					*nl
 					'All the breath leaves your body as Pavlin buries his fist into your pregnant belly. Your knees turn to jelly as you fall to the ground, now laying on your side. You feel a sickly, twisting pain in your stomach and everything inside you feels wrong.' 
 					'"<<$pitfs>>No! He has to stop! My baby...<<$pitfe>>" Your motherly instict cries out to you.'
 					'The tip of the horrible bastard''s steel toe boot slams into your swollen belly again and again. You try to cover your womb with your arms as the kicking assault continues, but the boot still manages to make it through your desperate defense.'
-					' '
+					*nl
 					'<<$pitfs>>I have to make him stop, I have to! <<$pitfe>>"Stop Pavlin! Please! My baby..." you beg and look up at him just in time to see the sole of his boot racing down towards your face...'
 					act 'Everything goes black':
 						*clr & cla
@@ -591,9 +587,8 @@ if $ARGS[0] = 'PregBDSM' :
 									killvar 'faintcounter'
 
 									*clr & cla
-									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/shared/clinic/wakeup.jpg"></center>'
-									' '
+									*nl
 									'You slowly open your eyes'
 									'"<<$pitfs>>Where am I?<<$pitfe>>" Your vision is blurry and you have to blink several times to clear it.'
 									'You find yourself lying on a soft bed. You look around and see a sterile white room with a woman in light blue scrubs standing with her back to you. Your mind pieces together the clues and you realize this is the hospital.'
@@ -634,23 +629,23 @@ if $ARGS[0] = 'PregBDSM' :
 									if nextbaby > 0:
 										jump 'poliabortloop'
 									end
+									gs 'stat'
 									act 'Wait for the doctor':
 										*clr & cla
 										'While you wait for the doctor you place your hand on your stomach. You feel a stillness inside you; an empty place where something grew before.'
 										'"<<$pitfs>>No. Please, no!<<$pitfe>>" Your mind prays to an uncaring god, trying to make this nightmare end. You know what the doctor will tell you, even before she enters the room.'
-										' '
+										*nl
 										'<center><img <<$set_imgh>> src="images/locations/shared/clinic/badnews.jpg"></center>'
-										' '
+										*nl
 										'The female doctor finally arrives and does a quick check on your vital signs before addressing you.'
 										'She explains in a frank but sympathetic tone that you were found unconscious in a hotel basement. You''d been beaten severely and the trauma caused a miscarriage.'
 										'You break down crying in a wail of tears.'
 										'The doctor tries to console you, telling you that she''s sorry but nothing could be done. She says that it could''ve been much worse; you could have died, or could have needed a hysterectomy. But they were able to save you from those fates.'
-										'<br>'
+										*nl
 										act 'Continue':
-
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/pavlin_policewoman.jpg"></center>'
-											' '
+											*nl
 											'After you''ve expended every tear your body could produce, a policewoman enters the room and asks everyone to step out so she can get your statement.'
 											'"Hi <<$pcs_firstname>>, I am Officer Uspensky. I am so sorry for your loss. I have your written testimony here, if I could just get your signature."'
 											'She reaches out to hand you a pen and the formal looking piece of paper.'
@@ -664,14 +659,13 @@ if $ARGS[0] = 'PregBDSM' :
 											'"<<$pitfs>>So that''s it? 20 000 <b>₽</b> for the life of my child. And that monster just gets away with it?<<$pitfe>>" You can barely form thoughts as the rage, pain, and desperation overwhelm you.'
 
 											act 'Sign the document':
-												money += 20000
 												*clr & cla
-												gs 'stat'
+												money += 20000
 												'With a reluctant, shaking hand, you sign the document throw it back at the policewoman. "That''s a good girl. Nice doing business with you." She says before gathering her things and leaving the room.'
 												'As soon as she is gone the tears start again and you cry yourself to sleep.'
 												'<br>'
 												'When you wake up, hours later, the nurse hands you some pain killers and tells you that you are being discharged from the hospital.'
-												' '
+												*nl
 												'You slowly get dressed and leave the building. As you head back out into the streets you feel numb; hollowed out inside like a long dead tree stump. You''re utterly broken as you wander the streets aimlessly, hoping for a way to move on from all this.'
 												painkiller += 10
 												pcs_childtrauma += 8
@@ -696,22 +690,23 @@ if $ARGS[0] = 'PregBDSM' :
 		end
 	end
 end
+
 if $ARGS[0] = 'Twins' :
 	*clr & cla
 	minut += 20
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/Pavlin.jpg"></center>'
 	'"Hi Pavlin, this is my sister, Anya."'
 	'Pavlin looks at the two of you from top to bottom with analytical eyes. Finally, he cracks a smile and starts laughing.'
 	'"Well, well, you weren''t kidding. You two look exactly alike. OK, let me call the client."'
 	'He steps away to make a quick phone call. You turn and smile at your sister, excitedly. Anya smiles back, but her grins seems forced and you can tell that she''s nervous. "Lighten up, sis. We''re just gonna go get dicked down and we''ll walk away paid. It''ll be fun!" You say, trying to reassure her while praying that she won''t back out. You hate to think how Pavlin would react if you cancelled at this stage.'
 	'Anya''s smile becomes more genuine seeing your excitement. "Yeah, I know. I''m just a little nervous, but I''ll be fine. I promise." You sigh with relief.'
-	' '
+	*nl
 	'Pavlin returns and ushers you both to his car.'
-	' '
+	*nl
 	'He drives you to a nice house at the outskirts of town.'
 	act 'Go meet the client':
 		*clr & cla
-		gs 'stat'
 		gs 'npcgeneratec', 0
 		gs 'boyStat', $npclastgenerated
 		'Pavlin drops you off and tells you he will come back to pick you up in 1 hour.'
@@ -729,9 +724,10 @@ if $ARGS[0] = 'Twins' :
 		'Anya immediately starts moaning loudly, caught off-guard and aroused by the sudden violation.'
 		'The sight of your sister getting off on <<$boydesc>>''s skilled tongue brings a tingling to your loins, and in no time you feel your pussy dripping.'
 		gs 'arousal','voyeur',5,'prostitution'
+		gs 'stat'
 		act 'Continue':
 			*clr & cla
-			gs 'stat'
+			
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins3.jpg"></center>'
 			'Just as your sister looks to be on the verge of cumming, <<$boydesc>> pulls her off of the couch and pushes her onto her knees. Her mouth still open in shock, the client pushes his dick between her lips. You hear Anya whimper as the throbbing member slides along her tongue, obviously frustrated by being so close, and yet so far, from orgasm.'
 			'The inconsiderate man turns his head your way. "You! Get over here and start licking my balls while I use your sister''s dirty mouth!"'
@@ -744,10 +740,12 @@ if $ARGS[0] = 'Twins' :
 			'You work the cock in and out of your throat, the whole time maintaining eye contact with the client. You can tell that he is enraptured, feeling like the luckiest man in the world to be bedding a pair of hot "twins".'
 			'"God, I can''t decide which one of you is the better cock sucker." He admits through raspy breath.'
 			'You playfully gesture towards yourself with a thumb and a wink, never slowing down as you blow him. Out of the corner of your eye, you see Anya shake her head and point to herself, claiming to be the superior.'
-			' '
+			*nl
 			'The man spends the next few minutes making you switch back and forth a few more times before declaring you and your sister to be equally skilled at giving head.'
 
 			gs 'arousal','bj',5,'prostitution'
+			gs 'stat'
+			
 			act 'Continue':
 				*clr & cla
 				gs 'stat'
@@ -765,43 +763,44 @@ if $ARGS[0] = 'Twins' :
 
 				act 'Continue':
 					*clr & cla
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins7.jpg"></center>'
 					'After a few minutes, the man pushes you off of him. His coarse, calloused hands manipulate your body until you are laying stomach down on the couch.'
 					'"Get up." He says gruffly to Anya. You stay in your place while looking back to see what they''re doing.'
-					' '
+					*nl
 					'By the time he''s satisfied, he has your sister stacked on top of you, her twat just above yours. The client takes a moment to admire his masterpiece before he thrusts his dick into Anya''s waiting pussy. Your sister cries out in pleasure as the stranger buries himself inside of her.'
 					'You are glad that your pussy is getting some rest after the furious pounding it received, but the relief doesn''t last long. Soon enough he pulls out of Anya and plunges into your depths once again. You scream out in surprise, not expecting the sudden penetration, as new waves of pleasure ripple through your body.'
 					'The man then begins alternating between you and your sister''s dripping holes every few thrusts, moaning to himself every time he makes the switch.'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins8.jpg"></center>'
 					'The man finally pulls his still-hard member out of your cunt and steps back. "Ok girls, one last request. I am going to fuck one of you up the ass, but you can decide which one gets it."'
 					gs 'arousal','vaginal',10,'prostitution'
+					gs 'stat'
 					if klismaday ! daystart:
 						'You lean in close and whisper to Anya that you hadn''t cleaned yourself down there today.'
 						'"Don''t worry <<$pcs_nickname>>, I love it up the ass!" She whispers back, her eyes wide with arousal and desire.'
 					else
 						'Your sister looks at you, unsure, and asks, "So, <<$pcs_nickname>>, do you want to take it?" You can tell that she''s not feeling the idea of getting assfucked by this guy, so you nod to let her know you''re ready to jump in front of this bullet.'
-						act '<<$pcs_nickname>> anal sex':
-						*clr & cla
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins9.jpg"></center>'
-						'You position yourself with your head resting on a pillow sitting on the couch and your butt high in the air. You wiggle your ass at the client enticingly. "Your anal slut is waiting." You say, a mischievous grin on your face.'
-						'"God, I love an eager whore."<<$boydesc>> says as he comes up behind you and starts rubbing his dick against your little star.'
-						'He starts to slowly push it in and you can''t stop a groan from escaping your mouth as your butthole resists the invasion.'
-						'"Just relax girl, it will go a lot easier." The man says.'
-						'"Yeah <<$pcs_nickname>>, just relax. I know this is not the first dick you have had in your ass." Anya agrees, mockingly, unable to hide a giggle that follows her words.'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins10.jpg"></center>'
-						'Hearing your sister teasing you about your sudden slut-hood surprisingly helps you relax, and the fat cock slips into your tight sphincter.'
-						'<<$boydesc>> starts slowly moving his dick back and forth with short, gentle thrusts. Your breathing begins to increase in pace as you get more excited by the massive member rubbing inside you.'
-						'<<$boydesc>> takes notice. "Looks like you''re ready to cum for me. Let me help you there"'
-						'The client gently flips you onto your back, lying on the couch, his dick somehow never slipping out of your ass. He continues stretching your anus while rubbing your clit with his thumb. You moan in pure pleasure as he manipulates your lady bits expertly.'
-						'His other hand falls gently upon your breast and he begins rubbing and squeezing your nipple, his cock continuing to drive back and forth into your bowels.'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins11.jpg"></center>'
-						'The pleasure quickly builds to a crescendo before exploding. While being stimulated in 3 erogenous zones at once you feel an earth-shattering orgasm like you''ve never experienced before.'
-						'Your whole body begins shaking uncontrollably as you cum and, if you sister hadn''t jumped up to hold you, you would have fallen off the couch.'
-						$orgasm_or = 'yes'
-						gs 'arousal','anal',10,'prostitution'
-						'<<$boydesc>> laughs. "Ok woman, you had your release. Now it is my turn."'
+						act 'You take it':
+							*clr & cla
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins9.jpg"></center>'
+							'You position yourself with your head resting on a pillow sitting on the couch and your butt high in the air. You wiggle your ass at the client enticingly. "Your anal slut is waiting." You say, a mischievous grin on your face.'
+							'"God, I love an eager whore."<<$boydesc>> says as he comes up behind you and starts rubbing his dick against your little star.'
+							'He starts to slowly push it in and you can''t stop a groan from escaping your mouth as your butthole resists the invasion.'
+							'"Just relax girl, it will go a lot easier." The man says.'
+							'"Yeah <<$pcs_nickname>>, just relax. I know this is not the first dick you have had in your ass." Anya agrees, mockingly, unable to hide a giggle that follows her words.'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins10.jpg"></center>'
+							'Hearing your sister teasing you about your sudden slut-hood surprisingly helps you relax, and the fat cock slips into your tight sphincter.'
+							'<<$boydesc>> starts slowly moving his dick back and forth with short, gentle thrusts. Your breathing begins to increase in pace as you get more excited by the massive member rubbing inside you.'
+							'<<$boydesc>> takes notice. "Looks like you''re ready to cum for me. Let me help you there"'
+							'The client gently flips you onto your back, lying on the couch, his dick somehow never slipping out of your ass. He continues stretching your anus while rubbing your clit with his thumb. You moan in pure pleasure as he manipulates your lady bits expertly.'
+							'His other hand falls gently upon your breast and he begins rubbing and squeezing your nipple, his cock continuing to drive back and forth into your bowels.'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins11.jpg"></center>'
+							'The pleasure quickly builds to a crescendo before exploding. While being stimulated in 3 erogenous zones at once you feel an earth-shattering orgasm like you''ve never experienced before.'
+							'Your whole body begins shaking uncontrollably as you cum and, if you sister hadn''t jumped up to hold you, you would have fallen off the couch.'
+							$orgasm_or = 'yes'
+							gs 'arousal','anal',10,'prostitution'
+							gs 'stat'
+							'<<$boydesc>> laughs. "Ok woman, you had your release. Now it is my turn."'
 							act 'Continue':
 								*clr & cla
 								gs 'stat'
@@ -810,9 +809,9 @@ if $ARGS[0] = 'Twins' :
 								'You kneel down next to your sister and move your head close to hers. You both open your mouths while <<$boydesc>> starts jerking his dick quickly, awaiting your prize.'
 								'"Here it comes girls, now you play nice and share my gift." He immediately starts spraying cum while adjusting his aim between you and your sister. You each catch some of his seed in you mouths while the rest splatters across your faces.'
 								'You turn to you sister and you both start licking the cum from each other''s faces before swapping the load back and forth with a kiss. You end up swallowing most of it while your sister smiles.'
-								' '
+								*nl
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins13.jpg"></center>'
-								' '
+								*nl
 								'"Since your sister was a real champ, taking it in the ass and all that, you can be on cleaning duty." <<$boydesc>> says as he pushes his cum-soaked dick between your sibling''s lips.'
 								'Anya tries to protest but it''s too late; the dick enters her mouth before any words leave it. She resigns herself to the task and uses her tongue to thoroughly clean the cock, whimpering in disapproval. You can''t help but snicker at the idea of her being forced to taste you ass on this stranger''s rod. Anya shoots you an angry look from the side.'
 								'Suddenly you hear someone honking a horn outside. You look at the clock and realize the whole hour has passed and Pavlin has arrived.'
@@ -821,7 +820,7 @@ if $ARGS[0] = 'Twins' :
 							end
 						end
 					end
-					act 'Anya anal sex':
+					act 'Anya takes it':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins9.jpg"></center>'
@@ -850,7 +849,7 @@ if $ARGS[0] = 'Twins' :
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins13.jpg"></center>'
 							'"Since your sister was a real champ by taking it in the ass, you can be on cleaning duty." <<$boydesc>> says while pushing his cum-soaked dick between your lips.'
 							'You try to protest but it''s too late; the dick enters your mouth before any words leave it. You submit and use your tongue to thoroughly clean his cock, whimpering in disapproval. You hear Anya snicker at the idea of you being forced to taste her ass on this stranger''s rod. You shoot her an angry look from the side.'
-							' '
+							*nl
 							'Suddenly, you hear someone honking a horn outside. You look at the clock and realize the whole hour has passed and Pavlin has arrived.'
 							'Not wanting to keep Pavlin waiting, you and your sister quickly put on your clothes, say goodbye to <<$boydesc>>, and leave the house.'
 							act 'Pavlin takes you home':gt 'HotelHole','twinhome'
@@ -861,9 +860,9 @@ if $ARGS[0] = 'Twins' :
 		end
 	end
 end
+
 if $ARGS[0] = 'twinhome':
 	*clr & cla
-	gs 'stat'
 	gs 'cum_call','face', $npclastgenerated
 	'You both jump in the car and Pavlin drives away.'
 	'"Thanks for this experience <<$pcs_nickname>>, you really are the greatest sister in the world!" Anya says before grabbing you and planting a passionate kiss on your still sticky lips.'
@@ -881,8 +880,10 @@ if $ARGS[0] = 'twinhome':
 	pav_prostitute += rand(2,4)
 	npc_rel['A217'] += 10
 	money += 9000
+	gs 'stat'
 	act 'Back to the corridor':gt 'korrPar'
 end
+
 if $ARGS[0] = 'clown':
 	*clr & cla
 	fcolor = rgb(255, 255, 255)
@@ -893,25 +894,26 @@ if $ARGS[0] = 'clown':
 	'You try to turn the lights on but nothing happens'
 	'"Hello is someone here ?" you yell'
 	'No reply, so you stumble towards the bed and try the light switch there.'
+	gs 'stat'
 	act 'Turn on the switch near the bed':
-		cls
-		cla
+		*clr & cla
 		'You hear the lights starting to buzz, but they don''t turn on immediately '
 		wait 2400
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/clown1.jpg"></center>'
 		wait 100
-		cls
+		*clr
 		'What was that? You thought you saw something.'
 		'the lights kept buzzing, still not producing any light'
 		wait 2500
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/clown1.jpg"></center>'
 		wait 100
-		cls
+		*clr
 		'Again, you think you saw something at the other side of the room.'
 		'You are getting scared.'
 		'The buzzing sound gets louder....'
 		wait 5000
-		cls
+		*clr
+		gs 'stat'
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
 		lcolor = rgb(106, 90, 205)
@@ -922,24 +924,21 @@ if $ARGS[0] = 'clown':
 		'"No, Popav, you have to put the tape over her mouth first."'
 		'"What? No, I can put the tape over the bag."'
 		'"That won''t work, just do the tape first."'
-		'...<br>'
+		*nl
 		'The two clowns start arguing, seemingly oblivious to your presence.'
 		'"Excuse me." you say.'
 		'The clowns ignore you and continue arguing on the order of their actions.'
-		' '
+		*nl
 		'"Now Don''t ruin this for me Popov, I need this."'
 		'"I need this too Popav, but we need to catch this girl first before we can have sex with her."'
 		'"I agree Popov, So let me do the tape first."'
 		'"No you were right before, I will do the bag first."'
 		'"No no, I will do the tape."'
-		'...<br>'
+		*nl
 		'The clowns are back to arguing over the order.'
 		'Ok, I need to speed things up here, you think to yourself.'
 		act 'Remove your clothes and move towards the clowns.':
-			cla
-			cls
-			gs 'stat'
-
+			*clr & cla
 			'<center><video autoplay loop src="images/characters/pavlovsk/Pavlin/clown3.mp4"></video></center>'
 			'You remove your clothes and move towards the quibbling clowns.'
 			'You grab them by the crotch.'
@@ -963,31 +962,27 @@ if $ARGS[0] = 'clown':
 			gs 'npcgeneratec', 1, 'Clown Popov', rand(18,45)
 			gs 'boyStat', $npclastgenerated
 			gs 'arousal', 'bj', 15, 'prostitution'
-
+			gs 'stat'
 			act 'Continue':
-				cla
-				cls
-				gs 'stat'
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/clown6.jpg"></center>'
 				'Popav starts licking your pussy while Popov places his balls over your mouth.'
 				'"Let''s go girl, these balls aren''t going to lick themselves."'
 				'You take the hint and put the balls in your mouth.'
-				gs 'arousal', 'cuni', 15, 'prostitution'
 				'After a minute Popav stops licking and asks: "Are you ready for some cock?"'
 				'"Ow yeah, give it to me you silly clown"'
 				'<center><video autoplay loop src="images/characters/pavlovsk/Pavlin/clown7.mp4"></video></center>'
 				'Suddenly he takes a plastic ''cock'' and rubs it against your breasts.'
 				'Both clowns start laughing but since you still had your mouth full of balls the only thing you could do was to roll your eyes at his dumb joke.'
 				'He puts the ''cock'' aside and says "But seriously, get ready for my massive, huge, humongous gigantic dick."'
-
+				gs 'arousal', 'cuni', 15, 'prostitution'
+				gs 'stat'
+				
 				act 'Continue':
-					cla
-					cls
-					gs 'stat'
+					*clr & cla
 					'<center><video autoplay loop src="images/characters/pavlovsk/Pavlin/clown8.mp4"></video></center>'
 					'You position yourself on your hands and knees and Popav pushes his average sized dick in your pussy.'
 					'Meanwhile you had started sucking on Popov''s dick again.'
-					gs 'arousal', 'vaginal', 15, 'prostitution'
 					'"Hey Popav, what is the difference between a battery and a woman?"'
 					'"I don''t know."'
 					'"A battery has a positive side."'
@@ -1000,23 +995,23 @@ if $ARGS[0] = 'clown':
 					'"Because you could easily fit another pair of tits in there."'
 					'Again you groan at the stupid joke and can''t hide the fact that you are tired of these 2 clowns.'
 					'"Ok girl, now we will give you one last present before we go, just sit up on the bed and look at me."'
-
+					gs 'arousal', 'vaginal', 15, 'prostitution'					
 					gs 'cum_call','breasts', $npclastgenerated, 1
 					gs 'npcgeneratec', 1, 'Clown Popav', rand(18,45)
 					gs 'cum_call','breasts', $npclastgenerated, 1
 					gs 'arousal','end'
+					gs 'stat'
 					guy += 2
 					slutty += 1
 					pav_prostitute += rand(2,4)
 					ClownQW = 1
 					npc_rel['A217'] += 8
 					act 'Sit on the bed':
-						cla
-						cls
+						*clr & cla
 						gs 'stat'
 						'You go sit on the bed and Popov starts juggling some balls in the air.'
 						'You are not impressed at all and just want to leave at this point.'
-						wait 5000
+						wait 2500
 						'Suddenly out of nowhere you are hit in the face with a cream pie.'
 						'And it is not the fun baby-making one.'
 						'<center><video autoplay loop src="images/characters/pavlovsk/Pavlin/clown2.mp4"></video></center>'
@@ -1025,8 +1020,9 @@ if $ARGS[0] = 'clown':
 						'You start rubbing your face, cleaning off the pie when you realize you are standing butt naked in the hallway.'
 						'You quickly put on your clothes and go to the bar to meet Pavlin.'
 						act 'Go to the bar':
-							cla
-							cls
+							*clr & cla
+							money += 2000
+							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/Pavlin/Pavlin.jpg"></center>'
 							'You see Pavlin in his usual corner booth and go over to him.'
 							'When he notices your face full of pie he starts laughing.'

+ 16 - 0
locations/HotelRoom.qsrc

@@ -14,6 +14,10 @@ gs 'stat'
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -57,6 +61,10 @@ gs 'stat'
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -99,6 +107,10 @@ gs 'stat'
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -149,6 +161,10 @@ $location_type = 'bathroom'
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 1 - 1
locations/HotelWork.qsrc

@@ -454,7 +454,7 @@ if $ARGS[0] = 'maid':
 			chai1 = rand(0,100 - (maidstat/2))
 			
 			!! MJ: from 50,51 to 50,150 -- More often but less.
-			if chai1 < 25:chai = 50 + rand(0, maidstat)
+			if chai1 < 25:chai = rand(20,60) + rand(0, maidstat)
 			
 			if maidrand <= 10:
 				minut += 35

+ 4 - 0
locations/IrinaRoom.qsrc

@@ -10,6 +10,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/MartinSex.qsrc

@@ -5,6 +5,10 @@ if night_mode = 1:
 	fcolor = rgb(255, 255, 255)
 	bcolor = rgb(0, 0, 0)
 	lcolor = rgb(106, 90, 205)
+elseif night_mode = 2:
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(20, 20, 20)
+	lcolor = rgb(106, 90, 205)
 else
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/MartinSex2.qsrc

@@ -5,6 +5,10 @@ if night_mode = 1:
 	fcolor = rgb(255, 255, 255)
 	bcolor = rgb(0, 0, 0)
 	lcolor = rgb(106, 90, 205)
+elseif night_mode = 2:
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(20, 20, 20)
+	lcolor = rgb(106, 90, 205)
 else
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/MartinSex3.qsrc

@@ -5,6 +5,10 @@ if night_mode = 1:
 	fcolor = rgb(255, 255, 255)
 	bcolor = rgb(0, 0, 0)
 	lcolor = rgb(106, 90, 205)
+elseif night_mode = 2:
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(20, 20, 20)
+	lcolor = rgb(106, 90, 205)
 else
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/MartinTalk.qsrc

@@ -7,6 +7,10 @@ if night_mode = 1:
 	fcolor = rgb(255, 255, 255)
 	bcolor = rgb(0, 0, 0)
 	lcolor = rgb(106, 90, 205)
+elseif night_mode = 2:
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(20, 20, 20)
+	lcolor = rgb(106, 90, 205)
 else
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)

+ 38 - 26
locations/Meadow.qsrc

@@ -1,17 +1,29 @@
 # Meadow
+
 if $ARGS[0] = 'start' or $ARGS[0] = '':
-	$location_type = 'secluded'
-	$metka = 'start'
 	$loc = 'Meadow'
+	$metka = 'start'
+	$location_type = 'secluded'
+
+	$menu_loc = 'Meadow'
+	$menu_arg = 'start'
+	menu_off = 0
 
 	gs 'stat'
 
-!MiraLoc = 0 (Mira at home)
-!MiraLoc = 1 (Mira at river)
-!MiraLoc = 2 (Mira at meadow)
-!MiraLoc = 3 (Mira at forest)
-!MiraLoc = 4 (Mira at field)
-!MiraLoc = 5 (Mira with gop)
+	!MiraLoc = 0 (Mira at home)
+	!MiraLoc = 1 (Mira at river)
+	!MiraLoc = 2 (Mira at meadow)
+	!MiraLoc = 3 (Mira at forest)
+	!MiraLoc = 4 (Mira at field)
+	!MiraLoc = 5 (Mira with gop)
+
+	!meadow = 1 'You have found the meadow'
+	!meadow = 2 'Your first visit with Mira'
+	!meadow = 3 'You allowed Mira to come here without you'
+	!meadow = 4 'You have denied Mira from coming here without you. Blocks wish and father events.'
+	!meadow = 5 'You are interested in Mira''s father'
+	!meadow = 6 'You have seduced Mira''s father, now its her turn'
 
 	'<center><H4>Meadow</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
@@ -28,6 +40,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	!125e
 
 	if MiraLoc = 2:
+		act 'Talk to Mira': gt 'Meadow', 'Mira'
 		'<a href="exec: gt ''Meadow'', ''Mira''">Mira</a> is in the meadow and is spinning with a delightful smile and laughing.'
 	elseif Mira_no = 0:
 		temp_md = 20
@@ -77,18 +90,12 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	act 'Leave':minut += 20 & MiraLoc = 0 & gt 'Gaddvor'
 end
 
-	!meadow = 1 'You have found the meadow'
-	!meadow = 2 'Your first visit with Mira'
-	!meadow = 3 'You allowed Mira to come here without you'
-	!meadow = 4 'You have denied Mira from coming here without you. Kills wish and father events.'
-	!meadow = 5 'You are interested in Mira''s father'
-	!meadow = 6 'You have seduced Mira''s father, now its her turn'
-
 if $ARGS[0] = 'Mira':
 	minut += 2
 	gs 'stat'
+	! first time here with Mira
 	if meadow = 2:
-	gs 'Miroslava', 'miraclothes'
+		gs 'Miroslava', 'miraclothes'
 		'"Wow! This place is awesome. My family and I have only been in the village a few months, but I have never heard anyone ever talk about this place." Mira tells you. "Now I know where I can come to, when I want to be alone. You don''t mind, do you?"'
 		act 'You allow her to come here on her own':
 			*clr & cla
@@ -142,14 +149,14 @@ if $ARGS[0] = 'Mira':
 					'Mira immediately sits on the grass and waits until you get undressed. Holding out your hand, you throw caution to the winds and push your panties aside, revealing your already dripping snatch...'
 					gs 'arousal', 'foreplay', 5, 'lesbian'
 					gs 'stat'
-					act 'Further':
+					act 'Continue':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/miralick1.jpg"></center>'
 						'You enjoy, Mira''s gentle touch between your legs. She teases you by gently touching your clit...'
 						gs 'arousal', 'vaginal_finger', 5, 'lesbian'
 						gs 'stat'
-						act 'Further':
+						act 'Continue':
 							*clr & cla
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/miralick2.jpg"></center>'
@@ -162,7 +169,7 @@ if $ARGS[0] = 'Mira':
 						end
 					end
 				else
-					act 'Further':
+					act 'Continue':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/miralick2.jpg"></center>'
@@ -521,6 +528,9 @@ if $ARGS[0] = 'miraperversion11':
 	pcs_horny += 10
 	npc_QW['A60'] = 12
 	gs 'stat'
+
+	gs 'Miroslava', 'miraclothes'
+
 	'You don''t know where to begin, so you stay silent just staring at Mira. Mira at the same time is looking at her feet and blushing hard.'
 	'Finally you gather your wits and ask what happened last night? Mira, still not looking you in the eye, stammers out that she doesn''t know why she did it. She says that she was out of control.'
 	'But you were also drunk, and did not do what she did. Her face sinks with shame and she continues to look at the ground.'
@@ -537,8 +547,8 @@ if $ARGS[0] = 'lesb_mira':
 	'You continue, "Mira, I want you," you whispered in her ear and kissed her passionately on the lips.'
 	gs 'arousal', 'kiss_give', 5, 'lesbian'
 	gs 'stat'
-	if mirahorny < 20:act 'Further':gt 'mirasex','mirakiss'
-	if mirahorny >= 20:act 'Further':gt 'mirasex','foreplay'
+	if mirahorny < 20:act 'Continue':gt 'mirasex','mirakiss'
+	if mirahorny >= 20:act 'Continue':gt 'mirasex','foreplay'
 end
 
 if $ARGS[0] = 'mira_lesb':
@@ -563,7 +573,7 @@ if $ARGS[0] = 'mira_lesb':
 			'"- You`re mean, " she sulked at you in response.'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Further':gt $loc, $metka
+			act 'Continue':gt $loc, $metka
 		end
 	end
 end
@@ -637,7 +647,7 @@ if $ARGS[0] = 'mira_lesb_talk1':
 	'" - Well, yeah so?"'
 	'" - I was thinking you served all the boys and forgot about your best friend." Mira said looking you in the eye.'
 	if lesbian = 0:
-		'" - So you''re not a guy. Do you want to do that?," - you.say surprised'
+		'" - So you''re not a guy. Do you want to do that?," - you say surprised'
 		'" - Everyone knows girls know the best ways to pleasure girls," she answered you.'
 	else
 		'You already guessed where she was going with this, but still hesitated.'
@@ -682,7 +692,8 @@ if $ARGS[0] = 'mira_lesb_talk2':
 	mirahorny = rand(0,80)
 	gs 'stat'
 
-	'Mira walks up toyou with a malicious smile on her face.'
+	'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_lesb_talk2.jpg"></center>'
+	'Mira walks up to you with a malicious smile on her face.'
 	' - Well, <<$pcs_nickname>>, congratulations, she said. - You are now the same whore as me. All the boys fucked you too.'
 	'You tried to keep silent, but she is not satisfied.'
 	' - So did they or did they not?, - she insists on an answer.'
@@ -722,6 +733,7 @@ if $ARGS[0] = 'mira_lesb_talk4':
 	mirahorny = rand(40,80)
 	miraday = daystart
 	gs 'stat'
+
 	gs 'Miroslava', 'miraclothes'
 
 	'Walking through the village you meet Mira. Seeing you, she immediately came up to you with an excited face.'
@@ -740,7 +752,7 @@ if $ARGS[0] = 'mirameadow':
 		*clr & cla
 		minut += 2
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr.jpg"></center>'
-		'You are about to approach her, but stop as she undoes her pants. You decide to watch to what she does...'
+		'You were about to approach her, but stop as she undoes her pants. You decide to watch to what she does...'
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr1.jpg"></center>'
@@ -778,7 +790,7 @@ if $ARGS[0] = 'mirameadow':
 								gs 'arousal', 'voyeur', 10, 'lesbian'
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Leave':minut += 30 & gt'Gaddvor'
+								act 'Leave':minut += 20 & gt 'gadukino'
 							end
 						end
 					end

+ 80 - 75
locations/Miroslava.qsrc

@@ -1,14 +1,19 @@
 # Miroslava
 
 if $ARGS[0] = 'Start' or $ARGS[0] = '':
+	$loc = 'Miroslava'
 	$metka = $ARGS[0]
-	$loc = $curloc
+
+	$menu_loc = 'Miroslava'
+	$menu_arg = $ARGS[0]
+	menu_off = 0
+
 	gs 'boyStat', 'A60'
 	girlage = age
 	temp = RAND(0,20)
 	mira_temp = rand(0,20)
 
-	!MiaLoc tells us where Mira is Located
+	!MiraLoc tells us where Mira is Located
 	!----------------------------------------------
 	!MiraLoc = 0 (Mira at home)
 	!MiraLoc = 1 (Mira at river)
@@ -36,7 +41,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 	! npc_QW['A60'] = 11 Guys fuck Mira after she pissed at party
 	! npc_QW['A60'] = 12 PC tells her about it
 	! npc_QW['A60'] += Mira pose as a prostitute
-	
+
 	gs 'Miroslava', 'miraclothes'
 	'Mira is a sociable girl. She is <<girlage>> years old. She lives with her father, who recently had to move in here because of the huge debts he had to some disreptuble men in the city. He had to sell all the families property, including an apartment in the city center. With the little money they had left over, they could only afford to buy a house in a rundown village, like this one.'
 
@@ -63,11 +68,11 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/graze_cow_mira.jpg"></center>'
 			'You chat with Mira for an hour. You feel like your relationship with her has improved.'
 
-			if hour < 13:act 'Further':gt'gadfield','cow'
-			if hour >= 13 or hour < 16:act 'Further':gt'gadfield','cow2'
-			if hour >= 16:act 'Further':gt'gadfield','cow3'
+			if hour < 13:act 'Continue':gt'gadfield','cow'
+			if hour >= 13 or hour < 16:act 'Continue':gt'gadfield','cow2'
+			if hour >= 16:act 'Continue':gt'gadfield','cow3'
 		end
-		
+
 		if hour < 13 or hour >= 16:
 			act 'Go for a run on the field':
 				*clr & cla
@@ -82,8 +87,8 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/graze_cow_run_mira.jpg"></center>'
 				'You spend the next hour running around the field with Mira.'
 
-				if hour < 14:act 'Further':gt'gadfield','cow'
-				if hour >= 16:act 'Further':gt'gadfield','cow3'
+				if hour < 14:act 'Continue':gt'gadfield','cow'
+				if hour >= 16:act 'Continue':gt'gadfield','cow3'
 			end
 			if temper >= 15 and sunWeather = 1:
 				act 'Tan by the field':
@@ -96,12 +101,12 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/graze_cow_sun_mira.jpg"></center>'
 					'You lie down next to Mira and tan together in the sun.'
 
-					if hour < 14:act 'Further':gt'gadfield','cow'
-					if hour >= 16:act 'Further':gt'gadfield','cow3'
+					if hour < 14:act 'Continue':gt'gadfield','cow'
+					if hour >= 16:act 'Continue':gt'gadfield','cow3'
 				end
 			end
 		end
-		
+
 		if hour >= 13 and hour < 16 and temper >= 15 and sunWeather = 1:
 			act 'Swim in the nearby river':
 				*clr & cla
@@ -116,7 +121,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_river_mira.jpg"></center>'
 				'You wade in the river, splashing around with Mira is lot of fun.'
 
-				act 'Further':gt'gadfield','cow2'
+				act 'Continue':gt'gadfield','cow2'
 			end
 
 			act 'Tan by the river':
@@ -129,7 +134,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/graze_cow_sun_mira2.jpg"></center>'
 				'You lie down next to Mira and tan together in the sun.'
 
-				act 'Further':gt'gadfield','cow2'
+				act 'Continue':gt'gadfield','cow2'
 			end
 		end
 
@@ -144,10 +149,10 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 	else
 		if mirasex = 1 and npc_QW['A63'] < 13 and miralick > 0 and MiraLoc = 2 and pcs_horny >= 40: act 'Talk to Mira in the meadow': gt 'Meadow','lesb_talk_mira3'
 		if mirasex = 2 and MiraLoc = 2 and pcs_horny >= 40 and npc_rel['A60'] >= 15: act 'Talk to Mira in the meadow': gt 'Meadow','lesb_mira'
-		
+
 		act 'Leave':gt 'Miroslava','Leave'
 		act 'Chat':gt 'Miroslava', 'miratalk'
-		
+
 		if month >= 4 and month <= 10 and sunWeather = 1:
 			act 'Offer to walk together':
 				*clr & cla
@@ -201,7 +206,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				end
 			end
 		end
-		
+
 		if meadow = 1 and MiraLoc ! 3:
 			act 'Show her your secret place':
 				*clr & cla
@@ -238,7 +243,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/girls_go.jpg"></center>'
 						'You offer go with Mira to to the meadow and she readily agrees. On the way you tell each other different stories, some true but mostly tall tales.'
 
-						act 'Further':gt 'meadow'
+						act 'Continue':gt 'meadow'
 					else
 						minut += 5
 						gs 'stat'
@@ -257,9 +262,9 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				end
 			end
 		end
-		
+
 		if npc_rel['A60'] >= 15 and hour >= 20 and npc_QW['A60'] = 0 and sunWeather = 1 and MiraLoc ! 3:
-			act 'Ask if she has met the local boys?':
+			act 'Ask if she''s met the local boys?':
 				*clr & cla
 				minut += 2
 				npc_rel['A60'] += 1
@@ -273,12 +278,12 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				gs 'Miroslava', 'miraclothes'
 				'You ask Mira if she has already met everyone in the village. When she says no, you offer to introduce her to some of the local guys and she readily agrees, asking you to wait a couple of minutes while she changes and freshens up. When she comes out, you go drinking with the group of boys near your house...'
 
-				act 'Further':mira_guest = 0 & minut += 15 & temp = 0 & npc_drunk['A60'] = 0 & gt 'mitkabuh'
+				act 'Continue':mira_guest = 0 & minut += 15 & temp = 0 & npc_drunk['A60'] = 0 & gt 'mitkabuh'
 			end
 		end
 
 		if npc_rel['A60'] >= 16 and hour >= 20 and npc_QW['A60'] > 0 and sunWeather = 1 and MiraLoc ! 3:
-			act 'Suggest catching up with the local guys and having a drink or three':
+			act 'Drink with the local guys':
 				if Mira_no = 0:
 					*clr & cla
 					minut += 5
@@ -296,9 +301,9 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						'You suggest drinking with the village boys and Mira readily agrees, then asks you to wait a couple of minutes while she changes. When she comes out, you go to to drink with the group of boys near your house....'
 					end
 					if npc_QW['A60'] > 15 and npc_QW['A63'] > 15 and gadriver_gang < 3 :
-						act 'Further':mira_guest = 0 & MiraLoc = 5 & minut += 15 & temp = 0 & npc_drunk['A60'] = 0 & gt 'mitkabuh_group'
+						act 'Continue':mira_guest = 0 & MiraLoc = 5 & minut += 15 & temp = 0 & npc_drunk['A60'] = 0 & gt 'mitkabuh_group'
 					else
-						act 'Further':mira_guest = 0 & MiraLoc = 5 & minut += 15 & temp = 0 & npc_drunk['A60'] = 0 & gt 'mitkabuh'
+						act 'Continue':mira_guest = 0 & MiraLoc = 5 & minut += 15 & temp = 0 & npc_drunk['A60'] = 0 & gt 'mitkabuh'
 					end
 				else
 					minut += 5
@@ -310,9 +315,9 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				end
 			end
 		end
-		
+
 		if npc_rel['A60'] >= 20 and week >= 6 and hour > 18 and hour < 22:
-			act 'Suggest taking a steam bath in your grandparents sauna':
+			act 'Inite for a steam bath':
 				if Mira_no = 0:
 					if npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1:
 						*clr & cla
@@ -352,7 +357,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				end
 			end
 		end
-		
+
 		if sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and MiraLoc ! 1:
 			act 'Offer to go to the river':
 				*clr & cla
@@ -372,7 +377,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						gs 'Miroslava', 'miraclothes'
 						'You suggest going to the river to swim or sunbathe, Mira readily agrees.'
 
-						act 'Go to the river':gt 'Gadriver', 'Gadbitch'
+						act 'Go to the river':gt 'gadriver', 'gadbitch'
 					else
 						MiraLoc = 0
 						minut += 5
@@ -393,7 +398,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				end
 			end
 		end
-		
+
 		if miratalkforest = 0 and npc_rel['A60'] >= 5:
 			act 'Ask about the forest':
 				*clr & cla
@@ -422,10 +427,10 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				'"But, I just willing only go to the forest edge. I refuse to go deep into the forest," Mira quickly added.'
 				'"Okay, okay, we''ll only walk along the edge of the forest," - you agree.'
 
-				act 'Further':gt $loc, $metka
+				act 'Continue':gt $loc, $metka
 			end
 		end
-		
+
 		if sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and MiraLoc ! 3 and miratalkforest > 0 and npc_rel['A60'] >= 5:
 			act 'Offer to go to the forest':
 				*clr & cla
@@ -463,26 +468,26 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				end
 			end
 		end
-		
+
 		if sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and MiraLoc = 3 and miratalkforest > 1 and npc_rel['A60'] >= 5 and $clothingworntype ! 'nude' and forestpicnic = 0:
-			act 'Offer to walk naked':
-				*clr & cla
-				!the clothing remains in the woods
-				clothesforest = 1
-				minut+=5
-				gs 'underwear', 'remove'
-				gs 'clothing', 'strip', 'gadforest'
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest6.jpg"></center>'
-				'You offered Mira to take a walk through the woods naked and she immediately agreed.'
+			if pcs_inhib >= 25 or exhibitionist_lvl > 1:
+				act 'Offer to walk naked':
+					*clr & cla
+					minut+=5
+					gs 'underwear', 'remove'
+					gs 'clothing', 'strip', 'gadforest'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest6.jpg"></center>'
+					'You offered Mira to take a walk through the woods naked and she immediately agreed.'
 
-				act'Further':gt'gadforest','1'
+					act'Continue':gt'gadforest','1'
+				end
 			end
 		end
-		
+
 		if npc_rel['A60'] >= 15 and MiraLoc ! 3 and (npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
 			if mira_guest = 0:
-				act 'Invite Mira back to your grandparent''s house':
+				act 'Invite to your grandparent''s':
 					*clr & cla
 					minut += 5
 					mira_guest = 1
@@ -503,12 +508,12 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/dressbch.jpg"></center>'
 							'You changed into your regular clothes and went home with Mira.'
 
-							act 'Further': minut += 15 & gt'Gadhouse'
+							act 'Continue': minut += 15 & gt'Gadhouse'
 						end
 					end
 				end
 			end
-			
+
 			if mira_guest = 1:
 				act 'Watch TV':
 					*clr & cla
@@ -519,10 +524,10 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_tv'+rand(1,12)+'.jpg"></center>'
 					'You and Mira watch TV for an hour.'
 
-					act'Further':gt'Gadhouse'
+					act'Continue':gt'Gadhouse'
 				end
 			end
-			
+
 			if mira_guest = 1 and hour >= 18:
 				act 'Sleep over':
 					*clr & cla
@@ -540,7 +545,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					end
 				end
 			end
-			
+
 			if mira_guest > 0:
 				act 'Say goodbye to Mira':
 					*clr & cla
@@ -550,12 +555,12 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					gs 'stat'
 					gs 'Miroslava', 'miraclothes'
 					'You say goodbye to Mira, and she went home.'
-					
+
 					act 'Walk back home':gt'Gadhouse'
 				end
 			end
 		end
-		
+
 		if npc_rel['A60'] >= 15 and Mira_no = 0 and (npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
 			if mira_guest = 0 and mira_temp >= 1 and mira_temp <= 2 and mira_go_blok = 0 and MiraLoc ! 3:
 				*clr & cla
@@ -585,7 +590,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/dressbch.jpg"></center>'
 						'You change into your clothes and go home with Mira.'
 
-						act 'Further': gt'Gadhouse'
+						act 'Continue': gt'Gadhouse'
 					end
 				end
 
@@ -597,7 +602,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 					'You deny Mira, saying that you don''t want to right now.'
 
-					act 'Further': gt 'Miroslava', 'Start'
+					act 'Continue': gt 'Miroslava', 'Start'
 				end
 			end
 			if mira_guest = 1 and mira_temp >= 3 and mira_temp <= 4:
@@ -617,7 +622,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_tv'+rand(1,12)+'.jpg"></center>'
 					'You watch TV with Mira for an hour.'
 
-					act'Further':gt'Gadhouse'
+					act'Continue':gt'Gadhouse'
 				end
 
 				act'Refuse':
@@ -627,7 +632,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 					'You deny Mira, saying that you don''t want to right now.'
 
-					act 'Further': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
 				end
 			end
 			if MiraLoc ! 2 and mira_temp = 5 and (meadow = 3 or meadow = 6) and mira_go_blok = 0 and MiraLoc ! 3 and hour < 19 and sunWeather = 1:
@@ -652,7 +657,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/girls_go.jpg"></center>'
 					'You go to Mira through the dense undergrowth to the hidden meadow. Along the way she merrily tells stories from her past city life.'
 
-					act 'Further': gt 'Meadow'
+					act 'Continue': gt 'Meadow'
 				end
 
 				act'Refuse':
@@ -663,7 +668,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 					'You deny Mira, saying that you don''t want to right now.'
 
-					act 'Further': gt 'Miroslava', 'Start'
+					act 'Continue': gt 'Miroslava', 'Start'
 				end
 			end
 
@@ -694,7 +699,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 					'You deny Mira, saying that you don''t want to right now.'
 
-					act 'Further': gt 'Miroslava', 'Start'
+					act 'Continue': gt 'Miroslava', 'Start'
 				end
 			end
 
@@ -717,7 +722,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira.jpg"></center>'
 					'"Not right now Mira," you say. "I''m not in the mood to talk right now."'
 
-					act 'Further': gt 'Miroslava', 'Start'
+					act 'Continue': gt 'Miroslava', 'Start'
 				end
 			end
 			if MiraLoc ! 1 and mira_temp >= 6 and mira_temp <= 7 and sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and mira_go_blok = 0 and MiraLoc ! 3 and hour < 18:
@@ -742,7 +747,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/girls_go.jpg"></center>'
 					'You decided to go with Mira to the village beach and all the way she goes, merrily chattering and telling stories.'
 
-					act 'Further': gt'Gadriver', 'Gadbitch'
+					act 'Continue': gt'gadriver', 'gadbitch'
 				end
 
 				act'Refuse':
@@ -753,11 +758,11 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 					'You tell Mira that you don''t feel like going to the river right now.'
 
-					act 'Further': gt 'Miroslava', 'Start'
+					act 'Continue': gt 'Miroslava', 'Start'
 				end
 			end
 		end
-		
+
 		if npc_QW['A60'] >= 30 and hour < 19 and month >= 5 and month <= 9 and MiraLoc ! 3:
 			act '<b>Make your third wish</b>':
 				*clr & cla
@@ -954,7 +959,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				end
 			end
 		end
-		
+
 		if mira_temp = 0 and mira_go_blok = 0 and meadow > 2 and MiraLoc = 0:
 			*clr & cla
 			minut += 5
@@ -966,12 +971,12 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 			if MiraLoc ! 1:gs 'Miroslava', 'miraclothes'
 			'"<<$pcs_nickname>>, you''re fun to be with, but Dad has chores for me to work on." Mira tells you.'
-			
+
 			if $clothingworntype = 'nude':
 				gs 'clothing', 'wear_last_worn'
 				gs 'underwear', 'wear'
 			end
-			
+
 			act 'Go back to the village':mira_guest = 0 & MiraLoc = 0 & gt 'Gadukino'
 		end
 
@@ -986,12 +991,12 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 			if MiraLoc ! 1:gs 'Miroslava', 'miraclothes'
 			'"<<$pcs_nickname>>, you''re fun to be with, but I gotta get home. Dad has chores for me to work on.," Mira tells you.'
-			
+
 			if $clothingworntype = 'nude':
 				gs 'clothing', 'wear_last_worn'
 				gs 'underwear', 'wear'
 			end
-			
+
 			act 'Go back to the village':mira_guest = 0 & MiraLoc = 0 & gt 'Gadukino'
 		end
 
@@ -1002,12 +1007,12 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			gs 'stat'
 			gs 'Miroslava', 'miraclothes'
 			'"<<$pcs_nickname>>, you''re fun to be with, but it''s late. I gotta get to bed. Dad has chores for me to work on tomorrow." Mira tells you.'
-			
+
 			if $clothingworntype = 'nude':
 				gs 'clothing', 'wear_last_worn'
 				gs 'underwear', 'wear'
 			end
-			
+
 			act 'Go back to the village':gt 'Gadukino'
 		end
 
@@ -1022,14 +1027,14 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 			if MiraLoc ! 1:gs 'Miroslava', 'miraclothes'
 			'"<<$pcs_nickname>>, you''re fun to be with, but I gotta get home and get to bed. Dad has chores for me to work on tomorrow." Mira tells you.'
-			
+
 			if $clothingworntype = 'nude':
 				gs 'clothing', 'wear_last_worn'
 				gs 'underwear', 'wear'
 			end
-			
+
 			act 'Go back to the village':mira_guest = 0 & MiraLoc = 0 & gt 'Gadukino'
-		end		
+		end
 	end
 end
 
@@ -1230,9 +1235,9 @@ if $ARGS[0] = 'mira_river':
 end
 
 if $ARGS[0] = 'Leave':
-	if MiraLoc = 0: 
+	if MiraLoc = 0:
 		gt 'MiroslavaHome','start'
-	elseif MiraLoc = 3: 
+	elseif MiraLoc = 3:
 		gt 'gadforest', '1'
 	elseif MiraLoc = 6:
 		gt 'Gadhouse'

+ 18 - 12
locations/MiroslavaHome.qsrc

@@ -1,17 +1,23 @@
 # MiroslavaHome
 
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc = 'MiroslavaHome'
+	$metka = 'start'
 	$location_type = 'public_outdoors'
+
+	$menu_loc = 'MiroslavaHome'
+	$menu_arg = 'start'
+	menu_off = 0
+
 	*clr & cla
 	minut += 5
 	mira_temp = rand(0,15)
 	gs 'stat'
+
 	'<center><h2>Gadukino Village</h2></center>'
 	'<center><b>Mira''s Yard</b></center>'
 
-	!!MiaLoc tells us where Mira is Located
+	!!MiraLoc tells us where Mira is Located
 	!!----------------------------------------------
 	!!MiraLoc = 0 (Mira at home)
 	!!MiraLoc = 1 (Mira at river)
@@ -22,7 +28,7 @@ if $ARGS[0] = 'start':
 	!!---------------------------------------------
 
 	act 'Leave': gt 'gadukino'
-	
+
 	if hour >= 8 and hour <= 22:
 		if Mira_no > 0 and mirafathertalk = 0 and miraday ! daystart:
 			*clr & cla
@@ -41,14 +47,14 @@ if $ARGS[0] = 'start':
 			mirafathertalk = 1
 			gs'stat'
 
-			act 'Further':gt 'miroslavahome', 'start'
+			act 'Continue':gt 'miroslavahome', 'start'
 		elseif temper >= 15 and sunWeather = 1 and npc_QW['A60'] = 7 and hour >= 8 and hour <= 18:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/miraqw7.jpg"></center>'
 			'Entering the courtyard, you notice Mira, working in the garden. She is bent over and, to your amazement, you see her bare naked crotch...'
 			MiraLoc = 0
 
-			act 'Approach it':
+			act 'You approach slowly':
 				*clr & cla
 				gs 'Miroslava', 'miraclothes'
 				'You quietly sneak up to her, but she notices you and turns around, immediately blushing rapidly. You a couple seconds of silently staring at her, and then unceremoniously asked why she without panties. Miroslav took the eye, with rumpled feet and legs, explaining that it turned out very hot, so she... You remind her about the second wish and ask to sit down. Miroslav reluctantly agrees, and when he sits down, you tell her, she`ll show you the crotch, you bad considered. The girl mumbles something unintelligible, but then for half a minute lifts up her skirt and gives you a good look at my crotch.'
@@ -64,10 +70,10 @@ if $ARGS[0] = 'start':
 					minut += 15
 					gs 'stat'
 
-					act 'Go out on the road':
+					act 'Lead her to the road':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2_1.jpg"></center>'
-						'Out on the road you say, "Mira, pose as a prostitute, this will be the second wish." Mira sadly nods her head, looks around and seeing that the street was quiet, fulfills your desire...'
+						'You lead her out to the main road. You tell Mira, that she is to pose as a prostitute and attempt to get a customer or two. This is your second wish. You want Mira to become a prostitute and fulfill the desires of anyone who asks for her services. Mira looks shocked but nods that she will do it, Mira looks around the area and seeing no one else watching begins to pose by the roadside for passing cars...'
 						minut += 15
 						npc_QW['A60'] = 8
 						gs 'stat'
@@ -111,7 +117,7 @@ if $ARGS[0] = 'start':
 					act 'Leave': gt 'gadukino'
 				end
 			end
-!!125s
+
 			act 'Ask for Mira':
 				if mira_temp >= 10 and sunWeather = 1 and temper >= 15 and hour < 20 and Mira_no = 0:
 					*clr & cla
@@ -141,7 +147,7 @@ if $ARGS[0] = 'start':
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirahome.jpg"></center>'
-		if hour > 22 or hour < 3: 'It''s late, most of Mira''s family is asleep, no need to them up unnecessarily.' else 'It''s too early, most of Mira''s family is still asleep, no need to wake people up unnecessarily.'
+		if hour > 22 or hour < 3: 'It''s too late, most of Mira''s family is asleep, no need to wake them up unnecessarily.' else 'It''s too early, most of Mira''s family is still asleep, no need to wake them up unnecessarily.'
 		act 'Leave': gt 'gadukino'
 	end
 end
@@ -166,7 +172,7 @@ if $ARGS[0] = 'mirabrother':
 			else
 				'He gazes at you a couple of seconds, and then asks, "Who are you again?"'
 			end
-			
+
 			act 'Walk away': gt 'MiroslavaHome', 'start'
 		else
 			if $pantyworntype ! 'none':
@@ -259,7 +265,7 @@ if $ARGS[0] = 'mirabrother':
 
 												'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto6.jpg"></center>'
 												'You obediently sit down in front of him on your knees and unzip his pants. His quickly growing member pops out right in front of your face...'
-												
+
 												act 'Suck':
 													*clr & cla
 													pcs_horny += RAND(10,20)

+ 3 - 3
locations/NatBelHome.qsrc

@@ -376,16 +376,16 @@ elseif lernHome = 0:
 										natcp += 1
 										'You let her pull away from your brother, but it appears Kolka was really close, and before anyone could do anything, your brother pumps his seed in Natasha''s body.'
 										'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natasha/sex/natcp.mp4"></video></center>'
-										'"Fuck, I really am sorry, Nat!", he says apologetically. "It is just, you are so hot!"'
+										'"Fuck, I really am sorry, Natasha!", he says apologetically. "It is just, you are so hot!"'
 										'Natalia doesn''t even listen to him, just looks at you with a strange expression on her face. You can''t really decide whether she is scared that Kolka came in her pussy, or enjoyed it. Maybe both at the same time?'
-										'You quitely signal your brother to dress up and leave while you kiss her deeply. "I hope you enjoyed it, pet. We may repeat it."'
+										'You quietly signal your brother to dress up and leave while you kiss her deeply. "I hope you enjoyed it, pet. We may repeat it."'
 										if rand(1,100) >= 95 and natpregday = 0:natpregday = daystart
 									else
 										'You let her pull away from your brother, so that you brother''s dick slips out of her just in time. His seed sprays Natasha''s ass, back and hair, and it even reaches your face and hair.'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natkolfacial.jpg"></center>'
 										'"Nice shot, bro!", you say laughing, wiping his seed away from your eyelid. "That was quite the distance!"'
 										'"That was close," whispers Nat, with a strange look in her face. You actually can''t decide whether she is relieved or disappointed that Kolka didn''t cum in her pussy.'
-										'You quitely signal your brother to dress up and leave while you kiss her deeply. "I hope you enjoyed it, pet. We may repeat it."'
+										'You quietly signal your brother to dress up and leave while you kiss her deeply. "I hope you enjoyed it, pet. We may repeat it."'
 										gs 'boyStat', 'A34'
 										spafinloc = 11
 										sexpartkno = 1

+ 5 - 1
locations/NewCloShop.qsrc

@@ -10,6 +10,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -25,7 +29,7 @@ if $ARGS[0] = 'start':
 		gt 'torgcentr'
 	end
 	
-	act 'View Clothing': minut += 5 & gt 'NewCloShop', 'clothes'
+	act 'View clothing': minut += 5 & gt 'NewCloShop', 'clothes'
 
 	act 'View panties': minut += 5 & gt 'NewCloShop', 'panties'
 

+ 16 - 16
locations/NikoDates.qsrc

@@ -1,6 +1,6 @@
 # NikoDates
 
-if $ARGS[0] =  'Date 1_1':
+if $ARGS[0] = 'Date 1_1':
 	cls
 	NikoDate_Day = daystart
 	minut += 5
@@ -45,7 +45,7 @@ if $ARGS[0] =  'Date 1_1':
 							minut += 5
 							'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer1.jpg"></center>'
-							'You downcast your eyes; feeling more bashful, as Niko approaches you; moving his face one inch from yours. "So, May I?" You finally get up the courage to tell him, "You...You may.." Niko gives you a warm smile, as he leans forward, pressing his lips against yours; sharing a very gently but firm kiss. After you both finish kissing, you look up to Niko, and see a very pleased smile on his face. "You are so beautiful <<$pcs_firstname>>, and your lips are as soft as silk; So perfect." You can feel your face quickly growing flushed, as you turn your head; trying to hide how red it is. Niko chuckles lightly, "We''re not done yet. Let''s go to the boxing game next."'
+							'You downcast your eyes; feeling more bashful, as Niko approaches you; moving his face one inch from yours. "So, May I?" You finally get up the courage to tell him, "You... You may..." Niko gives you a warm smile, as he leans forward, pressing his lips against yours; sharing a very gently but firm kiss. After you both finish kissing, you look up to Niko, and see a very pleased smile on his face. "You are so beautiful <<$pcs_firstname>>, and your lips are as soft as silk; So perfect." You can feel your face quickly growing flushed, as you turn your head; trying to hide how red it is. Niko chuckles lightly, "We''re not done yet. Let''s go to the boxing game next."'
 							*nl
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.mp4"></video></center>'
 
@@ -58,7 +58,7 @@ if $ARGS[0] =  'Date 1_1':
 						minut += 5
 						gs'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad2.jpg"></center>'
-						'You and Niko grab a plastic gun then begin shooting the bottles, as quickly, and efficiently, as possible. After a few minutes, the scores get tallied up, and...You won. The man hosting the event, hands you a plastic gnome. Niko looks at the score, a little shocked, as he scratches the back of his head. "I guess... You won. So what do you desire for your prize?" Niko moves his face closer to yours.'
+						'You and Niko grab a plastic gun then begin shooting the bottles, as quickly, and efficiently, as possible. After a few minutes, the scores get tallied up, and... You won. The man hosting the event, hands you a plastic gnome. Niko looks at the score, a little shocked, as he scratches the back of his head. "I guess... You won. So what do you desire for your prize?" Niko moves his face closer to yours.'
 						'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer1.jpg"></center>'
 
@@ -94,7 +94,7 @@ if $ARGS[0] =  'Date 1_1':
 	end
 end
 
-if $ARGS[0] =  'Stranger Danger':
+if $ARGS[0] = 'Stranger Danger':
 	cls
 	minut += 5
 	gs'stat'
@@ -116,7 +116,7 @@ if $ARGS[0] =  'Stranger Danger':
 	end
 end
 
-if $ARGS[0] =  'Date 1_2':
+if $ARGS[0] = 'Date 1_2':
 	cls
 	minut += 5
 	gs 'boyStat', 'A189'
@@ -244,7 +244,7 @@ if $ARGS[0] =  'Date 1_2':
 	end
 end
 
-if $ARGS[0] =  'Home 1':
+if $ARGS[0] = 'Home 1':
 	cls
 	NikoEv = 3
 	minut += 30
@@ -257,7 +257,7 @@ if $ARGS[0] =  'Home 1':
 	act 'Walk toward the city':gt 'pavResidential'
 end
 
-if $ARGS[0] =  'Home Sad':
+if $ARGS[0] = 'Home Sad':
 	cls
 	minut += 20
 	gs'stat'
@@ -269,7 +269,7 @@ if $ARGS[0] =  'Home Sad':
 	act 'Walk toward the city':gt 'pavResidential'
 end
 
-if $ARGS[0] =  'Date 2':
+if $ARGS[0] = 'Date 2':
 	cls
 	NikoDate_Day = daystart
 	gs 'boyStat', 'A189'
@@ -353,7 +353,7 @@ if $ARGS[0] =  'Date 2':
 	end
 end
 
-if $ARGS[0] =  'Date 2_2':
+if $ARGS[0] = 'Date 2_2':
 	cls
 	NikoDate_Day = daystart
 	gs 'boyStat', 'A189'
@@ -392,7 +392,7 @@ if $ARGS[0] =  'Date 2_2':
 				minut += 5
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/2/d2.jpg"></center>'
-				'Niko climbs off of the burly man then turns to  you, and asks, "Are you okay, he didn''t hurt you did he?" You quickly hug Niko then reply, "I''m fine. Thank you Niko. I feel so safe with you." You then kiss Niko''s neck, as he leads you back toward the bar, for a few drinks. While drinking with Niko, you can''t help but think to yourself: <font color=#FF00FF>What if that big guy gets up then comes back for revenge? Should we just leave?</font> Niko hands you another drink when you see the restroom door open, and the burly man steps out then brush off the dirt from his jacket before casually leaving the bar, not even looking back.'
+				'Niko climbs off of the burly man then turns to you, and asks, "Are you okay, he didn''t hurt you did he?" You quickly hug Niko then reply, "I''m fine. Thank you Niko. I feel so safe with you." You then kiss Niko''s neck, as he leads you back toward the bar, for a few drinks. While drinking with Niko, you can''t help but think to yourself: <font color=#FF00FF>What if that big guy gets up then comes back for revenge? Should we just leave?</font> Niko hands you another drink when you see the restroom door open, and the burly man steps out then brush off the dirt from his jacket before casually leaving the bar, not even looking back.'
 				*nl
 				'<font color=#FF00FF>He... He wasn''t mad? I thought that he would want revenge. That is so strange.</font> You try to focus on what Niko is saying, as he chats about various topics with you.'
 				*nl
@@ -415,7 +415,7 @@ if $ARGS[0] =  'Date 2_2':
 	end
 end
 
-if $ARGS[0] =  'Date Rape':
+if $ARGS[0] = 'Date Rape':
 	cls
 	gs 'boyStat', 'A189'
 	minut += 5
@@ -484,7 +484,7 @@ if NikoVolkovQW = 5 and NikoEv = 4 and NikoDate = 0:
 	'You, and Niko walk out of the cafeteria then Niko leans against the wall, and pulls you toward him, gently kissing your lips before whispering in your ear, "" '
 end
 
-if $ARGS[0] =  'Cafeteria':
+if $ARGS[0] = 'Cafeteria':
 	cls
 	gs 'boyStat', 'A189'
 	NikoDate = 1
@@ -513,7 +513,7 @@ if $ARGS[0] =  'Cafeteria':
 	end
 end
 
-if $ARGS[0] =  'Date 3':
+if $ARGS[0] = 'Date 3':
 	cls
 	NikoDate_Day = daystart
 	gs 'boyStat', 'A189'
@@ -632,7 +632,7 @@ if $ARGS[0] =  'Date 3':
 	end
 end
 
-if $ARGS[0] =  'Home':
+if $ARGS[0] = 'Home':
 	cls
 	gs 'boyStat', 'A189'
 	minut += 5
@@ -1471,7 +1471,7 @@ if $ARGS[0] = 'Locker Room':
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/fedor.jpg"></center>'
 												'You run to Fedor then jump into his arms, as he stares into your eyes, "Don''t worry <<$pcs_nickname>>. I will keep you safe." Vitek shouts, "Hey, she is ours, give her back." Fedor stands his ground, "No, she is mine!" Vitek walks up to his face, "What did you say punk?" Dan adds, "Hey, I''m sure Fedor misunderstands what''s going on, let me explain. <<$pcs_firstname>> has been a very naughty girl who has been fucking many other students." Fedor responds, "Bullshit! I know <<$pcs_firstname>>, and she''s better than that." Dan responds, "Ohh really? Watch this, and decide for yourself."'
 												*nl
-												'Dan shows Fedor the video of you sucking off Niko then confessing your love to him. Fedor''s face grows red with anger. "You..You bitch! How could you just use me like that?" You lower your head, "I..." You can''t collect your words. Fedor grabs the back of your neck then pushes you toward Vitek who catches you, "Have fun with her. I don''t want her anymore." Dan pats Fedor on the back, as he responds, "Why don''t you join us? We were just about to show her off to everyone else." Fedor nods then you all head into the cafeteria.'
+												'Dan shows Fedor the video of you sucking off Niko then confessing your love to him. Fedor''s face grows red with anger. "You... You bitch! How could you just use me like that?" You lower your head, "I..." You can''t collect your words. Fedor grabs the back of your neck then pushes you toward Vitek who catches you, "Have fun with her. I don''t want her anymore." Dan pats Fedor on the back, as he responds, "Why don''t you join us? We were just about to show her off to everyone else." Fedor nods then you all head into the cafeteria.'
 												'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></center>'
 
@@ -1491,7 +1491,7 @@ if $ARGS[0] = 'Locker Room':
 	end
 end
 
-if $ARGS[0] =  'Exposed':
+if $ARGS[0] = 'Exposed':
 	cls
 	if grupTipe = 1:VKGroup = 1 & grupTipe = 5
 	if grupTipe = 2:VKGroup = 2 & grupTipe = 5

+ 1 - 1
locations/Nudelake.qsrc

@@ -43,7 +43,7 @@ act 'Return to the main beach':
 	gt 'lake', 'start'
 end
 
-if katday ! daystart and npc_rel['A219'] >= 1:
+if katday ! daystart and npc_rel['A219'] >= 1 and temper >= 15:
 	'You see Kat on the beach.'
 
 	act 'Approach Kat':gt 'Katlake', 'kat'

+ 3 - 2
locations/ParkKafe.qsrc

@@ -13,8 +13,8 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/parkcafe.jpg"></center>'
 
 	act 'See the menu':gs 'food_menu'
-	if money >= 300:
-		act 'Eat and run (0:20) (300₽)':gt 'food', 'f_food'
+	if money >= 350:
+		act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
 	'Whilst sitting and eating in the summer cafe. You take a moment and enjoy the beautiful scenery.'
 
@@ -48,6 +48,7 @@ if $ARGS[0] = 'guys':
 
 			act 'Drink beer with the guys':
 				cla
+				alko += 1
 				'You drink a glass of beer, while the guys order another. One of them quietly slipped something into your glass. You got drunk very quickly and the guys guide you to the nearest woods.'
 				if rand(0, 1) = 0:
 					if parkara = 0:guy += 2 & parkara = 1

+ 4 - 0
locations/Peterroom.qsrc

@@ -9,6 +9,10 @@ if $ARGS[0] = 'start_door':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 13 - 14
locations/Snpc.qsrc

@@ -70,11 +70,13 @@ if grupTipe[numnpc] = 4:
 					'<<$npc_firstname[$static_num]>> offers you a beer and says: "Hey <<$pcs_nickname>>! Let''s drink some beer and have some fun!"'
 				end
 
+				act 'Decline':npc_rel[$static_num] -= 5 & gt $loc, $metka
+				
 				act 'Drink the beer':
 					cls
 					minut += 5
 					npc_rel[$static_num] += 5
-					alko += 1
+					alko += rand(1,2)
 					if pcs_hydra >= 100:
 						pcs_hydra += 5
 					else
@@ -88,8 +90,6 @@ if grupTipe[numnpc] = 4:
 
 					act 'Move away':gt $loc, $metka
 				end
-
-				act 'Decline':npc_rel[$static_num] -= 5 & gt $loc, $metka
 			end
 		elseif pav_slut >= 125:
 			if npcPol[numnpc] = 0:
@@ -235,7 +235,7 @@ if numnpc = 23:
 	if albinaQWdance > 0 and AlbinaBlokDance = 0 and ZvezdEnd = 0:
 		'Albina offers you a friendly smile and says: "<<$pcs_nickname>>, you''re progressing very well in your training. Don''t forget to keep attending!"'
 
-		if pav_slut > 100:'By the way, some people are telling some pretty disgusting rumours about you.'
+		if pav_slut >= 125:'By the way, some people are telling some pretty disgusting rumours about you.'
 	end
 
 	if artemIzdev = 1:
@@ -304,12 +304,12 @@ act 'Chat':
 	if $loc ! 'gdkin':
 		gs 'nogorslut'
 		gs 'yesgorslut'
-
+		
 		act 'Continue': gt 'gschool_lessons', 'short_break'
 	else
 		gs 'nogorslut'
 		gs 'yesgorslut'
-
+		
 		act 'Move away':gt $loc, $metka
 	end
 end
@@ -340,14 +340,14 @@ if numnpc = 2:
 			npc_rel[$static_num] += 5
 			sub += 1
 
-			if pav_slut < 100:artemLernQW = 1
+			if pav_slut < 125: artemLernQW = 1
 
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
 
-			if pav_slut < 100:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is a bit surprised: "What... you want my help? Well, okay I guess. Come meet me at my place if you want to do homework together."'
-			if pav_slut >= 100:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is outraged: "Bah... the school whore needs my help? I don''t think so."'
+			if pav_slut < 125:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is a bit surprised: "What... you want my help? Well, okay I guess. Come meet me at my place if you want to do homework together."'
+			if pav_slut >= 125:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is outraged: "Bah... the school whore needs my help? I don''t think so."'
 
 			if $loc ! 'gdkin':
 				act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -364,7 +364,6 @@ end
 
 	if numnpc = 3:gt 'IvanEv', 'School Chat'
 
-
 !!!!!!!!!!!!!!!
 !!Vitek Kotov!!
 !!!!!!!!!!!!!!!
@@ -398,8 +397,8 @@ if numnpc = 12:
 			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
 
-			if pav_slut < 100:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
-			if pav_slut >= 100:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
+			if pav_slut < 125:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
+			if pav_slut >= 125:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
 			if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
@@ -588,8 +587,8 @@ if numnpc = 16:
 			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
 
-			if pav_slut < 100:'You approach Natasha and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
-			if pav_slut >= 100:'You approach Natasha and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
+			if pav_slut < 125:'You approach Natasha and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
+			if pav_slut >= 125:'You approach Natasha and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else

+ 2 - 2
locations/VolleyTrenerSpeak.qsrc

@@ -50,14 +50,14 @@ else
 		'"<<$pcs_lastname>>, don''t piss me off, what I do is my business, and what are you doing here is also my business.'
 		if pcs_horny > 79:
 			trenerlust += 1
-			'"Is that the the truth, Michael N. Are you here because of me?" You move closer to the coach, and flutter your eyes at him.'
+			'"Is that the the truth, Mikhail N. Are you here because of me?" You move closer to the coach, and flutter your eyes at him.'
 			'"I meant as your coach, and don''t think you can win just by fluttering your eyes. Want to impress me? Workout, and no partying."'
 		else
 			'"As your coach." he adds with a slight blush.'
 		end
 	else
 		'The coach looked at you with condemnation. "<<$pcs_lastname>> you here again, what the fuck? This is not the place for candidates for the team.'
-		'"Michael N. you never said anything about not going out on a Friday."'
+		'"Mikhail N. you never said anything about not going out on a Friday."'
 		'"<<$pcs_lastname>>, are you thick? When does the team play?"'
 		'"Saturday." You respond, sheepishly.'
 		'"So, on Friday I expect my players not to hang out here but go home and get some sleep. Or they aren''t going to be fit to play tomorrow. Clear? You have some skill, sort out your attitude and you might yet make the team."'

+ 2 - 2
locations/VoltrenerSexShower.qsrc

@@ -200,7 +200,7 @@ if $ARGS[0] = '5':
 	act 'Get a better look':
 		cls
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower19.jpg"></center>'
-		'Through the glass you see, as Michael strong views approaching the booth, and Vanya nothing, not seeing, pulls your ass, you frantically try to close the booth door on the lock, that Ivan looks like and not closed. But the cock in her ass and pushes Ivan not let you do it, the door abruptly opens, coach growled: "Again fuck. Prokhorov will tell your coach, you honouring mode, and the competitions are preparing". From these words Ivan shrank his penis opal and easily fell out of your ass: "Don''t need Michael to say anything to anyone, please. I will help with the hall, well, there is a grid to hang, girls to hold after departure", - and he, sideways covering his dignity, grabbing your stuff, got out of the shower.'
+		'Through the glass you see, as Mikhail strong views approaching the booth, and Vanya nothing, not seeing, pulls your ass, you frantically try to close the booth door on the lock, that Ivan looks like and not closed. But the cock in her ass and pushes Ivan not let you do it, the door abruptly opens, coach growled: "Again fuck. Prokhorov will tell your coach, you honouring mode, and the competitions are preparing". From these words Ivan shrank his penis opal and easily fell out of your ass: "Don''t need Mikhail to say anything to anyone, please. I will help with the hall, well, there is a grid to hang, girls to hold after departure", - and he, sideways covering his dignity, grabbing your stuff, got out of the shower.'
 		!!Originally 65, but without significant anal experience Ivan will have you in too much pain to get anywhere near that		
 		if pcs_horny < 30: 
 			act 'Close the shower door':
@@ -252,7 +252,7 @@ if $ARGS[0] = '5':
 									cls
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower27.jpg"></center>'
 									$orgasm_or = 'custom'
-									$orgasm_txt = 'Literally exhausted from the desire of a cock inside you, you just get the coach on the floor and choose from the entire scope mounted on his cock. The head parted her lips, and a member with a flourish came in the pussy, leaning, what- then inside that has caused a new wave of pleasure. Starting to move up on it - down, from side to side, you skewer yourself on his cock. Michael caresses your neck, chest and waves of pleasure run from the nipples, where-down...the hands of coach you squeezed the nipples, surprise, you seem to be electrocuted, you cried, and huddled in orgasm.'
+									$orgasm_txt = 'Literally exhausted from the desire of a cock inside you, you just get the coach on the floor and choose from the entire scope mounted on his cock. The head parted her lips, and a member with a flourish came in the pussy, leaning, what- then inside that has caused a new wave of pleasure. Starting to move up on it - down, from side to side, you skewer yourself on his cock. Mikhail caresses your neck, chest and waves of pleasure run from the nipples, where-down...the hands of coach you squeezed the nipples, surprise, you seem to be electrocuted, you cried, and huddled in orgasm.'
 									gs 'arousal', 'vaginal_finger', 15, 'sub'
 									gs 'arousal', 'vaginal', 15, 'sub'
 									minut -= 15

+ 4 - 4
locations/Voltrenersex.qsrc

@@ -244,7 +244,7 @@ if $ARGS[0] = 'Defl':
 	act 'Show pussy':
 		cls
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex20.jpg"></center>'
-		'Michael rubs the delicate petals of your pussy, and making sure that you are still a virgin said: "You are still a girl.", You watch your coach as he makes the decision on whether or not you will remain a virgin and do you want to stay a virgin?'
+		'Mikhail rubs the delicate petals of your pussy, and making sure that you are still a virgin said: "You are still a girl.", You watch your coach as he makes the decision on whether or not you will remain a virgin and do you want to stay a virgin?'
 		act 'Leave':gt 'gdksport', 'start'
 		act 'Stay':
 			cls
@@ -265,7 +265,7 @@ if $ARGS[0] = 'Defl':
 					gs 'boyStat', 'A69'
 					sexpartkno = 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex23.jpg"></center>'
-					$sexstart2Deflor = '"You''re so sweet", coach caressed your hands, kissed, whispered sweet words to you as he took your virginity. Gradually, you started to get used to the new sensations, feeling of fullness, from having a dick in your body. Michael was moving slowly, giving you time to get used to it.'
+					$sexstart2Deflor = '"You''re so sweet", coach caressed your hands, kissed, whispered sweet words to you as he took your virginity. Gradually, you started to get used to the new sensations, feeling of fullness, from having a dick in your body. Mikhail was moving slowly, giving you time to get used to it.'
 					gs 'dinsex','vaginal_sex',10
 					'Then, gradually accelerating, coach, began to gently fuck your pussy. You led, you felt incredible languor, it didn''t really, as during Masturbation, or during anal sex. You seem, what he gets right to the marrow, because there were given a real firework of your emotions from the first vaginal sex.'
 					gs 'dinsex','sexcum'
@@ -395,7 +395,7 @@ if $ARGS[0] = 'masaj':
 					act 'Further':
 						cls
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj5.jpg"></center>'
-						'Michael began to knead your feet, lifting and twisting them. And you could only moan with pleasure and mild pain. You lost all track of time as the coach massaged you.'
+						'Mikhail began to knead your feet, lifting and twisting them. And you could only moan with pleasure and mild pain. You lost all track of time as the coach massaged you.'
 						act 'Further':
 							pcs_sleep += 25
 							minut += 30
@@ -532,7 +532,7 @@ if $ARGS[0] = 'discoSex':
 				end
 			else
 			  '<center><img <<$set_imgh>> src="images/pc/fatherim34.jpg"></center>'
-				'Having brought you to the girls bathroom, you stop and say to him. "Not the most secluded place Michael." turning away you walk off. He sighs but smiles as he watches your tight little ass as you walk away. "Ok we can go home if this isn''t good enough."'
+				'Having brought you to the girls bathroom, you stop and say to him. "Not the most secluded place Mikhail." turning away you walk off. He sighs but smiles as he watches your tight little ass as you walk away. "Ok we can go home if this isn''t good enough."'
 				act 'Go with coach':
 					Discoclose = 1
 					minut += 20

+ 1 - 1
locations/_attributes_average.qsrc

@@ -473,7 +473,7 @@ elseif ARGS[1] = 76:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloSkirtShortness = 1
+	CloSkirtShortness = 3
 	CloExhibit = 25
 elseif ARGS[1] = 77:
 	CloQuality = 4

+ 6 - 0
locations/_attributes_cheap.qsrc

@@ -2475,6 +2475,12 @@ elseif ARGS[1] = 413:
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloExhibit = 5
+elseif ARGS[1] = 414:
+	CloQuality = 1
+	CloThinness = 1
+	CloTopCut = 1
+	CloSkirtShortness = 3
+	CloExhibit = 0
 
 end
 

+ 5 - 2
locations/_body_image.qsrc

@@ -58,6 +58,9 @@ if $ARGS[0] = 'clothes':
 	elseif $clothingworntype = 'nude' and $pantyworntype = 'none':
 		$RESULT = 'images/pc/clothing/nude1.jpg'
 		$body_image_msg += 'You are completely naked.'
+	elseif $clothingworntype = 'cheap' and clothingwornnumber = 414:
+		$RESULT = FUNC('$clothing_image', $clothingworntype, clothingwornnumber)
+		$body_image_msg += 'You are wearing a hessian sack the hunters gave you.'
 	else
 		$RESULT = FUNC('$clothing_image', $clothingworntype, clothingwornnumber)
 		$body_image_msg += 'You are wearing ' + FUNC('$short_description', $clothingworntype, PCloStyle2) + '<<clothingwornnumber>>.'
@@ -97,7 +100,7 @@ if $ARGS[0] = 'panties':
 		$body_image_msg += 'You are not wearing any panties.'
 	else
 		$RESULT = FUNC('$panty_image', $pantyworntype, pantywornnumber)
-		!Kevin, please edit this line. I can not find panties description		
+		!Kevin, please edit this line. I can not find panties description
 		!$body_image_msg += 'You are wearing ' + FUNC('$shoe_description', $shoeworntype) + '<<shoewornnumber>>.'
 		$body_image_msg += 'You are wearing <<$pantyworntype>> panty <<pantywornnumber>>'
 	end
@@ -109,7 +112,7 @@ if $ARGS[0] = 'bra':
 		$body_image_msg += 'You are not wearing a bra. Your breasts would be considered an EU <<$titsize>>'
 	else
 		$RESULT = FUNC('$bra_image', $braworntype, brawornnumber)
-		!Kevin, please edit this line. I can not find bra description		
+		!Kevin, please edit this line. I can not find bra description
 		!$body_image_msg += 'You are wearing ' + FUNC('$shoe_description', $shoeworntype) + '<<shoewornnumber>>.'
 		$body_image_msg += 'You are wearing <<$braworntype>> bra <<brawornnumber>>. Your breasts would be considered an EU <<$titsize>>'
 	end

+ 2 - 2
locations/abduction.qsrc

@@ -495,7 +495,7 @@ if $ARGS[0] = 'abdEscapeWindow3':
 	i = rand(1, 3)
 	gs 'underwear', 'wear'
 	gs 'underwear', 'dispose'
-	gs 'clothing' 'wear_last_worn'
+	gs 'clothing', 'wear_last_worn'
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/midnowhere<<i>>.jpg"></center>'
 	'Pulling on your clothes as you run you finally think you are far enough away and try to find your bearings.'
 	'Any underwear you had with you is lost but that''s a small price to pay for your freedom.'
@@ -1020,7 +1020,7 @@ if $ARGS[0] = 'abdSoldSauna':
 	'"Yes madame."'
 	'"I am not a bad person. If you earn me at least five times more, I may let you go."'
 	'With this faint sign of hope she leaves.'
-	workDolg = 100000
+	workDolg = 40000
 
 	painkiller = painkiller_bak
 	prezik = prezik_bak

+ 9 - 1
locations/anushapt.qsrc

@@ -44,6 +44,14 @@ if $ARGS[0] = 'home':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -620,7 +628,7 @@ if $ARGS[0] = 'bed':
 	*clr
 	gs 'stat'
 	if AnushkaLoc = 2:
-		'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/nushbed.jpg"></center>'
+		'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 		'Anushka sits on her bed and waves you over to sit next to her. You quickly jump up on the bed next to her.'
 		act 'Chat': gt 'anushapt', 'chat'
 	else

+ 20 - 13
locations/artemEv.qsrc

@@ -102,7 +102,7 @@ if $ARGS[0] = 'learn':
 		'During your homework session, you notice Artem''s gaze wander a few times. He''s glancing at your feet and chest, whenever he thinks you''re not looking.'
 	end
 
-	if (pav_slut >= 50 and artemblag = 0) or artQW = 5:
+	if (pav_slut >= 125 and artemblag = 0) or artQW = 5:
 		if artemBJQW = 0 and (artemsex = 0 or artQW = 5):
 			cla
 			if artQW = 5:
@@ -665,25 +665,26 @@ if $ARGS[0] = 'learn':
 		end
 	end
 
-	if (artQW = 3 or artQW = 20) and artemkissday ! daystart and (pav_slut < 50 or artemblag = 1):
+	if (artQW = 3 or artQW = 20) and artemkissday ! daystart and (pav_slut < 125 or artemblag = 1):
 		'After you finish doing your homework with Artem, he closes his eyes and puckers his lips as he leans towards you. He wants to kiss you.'
 		act 'Kiss Artem': gt 'artemEv','kiss'
 	end
 end
 
 if $ARGS[0] = 'kiss':
-	'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss.jpg"></center>'
-	'You smile, and slowly move your face towards Artem''s. Artem reads your signal and leans in, softly kissing your <<$liptalk3>>.'
-	'When you finally end the kiss, he shyly says: "<<$pcs_nickname>>, I really like you."'
+	*clr & cla
 	pcs_horny += 10
 	minut += 5
+	gs 'stat'
 	artemkissday = daystart
-	if pav_slut >= 50 and artemblag = 0:
-		cla
-		'Artem stops you when you try to kiss him: "I don''t think so <<$pcs_nickname>>, I''ve heard way too many stories about where that mouth has been. You can still use it on me, though..."'
-		'He lets those words linger in the air for a second, and then unbuttons his pants and pulls out his erect cock.'
-		act 'Suck him off': gt 'artemEv','bj'
+
+	if pav_slut < 125:
+		'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss.jpg"></center>'
+		'You smile, and slowly move your face towards Artem''s. Artem reads your signal and leans in, softly kissing your <<$liptalk3>>.'
+		'When you finally end the kiss, he shyly says: "<<$pcs_nickname>>, I really like you."'
 	end
+	
+	act 'Just hang out':gt 'artemhome','inside'
 
 	if artemtimes >= 20 and leghumpArtem = 0:
 		'Artem trips over his words when he tries to suggest something: "<<$pcs_nickname>>, maybe we could... maybe I... I really want you... can I touch your ass? Please?"'
@@ -769,6 +770,7 @@ if $ARGS[0] = 'kiss':
 				npc_sex['A2'] += 1
 				bja += 1
 				gs 'arousal','bj',5
+				gs 'stat'
 
 				if mesec > 0:
 					if artemanal > 0:
@@ -891,9 +893,14 @@ if $ARGS[0] = 'kiss':
 			end
 		end
 	end
-	gs 'stat'
-
-	act 'Just hang out':gt 'artemhome','inside'
+	
+	if pav_slut >= 125 and artemblag = 0:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+		'Artem stops you when you try to kiss him: "I don''t think so <<$pcs_nickname>>, I''ve heard way too many stories about where that mouth has been. You can still use it on me, though..."'
+		'He lets those words linger in the air for a second, and then unbuttons his pants and pulls out his erect cock.'
+		act 'Suck him off': gt 'artemEv','bj'
+	end
 end
 
 

+ 22 - 22
locations/artemhome.qsrc

@@ -95,6 +95,8 @@ if $ARGS[0] = 'inside':
 		end
 	end
 
+	act 'Leave Artem''s apartment': gt 'artemhome','leave', 1 
+					
 	if artQW = 2:
 		!!took the flowers but not wanker Artem
 		artcooldown += 1
@@ -112,7 +114,27 @@ if $ARGS[0] = 'inside':
 		'Artem invites you to sit next to him on the bed.'
 		act 'Kiss Artem': gt 'artemEv','kiss'
 	end
+	
+	if talkartemday ! daystart and artQW ! 5:
+		act 'Chat with Artem':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+			'You talk with Artem for an hour, about various topics. Or rather: you''re doing most of the talking, and Artem is mostly listening to you talk. Occasionally he pitches in though, and you can tell he''s a very smart guy. You even learn a thing or two.'
+			artemtimes += 1
+			talkartemday = daystart
+			lern += rand(3, 6)
+			intel_exp += rand(1, 2)
+			comphckng_exp += rand(1,3)
+			minut += 60
+			pcs_mood += 10
+			gs 'stat'
 
+			act 'Continue':gt 'artemhome','inside'
+		end
+	end
+	
+	if lernHome > 0:act 'Do homework with Artem': gt 'artemEv','learn'
+	
 	if dimaFilm > 0 and arthakQW = 0 and pcs_vag > 0:
 		act 'Ask Artem to steal the video Dimka filmed of you':
 			*clr & cla
@@ -159,28 +181,6 @@ if $ARGS[0] = 'inside':
 			end
 		end
 	end
-
-	if talkartemday ! daystart and artQW ! 5:
-		act 'Chat with Artem':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
-			'You talk with Artem for an hour, about various topics. Or rather: you''re doing most of the talking, and Artem is mostly listening to you talk. Occasionally he pitches in though, and you can tell he''s a very smart guy. You even learn a thing or two.'
-			artemtimes += 1
-			talkartemday = daystart
-			lern += rand(3, 6)
-			intel_exp += rand(1, 2)
-			comphckng_exp += rand(1,3)
-			minut += 60
-			pcs_mood += 10
-			gs 'stat'
-
-			act 'Continue':gt 'artemhome','inside'
-		end
-	end
-
-	if lernHome > 0:act 'Do homework with Artem': gt 'artemEv','learn'
-
-	act 'Leave Artem''s apartment': gt 'artemhome','leave', 1 
 end
 
 !lied to artem about the content of the vide

+ 8 - 8
locations/backwater.qsrc

@@ -1,8 +1,8 @@
 # backwater
 
 $location_type = 'secluded'
-$metka = $ARGS[0]
-$loc = $CURLOC
+$metka = ''
+$loc = 'backwater'
 gs 'gadukino_event', 'sound'
 cls
 gs'stat'
@@ -23,7 +23,7 @@ if $clothingworntype = 'nude' and hantersKnowSlut = 0 and hanters = 1 and hour >
 			cls
 			minut += 5
 			gs 'underwear', 'wear'
-			gs 'clothing', 'recover_lost_clothes', $CURLOC, 1
+			gs 'clothing', 'recover_lost_clothes', 'backwater', 1
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude1.jpg"></center>'
 			'Noticing the hunter, you rush over to your clothes and begin dressing yourself in panic. As you get fully dressed, you look over your shoulder, expecting the hunter standing there, but there is no one there.'
@@ -86,7 +86,7 @@ if clothesAtLocation = 0:
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterundress.jpg"></center>'
 				end
-				gs 'clothing', 'strip', $CURLOC
+				gs 'clothing', 'strip', 'backwater'
 				'You do not hesitate getting undressed, not caring if anyone is watching.'
 				act'Back':gt'backwater'
 			else
@@ -103,7 +103,7 @@ else
 		act 'Pick up your clothes':
 			cla
 			*clr
-			gs 'clothing', 'recover_lost_clothes', $CURLOC
+			gs 'clothing', 'recover_lost_clothes', 'backwater'
 			'You pick up your clothes laying on the ground.'
 			gt $loc, $metka
 		end
@@ -111,7 +111,7 @@ else
 		act 'Get dressed':
 			cla
 			*clr
-			gs 'clothing', 'recover_lost_clothes', $CURLOC, 1
+			gs 'clothing', 'recover_lost_clothes', 'backwater', 1
 			gs 'underwear', 'wear'
 			'You pick up your clothes laying on the ground and get dressed.'
 			gt $loc, $metka
@@ -174,7 +174,7 @@ if $clothingworntype = 'nude':
 				*clr
 				minut += 5
 				clearclothes = 5
-				gs 'clothing','recover_lost_clothes',$CURLOC, 1
+				gs 'clothing','recover_lost_clothes','backwater', 1
 				gs 'clothing', 'strip', 'swamphouse'
 				if $clothingworntype = 'nude':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basinwash1.jpg"></center>'
@@ -191,7 +191,7 @@ if $clothingworntype = 'nude':
 					*clr
 					minut += 10
 					clearclothes = 3
-					gs 'clothing','recover_lost_clothes',$CURLOC, 1
+					gs 'clothing','recover_lost_clothes','backwater', 1
 					gs 'clothing', 'strip', 'clothesline_swamp'
 					if $clothingworntype = 'nude':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basinwash2.jpg"></center>'

+ 4 - 0
locations/bank.qsrc

@@ -8,6 +8,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/barbershop.qsrc

@@ -53,6 +53,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/bass.qsrc

@@ -12,6 +12,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/bedr.qsrc

@@ -22,6 +22,10 @@ if night_mode = 1:
 	fcolor = rgb(255, 255, 255)
 	bcolor = rgb(0, 0, 0)
 	lcolor = rgb(106, 90, 205)
+elseif night_mode = 2:
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(20, 20, 20)
+	lcolor = rgb(106, 90, 205)
 else
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/bedr2x.qsrc

@@ -19,6 +19,10 @@ if night_mode = 1:
 	fcolor = rgb(255, 255, 255)
 	bcolor = rgb(0, 0, 0)
 	lcolor = rgb(106, 90, 205)
+elseif night_mode = 2:
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(20, 20, 20)
+	lcolor = rgb(106, 90, 205)
 else
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)

+ 60 - 31
locations/bedrPar.qsrc

@@ -14,6 +14,10 @@ if night_mode = 1:
 	fcolor = rgb(255, 255, 255)
 	bcolor = rgb(0, 0, 0)
 	lcolor = rgb(106, 90, 205)
+elseif night_mode = 2:
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(20, 20, 20)
+	lcolor = rgb(106, 90, 205)
 else
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)
@@ -99,9 +103,9 @@ if popugai2 = 1:
 	*nl
 end
 if budilnikOn = 0:
-	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <<timer>>:<<timerM>> and is currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
+	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
 else
-	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <<timer>>:<<timerM>> and is currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
+	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
 end
 
 if tabletki > 0 and prezik + prezikcount + preziksabo > 0:
@@ -243,19 +247,12 @@ if sisterHere = 0 and breastpump = 1 and bp_unbox <= 0:
 	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
 elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:
 	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
-elseif sisterHere = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inbition < 40:
+elseif sisterHere = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inbition > 40:
 	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Try out</a> your breast pump'
 elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inbition > 30:
 	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Try out</a> your breast pump'
 end
-if breastcounter <= 0:
-	temp_var = 50
-else
-	temp_var = (50/breastcounter)
-end
-if breastpump <= 0 and pcs_horny >= temp_var:
-	act 'Massage your breasts': gt 'lact_lib','man_milking'
-end
+gs 'lact_lib', 'massage'
 
 if pcs_sleep <= 80:
 	if $clothingworntype = 'nude':
@@ -290,41 +287,73 @@ end
 
 if $ARGS[0] = 'intro':
 	cla & *clr
+	$metka = ''
+	$loc = 'korrPar'
+	$temp_nickname = '<<$npc_nickname[''A29'']>>'
+	monthbabkapay = month
 	menu_off = 1
-	minut += 5
+	hour = 6
 	gs 'stat'
+	'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
 	*nl
 	'All of a sudden you hear a familiar voice yell out, "<<$pcs_nickname>>, time to get up. You can''t spend the whole day laying around!"'
 	wait 2000
-	$npc_nickname['A29'] = input('<center>What name do you address your mother by?<br><br>Mother (default), Mum, Mom, Mama, etc.</center>')
+	$npc_nickname['A29'] = input('<center>What name do you address your mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
+	if $npc_nickname['A29'] = '':$npc_nickname['A29'] = '<<$temp_nickname>>'
+	killvar '$temp_nickname'
 
 	act 'Continue':
 		cla & *clr
-		menu_off = 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
+		minut += 2
+		gs 'stat'
+		'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
 		*nl
-		'You tiredly open your eyes seeing your <<$npc_nickname[''A29'']>>, standing over you, "Fifteen more minutes..."'
-		'<<$npc_nickname[''A29'']>> lets out a loud sigh, "No, up now!" as she yanks the cover off...'
-		'"<<$npc_nickname[''A29'']>>!" you let out as you feel a slight cold breeze hit your body.'
-		'"No excuses, <<$pcs_nickname>>. The summer holidays will be over soon and you need to get used to getting up early, for when school starts. So, from now on set your alarm on so you can wake up at a reasonable time." <<$npc_nickname[''A29'']>> says as she storms out of the room...'
-
+		'You tiredly open your eyes seeing your <<$npc_nickname[''A29'']>> standing over you, "Fifteen more minutes..."'
+		'Your <<$npc_nickname[''A29'']>> lets out a loud sigh, "No, up now!" as she yanks the cover off...'
+		'"<<$npc_nickname[''A29'']>>!" you exclaim, as you feel a slight cold breeze hit your body.'
+		'"No excuses, <<$pcs_nickname>>. The summer holidays will be over soon and you need to get used to waking up early, for when school starts. So, from now on set your alarm, so you can wake up at a reasonable time." <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
 		act 'Get up':
 			cla & *clr
-			minut += 5
+			minut += 2
 			gs 'stat'
+			'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
 			*nl
-			'As soon as you step out of your room, your <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "Summer is almost over, you can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
-			'"What are you going to do when school starts, or when you get a job? Better get into the habit of setting your alarm so you can wake up bright and early."'
-			'You let out an exasperated sigh, "Yeah, yeah I know, you told me that already. So, how early are we talking?"'
-			'Your <<$npc_nickname[''A29'']>> shoots you a sharp look and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right...Anya used to wake up at 06:00 for school."'
-			'"You want me to wake up that early?!" You huff. "Can''t I wake up at like... 07:00?"'
-			'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns you before making her way towards the kitchen. "Oh, don''t forget: you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month," she adds quickly.'
-			'"But why do I--"'
-			'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?"'
-
-			act 'I understand...':gt 'budilnik', 'start'
+			'As soon as you get off your now coverless bed, your <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "Summer is almost over, you can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
+			'"What are you going to do when school starts, or when you get a job? You better get into the habit of setting your alarm so you can wake up bright and early."'
+			act 'Continue':
+				cla & *clr
+				minut += 2
+				gs 'stat'
+				'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
+				*nl
+				'You let out an exasperated sigh, "Yeah, yeah I know, you told me that already. So, how early are we talking?"'
+				'Your <<$npc_nickname[''A29'']>> shoots you a sharp look and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right...Anya used to wake up at 06:00 for school."'
+				act 'Continue':
+					cla & *clr
+					minut += 2
+					gs 'stat'
+					'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
+					*nl
+					'"You want me to wake up that early?!" You huff. "Can''t I wake up at like... 07:00?"'
+					'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns you before making her way towards the kitchen. "Oh, don''t forget; you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month," she adds quickly.'
+					act 'But why do I--':
+						cla & *clr
+						minut += 2
+						gs 'stat'
+						'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
+						*nl
+						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" <<$npc_nickname[''A29'']>> says as she storms out of the room, without giving you a chance to respond..'
+
+						act 'I understand...':gt 'budilnik', 'start'
+					end
+				end
+			end
 		end
 	end
 end

+ 4 - 0
locations/bedrPar2.qsrc

@@ -15,6 +15,10 @@ if $ARGS[0] = '':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 1 - 1
locations/begin.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">CHOOSE GAME START</font></b></center>'
 	*nl
 	'<b>Transformation Start:</b>'
-	'You are Michael Kuznetsov, a fairly average, 35 year old businessman who finds an artefact that changes everything about him and his life. Features magic.'
+	'You are Mikhail Kuznetsov, a fairly average, 35 year old businessman who finds an artefact that changes everything about him and his life. Features magic.'
 	*nl
 	'<b>School girl Start:</b>'
 	'You are a school girl in the most lustful town in Russia. Will you study hard and keep your purity for that special someone or become a sex addicted whore? Or anything in between, the possibilities are endless. No magic.'

+ 8 - 10
locations/bicycle.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'sarai':
 	else
 		'You notice an old bike. It looks like it''s still in a good condition, you can probably ride it without any trouble.'
 	end
-		
+
 	if hour >= 6 and hour <= 20 and sunWeather = 1 and month >= 4 and month <= 10:
 		if findvelday ! daystart:
 			act 'Ride the bike (1:00)':
@@ -132,18 +132,18 @@ if $ARGS[0] = 'forest':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
 
 	act 'Bike to the village (0:25)':
-		dirtyclothes = 0 & swamp_clothes = 0
+		dirtyclothes = 0
+		gs 'clothing', 'swamp_clothes', 0
 		if $clothingworntype ! 'nude' or pcs_inhib > 50:
 			cls
 			pcs_mood += 10
 			findvel = 1
 			minut += 25
 			inhib_exp += 4
-			gs'stat'
-
 			gs 'bicycle', 'clothes_findvel'
 			'You ride your bike out of the forest and return to the village.'
 			gs 'bicycle', 'ridego', 'Gaddvor'
+			gs'stat'
 		else
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel_nude.jpg"></center>'
@@ -182,7 +182,8 @@ if $ARGS[0] = 'swamp':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
 
 	act 'Bike to the village (1:15)':
-		dirtyclothes = 0 & swamp_clothes = 0
+		dirtyclothes = 0
+		gs 'clothing', 'swamp_clothes', 0
 		if $clothingworntype ! 'nude' or pcs_inhib > 50:
 			cls
 			minut += 75
@@ -194,13 +195,11 @@ if $ARGS[0] = 'swamp':
 			findvel = 1
 			hanters = 0
 			inhib_exp += 4
-			gs'stat'
 			!gs'time'
-
 			gs 'bicycle', 'clothes_findvel'
 			'You ride your bike out of the swamp and return to the village.'
-
 			gs 'bicycle', 'ridego', 'Gaddvor'
+			gs'stat'
 		else
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel_nude.jpg"></center>'
@@ -214,12 +213,11 @@ if $ARGS[0] = 'swamp':
 		pcs_mood += 5
 		hanters = 0
 		findvel = 2
-		gs'stat'
 		!gs'time'
-
 		gs 'bicycle', 'clothes_findvel'
 		'You jump onto your bike and ride to the forest.'
 		gs 'bicycle', 'ridego', 'gadforest','1'
+		gs'stat'
 	end
 	act 'Put the bike aside': gt'swamp_yard'
 end

+ 5 - 5
locations/bras.qsrc

@@ -158,10 +158,12 @@ if $ARGS[0] = 'view_bra_item':
 	else
 		if $ARGS[1] ! 'bathroom':
 			if metka_bras ! 1:$RESULT += 'Move these bras to <a href="exec:gt ''bras'', ''dest1'', ''<<$ARGS[1]>>'', ''<<$ARGS[2]>>'', <<ARGS[3]>>">Storage</a><BR>'
-			if metka_bras ! 0:$RESULT += 'Move these bras to  <a href="exec:gt ''bras'', ''dest0'', ''<<$ARGS[1]>>'', ''<<$ARGS[2]>>'', <<ARGS[3]>>">Wardrobe</a><BR>'
-			if metka_bras ! 2:$RESULT += 'Move these bras to  <a href="exec:gt ''bras'', ''dest2'', ''<<$ARGS[1]>>'', ''<<$ARGS[2]>>'', <<ARGS[3]>>">Unwanted</a>'
+			if metka_bras ! 0:$RESULT += 'Move these bras to <a href="exec:gt ''bras'', ''dest0'', ''<<$ARGS[1]>>'', ''<<$ARGS[2]>>'', <<ARGS[3]>>">Wardrobe</a><BR>'
+			if metka_bras ! 2:$RESULT += 'Move these bras to <a href="exec:gt ''bras'', ''dest2'', ''<<$ARGS[1]>>'', ''<<$ARGS[2]>>'', <<ARGS[3]>>">Unwanted</a>'
 		end
 
+		act 'Return':gt 'bras', 'view_bra_list', $ARGS[1]
+		
 		if $ARGS[1] = 'store':
 			'This bra is in storage.'
 		elseif $ARGS[1] = 'unwanted':
@@ -181,9 +183,7 @@ if $ARGS[0] = 'view_bra_item':
 						end
 					end
 				end
-			end
-
-			act 'Return':gt 'bras', 'view_bra_list', $ARGS[1]
+			end	
 		end
 	end
 end

+ 5 - 0
locations/brother.qsrc

@@ -37,6 +37,11 @@ if npc_QW['A34'] > 20 and npc_QW['A34'] < 25: npc_QW['A34'] = 20
 ! BrotherNo:
 ! brother_ev1
 ! brotherConfidence: if it is over 10 he might try and touch you during a homework (not used yet)
+! npc_know_sveta_lact['A34'] = 0 - Kolka does not know sveta is lactating
+! npc_know_sveta_lact['A34'] = 1 - Kolka does know sveta is lactating
+! npc_know_sveta_lact['A34'] = 2 - Kolka does know that sveta was lactating
+! npc_breastfeed_by_sveta['A34'] = 0 or 1 - Kolka was no/was breastfeed by sveta
+! npc_tasted_sveta_milk['A34'] = 0 or 1 - Does Kolka know how svetas breastmilk taste? 0 = no, 1 = yes
 
 if $ARGS[0] = 'start':
 	gs 'stat'

+ 217 - 32
locations/brother_lessons.qsrc

@@ -357,6 +357,7 @@ if $ARGS[0] = 'anatomylesson1':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/5.jpg"></center>'
 					'	Eventually, Kolka has traced out all the arteries and veins you have and you bring the lesson to a close.'
+					if lactate > 0: '	He even traces every vein and artery that can be seen through your breasts skin.'
 					'	You quickly sit up to hide the growing wetness between you legs and ask him, "So how was that? Do you think you have a better understanding of the material now?"'
 					'	"Yeah!" he says excitedly. "I think I get it now! You really helped me out <<$pcs_nickname>>!" He unexpectedly wraps his arms around you, giving you a big hug. You''re surprised by this, mostly because you weren''t expecting him to do something like this while you were still naked.'
 					'	"You''re the best sister ever!" he cries.'
@@ -399,25 +400,120 @@ if $ARGS[0] = 'anatomylesson2':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
 				'	A few awkward long moments go by of Kolka closely examining your breasts and nipples before you realize that he''s not going to sit back down. You sigh and figure you might as well get on with the lesson in the mean time. At least he''ll be able to see them clearly.'
-				'	"So... Like I was saying, women have breasts because of babies. When a woman is pregnant, her breasts start to produce milk which is then used to feed her newborn."'
-				'	"How does the milk come out?" Kolka asks, now inspecting your breasts from multiple angles. "Do you squeeze it and milk it out like cows?"'
-				'	You sputter in laughter saying, "What? No, silly! That would be really painful because girls nipples are very sensitive! No, the baby suckles, meaning they just use their mouth and suck to draw the milk out. That''s why they call it ''breastfeeding.''"'
-				'	"Oh! So you mean like this?" and before you can stop him, Kolka leans in to put your nipple in his mouth and starts sucking.'
+				if lactate > 0 and kid <= 0:
+					'	"So... Like I was saying, women have breasts because of babies. When a woman is pregnant, her breasts start to produce milk which is then used to feed her newborn. In some cases, there can also be milk without having a baby."'
+				elseif lactate > 0 and kid > 0:
+					if npc_know_sveta_lact['A34'] = 1 or npc_know_sveta_lact['A34'] = 2:
+						'	"So... Like I was saying, women have breasts because of babies. When a woman is pregnant, her breasts start to produce milk which is then used to feed her newborn. You probably saw me doing this from time to time."'
+					else
+						'	"So... Like I was saying, women have breasts because of babies. When a woman is pregnant, her breasts start to produce milk which is then used to feed her newborn."'
+					end
+				else
+					'	"So... Like I was saying, women have breasts because of babies. When a woman is pregnant, her breasts start to produce milk which is then used to feed her newborn."'
+				end
+				if npc_know_sveta_lact['A34'] = 1 or npc_know_sveta_lact['A34'] = 2:
+					if npc_breastfeed_by_sveta['A34'] >= 1 and kid >= 0:
+						'	Kolka inspecting your breasts from multiple angles. "Yeah, I remember. Your milk tasted good."'
+						'	You blush a bit, remembering how you breastfeed Kolka. "Uhm yes, but we are doing this here for school, so you bettern don''t write that down somewhere. So the baby latches out with the mouth here an then sucks to draw out the milk."'
+						'	"Oh! Like this?" and before you can stop him, Kolka leans in to put your nipple in his mouth and starts sucking.'
+					elseif npc_breastfeed_by_sveta['A34'] <= 0 and kid >= 1:
+						'	Kolka inspecting your breasts from multiple angles. "Yeah, I remember. The baby sucked on your breast."'
+						'	You nod at Kolka. "Exactly. So the baby latches out with the mouth here an then sucks to draw out the milk." Your finger points to your nipples.'
+						'	"Oh! Like this?" and before you can stop him, Kolka leans in to put your nipple in his mouth and starts sucking.'
+					else
+						'	"How does the milk come out?" Kolka asks, now inspecting your breasts from multiple angles. "Do you squeeze it and milk it out like cows?"'
+						'	You sputter in laughter saying, "What? No, silly! That would be really painful because girls nipples are very sensitive! No, the baby suckles, meaning they just use their mouth and suck to draw the milk out. That''s why they call it ''breastfeeding.''"'
+						'	"Oh! So you mean like this?" and before you can stop him, Kolka leans in to put your nipple in his mouth and starts sucking.'
+					end
+				else
+					'	"How does the milk come out?" Kolka asks, now inspecting your breasts from multiple angles. "Do you squeeze it and milk it out like cows?"'
+					'	You sputter in laughter saying, "What? No, silly! That would be really painful because girls nipples are very sensitive! No, the baby suckles, meaning they just use their mouth and suck to draw the milk out. That''s why they call it ''breastfeeding.''"'
+					'	"Oh! So you mean like this?" and before you can stop him, Kolka leans in to put your nipple in his mouth and starts sucking.'
+				end
 				act'"Hey! Stop that!"':
 					cla & *clr
 					pcs_horny += 20
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
-					'	You push him back immediately. "Hey! What do you think you''re doing?! You can''t just do that to a girl!"'
-					'	"But you were sayin-"'
-					'	"I know what I was saying! You''re not a baby Kolka. You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. "... girl''s nipples are very sensitive..."'
-					'	"Oh." he says very matter of factly. "Right. You did just say that. I forgot. I''m sorry <<$pcs_nickname>>."'
-					'	"It''s okay," you reply, gently massaging your nipple and trying your best not to accidentally wipe your love juice on anything. "Just, don''t do that so suddenly like that okay? At least ask next time."'
-					'	"Wait so if I ask I can do it?" he pipes up.'
-					'	"No!" you say with a stern smile. "I mean... I''ll think about it. But expect the answer to be more likely no than yes okay?"'
-					'	"Mkay," he says, while writing down some things in his notebook.'
-					'	<i><b>sigh</b> Boys...</i>'
-					'	Looking at the next part of the homework it talks about the anatomy of the vulva but doesn''t go on to the internals. At least you''ll be able to use your arousal for the lesson now..."'
+					temp_var = func('lact_lib','$get_breastmilk', 0, 1)
+					'<<temp_var>>'
+					milkedvolume = temp_var/6
+					if lactate > 0 and milkedvolume >=5:
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
+						'	You push him back immediately. "Hey! What do you think you''re doing?! You can''t just do that to a girl!"'
+						'	"But you were sayin-"'
+						if npc_breastfeed_by_sveta['A34'] <= 0:
+							'	"I know what I was saying! You''re not a baby Kolka. You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. Your nipple tingles, that means that Kolka probably got some milk out "... girl''s nipples are very sensitive..."'
+						else
+							'	"I know what I was saying! You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. Your nipple tingles, that means that Kolka probably got some milk out "... girl''s nipples are very sensitive..."'
+						end
+						'	"Oh." he says very matter of factly. "Right. You did just say that. I forgot. I''m sorry <<$pcs_nickname>>."'
+						'	"It''s okay," you reply, gently massaging your nipple and trying your best not to accidentally wipe your love juice on anything. "Just, don''t do that so suddenly like that okay? At least ask next time."'
+						'	"Wait so if I ask I can do it?" he pipes up.'
+						'	"No!" you say with a stern smile. "I mean... I''ll think about it. But expect the answer to be more likely no than yes okay?"'
+						'	"Mkay," he says, while writing down some things in his notebook.'
+						if npc_know_sveta_lact['A34'] = 0 and npc_tasted_sveta_milk['A34'] <= 0:
+							'	During writing Kolka licks his lips "I didn''t know you had milk in your breasts. It tastes good!"'
+						elseif npc_know_sveta_lact['A34'] = 0 and npc_tasted_sveta_milk['A34'] >= 1:
+							'	During writing Kolka licks his lips "Wow ... I didn''t know you had milk in your breasts... and it tastes familiar..."'
+						elseif npc_know_sveta_lact['A34'] = 1 and npc_tasted_sveta_milk['A34'] >= 1:
+							'	During writing Kolka licks his lips and adds "Your milk tastes way better from the source...".'
+						elseif npc_know_sveta_lact['A34'] = 1 and npc_tasted_sveta_milk['A34'] <= 0:
+							'	During writing Kolka licks his lips and adds "Hmm - I didn''t think your milk would taste so good...".'
+						elseif npc_know_sveta_lact['A34'] = 2 and npc_tasted_sveta_milk['A34'] >= 1:
+							'	During writing Kolka licks his lips and adds "I didn''t know you had milk again..."'
+							npc_know_sveta_lact['A34'] = 1
+						elseif npc_know_sveta_lact['A34'] = 2 and npc_tasted_sveta_milk['A34'] <= 0:
+							'	During writing Kolka licks his lips and adds "I didn''t know you had milk again...and it tastes really good."'
+							npc_know_sveta_lact['A34'] = 1
+						else
+							'	During writing Kolka licks his lips and adds "Hmm - I didn''t think your milk would taste so good...".'
+						end
+						'	You slap him on the back of his head playfully. "shh - stop that now."'
+						'	<i><b>sigh</b> Boys...</i>'
+						'	Looking at the next part of the homework it talks about the anatomy of the vulva but doesn''t go on to the internals. At least you''ll be able to use your arousal for the lesson now..."'
+						npc_tasted_sveta_milk['A34'] = 1
+					elseif lactate > 0 and milkedvolume < 5:
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
+						'	You push him back immediately. "Hey! What do you think you''re doing?! You can''t just do that to a girl!"'
+						'	"But you were sayin-"'
+						if npc_breastfeed_by_sveta['A34'] <= 0:
+							'	"I know what I was saying! You''re not a baby Kolka. You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. "... girl''s nipples are very sensitive..."'
+						else
+							'	"I know what I was saying! You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. "... girl''s nipples are very sensitive..."'
+						end
+						if npc_know_sveta_lact['A34'] <= 0:
+							'	You can tell that no milk came out, but you were nervous for a moment for him to find out about your lactation.'
+						elseif npc_know_sveta_lact['A34'] = 1 and npc_breastfeed_by_sveta['A34'] <= 0:
+							'	You can tell that no milk came out, but you were nervous for a moment for him to find out about your lactation. You don''t feel like breastfeeding Kolka at the moment.'
+						elseif npc_know_sveta_lact['A34'] = 2:
+							'	You can tell that no milk came out, but you were nervous for a moment for him to find out that you are lactation again.'
+						end
+						'	"Oh." he says very matter of factly. "Right. You did just say that. I forgot. I''m sorry <<$pcs_nickname>>."'
+						'	"It''s okay," you reply, gently massaging your nipple and trying your best not to accidentally wipe your love juice on anything. "Just, don''t do that so suddenly like that okay? At least ask next time."'
+						'	"Wait so if I ask I can do it?" he pipes up.'
+						'	"No!" you say with a stern smile. "I mean... I''ll think about it. But expect the answer to be more likely no than yes okay?"'
+						'	"Mkay," he says, while writing down some things in his notebook.'
+						'	<i><b>sigh</b> Boys...</i>'
+						'	You '
+						'	Looking at the next part of the homework it talks about the anatomy of the vulva but doesn''t go on to the internals. At least you''ll be able to use your arousal for the lesson now..."'
+					else
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
+						'	You push him back immediately. "Hey! What do you think you''re doing?! You can''t just do that to a girl!"'
+						'	"But you were sayin-"'
+						'	"I know what I was saying! You''re not a baby Kolka. You can''t just start sucking on someone''s nippes like that. I told you..." you trail off, nervously noticing the wetness beginning to seep from your pussy. "... girl''s nipples are very sensitive..."'
+						'	"Oh." he says very matter of factly. "Right. You did just say that. I forgot. I''m sorry <<$pcs_nickname>>."'
+						'	"It''s okay," you reply, gently massaging your nipple and trying your best not to accidentally wipe your love juice on anything. "Just, don''t do that so suddenly like that okay? At least ask next time."'
+						'	"Wait so if I ask I can do it?" he pipes up.'
+						'	"No!" you say with a stern smile. "I mean... I''ll think about it. But expect the answer to be more likely no than yes okay?"'
+						'	"Mkay," he says, while writing down some things in his notebook.'
+						if npc_know_sveta_lact['A34'] = 1:
+							'	Kolka looks up at you for a moment "Did you stop having milk?"'
+							'	You nod at Kolka and tell him to concentrate on the studies.'
+							npc_know_sveta_lact['A34'] = 2
+						end
+						'	<i><b>sigh</b> Boys...</i>'
+						'	Looking at the next part of the homework it talks about the anatomy of the vulva but doesn''t go on to the internals. At least you''ll be able to use your arousal for the lesson now..."'
+					end
 					act'Continue the lesson':gt'brother_lessons', 'anatomylesson3'
 				end
 
@@ -425,22 +521,111 @@ if $ARGS[0] = 'anatomylesson2':
 					cla & *clr
 					pcs_horny += 40
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
-					'	"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
-					'	Your brother continues to suck on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure.'
-					'	He pulls his lips off with a pop. "Huh. Why isn''t any milk coming out?" he asks. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
-					'	"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
-					'	After another minute of sucking and squirming, your brother finally relents. "<<$pcs_nickname>>, I thought you said milk came out. I''ve been sucking all this time and nothing''s come out. Why''s that?" Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
-					act'Continue':
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
-						'	"Kolka..." you sigh deeply before continuing. "First of all, you can''t just suck on a girl''s nipples like that! I told you..." you trail off, taking notice of the love juices dripping from your snatch and nervously smiling. "... they''re very sensitive... Second of all, I''m not pregnant dummy! Breasts only produce milk if you''re pregnant or recently gave birth."'
-						'	"Oh. Sorry."'
-						'	"It''s okay... It felt kind of good to be honest..." you admit with some embarrassment. "Just... ask next time? Please?"'
-						'	"Okay <<$pcs_nickname>>," he says, writing some things down in his notebook.'
-						'	You sigh again. Taking a look in the textbook, it says the next part of the homework is about the external female organs: the vulva. You slyly smile to yourself.'
-						'	<i>Well, at least I didn''t get wet for nothing.</i>'
-						act'Continue the lesson':gt'brother_lessons', 'anatomylesson3'
+					if lactate > 0:
+						milkedvolume = func('lact_lib','$get_breastmilk', 0, 5)
+						milkedvolume += func('lact_lib','$get_breastmilk', 5, 5)
+						if npc_know_sveta_lact['A34'] <= 0:
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
+							'	"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
+							'	Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure. You can tell that his definately getting out your breast milk.'
+							'	He pulls his lips off with a pop. "Wow! There really is any milk coming out!" he says surprised. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
+							'	"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
+							'	After 5 minutes of sucking and squirming, your brother finally stops. "<<$pcs_nickname>>, I didn''t know you had milk - and it is so delicious!"'
+							if milkedvolume >= 500:'	He goes on "... and there is so much of it!'
+							'	Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
+							npc_know_sveta_lact['A34'] = 1
+							npc_breastfeed_by_sveta['A34'] = 1
+						elseif npc_know_sveta_lact['A34'] = 1 and npc_breastfeed_by_sveta['A34'] <= 0:
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
+							'	"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
+							'	Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure. You can tell that his definately getting out your breast milk.'
+							'	He pulls his lips off with a pop. "Wow! This milk tastes so good!" he says energetic. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
+							'	"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
+							'	After 5 minutes of sucking and squirming, your brother finally stops. "<<$pcs_nickname>>, it is so delicious, I want seconds!"'
+							if milkedvolume >= 500:'	He goes on "... and you probably can make enough milk for that!'
+							'	Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
+						elseif npc_know_sveta_lact['A34'] = 2:
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
+							'	"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
+							'	Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure. You can tell that his definately getting out your breast milk.'
+							'	He pulls his lips off with a pop. "Wow! I didn''t know you had milk again - this milk tastes so good!" he says energetic. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
+							'	"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
+							'	After 5 minutes of sucking and squirming, your brother finally stops. "<<$pcs_nickname>>, it is so delicious, I want seconds!"'
+							if milkedvolume >= 500:'	He goes on "... and you probably can make enough milk for that!'
+							'	Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
+							npc_know_sveta_lact['A34'] = 1
+						else
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
+							'	"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
+							'	Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure. You can tell that his definately getting out your breast milk.'
+							'	He pulls his lips off with a pop. "Wow! This milk tastes so good!" he says energetic. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
+							'	"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
+							'	After 5 minutes of sucking and squirming, your brother finally stops. "<<$pcs_nickname>>, it is so delicious, I want seconds!"'
+							if milkedvolume >= 500:'	He goes on "... and you probably can make enough milk for that!'
+							'	Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
+						end
+						milkedvolume = 0
+						act'Continue':
+							cla & *clr
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
+							'	"Kolka..." you sigh deeply before continuing. "First of all, you can''t just suck on a girl''s nipples like that! I told you..." you trail off, taking notice of the love juices dripping from your snatch and nervously smiling. "... they''re very sensitive..."'
+							'	"Oh. Sorry."'
+							'	"It''s okay... It felt kind of good to be honest..." you admit with some embarrassment. "Just... ask next time? Please?"'
+							'	"Okay <<$pcs_nickname>>," he says, writing some things down in his notebook.'
+							if kid <= 0 and npc_know_sveta_lact['A34'] <= 0:
+								'	Kolka looks up for short "Wait ... haven''t you said only pregnant women have milk?'
+								'	You blush a bit "I also said, that it can happen under other circumstances...'
+							end
+							'	You sigh again. Taking a look in the textbook, it says the next part of the homework is about the external female organs: the vulva. You slyly smile to yourself.'
+							'	<i>Well, at least I didn''t get wet for nothing.</i>'
+							npc_know_sveta_lact['A34'] = 1
+							npc_breastfeed_by_sveta['A34'] = 1
+							npc_tasted_sveta_milk['A34'] = 1
+							act'Continue the lesson':gt'brother_lessons', 'anatomylesson3'
+						end
+					else
+						milkedvolume = func('lact_lib','$get_breastmilk', 0, 2)
+						milkedvolume += func('lact_lib','$get_breastmilk', 5, 2)
+						milkedvolume = 0
+						if npc_know_sveta_lact['A34'] = 1:
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
+							'	"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
+							'	Your brother continues to suck eagerly on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure.'
+							'	He pulls his lips off with a pop. "Huh. Why isn''t any milk coming out?" he asks. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
+							'	"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
+							'	After another minute of sucking and squirming, your brother finally relents. "<<$pcs_nickname>>, I thought your milk will come out. I''ve been sucking all this time and nothing''s come out. Why''s that?" Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
+							npc_know_sveta_lact['A34'] = 2
+							act'Continue':
+								cla & *clr
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
+								'	"Kolka..." you sigh deeply before continuing. "First of all, you can''t just suck on a girl''s nipples like that! I told you..." you trail off, taking notice of the love juices dripping from your snatch and nervously smiling. "... they''re very sensitive... Second of all, I don''t have milk anymore."'
+								'	"Oh. Sorry." Kolka looks a bit sad that no milk came.'
+								'	"It''s okay... It felt kind of good to be honest..." you admit with some embarrassment. "Just... ask next time? Please?"'
+								'	"Okay <<$pcs_nickname>>," he says, writing some things down in his notebook.'
+								'	You sigh again. Taking a look in the textbook, it says the next part of the homework is about the external female organs: the vulva. You slyly smile to yourself.'
+								'	<i>Well, at least I didn''t get wet for nothing.</i>'
+								act'Continue the lesson':gt'brother_lessons', 'anatomylesson3'
+							end
+							
+						else
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
+							'	"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
+							'	Your brother continues to suck on your nipple with increased vigor, now grabbing your other breast to use as leverage and keep his face close. You squirm under his advances, trying to push him off but you''re too weak, your body floundering in pleasure.'
+							'	He pulls his lips off with a pop. "Huh. Why isn''t any milk coming out?" he asks. At last! A respite! You start to catch your breath and just as you''re about to tell him not to do that again, he leans forward and starts sucking again.'
+							'	"Ahh~!" A cry briefly escapes your lips before you clamp your own hand over them to make sure the rest of your family doesn''t overhear you. You can only imagine your mother''s reaction if she came in to find your brother sucking on your tits like this.'
+							'	After another minute of sucking and squirming, your brother finally relents. "<<$pcs_nickname>>, I thought you said milk came out. I''ve been sucking all this time and nothing''s come out. Why''s that?" Then he notices your heavy breathing. "Hey, are you okay? Is there something wrong with you?"'
+							act'Continue':
+								cla & *clr
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/7.jpg"></center>'
+								'	"Kolka..." you sigh deeply before continuing. "First of all, you can''t just suck on a girl''s nipples like that! I told you..." you trail off, taking notice of the love juices dripping from your snatch and nervously smiling. "... they''re very sensitive... Second of all, I''m not pregnant dummy! Breasts only produce milk if you''re pregnant or recently gave birth."'
+								'	"Oh. Sorry."'
+								'	"It''s okay... It felt kind of good to be honest..." you admit with some embarrassment. "Just... ask next time? Please?"'
+								'	"Okay <<$pcs_nickname>>," he says, writing some things down in his notebook.'
+								'	You sigh again. Taking a look in the textbook, it says the next part of the homework is about the external female organs: the vulva. You slyly smile to yourself.'
+								'	<i>Well, at least I didn''t get wet for nothing.</i>'
+								act'Continue the lesson':gt'brother_lessons', 'anatomylesson3'
+							end
+						end
 					end
 				end
 			end
@@ -623,7 +808,7 @@ if $ARGS[0] = 'anatomylesson4':
 			act'Continue':
 				cla & *clr
 				'<center><video src="images/shared/sex/kuni/pussylick3.mp4"></center>'
-				'	Before you know it, he''s found a rhythm and is licking you like there''s no tomorrow. You eyes roll back in your head and every other sensation fades and blurs into the background except the feeling of your brother''s tongue on your clit.'
+				'	Before you know it, he''s found a rhythm and is licking you like there''s no tomorrow. Your eyes roll back in your head and every other sensation fades and blurs into the background except the feeling of your brother''s tongue on your clit.'
 				'	He stops briefly and you vaguely hear him say, "Girls taste good," before diving back in and returning you to bliss.'
 				act'"I''m cumming!"':
 					cla & *clr

+ 16 - 11
locations/budgetclothes.qsrc

@@ -13,6 +13,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -61,35 +65,35 @@ if $ARGS[0] = 'start':
 		
 		act 'Return':gt 'budgetclothes', 'start'
 		
-		act 'Look at regular shoes':
+		act 'View regular shoes':
 			minut += 5
 			gt 'budgetclothes', 'shoes'
 		end
 
-		act 'Look at exercise shoes':
+		act 'View exercise shoes':
 			minut += 5
 			gt 'budgetclothes', 'trainers'
 		end
 	end
 
-	act 'View coats':
+	act 'View panties':
 		minut += 5
-		gt 'budgetclothes', 'coats'
+		gt 'budgetclothes', 'panties'
 	end
 
-	act 'View purses':
+	act 'View bras':
 		minut += 5
-		gt 'budgetclothes', 'purses'
+		gt 'budgetclothes', 'bras'
 	end
 
-	act 'View panties':
+	act 'View purses':
 		minut += 5
-		gt 'budgetclothes', 'panties'
+		gt 'budgetclothes', 'purses'
 	end
 
-	act 'View bras':
+	act 'View coats':
 		minut += 5
-		gt 'budgetclothes', 'bras'
+		gt 'budgetclothes', 'coats'
 	end
 end
 
@@ -131,7 +135,8 @@ if $ARGS[0] = 'clothes':
 		if i = 10: i = 16
 		if i = 45: i = 57
 		if i = 80:i = 86
-	if i <= 413:jump 'loopcheap'
+		if i = 414:i = 415
+	if i <= 414:jump 'loopcheap'
 end
 
 if $ARGS[0] = 'cheapclo':

+ 10 - 11
locations/budilnik.qsrc

@@ -19,13 +19,14 @@ if $ARGS[0] = 'start':
 	'<center><b><a href="exec:gt ''budilnik'', ''7''">7</a> <a href="exec:gt ''budilnik'', ''8''">8</a> <a href="exec:gt ''budilnik'', ''9''">9</a></b></center>'
 	'<center><b><a href="exec:gt ''budilnik'', ''0''">0</a></b></center>'
 	'<center><b><a href="exec:gt ''budilnik'', ''Reset''">Reset</a> <a href="exec:gt ''budilnik'', ''Time''">Set Alarm</a></b></center>'
+	*nl
 	if budilnikOn = 0:
-		'<center>Your alarm is currently turned <a href="exec: budilnikOn = 1 & GT ''budilnik'', ''start''"><b>off</a></b></center>.'
+		'<center>Your alarm is currently turned <a href="exec: budilnikOn = 1 & GT ''budilnik'', ''start''"><b>off</a></b></center>'
 	else
-		'<center>Your alarm is currently turned <a href="exec: budilnikOn = 0 & GT ''budilnik'', ''start''"><b>on</b></a></center>.'
+		'<center>Your alarm is currently turned <a href="exec: budilnikOn = 0 & GT ''budilnik'', ''start''"><b>on</b></a></center>'
+		'<center>The alarm is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'.</center>'
 	end
-
-	act 'Leave':
+	act 'Finish':
 		cla
 		bud1 = 0
 		bud2 = 0
@@ -38,6 +39,7 @@ end
 
 if $ARGS[0] = 'Time':
 	cla
+	budilnikOn = 1
 
 	timer = bud1 * 10 + bud2
 	timerM = bud3 * 10 + bud4
@@ -45,12 +47,7 @@ if $ARGS[0] = 'Time':
 	if timer > 23:timer = 0
 	if timerM > 60:timerM = 0
 
-	'The alarm is set to <<timer>>:<<timerM>>.'
-
-	act 'Confirm':
-		cla
-		gt 'budilnik', 'fin'
-	end
+	gt 'budilnik', 'start'
 end
 
 if $ARGS[0] = '1':
@@ -174,7 +171,9 @@ end
 
 if $ARGS[0] = 'Reset':
 	cla
-
+	budilnikOn = 0
+	timer = 0
+	timerM = 0
 	bud1 = 0
 	bud2 = 0
 	bud3 = 0

+ 52 - 0
locations/buklinik.qsrc

@@ -11,6 +11,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -43,6 +47,10 @@ if $ARGS[0] = 'holl':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -85,6 +93,10 @@ if $ARGS[0] = 'registr':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -119,6 +131,10 @@ if $ARGS[0] = 'registr2':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -145,6 +161,10 @@ if $ARGS[0] = 'registr3':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -167,6 +187,10 @@ if $ARGS[0] = 'sklad':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -191,6 +215,10 @@ if $ARGS[0] = 'olga':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -221,6 +249,10 @@ if $ARGS[0] = 'sec':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -252,6 +284,10 @@ if $ARGS[0] = 'dir':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -285,6 +321,10 @@ if $ARGS[0] = 'shower':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -308,6 +348,10 @@ if $ARGS[0] = 'stol':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -331,6 +375,10 @@ if $ARGS[0] = 'spal':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -358,6 +406,10 @@ if $ARGS[0] = 'olga2':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 6 - 2
locations/burger.qsrc

@@ -14,6 +14,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -33,8 +37,8 @@ if $ARGS[0] = 'start':
 	end
 
 	act 'See the menu':gs 'food_menu'
-	if money >= 300:
-		act 'Eat and run (0:20) (300₽)':gt 'food', 'f_food'
+	if money >= 315:
+		act 'Eat and run (0:20) (315 <b>₽</b>)':money -= 315 & gt 'food', 'f_food'
 	end
 
 	if IvanPodstavaQW = 2:

+ 16 - 10
locations/butik.qsrc

@@ -14,6 +14,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -57,23 +61,25 @@ if $ARGS[0] = 'start':
 		gt 'torgcentr'
 	end
 	
-	act 'Browse the clothing': minut += 5 & gt 'butik', 'clothes'
+	act 'View clothing': minut += 5 & gt 'butik', 'clothes'
 
-	act 'Browse the panties': minut += 5 & gt 'butik', 'panties'
+	act 'View panties': minut += 5 & gt 'butik', 'panties'
 
-	act 'Browse the bras': minut += 5 & gt 'butik', 'bras'
+	act 'View bras': minut += 5 & gt 'butik', 'bras'
 
-	act 'Browse the shoes': minut += 5 & gt 'butik', 'shoes'
+	act 'View shoes': minut += 5 & gt 'butik', 'shoes'
 
-	act 'Browse the handbags': minut += 5 & gt 'butik', 'purses'
+	act 'View purses': minut += 5 & gt 'butik', 'purses'
 
 	if money >= 50000:
-		if coat[9] < 1:
-			if coat[9] = 0:dynamic 'act ''Look at designer coat 9'':gt ''clothing'', ''view_clothing_item'', ''shop'', ''coat'', 9, 50000'
-		end
+		act 'View coats':
+			if coat[9] < 1:
+				if coat[9] = 0:dynamic 'act ''Look at designer coat 9'':gt ''clothing'', ''view_clothing_item'', ''shop'', ''coat'', 9, 50000'
+			end
 
-		if coat[11] < 1:
-			if coat[11] = 0:dynamic 'act ''Look at designer coat 11'':gt ''clothing'', ''view_clothing_item'', ''shop'', ''coat'', 11, 50000'
+			if coat[11] < 1:
+				if coat[11] = 0:dynamic 'act ''Look at designer coat 11'':gt ''clothing'', ''view_clothing_item'', ''shop'', ''coat'', 11, 50000'
+			end
 		end
 	end
 end

+ 4 - 0
locations/butoilet.qsrc

@@ -13,6 +13,10 @@ gs 'stat'
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 2 - 2
locations/cafe_parco.qsrc

@@ -25,8 +25,8 @@ if $args[0]= 'inner':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/cafe/caffe_del_parco_in.jpg"></center>'
 
 	act 'See the menu':gs 'food_menu'
-	if money >= 300:
-		act 'Eat and run (0:20) (300₽)':gt 'food', 'f_food'
+	if money >= 350:
+		act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
 
 	act 'Go back outside': gt 'gskver', 'start'

+ 4 - 0
locations/carF.qsrc

@@ -38,6 +38,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 3 - 3
locations/cikl.qsrc

@@ -177,10 +177,10 @@ if succubusflag = 1:
 	if bimbolevel > 0 and bimbo > 0: bimbowithdrawal = 40
 elseif bimbolevel >= 1:
 !!Checks how often sex has occured in the last 24 hours and for drops in bimbo score, for calculating withdrawal
-	if 3 > snapshotY + snapshotX - (stat['vaginal'] + stat['bj'] + stat['anal']):
-		bimbowithdrawal = 0
-	else
+	if 4 > snapshotY + (stat['vaginal'] + stat['bj'] + stat['anal']) - snapshotX:
 		bimbowithdrawal += 1
+	else
+		bimbowithdrawal = 0
 	end
 end
 

+ 4 - 0
locations/clener.qsrc

@@ -10,6 +10,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/cloakroom.qsrc

@@ -12,6 +12,8 @@ $coat_list_line = {
 
 	if night_mode = 1:
 		$bgcolor = iif($bgcolor='#0C0B11','#000000','#0C0B11')
+	elseif night_mode = 2:
+		$bgcolor = iif($bgcolor='#0C0B11','#141414','#0C0B11')
 	else
 		$bgcolor = iif($bgcolor='#f3f4ee','#ffffff','#f3f4ee')
 	end
@@ -80,6 +82,8 @@ if $ARGS[0] = 'view_coat_list':
 
 	if night_mode = 1:
 		$bgcolor = iif($bgcolor='#0C0B11','#000000','#0C0B11')
+	elseif night_mode = 2:
+		$bgcolor = iif($bgcolor='#0C0B11','#202020','#0C0B11')
 	else
 		$bgcolor = iif($bgcolor='#f3f4ee','#ffffff','#f3f4ee')
 	end

+ 27 - 9
locations/clothing.qsrc

@@ -8,6 +8,8 @@ $clothing_list_line = {
 
 	if night_mode = 1:
 		$bgcolor = iif($bgcolor='#0C0B11','#000000','#0C0B11')
+	elseif night_mode = 2:
+		$bgcolor = iif($bgcolor='#0C0B11','#141414','#0C0B11')
 	else
 		$bgcolor = iif($bgcolor='#f3f4ee','#ffffff','#f3f4ee')
 	end
@@ -35,7 +37,9 @@ $clothing_list_line = {
 		$RESULT += '<TD colspan="2"></TD>'
 	end
 
-	if $ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear':
+	if $ARGS[1] = 'cheap' and ARGS[2] = 414:
+		$RESULT += '<TD>A hessian sack the hunters gave you.</TD>'
+	elseif $ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear':
 		gs 'clothing_descriptions'
 		$RESULT += '<TD><<FUNC(''$short_description'', $ARGS[1])>> <<ARGS[2]>><br/><br/><<$description>></TD>'
 	else
@@ -367,7 +371,9 @@ if $ARGS[0] = 'view_clothing_item':
 	$RESULT = FUNC('$short_description', $ARGS[2], CloStyle2)
 	$RESULT += '<<ARGS[3]>>'
 	'<<$RESULT>>'
-	if $ARGS[2] ! 'coat' and $ARGS[2] ! 'swimwear':
+	if $ARGS[1] = 'cheap' and ARGS[2] = 414:
+		'A hessian sack the hunters gave you.'
+	elseif $ARGS[2] ! 'coat' and $ARGS[2] ! 'swimwear':
 		gs 'clothing_descriptions'
 		'<<$description>>'
 	else
@@ -710,12 +716,6 @@ if $ARGS[0] = 'wear':
 
 	dynamic $ARGS[1] + 'W[<<ARGS[2]>>] = 1'
 
-	if $ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear':
-		gs 'clothing_descriptions'
-	else
-		FUNC('$clothing_name', $ARGS[1], ARGS[2])
-	end
-
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
 
 	dynamic '<<$ARGS[1]>>S[<<ARGS[2]>>] = 0'
@@ -732,9 +732,11 @@ if $ARGS[0] = 'wear':
 	PCloInhibit = CloInhibit
 	if cheatbimbo = 0:
 		PCloBimbo = CloBimbo
-		if CloBimbo = 1:bimbocl = 1
+		if CloBimbo = 1: bimbocl = 1
+		if CloBimbo = 0: bimbocl = 0
 	else
 		PCloBimbo = 0
+		CloBimbo = 0
 		bimbocl = 0
 	end
 
@@ -828,8 +830,24 @@ if $ARGS[0] = 'wear':
 end
 
 if $ARGS[0] = 'wear_last_worn':
+	!!contingency
+	if $lastwornclothingtype = '': $lastwornclothingtype = 'nude'
 	gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 end
 
+if $ARGS[0] = 'swamp_clothes':
+	if ARGS[1] = 1:
+		cheap[414] = 1
+		cheapS[414] = 0
+		cheapH[414] = 100
+		cheapB[414] = pcs_hips
+		swamp_clothes = 1
+		gs 'clothing', 'wear', 'cheap', 414
+	end
+	if ARGS[1] = 0:
+		cheap[414] = 0
+		swamp_clothes = 0
+	end
+end
 --- clothing ---------------------------------
 

+ 17 - 13
locations/clothing_QV.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'list':
 			gt 'wardrobe', 'start'
 		end
 	end
-	
+
 	'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm''"><img src="images/locations/city/citycenter/mall/GM.png"></a></center>'
 
 	if ARRSIZE('average') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
@@ -34,9 +34,9 @@ if $ARGS[0] = 'list':
 	if ARRSIZE('fetish') > 0 or ARRSIZE('burlesque') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sexshop''"><img src="images/locations/city/citycenter/sexshop/shop_name.png"></a></center>'
 
 	if ARRSIZE('exhibit') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''exhibitshop''"><img src="images/locations/oldtown/exhibitshop/shop_name.png"></a></center>'
-	
+
 	if ARRSIZE('alternative') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''dolls''"><img src="images/locations/city/island/dolls.png"></a></center>'
-	
+
 	if ARRSIZE('exercise') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
 	if $ARGS[1] = 'gm':
@@ -54,7 +54,7 @@ if $ARGS[0] = 'list':
 
 		i = 1
 		:loopcheap
-		if cheap[i] = 1: 
+		if cheap[i] = 1:
 			gs 'clothing_attributes', 'cheap', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
@@ -257,7 +257,7 @@ if $ARGS[0] = 'list':
 		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></center></table>'
 		*nl
 		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl	
+		*nl
 
 		i = 1
 		:loopalternative
@@ -371,7 +371,7 @@ if $ARGS[0] = 'strip':
 			gt 'clothing_QV', 'gym'
 		end
 	end
-	
+
 	act 'Leave': gt $loc, $metka
 end
 
@@ -380,14 +380,18 @@ if $ARGS[0] = 'change':
 	cla
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
 	'<center><img src="<<FUNC(''$clothing_image'',  $ARGS[1], ARGS[2])>>"></center>'
-	$RESULT = FUNC('$short_description', $ARGS[1], CloStyle2)
-	$RESULT += '<<ARGS[2]>>'
-	'<<$RESULT>>'
-	if $ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear':
-		gs 'clothing_descriptions'
-		'<<$description>>'
+	if $ARGS[1] = 'cheap' and ARGS[2] = 414:
+		'A hessian sack the hunters gave you.'
 	else
-		FUNC('$clothing_name', $ARGS[1], ARGS[2])
+		$RESULT = FUNC('$short_description', $ARGS[1], CloStyle2)
+		$RESULT += '<<ARGS[2]>>'
+		'<<$RESULT>>'
+		if $ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear':
+			gs 'clothing_descriptions'
+			'<<$description>>'
+		else
+			FUNC('$clothing_name', $ARGS[1], ARGS[2])
+		end
 	end
 
 	if CloBimbo = 1:'This item is considered bimbo clothing.'

+ 47 - 47
locations/clothing_descriptions.qsrc

@@ -3,33 +3,33 @@
 
 $description = ''
 if CloQuality = 1:
-   $description = 'This crappy quality outfit'
+	$description = 'This crappy quality outfit'
 elseif CloQuality = 2:
-   $description = 'This very low quality outfit'
+	$description = 'This very low quality outfit'
 elseif CloQuality = 3:
-   $description = 'This low quality outfit'
+	$description = 'This low quality outfit'
 elseif CloQuality = 4:
-   $description = 'This average quality outfit'
+	$description = 'This average quality outfit'
 elseif CloQuality = 5:
-   $description = 'This reasonable quality outfit'
+	$description = 'This reasonable quality outfit'
 elseif CloQuality = 6:
-   $description = 'This good quality outfit'
+	$description = 'This good quality outfit'
 elseif CloQuality = 7:
-   $description = 'This is a outstanding quality outfit'
+	$description = 'This is a outstanding quality outfit'
 end
 
 if CloThinness = 1:
-   $description = $description + ', which completely obscures your figure'
+	$description = $description + ', which completely obscures your figure'
 elseif CloThinness = 2:
-   $description = $description + ', which somewhat obscures your figure'
+	$description = $description + ', which somewhat obscures your figure'
 elseif CloThinness = 3:
-   $description = $description + ', which shows your figure somewhat'
+	$description = $description + ', which shows your figure somewhat'
 elseif CloThinness = 4:
-   $description = $description + ', which shows your figure well'
+	$description = $description + ', which shows your figure well'
 elseif CloThinness = 5:
-   $description = $description + ', which shows every detail of your figure'
+	$description = $description + ', which shows every detail of your figure'
 elseif CloThinness = 6:
-   $description = $description + ', which intentionally reveals your intimate areas'
+	$description = $description + ', which intentionally reveals your intimate areas'
 end
 
 if CloBra = 2:
@@ -38,55 +38,55 @@ elseif CloBra = 1:
 	$description = $description + ', the top replaces a bra (if you are wearing one)'
 elseif CloTopCut > 0:
 	if CloTopCut = 1:
-	   $description = $description + ', includes a very modest top'
+		$description = $description + ', includes a very modest top'
 	elseif CloTopCut = 2:
-	   $description = $description + ', includes a modest top'
+		$description = $description + ', includes a modest top'
 	elseif CloTopCut = 3:
-	   $description = $description + ', includes a somewhat revealing top'
+		$description = $description + ', includes a somewhat revealing top'
 	elseif CloTopCut = 4:
-	   $description = $description + ', includes a very revealing top'
+		$description = $description + ', includes a very revealing top'
 	end
 	if tits < 2:
-	   $description = $description + ', that would hang loosely around your humble bosom'
+		$description = $description + ', that would hang loosely around your humble bosom'
 	elseif tits < 5:
-	   $description = $description + ', that would fit your decently-sized bosom'
+		$description = $description + ', that would fit your decently-sized bosom'
 	elseif tits < 8:
-	   $description = $description + ', that would tightly strain to contain your ample bosom'
+		$description = $description + ', that would tightly strain to contain your ample bosom'
 	else
-	   $description = $description + ', that your huge bosom would spill out of'
+		$description = $description + ', that your huge bosom would spill out of'
 	end
 end
 
 if CloPanties = 1:
 	$description += ' the bottom of which is so skimpy it replaces your panties.'
 elseif CloPantsShortness > 0:
-   if CloPantsShortness = 1:
-      $description = $description + ' and long pants.'
-   elseif CloPantsShortness = 2:
-      $description = $description + ' and calf-length pants.'
-   elseif CloPantsShortness = 3:
-      $description = $description + ' and knee-length shorts.'
-   elseif CloPantsShortness = 4:
-      $description = $description + ' and thigh-length shorts.'
-   elseif CloPantsShortness = 5:
-      $description = $description + ' and shorts that don''t go past your crotch.'
-   elseif CloPantsShortness = 6:
-      $description = $description + ' and shorts so short, that they reveal your panties.'
-   end
+	if CloPantsShortness = 1:
+		$description = $description + ' and long pants.'
+	elseif CloPantsShortness = 2:
+		$description = $description + ' and calf-length pants.'
+	elseif CloPantsShortness = 3:
+		$description = $description + ' and knee-length shorts.'
+	elseif CloPantsShortness = 4:
+		$description = $description + ' and thigh-length shorts.'
+	elseif CloPantsShortness = 5:
+		$description = $description + ' and shorts that don''t go past your crotch.'
+	elseif CloPantsShortness = 6:
+		$description = $description + ' and shorts so short, that they reveal your panties.'
+	end
 elseif CloSkirtShortness > 0:
-   if CloSkirtShortness = 1:
-      $description = $description + ' and a floor-length skirt.'
-   elseif CloSkirtShortness = 2:
-      $description = $description + ' and a knee-length skirt.'
-   elseif CloSkirtShortness = 3:
-      $description = $description + ' and a fairly standard skirt.'
-   elseif CloSkirtShortness = 4:
-      $description = $description + ' and a rather short skirt.'
-   elseif CloSkirtShortness = 5:
-      $description = $description + ' and a miniskirt that barely reaches past your groin.'
-   elseif CloSkirtShortness = 6:
-      $description = $description + ' and a microskirt not even long enough to hide your privates.'
-   end
+	if CloSkirtShortness = 1:
+		$description = $description + ' and a floor-length skirt.'
+	elseif CloSkirtShortness = 2:
+		$description = $description + ' and a knee-length skirt.'
+	elseif CloSkirtShortness = 3:
+		$description = $description + ' and a fairly standard skirt.'
+	elseif CloSkirtShortness = 4:
+		$description = $description + ' and a rather short skirt.'
+	elseif CloSkirtShortness = 5:
+		$description = $description + ' and a miniskirt that barely reaches past your groin.'
+	elseif CloSkirtShortness = 6:
+		$description = $description + ' and a microskirt not even long enough to hide your privates.'
+	end
 end
 
 --- clothing_descriptions ---------------------------------

+ 16 - 0
locations/club.qsrc

@@ -11,6 +11,14 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -91,6 +99,10 @@ if $ARGS[0] = 'inside':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -236,6 +248,10 @@ if $ARGS[0] = 'tou':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/dachain.qsrc

@@ -9,6 +9,10 @@ if night_mode = 1:
 	fcolor = rgb(255, 255, 255)
 	bcolor = rgb(0, 0, 0)
 	lcolor = rgb(106, 90, 205)
+elseif night_mode = 2:
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(20, 20, 20)
+	lcolor = rgb(106, 90, 205)
 else
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/dachaogr0.qsrc

@@ -6,6 +6,10 @@ if night_mode = 1:
 	fcolor = rgb(255, 255, 255)
 	bcolor = rgb(0, 0, 0)
 	lcolor = rgb(106, 90, 205)
+elseif night_mode = 2:
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(20, 20, 20)
+	lcolor = rgb(106, 90, 205)
 else
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/danceclass.qsrc

@@ -6,6 +6,10 @@ if night_mode = 1:
 	fcolor = rgb(255, 255, 255)
 	bcolor = rgb(0, 0, 0)
 	lcolor = rgb(106, 90, 205)
+elseif night_mode = 2:
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(20, 20, 20)
+	lcolor = rgb(106, 90, 205)
 else
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)

+ 62 - 115
locations/dateF.qsrc

@@ -14,9 +14,10 @@
 
 if $ARGS[0] = 'start':
 	!! generate a girlfriend
+	menu_off = 1
+	$location_type = 'event'
 	gs 'girl'
-	*clr
-	cla
+	*clr & cla
 
 	!!1) Sveta in a school uniform
 	if clothingworntype = 'school':
@@ -24,16 +25,14 @@ if $ARGS[0] = 'start':
 		'You notice a girl of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
 		'As she nears you, she presents herself; "Hi. My name is <<$boydesc>>. What are you doing here all by yourself?"'
 		act 'Greet her':
-			*clr
-			cla
+			*clr & cla
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 			'"Hi! My name is <<$pcs_nickname>>." you answer. "School just ended so I was trying to figure out what to do for the rest of the day."'
 			'"Oh really." After a moment of silence <<$boydesc>> finally speaks up; "Don''t take this the wrong way but what school do you attend?" she asks.'
 			act 'Tell her':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'"I don''t really know if I should tell you that. For all I know you might be a creepy woman that wants to kidnap me."'
 				'"I''m sorry I knew I would come off as creepy, but I got a bit thrown off by your school outfit. I didn''t mean anything by it."'
@@ -49,16 +48,14 @@ if $ARGS[0] = 'start':
 					'You smile back as she gathers courage to ask you, "Since you''re not from here, what would you say to letting me show you around the town?"'
 				end
 				act 'I would love to':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"Sure, that sounds fun and I just so happen to have some time to kill." You say with a wink.'
 					'"Great!" answers <<$boydesc>> "So, what do you want to do?".'
 					gs 'dateF', 'date_choice'
 				end
 				act 'I would love to but can''t right now':
-					*clr
-					cla
+					*clr & cla
 					gs 'girlfriend', 'start'
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
@@ -67,8 +64,7 @@ if $ARGS[0] = 'start':
 					act 'Return': gt $loc, $metka
 				end
 				act 'Decline':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'As you''re talking you get a creepy feeling about this girl, "I''m sorry but I just remembered I was supposed to meet a friend."'
 					'<<$boydesc>> looks at you disappointed. "Oh, that''s a shame. Could I get-..."'
@@ -76,8 +72,7 @@ if $ARGS[0] = 'start':
 					act 'Return': gt $loc, $metka
 				end
 				act 'Decline politely':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m sorry but I''m not interested. I sort of have a boyfriend..." you answer wanting to reject the girl as easy as possible.'
 					'"That''s too bad... I should have guessed a girl in that hot outfit would be taken."'
@@ -86,8 +81,7 @@ if $ARGS[0] = 'start':
 				end
 			end
 			act 'Don''t tell her which school':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'You break out into laughter, "Why would I tell you that, for all I know you could be a weird stalker."'
 				'"Did you just accuse me for being a stalker?" she asks as her voice changes to a more serious tone.'
@@ -103,16 +97,14 @@ if $ARGS[0] = 'start':
 		'You notice a girl of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
 		'As she nears you, you hear her say, "Hey baby, you seem like a girl that likes to have fun. What do you say, wanna hang out?"'
 		act 'Look at her':
-			*clr
-			cla
+			*clr & cla
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 			'You give her a once over and then give her a amused look, "What did you say? I hope you know what you''re getting yourself into."'
 			'Not fazed by your brashness she continues on, "I know it''s just a front with girls like you. All of you just act hard but I''ve got you all figured out. Tell me this instead, what is your name?"'
 			act 'Answer her':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'You give her a contemptuous look. "Oh, you have me all figured out do you? My name is <<$pcs_nickname>>, not that it is any of your business."'
 				if $loc = 'pavResidential' or $loc = 'pavCommercial':
@@ -125,16 +117,14 @@ if $ARGS[0] = 'start':
 					'She starts laughing clearly not feeling threatened by you, "Relax, I''m only kidding. I like my tits just where they are, but if you wanted to fondle them..." She says with a grin. "But seriously, I just wanted to ask you out, so how about it?'
 				end
 				act 'Fine':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'You give her a hard look and eye her up and down. "Fine I''m fucking bored anyways, but you''re paying."'
 					'"Good, I expected no other outcome." she says. "I''ll give it to you to decide what we should do?".'
 					gs 'dateF', 'date_choice'
 				end
 				act 'Not now':
-					*clr
-					cla
+					*clr & cla
 					gs 'girlfriend', 'start'
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m busy right now." You tell her and watch her become disappointed. "But maybe I will get bored out of my skull and you will seem like a better open, so take my number and maybe I will answer if you call."'
@@ -143,8 +133,7 @@ if $ARGS[0] = 'start':
 					act 'Return': gt $loc, $metka
 				end
 				act 'Fuck off!':
-					*clr
-					cla
+					*clr & cla
 					'<center><img src="images/pc/fuckoff1.jpg"></center>'
 					'"Fuck off loser, I only date real men, the kinda that would kick your ass just for laughs!" you answer.'
 					'<<$boydesc>> looks at you in shock as she was not ready for you to react that way. "Well, I thought we could just have a little fun together..."'
@@ -153,8 +142,7 @@ if $ARGS[0] = 'start':
 				end
 			end
 			act 'No':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'"How about I kick your ass instead? Now get out of here before you know what my boot feels like shoved up your ass." you reply angrily.'
 				'"Okay, okay, sheesh... take it easy." she says loudly as she''s moving away from you.'
@@ -167,8 +155,7 @@ if $ARGS[0] = 'start':
 		'You notice a girl of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair aproaching you. She is wearing <<$boyClo>>'
 		'As she nears you, she reaches out her hand for a handshake. "Hi. My name is <<$boydesc>>."'
 		act 'Grasp hand':
-			*clr
-			cla
+			*clr & cla
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
@@ -177,8 +164,7 @@ if $ARGS[0] = 'start':
 	!!I would suggest a option for Sveta to be happy about it.
 			act 'Decline':gt 'dateF', 'decline'
 			act 'Happily tell her your name':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'All of a sudden you get a bubbly feeling in your stomach thinking if she''s really asking your name?'
 				'You break out in a smile telling her, "My name is <<$pcs_nickname>>."'
@@ -186,16 +172,14 @@ if $ARGS[0] = 'start':
 				'You start blushing as <<$boydesc>> compliments you... "So what do you say <<$pcs_nickname>> would you like to go on a date with me?"'
 				!!Go on date, same answer no matter what time of day or weather
 				act 'I would love to':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'You think about it a moment and figure why not "Sure I would love to out with you."'
 					'"Great!" answers <<$boydesc>> "So, what do you want to do?".'
 					gs 'dateF', 'date_choice'
 				end
 				act 'I would love to but can''t right now':
-					*clr
-					cla
+					*clr & cla
 					gs 'girlfriend', 'start'
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
@@ -207,8 +191,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 		act 'Refuse and walk away':
-			*clr
-			cla
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 			'Not really impressed, you decide to teach her a lesson, "Sure thing, here''s my number."'
 			'<<$boydesc>> quickly scribbles it down not knowing you''ve just given her a totally unknown number.'
@@ -220,16 +203,14 @@ if $ARGS[0] = 'start':
 		'You notice a girl of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
 		'She walks up to full of confidence, "Damn, baby, on a scale from 1 to 10, you''re an 11. How about a date?"'
 		act 'Excuse me?':
-			*clr
-			cla
+			*clr & cla
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 			'"Yeah, you heard me." said <<$boydesc>>. "Don''t act all that surprised, you''re good-looking, I''m good-looking we would be the perfect couple, so what do you say?"'
 			'"Isn''t someone full of confidence." you comment, seizing control of the conversation, as you contemplate your next move...'
 			act 'Remain silent':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'"Come on, gorgeous, don''t give me the silent treatment."'
 				'As you hear the word gorgeous you melt straight away. You blush and mumble thanks, stammering like a buffoon.'
@@ -240,17 +221,15 @@ if $ARGS[0] = 'start':
 				'"Just as I expected a beautiful name for a beautiful girl..." <<$boydesc>> quickly replies.'
 				!!Go on date, same answer no matter what time of day or weather
 				act 'Agree to a date':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"Stop, you''re making me blush again. Sure, sounds like fun, I would love to."'
 					'"Great!" answers <<$boydesc>> "So, what do you want to do gorgeous?".'
 					gs 'dateF', 'date_choice'
 				end
-					!!Wanting to go on date but not right now, offer phone number
+					
 				act 'I would love to but can''t right now':
-					*clr
-					cla
+					*clr & cla
 					gs 'girlfriend', 'start'
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
@@ -258,18 +237,18 @@ if $ARGS[0] = 'start':
 					'"You better be." you say teasingly.'
 					act 'Return': gt $loc, $metka
 				end
+				
 				act 'Decline':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m sorry but I don''t feel myself attracted to you enough and I don''t want to lead you on."'
 					'<<$boydesc>> looks at you disappointed. "Oh well, I didn''t think I had a chance but you can''t blame me for trying."'
 					'The two of you say goodbye to each other.'
 					act 'Return': gt $loc, $metka
 				end
+				
 				act 'Look at her in disgust':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m sorry, it''s good that you have all this confidence, but I''m way out of your league. There''s no way I would be caught seen out with you."'
 					'"What did you say, you little..." you''re not able to hear the rest as you walk away...'
@@ -281,8 +260,7 @@ if $ARGS[0] = 'start':
 end
 
 if $args[0] = 'decline':
-	*clr
-	cla
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 	'"I''m sorry but I don''t feel us clicking so I''ll have to decline."'
 	'<<$boydesc>> looks at you disappointed and then shrugs. "Well can''t blame a girl for trying, right?"'
@@ -306,47 +284,41 @@ end
 !Time 2-4 hours depending on the path the player chooses. Nothing special, there is a sex act but the player has the option to stop before it gets way out of control.
 
 if $ARGS[0] = 'datepark':
-	*clr
-	cla
+	*clr & cla
 	minut += 30
 	gs 'stat'
 	'<center><img src="images/locations/shared/dateF/park1.jpg"></center>'
 	'"Since it''s such a beautiful day today, let''s go for a walk in the park." you suggest.'
 	'"Sounds great. Lets go." <<$boydesc>> walks with you towards the park.'
 	'The two of you walk in the park for a while causally talking, getting knowing each other. After a while she suggests sitting down.'
-    !!Jump to park 
+	!!Jump to park 
 	act 'Watch people':
-		*clr
-		cla
+		*clr & cla
 		minut += 45
 		gs 'stat'
 		'<center><img src="images/locations/shared/dateF/park2.jpg"></center>'
 		'The two of you sit down and begin commenting on the people walking by. You laugh while <<$boydesc>> makes up stories about their backgrounds and quirks.'
 		'There are a few times you almost get caught as you point and laugh. As you''re sitting down an ice cream pushcart appears, generating quite a buzz around it. <<$boydesc>> asks you, "I sure could go for some ice cream. Would you also like some ice cream?"'
 		act 'Yeah':
-			*clr
-			cla
+			*clr & cla
 			minut += 15
 			gs 'stat'
 			'<center><img src="images/locations/shared/dateF/park3.jpg"></center>'
 			'<<$boydesc>> runs away to the pushcart and comes back with two ice creams. "Here you go, <<$pcs_nickname>> I hope you''ll enjoy it."'
 			'You nod and thank her. The two of you continue talking while eating the ice cream. As you finish <<$boydesc>> asks, "Shall we move on?"'
 			act 'Nod':
-				*clr
-				cla
+				*clr & cla
 				minut += 15
 				gs 'stat'
 				'<center><img src="images/locations/shared/dateF/park4.jpg"></center>'
 				'As you continue walking the two of you begin holding hands. You''re really enjoying yourself by now everything is going really well.'
 				'You don''t even notice that the two of you strayed off the beaten path, all of a sudden <<$boydesc>> stops and whispers in your ear, "Now that we''re at a secluded spot, you know what would make this date even better?"'
 				act 'What?':
-					*clr
-					cla
+					*clr & cla
 					'<center><img src="images/locations/shared/dateF/park5.jpg"></center>'
 					'Before you''re even able to respond <<$boydesc>> leans in and kisses you on the lips.'
 					act 'Make out':
-						*clr
-						cla
+						*clr & cla
 						'<center><img src="images/locations/shared/dateF/park6.jpg"></center>'
 						'Feeling frisky you kiss <<$boydesc>> back. Not before long the two of you are having a make out session, french kissing each other.'
 						'You feel yourself getting more and more aroused, maybe you should stop before the situation escalates too much...'
@@ -358,8 +330,7 @@ if $ARGS[0] = 'datepark':
 							gt 'lezbsex','start'
 						end
 						act 'Stop her':
-							*clr
-							cla
+							*clr & cla
 							minut += 5
 							gs 'stat'
 							'<center><img src="images/locations/shared/dateF/parkback.jpg"></center>'
@@ -369,8 +340,7 @@ if $ARGS[0] = 'datepark':
 						end
 					end
 					act 'Back up':
-						*clr
-						cla
+						*clr & cla
 						minut += 5
 						gs 'stat'
 						'<center><img src="images/locations/shared/dateF/parkback.jpg"></center>'
@@ -385,16 +355,14 @@ if $ARGS[0] = 'datepark':
 end
 
 if $ARGS[0] = 'walk_back':
-	*clr
-	cla
+	*clr & cla
 	minut += 10
 	gs 'stat'
 	'<center><img src="images/locations/shared/dateF/parkback.jpg"></center>'
 	'As you finish up the two still holding hands walk all the way back to the park entrance. You stand there for a while feeling that awkward silence creeping up as neither of you know how to end the date.'
 	'"I''ve had a great time." you say smiling. "Yeah, me too..." <<$boydesc>> says quietly. "Could I get your number so I can call you?"'
 	act 'Sure':
-		*clr
-		cla
+		*clr & cla
 		gs 'girlfriend', 'start'
 		'<center><img src="images/locations/shared/date/givenumber.jpg"></center>'
 		'You give <<$boydesc>> your number. "Now I really hope you don''t forget to call me." you tell her. "Oh, don''t worry about that I''ll be in touch." she says.'
@@ -402,8 +370,7 @@ if $ARGS[0] = 'walk_back':
 		act 'Leave':gt $loc, $metka
 	end
 	act 'Sorry':
-		*clr
-		cla
+		*clr & cla
 		'<center><img src="images/locations/shared/date/datereject.jpg"></center>'
 		'"I''ve really enjoyed the date but I''m sorry I can''t give you my number..."'
 		'"But why, I thought..." Before she continues you stop her telling her that you''re sorry once again but that it won''t work out between the two of you.'
@@ -416,10 +383,8 @@ end
 !Go to movie theater pav/city, time 3-4 hours
 !Nothing special, there is a sex act but the player has the option to stop before it gets way out of control.
 
-
 if $ARGS[0] = 'datebar':
-	*clr
-	cla
+	*clr & cla
 	minut += 20
 	gs 'stat'
 	'<center><img src="images/locations/shared/date/barinside.jpg"></center>'
@@ -427,23 +392,19 @@ if $ARGS[0] = 'datebar':
 	'"Great idea, <<$pcs_nickname>>. I know a great bar with great drinks and lightning."'
 	'The two of you enter this buzzing hip bar and find a spot where you have a great overview over the place.'
 	act 'Order':
-		*clr
-		cla
+		*clr & cla
 		'<center><img src="images/locations/shared/date/bardrink.jpg"></center>'
 		'As you sit down <<$boydesc>> asks you, "Would you like to drink something?"'
-		!!if beer, add buzz
 		act 'I''ll have a beer, thanks':
-			*clr
-			cla
+			*clr & cla
 			alko += 1
 			'<center><img src="images/locations/shared/dateF/bar1.jpg"></center>'
 			'"My kind of girl." <<$boydesc>> tells you.'
 			act 'Talk':gt 'dateF', 'bartalk'
 		end
-			!!elseif, add buzz
+
 		act 'I''ll have some hard liquor, thanks':
-			*clr
-			cla
+			*clr & cla
 			alko += 2
 			'<center><img src="images/locations/shared/dateF/bar1.jpg"></center>'
 			'"My kind of girl." <<$boydesc>> tells you.'
@@ -452,10 +413,8 @@ if $ARGS[0] = 'datebar':
 	end
 end
 
-
 if $ARGS[0] = 'bartalk':
-	*clr
-	cla
+	*clr & cla
 	minut += 15
 	gs 'stat'
 	'<center><img src="images/locations/shared/date/barinside.jpg"></center>'
@@ -463,18 +422,15 @@ if $ARGS[0] = 'bartalk':
 	'"This place is packed." you say to <<$boydesc.>>'
 	'"Yeah, it''s pretty cool, I think it''s the night when there is a band playing live here, so I guess that''s why it''s so packed."'
 	act 'Continue on':
-		*clr
-		cla
+		*clr & cla
 		minut += 10
 		gs 'stat'
 		'<center><img src="images/locations/shared/date/barband.jpg"></center>'
 		'As you sit there talking to each other, the lights suddenly go dim and you hear a guitar riff playing.'
 		'The band steps out and starts playing. You''re amazed over how well they play and turn to <<$boydesc>> "They are pretty good don''t you think?"'
 		'<<$boydesc>> nods her head. "Yeah they are, do you want another drink?"'
-		!!add to buzz
 		act 'Sure':
-			*clr
-			cla
+			*clr & cla
 			alko += 2
 			minut += 20
 			gs 'stat'
@@ -484,8 +440,7 @@ if $ARGS[0] = 'bartalk':
 			'"Well, I''m having a great time so why not." <<$boydesc>> goes over to the counter and returns with two new drinks.'
 			if pcs_danc > 30:
 				act 'Dance':
-					*clr
-					cla
+					*clr & cla
 					minut += 10
 					gs 'stat'
 					'<center><img src="images/locations/shared/dateF/bar3.jpg"></center>'
@@ -494,19 +449,17 @@ if $ARGS[0] = 'bartalk':
 					'She shakes her head. "I am no dancer, but you should if you want to dance." She says indicating you should get out on the dance floor yourself.'
 					'You get up from the chair and walk up near the stage and begin moving sensually, teasing <<$boydesc>>.'
 					act 'Return to your date':
-						*clr
-						cla
+						*clr & cla
 						minut += 15
 						gs 'stat'
-						!!add buzz
+						alko += 2
 						'<center><img src="images/locations/shared/dateF/bar3.jpg"></center>'
 						'"Damn <<$pcs_nickname>> you really know how to move. I bet all that dancing made you even thirstier."'
 						'You nod and she quickly gets up and gets more drinks.'
 						'You chug the drink down, quenching some of the thirst. "Look at you go. I love a girl that can keep a drink down."'
 						'By now you''re feel quite tipsy, feeling your inhibitions fading away. You panic a little at feeling and feel you must get a breather before you lose control.'
 						act 'Excuse yourself':
-							*clr
-							cla
+							*clr & cla
 							minut += 10
 							gs 'stat'
 							'<center><img src="images/locations/shared/dateF/bar4.jpg"></center>'
@@ -515,8 +468,7 @@ if $ARGS[0] = 'bartalk':
 							'Recognizing <<$boydesc>> voice, you come to your senses and open the door, quickly pulling her in.'
 							'"What''s happening?" she asks as you lean into her and begin kissing her.'
 							act 'Make out':
-								*clr
-								cla
+								*clr & cla
 								'<center><img src="images/locations/shared/dateF/bar5.jpg"></center>'
 								'<<$boydesc>> doesn''t seem to mind your brashness. She begins grabbing you all over your body, adding even more to your arousal.'
 								'As you''re kissing you feel her fingers playing with your wet clit through the panties.'
@@ -529,8 +481,7 @@ if $ARGS[0] = 'bartalk':
 									gt 'lezbsex','start'
 								end
 								act 'Decide to stop':
-									*clr
-									cla
+									*clr & cla
 									gs 'arousal', 'end'
 									'<center><img src="images/locations/shared/date/barinside.jpg"></center>'
 									'You can''t get yourself to go through this. Excusing yourself you walk back to the table and sit down.'
@@ -544,8 +495,7 @@ if $ARGS[0] = 'bartalk':
 				end
 			end
 			act 'Keep talking':
-				*clr
-				cla
+				*clr & cla
 				minut += 20
 				gs 'stat'
 				'<center><img src="images/locations/shared/dateF/bar2.jpg"></center>'
@@ -558,27 +508,24 @@ if $ARGS[0] = 'bartalk':
 	end
 end
 				
-
 if $ARGS[0] = 'barend':
-	*clr
-	cla
+	*clr & cla
 	minut += 5
 	gs 'stat'
 	'<center><img src="images/locations/shared/dateF/bar2.jpg"></center>'
 	'You tell <<$boydesc>>, "I''ve had a great time but we should be on our way."'
 	'"I had a great time, you''re really fun to hang out with." <<$boydesc>> tells you. "Could I get your number?"'
 	act 'Sure':
-		*clr
-		cla
+		*clr & cla
 		gs 'girlfriend', 'start'
 		'<center><img src="images/locations/shared/date/givenumber.jpg"></center>'
 		'You give <<$boydesc>> your number. "Now I really hope you don''t forget to call me." you tell her. "Oh, don''t worry about that I''ll be in touch." she says.'
 		'You end the date by her giving you a kiss on the cheek.'
 		act 'Leave':gt $loc, $metka
 	end
+	
 	act 'Sorry':
-		*clr
-		cla
+		*clr & cla
 		'<center><img src="images/locations/shared/date/barreject.jpg"></center>'
 		'"I''ve really enjoyed the date but I just can''t I''ve made a fool of myself..."'
 		'"No you didn''t, I understand..." Before she continues you stop her telling her that you''re sorry once again but you''re too ashamed to see her again.'

+ 93 - 181
locations/dateM.qsrc

@@ -13,27 +13,26 @@
 !!4) Bar, sex act in the toilet
 
 if $ARGS[0] = 'start':
+	menu_off = 1
+	$location_type = 'event'
+	*clr & cla
 	!! generate a boyfriend
 	gs 'boy'
-	*clr
-	cla
-
+	
 !!1) Sveta in a school uniform
 	if clothingworntype = 'school':
 		'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
 		'As he nears you, he presents himself; "Hi. My name is <<$boydesc>>. What are you doing here all by yourself?"'
 		act 'Greet him':
-			*clr
-			cla
+			*clr & cla
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 			'"Hi! My name is <<$pcs_nickname>>." you answer. "School just ended so I was trying to figure out what to do for the rest of the day."'
 			'"Oh really." After a moment of silence <<$boydesc>> finally speaks up; "Don''t take this the wrong way but what school do you attend?" he asks.'
 			act 'Tell him':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'"I don''t really know if I should tell you that. For all I know you might be a creepy guy, that wants to kidnap me."'
 				'"I''m sorry I knew I would come off as creepy but I got a bit thrown off by your school outfit. I didn''t mean anything by it."'
@@ -49,16 +48,14 @@ if $ARGS[0] = 'start':
 					'You smile back as he gathers courage to ask you, "Since you''re not from here, what would you say to letting me show you around the town?"'
 				end
 				act 'I would love to':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"Sure, that sounds fun and I just so happen to have some time to kill." You say with a wink.'
 					'"Great!" answers <<$boydesc>> "So, what do you want to do?".'
 					gs 'dateM', 'date_choice'
 				end
 				act 'I would love to but can''t right now':
-					*clr
-					cla
+					*clr & cla
 					gs 'boyfrend', 'start'
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
@@ -67,8 +64,7 @@ if $ARGS[0] = 'start':
 					act 'Return': gt $loc, $metka
 				end
 				act 'Decline':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'As you''re talking you get a creepy feeling about this guy, "I''m sorry but I just remembered I was supposed to meet a friend."'
 					'<<$boydesc>> looks at you disappointed. "Oh, that''s a shame. Could I get-..."'
@@ -76,8 +72,7 @@ if $ARGS[0] = 'start':
 					act 'Return': gt $loc, $metka
 				end
 				act 'Decline politely':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m sorry but I''m not interested. I sort of have a boyfriend..." you answer wanting to reject the guys as easy as possible.'
 					'"That''s too bad... I should have guessed a girl in that hot outfit would be taken."'
@@ -86,8 +81,7 @@ if $ARGS[0] = 'start':
 				end
 			end
 			act 'Don''t tell him which school':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'You break out into laughter, "Why would I tell you that, for all I know you could be a rapist."'
 				'"Did you just accuse me for a rapist?" he asks as his voice changes to a more serious tone.'
@@ -103,16 +97,14 @@ if $ARGS[0] = 'start':
 		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
 		'As he nears you, you hear him say, "Hey baby, you seem like a girl that likes to have fun. What do you say, wanna hang out?"'
 		act 'Look at him':
-			*clr
-			cla
+			*clr & cla
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 			'You give him a once over and then give him a amused look, "What did you say? I hope you know what you''re getting yourself into."'
 			'Not fazed by your brashness he continues on, "I know it''s just a front with girls like you. All of you just act hard but I''ve got you all figured out. Tell me this instead, what is your name?"'
 			act 'Answer him':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'You give him a contemptuous look. "Oh, you have us all figured out do you? My name is <<$pcs_nickname>>, not that it is any of your business."'
 				if $loc = 'pavResidential' or $loc = 'pavCommercial':
@@ -125,16 +117,14 @@ if $ARGS[0] = 'start':
 					'He starts laughing clearly not feeling threatened by you, "Relax, I''m only kidding. I like my balls just where they are, but if you wanted to fondle them..." He says with a grin. "But seriously, I just wanted to ask you out, so how about it?'
 				end
 				act 'Fine':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'You give him a hard look and eye him up and down. "Fine I''m fucking bored anyways, but you''re paying."'
 					'"Good, I expected no other outcome." he says. "I''ll give it to you to decide what we should do?".'
 					gs 'dateM', 'date_choice'
 				end
 				act 'Not now':
-					*clr
-					cla
+					*clr & cla
 					gs 'boyfrend', 'start'
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m busy right now." You tell him and watch him become disappointed. "But maybe I will get bored out of my skull and you will seem like a better open, so take my number and maybe I will answer if you call."'
@@ -143,8 +133,7 @@ if $ARGS[0] = 'start':
 					act 'Return': gt $loc, $metka
 				end
 				act 'Fuck off!':
-					*clr
-					cla
+					*clr & cla
 					'<center><img src="images/pc/fuckoff1.jpg"></center>'
 					'"Fuck off loser, I only date real men, the kinda that would kick your ass just for laughs!" you answer.'
 					'<<$boydesc>> looks at you in shock as he was not ready for you to react that way. "Well, I thought we could just have a little fun together..."'
@@ -153,8 +142,7 @@ if $ARGS[0] = 'start':
 				end
 			end
 			act 'No':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'"How about I kick your ass instead? Now get out of her before you know what my boot feels like shoved up your ass." you reply angrily.'
 				'"Okay, okay, sheesh... take it easy." he says loudly as he''s moving away from you.'
@@ -167,8 +155,7 @@ if $ARGS[0] = 'start':
 		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair aproaching you. He is wearing <<$boyClo>>.'
 		'As he nears you, he reaches out his hand for a handshake. "Hi. My name is <<$boydesc>>."'
 		act 'Grasp hand':
-			*clr
-			cla
+			*clr & cla
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
@@ -177,8 +164,7 @@ if $ARGS[0] = 'start':
 	!!I would suggest a option for Sveta to be happy about it.
 			act 'Decline':gt 'dateM', 'decline'
 			act 'Happily tell him your name':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'All of a sudden you get a bubbly feeling in your stomach thinking if he''s really asking your name?'
 				'You break out in a smile telling him, "My name is <<$pcs_nickname>>."'
@@ -186,16 +172,14 @@ if $ARGS[0] = 'start':
 				'You start blushing as <<$boydesc>> compliments you... "So what do you say <<$pcs_nickname>> would you like to go on a date with me?"'
 				!!Go on date, same answer no matter what time of day or weather
 				act 'I would love to':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'You think about it a moment and figure why not "Sure I would love to out with you."'
 					'"Great!" answers <<$boydesc>> "So, what do you want to do?".'
 					gs 'dateM', 'date_choice'
 				end
 				act 'I would love to but can''t right now':
-					*clr
-					cla
+					*clr & cla
 					gs 'boyfrend', 'start'
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
@@ -207,8 +191,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 		act 'Refuse and walk away':
-			*clr
-			cla
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 			'Not really impressed, you decide to teach him a lesson, "Sure thing, here''s my number."'
 			'<<$boydesc>> quickly scribbles it down not knowing you''ve just given him a totally unknown number.'
@@ -220,16 +203,14 @@ if $ARGS[0] = 'start':
 		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
 		'He walks up to full of confidence, "Damn, baby, on a scale from 1 to 10, you''re an 11. How about a date?"'
 		act 'Excuse me?':
-			*clr
-			cla
+			*clr & cla
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 			'"Yeah, you heard me." said <<$boydesc>>. "Don''t act all that surprised, you''re good-looking, I''m good-looking we would be the perfect couple, so what do you say?"'
 			'"Isn''t someone full of confidence." you comment, seizing control of the conversation, as you contemplate your next move...'
 			act 'Remain silent':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'"Come on, gorgeous, don''t give me the silent treatment."'
 				'As you hear the word gorgeous you melt straight away. You blush and mumble thanks, stammering like a buffoon.'
@@ -240,8 +221,7 @@ if $ARGS[0] = 'start':
 				'"Just as I expected a beautiful name for a beautiful girl..." <<$boydesc>> quickly replies.'
 				!!Go on date, same answer no matter what time of day or weather
 				act 'Agree to a date':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"Stop, you''re making me blush again. Sure, sounds like fun, I would love to."'
 					'"Great!" answers <<$boydesc>> "So, what do you want to do gorgeous?".'
@@ -249,8 +229,7 @@ if $ARGS[0] = 'start':
 				end
 					!!Wanting to go on date but not right now, offer phone number
 				act 'I would love to but can''t right now':
-					*clr
-					cla
+					*clr & cla
 					gs 'boyfrend', 'start'
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
@@ -259,8 +238,7 @@ if $ARGS[0] = 'start':
 					act 'Return': gt $loc, $metka
 				end
 				act 'Decline':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m sorry but I don''t feel myself attracted to you enough and I don''t want to lead you on."'
 					'<<$boydesc>> looks at you disappointed. "Oh well, I didn''t think I had a chance but you can''t blame me for trying."'
@@ -268,8 +246,7 @@ if $ARGS[0] = 'start':
 					act 'Return': gt $loc, $metka
 				end
 				act 'Look at him in disgust':
-					*clr
-					cla
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 					'"I''m sorry, it''s good that you have all this confidence, but I''m way out of your league. There''s no way I would be caught seen out with you."'
 					'"What did you say, you little..." you''re not able to hear the rest as you walk away...'
@@ -281,8 +258,7 @@ if $ARGS[0] = 'start':
 end
 
 if $args[0] = 'decline':
-	*clr
-	cla
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 	'"I''m sorry but I don''t feel us clicking so I''ll have to decline."'
 	'<<$boydesc>> looks at you disappointed then shrugs. "Well can''t blame a guy for trying right."'
@@ -310,55 +286,48 @@ end
 !Time 2-4 hours depending on the path the player chooses. Nothing special, there is a sex act but the player has the option to stop before it gets way out of control.
 
 if $ARGS[0] = 'datepark':
-	*clr
-	cla
+	*clr & cla
 	minut += 30
 	gs 'stat'
 	'<center><img src="images/locations/shared/park/walk_'+ rand(1,2) +'.jpg"></center>'
 	'"Since it''s such a beautiful day today, let''s go for a walk in the park." you suggest.'
 	'"Sounds great. Lets go." <<$boydesc>> walks with you towards the park.'
 	'The two of you walk in the park for a while causally talking, getting knowing each other. After a while he suggests sitting down.'
-    !!Jump to park 
+	!!Jump to park 
 	act 'Watch people':
-		*clr
-		cla
+		*clr & cla
 		minut += 45
 		gs 'stat'
 		'<center><img src="images/locations/shared/date/parkwatch.jpeg"></center>'
 		'The two of you sit down and begin commenting on the people walking by. You laugh while <<$boydesc>> makes up stories about their backgrounds and quirks.'
 		'There are a few times you almost get caught as you point and laugh. As you''re sitting down an ice cream pushcart appears, generating quite a buzz around it. <<$boydesc>> asks you, "I sure could go for some ice cream. Would you also like some ice cream?"'
 		act 'Yeah':
-			*clr
-			cla
+			*clr & cla
 			minut += 15
 			gs 'stat'
 			'<center><img src="images/locations/shared/date/parkice.jpg"></center>'
 			'<<$boydesc>> runs away to the pushcart and comes back with two ice creams. "Here you go, <<$pcs_nickname>> I hope you''ll enjoy it."'
 			'You nod and thank him. The two of you continue talking while eating the ice cream. As you finish <<$boydesc>> asks, "Shall we move on?"'
 			act 'Nod':
-				*clr
-				cla
+				*clr & cla
 				minut += 15
 				gs 'stat'
 				'<center><img src="images/locations/shared/date/parkholding.jpg"></center>'
 				'As you continue walking the two of you begin holding hands. You''re really enjoying yourself by now everything is going really well.'
 				'You don''t even notice that the two of you strayed off the beaten path, all of a sudden <<$boydesc>> stops and whispers in your ear, "Now that we''re at a secluded spot, you know what would make this date even better?"'
 				act 'What?':
-					*clr
-					cla
+					*clr & cla
 					'<center><img src="images/locations/shared/date/parklean.jpg"></center>'
 					'Before you''re even able to respond <<$boydesc>> leans in and kisses you on the lips.'
 					act 'Make out':
-						*clr
-						cla
+						*clr & cla
 						'<center><img src="images/locations/shared/date/parkmake.jpg"></center>'
 						'Feeling frisky you kiss <<$boydesc>> back. Not before long the two of you are having a make out session, french kissing each other.'
 						'You feel yourself getting more and more aroused, maybe you should stop before the situation escalates too much...'
 						gs 'arousal', 'kiss', 3, 'exhibitionism'
 						gs 'stat'
 						act 'Stop him':
-							*clr
-							cla
+							*clr & cla
 							minut += 5
 							gs 'stat'
 							'<center><img src="images/locations/shared/date/parkback.jpg"></center>'
@@ -367,8 +336,7 @@ if $ARGS[0] = 'datepark':
 							act 'Walk back':gt 'dateM', 'walk_back'
 						end
 						act 'Who cares':
-							*clr
-							cla
+							*clr & cla
 							'<center><img src="images/locations/shared/date/parkkiss.jpg"></center>'
 							'You decide to ignore the little voice in your back head and continue on the make out session.'
 							'<<$boydesc>> pulls you in closer and slowly begins rubbing your wet slit through your clothes. You let out a soft whimper as he''s touching you.'
@@ -376,8 +344,7 @@ if $ARGS[0] = 'datepark':
 							gs 'stat'
 							'As you''re pressed against <<$boydesc>> you feel his bulge through his pants. The two of you quickly remove your clothes, playing with each other''s sensitive parts.'
 							act 'On your knees':
-								*clr
-								cla
+								*clr & cla
 								'<center><img src="images/locations/shared/date/parkhj.jpg"></center>'
 								'You give him a lustful smirk and get down on your knees. You quickly unbutton his pants and let his semi-grown cock hang loose.'
 								'Looking at it you say, "Let me help you get ready for what''s to come." as you grab it with your hand and start jerking him off.'
@@ -387,8 +354,7 @@ if $ARGS[0] = 'datepark':
 								gs 'arousal', 'bj', 4, 'exhibitionism'
 								gs 'stat'
 								act 'Give blowjob':
-									*clr
-									cla
+									*clr & cla
 									'<center><img src="images/locations/shared/date/parkbj.jpg"></center>'
 									'"Enough teasing, I want you to blow me <<$pcs_nickname>>, I don''t want to cum before you''ve had a taste of my cock."'
 									'You comply and start sucking on the head, smacking loudly. You are working calmly and methodically for some minutes and in the end you''re able to fit him into your mouth entirely.'
@@ -396,8 +362,7 @@ if $ARGS[0] = 'datepark':
 									gs 'stat'
 									'"Damn, <<$pcs_nickname>>, you''re really a good little cocksucker. How about you get on all fours so I can enjoy that little pussy of yours?"'
 									act 'Doggy':
-										*clr
-										cla
+										*clr & cla
 										'<center><img src="images/locations/shared/date/parkdoggy.jpg"></center>'
 										'You''re already wet and ready for him as you spread your legs as he bends down. <<$boydesc>> slowly runs his shaft along your wet pussy teasing you right back as a payback for before.'
 										'You let out a sigh as he slowly enters you. Holding your waist, <<$boydesc>> slowly increases his pace. It doesn''t take long for him to be at full pace. You feel great as his strong member alternately fills and pleasantly stretches your pussy.'
@@ -407,8 +372,7 @@ if $ARGS[0] = 'datepark':
 										gs 'stat'
 										'Even <<$boydesc>> is groaning and grimacing badly by now ready to cum.'
 										act 'Finish':
-											*clr
-											cla
+											*clr & cla
 											minut += 10
 											gs 'cum_call', 'labia', $boydesc
 											gs 'stat'
@@ -424,8 +388,7 @@ if $ARGS[0] = 'datepark':
 						end
 					end
 					act 'Back up':
-						*clr
-						cla
+						*clr & cla
 						minut += 5
 						gs 'stat'
 						'<center><img src="images/locations/shared/date/parkback.jpg"></center>'
@@ -440,16 +403,14 @@ if $ARGS[0] = 'datepark':
 end
 
 if $ARGS[0] = 'walk_back':
-	*clr
-	cla
+	*clr & cla
 	minut += 10
 	gs 'stat'
 	'<center><img src="images/locations/shared/date/parkholding.jpg"></center>'
 	'As you finish up the two still holding hands walk all the way back to the park entrance. You stand there for a while feeling that awkward silence creeping up as neither of you know how to end the date.'
 	'"I''ve had a great time." you say smiling. "Yeah, me too..." <<$boydesc>> says quietly. "Could I get your number so I can call you?"'
 	act 'Sure':
-		*clr
-		cla
+		*clr & cla
 		gs 'boyfrend', 'start'
 		'<center><img src="images/locations/shared/date/givenumber.jpg"></center>'
 		'You give <<$boydesc>> your number. "Now I really hope you don''t forget to call me." you tell him. "Oh, don''t worry about that I''ll be in touch." he says.'
@@ -457,8 +418,7 @@ if $ARGS[0] = 'walk_back':
 		act 'Leave':gt $loc, $metka
 	end
 	act 'Sorry':
-		*clr
-		cla
+		*clr & cla
 		'<center><img src="images/locations/shared/date/datereject.jpg"></center>'
 		'"I''ve really enjoyed the date but I''m sorry I can''t give you my number..."'
 		'"But why, I thought..." Before he continues you stop him telling him that you''re sorry once again but that it won''t work out between the two of you.'
@@ -472,8 +432,7 @@ end
 !Nothing special, there is a sex act but the player has the option to stop before it gets way out of control.
 
 if $ARGS[0] = 'datecinema':
-	*clr
-	cla
+	*clr & cla
 	minut += 15
 	gs 'stat'
 	'<center><img src="images/locations/pavlovsk/park/theater/kinoteatr.jpg"></center>'
@@ -481,8 +440,7 @@ if $ARGS[0] = 'datecinema':
 	'"Sounds like a great idea. There''s a movie theater nearby."'
 	'You arrive at the movie theater and look at the display showing what movies are playing right now.'
 	act 'Decide on a movie':
-		*clr
-		cla
+		*clr & cla
 		minut += 5
 		gs 'stat'
 		'<center><img src="images/locations/pavlovsk/park/theater/cinema.jpg"></center>'
@@ -490,8 +448,7 @@ if $ARGS[0] = 'datecinema':
 		'You shake your head, "No, I''m not in the mood for that. How about this one?" you point at a comedy.'
 		'"Perfect, I love comedies." he comments.'
 		act 'Buy tickets':
-			*clr
-			cla
+			*clr & cla
 			minut += 5
 			gs 'stat'
 			'<center><img src="images/locations/shared/cinema/theaterbuy.jpg"></center>'
@@ -501,8 +458,7 @@ if $ARGS[0] = 'datecinema':
 			'He smiles and walks over to the concession stand, returning with a big popcorn tub, handing it over to you.'
 			'You shine up immediately, thanking him for buying it for you.'
 			act 'Take a seat':
-				*clr
-				cla
+				*clr & cla
 				minut += 45
 				gs 'stat'
 				'<center><img src="images/locations/shared/cinema/kino_'+ rand(1,3) +'.jpg"></center>'
@@ -510,16 +466,14 @@ if $ARGS[0] = 'datecinema':
 				'You nod and the two of you make your way inside the theater. You find your seats, making yourselves comfortable.'
 				'The movies starts off in a frantic pace containing many slapstick scenes. You''re having a great time, laughing almost all the time.'
 				act 'Eat some popcorn':
-					*clr
-					cla
+					*clr & cla
 					minut += 15
 					'<center><img src="images/locations/shared/cinema/kino_'+ rand(1,3) +'.jpg"></center>'
 					'As you''re about to grab some popcorn from the tub, <<$boydesc>> unknowingly goes to grab some popcorn too, touching your hand.'
 					'He''s startled as he didn''t expect your hand to be there either. You acknowledge his touch by teasingly whispering, "Are you trying to make a move on me?"'
 					'<<$boydesc>> nervously smiles at you. "Sorry it wasn''t my intentions to make you feel uncomfortable."'
 					act 'Tease him':
-						*clr
-						cla
+						*clr & cla
 						minut += 5
 						gs 'stat'
 						'<center><img src="images/locations/shared/date/theatertease.jpg"></center>'
@@ -527,8 +481,7 @@ if $ARGS[0] = 'datecinema':
 						'You look around checking if everyone else is concentrating on the movie and then quickly remove your top. <<$boydesc>> not knowing how to respond looks in awe. Not wanting to wait on him anymore you decide to take action.'
 						'"Let me show you a great time." you slyly tell him. "Just relax and enjoy yourself."'
 						act 'Get on your knees':
-							*clr
-							cla
+							*clr & cla
 							'<center><img src="images/locations/shared/date/theaterbj.jpg"></center>'
 							'You go down on your knees removing your shirt and bra showing your body to <<$boydesc>>. You begin playing with his rock hard penis through the pants.'
 							'<<$boydesc>> looks at you with lust. His eyes are quite revealing, he wants you to please him with your mouth and he wants it now.'
@@ -537,8 +490,7 @@ if $ARGS[0] = 'datecinema':
 							gs 'arousal', 'bj', 5, 'dom', 'exhibitionism'
 							gs 'stat'
 							act 'Lay down on the seat':
-								*clr
-								cla
+								*clr & cla
 								'<center><img src="images/locations/shared/date/theatercuni.jpg"></center>'
 								'After a few minutes you stop and get up, lean into him telling him that it''s his turn to impress you.'
 								'You lay down on the empty seats next to you and spread your legs. <<$boydesc>> by now very aroused dives in and begins playing with your wet clit.'
@@ -546,8 +498,7 @@ if $ARGS[0] = 'datecinema':
 								gs 'arousal', 'cuni', 5, 'dom', 'exhibitionism'
 								gs 'stat'
 								act 'Reverse cowgirl':
-									*clr
-									cla
+									*clr & cla
 									'<center><img src="images/locations/shared/date/theatercow.jpg"></center>'
 									'He stops to let you rest just as you''re nearing the orgasm, feeling irritated you decide to get even.'
 									'You make <<$boydesc>> sit down again and plant yourself on top of his cock, letting out a quiet whimper as you don''t want the guy in front of you to find out what the two of you are doing.'
@@ -555,8 +506,7 @@ if $ARGS[0] = 'datecinema':
 									gs 'arousal', 'vaginal', 5, 'dom', 'exhibitionism'
 									gs 'stat'
 									act 'Back to laying down':
-										*clr
-										cla
+										*clr & cla
 										gs 'cum_call', 'stomach', $boydesc
 										gs 'cum_call', 'breasts', $boydesc
 										'<center><img src="images/locations/shared/date/theatervag.jpg"></center>'
@@ -566,8 +516,7 @@ if $ARGS[0] = 'datecinema':
 										gs 'stat'
 										'He starts groaning pulling out his cock out of you and shoots the load all over you. His warm spunk hits your stomach and breast as he jerks out the last drips. You take your finger and swipe a small sample off your stomach putting it in your mouth. It tastes great.'
 										act 'Caught':
-											*clr
-											cla
+											*clr & cla
 											minut += 10
 											gs 'stat'
 											'<center><img src="images/locations/shared/date/theatercaught.jpg"></center>'
@@ -576,8 +525,7 @@ if $ARGS[0] = 'datecinema':
 											'"Kids these days. It''s the third time I catch couples doing this shit this week. Pick up your stuff and get the hell out of here, you''re lucky I don''t have the time to call the cops."'
 											'You''re blemishing red as you quickly get dressed, grabbing your stuff, running out of the theater. You can hear some of the other people commenting on the situation as you walk past them. <<$boydesc>> is walking besides you and also has his head down looking at the ground as ashamed as you.'
 											act 'Outside':
-												*clr
-												cla
+												*clr & cla
 												minut += 5
 												gs 'stat'
 												'<center><img src="images/locations/pavlovsk/park/theater/kinoteatr.jpg"></center>'
@@ -594,16 +542,14 @@ if $ARGS[0] = 'datecinema':
 						end
 					end
 					act 'Keep watching the movie':
-						*clr
-						cla
+						*clr & cla
 						minut += 45
 						gs 'stat'
 						'<center><img src="images/locations/shared/cinema/kino_'+ rand(1,3) +'.jpg"></center>'
 						'After a while <<$boydesc>> leans towards you and whispers if you''re enjoying yourself.'
 						'You turn to him nodding, as you''re nodding he leans in once again and gives you a kiss. The two of you hold hands for the rest of the movie.'
 						act 'Outside':
-							*clr
-							cla
+							*clr & cla
 							minut += 5
 							gs 'stat'
 							'<center><img src="images/locations/pavlovsk/park/theater/kinoteatr.jpg"></center>'
@@ -621,8 +567,7 @@ if $ARGS[0] = 'datecinema':
 end
 
 if $ARGS[0] = 'cinema_sure':
-	*clr
-	cla
+	*clr & cla
 	gs 'boyfrend', 'start'
 	'<center><img src="images/locations/shared/date/givenumber.jpg"></center>'
 	'You give <<$boydesc>> your number. "Now I really hope you don''t forget to call me." you tell him. "Oh, don''t worry about that I''ll be in touch." he says.'
@@ -631,8 +576,7 @@ if $ARGS[0] = 'cinema_sure':
 end
 
 if $ARGS[0] = 'cinema_sorry':
-	*clr
-	cla
+	*clr & cla
 	'<center><img src="images/locations/shared/date/datereject.jpg"></center>'
 	'"I''ve really enjoyed the date but I''m sorry I can''t give you my number..."'
 	'"But why, I thought..." Before he continues you stop him telling him that you''re sorry once again but that it won''t work out between the two of you.'
@@ -646,8 +590,7 @@ end
 !Maybe make it so that the action "Agree" triggers if Sveta has dom points.
 
 if $ARGS[0] = 'datecafe':
-	*clr
-	cla
+	*clr & cla
 	minut += 15
 	gs 'stat'
 	'<center><img src="images/locations/shared/date/cafe.jpg"></center>'
@@ -655,8 +598,7 @@ if $ARGS[0] = 'datecafe':
 	'"Great idea <<$pcs_nickname>> I know a great place."'
 	'The two of you enter the café and find a secluded spot where you can be left alone.'
 	act 'Interact':
-		*clr
-		cla
+		*clr & cla
 		minut += 10
 		gs 'stat'
 		'<center><img src="images/locations/shared/date/cafetalk.jpg"></center>'
@@ -664,8 +606,7 @@ if $ARGS[0] = 'datecafe':
 		'You tell him a little about your family, where you''re from and the likes. All while <<$boydesc>> carefully listens to your every word just like he''s analyzing you in his head.'
 		'The conversation takes a deeper meaning as he keeps probing you with more serious questions about you.'
 		act 'Order':
-			*clr
-			cla
+			*clr & cla
 			minut += 5
 			gs 'stat'
 			'<center><img src="images/locations/shared/date/cafewaitress.jpg"></center>'
@@ -674,8 +615,7 @@ if $ARGS[0] = 'datecafe':
 			'"What is wrong with you? Can''t you write down a simple order?" <<$boydesc>> reacts.'
 			'You sit there looking in shock wondering what you should do...'
 			act 'React':
-				*clr
-				cla
+				*clr & cla
 				minut += 10
 				gs 'stat'
 				'<center><img src="images/locations/shared/date/cafereact.jpg"></center>'
@@ -687,8 +627,7 @@ if $ARGS[0] = 'datecafe':
 				act 'Continue date':gt 'dateM', 'cafepeople'
 			end
 			act 'Keep quiet':
-				*clr
-				cla
+				*clr & cla
 				minut += 10
 				gs 'stat'
 				'<center><img src="images/locations/shared/date/cafequiet.jpg"></center>'
@@ -699,8 +638,7 @@ if $ARGS[0] = 'datecafe':
 				act 'Continue date':gt 'dateM', 'cafepeople'
 			end
 			act 'Agree':
-				*clr
-				cla
+				*clr & cla
 				minut += 10
 				gs 'stat'
 				'<center><img src="images/locations/shared/date/cafemad.jpg"></center>'
@@ -712,8 +650,7 @@ if $ARGS[0] = 'datecafe':
 				act 'Continue date':gt 'dateM', 'cafepeople'
 			end
 			act 'Tell him off':
-				*clr
-				cla
+				*clr & cla
 				'<center><img src="images/locations/shared/date/cafetelloff.jpg"></center>'
 				'Not liking the way <<$boydesc>> treated the waitress you go on the attack against <<$boydesc>>. You''re appalled by how he behaves. With such poor first-impression you decide you don''t ever want to see this bottom-feeder again.'
 				'"You should really learn some matters. To treat a human being like that is despicable. You should be ashamed of yourself."'
@@ -726,8 +663,7 @@ if $ARGS[0] = 'datecafe':
 end
 
 if $ARGS[0] = 'cafepeople':
-	*clr
-	cla
+	*clr & cla
 	minut += 15
 	gs 'stat'
 	'<center><img src="images/locations/shared/date/cafewatching.jpg"></center>'
@@ -737,16 +673,14 @@ if $ARGS[0] = 'cafepeople':
 end
 
 if $ARGS[0] = 'cafeend':
-	*clr
-	cla
+	*clr & cla
 	minut += 5
 	gs 'stat'
 	'<center><img src="images/locations/shared/date/cafefinish.jpg"></center>'
 	'After a while you end observing the man and tell <<$boydesc>>, "Well, thanks for the coffee but I should be on my way."'
 	'"I had a great time, you''re really fun to hang out with." <<$boydesc>> tells you. "Could I get your number?"'
 	act 'Sure':
-		*clr
-		cla
+		*clr & cla
 		gs 'boyfrend', 'start'
 		'<center><img src="images/locations/shared/date/givenumber.jpg"></center>'
 		'You give <<$boydesc>> your number. "Now I really hope you don''t forget to call me." you tell him. "Oh, don''t worry about that I''ll be in touch." he says.'
@@ -754,8 +688,7 @@ if $ARGS[0] = 'cafeend':
 		act 'Leave':gt $loc, $metka
 	end
 	act 'Sorry':
-		*clr
-		cla
+		*clr & cla
 		'<center><img src="images/locations/shared/date/datereject.jpg"></center>'
 		'"I''ve really enjoyed the date but I''m not impressed by your first-impression, you were too lenient on that waitress..."'
 		'"But why, I thought..." Before he continues you stop him telling him that you''re sorry once again but that it won''t work out between the two of you.'
@@ -769,8 +702,7 @@ end
 !This date is containing a sex scene in the toilet
 
 if $ARGS[0] = 'datebar':
-	*clr
-	cla
+	*clr & cla
 	minut += 20
 	gs 'stat'
 	'<center><img src="images/locations/shared/date/barinside.jpg"></center>'
@@ -778,23 +710,19 @@ if $ARGS[0] = 'datebar':
 	'"Great idea <<$pcs_nickname>> I know a great bar with great drinks and lightning."'
 	'The two of you enter this buzzing hip bar and find a spot where you have a great overview over the place.'
 	act 'Order':
-		*clr
-		cla
+		*clr & cla
 		'<center><img src="images/locations/shared/date/bardrink1.jpg"></center>'
 		'As you sit down <<$boydesc>> asks you, "Would you like to drink something?"'
-		!!if beer, add buzz
 		act 'I''ll have a beer, thanks':
-			*clr
-			cla
+			*clr & cla
 			alko += 1
 			'<center><img src="images/locations/shared/date/barorder_'+ rand(1,2) +'.jpg"></center>'
 			'"My kind of girl." <<$boydesc>> tells you.'
 			act 'Talk':gt 'dateM', 'bartalk'
 		end
-			!!elseif, add buzz
+
 		act 'I''ll have some hard liquor, thanks':
-			*clr
-			cla
+			*clr & cla
 			alko += 2
 			'<center><img src="images/locations/shared/date/barorder_'+ rand(1,2) +'.jpg"></center>'
 			'"My kind of girl." <<$boydesc>> tells you.'
@@ -805,8 +733,7 @@ end
 
 
 if $ARGS[0] = 'bartalk':
-	*clr
-	cla
+	*clr & cla
 	minut += 15
 	gs 'stat'
 	'<center><img src="images/locations/shared/date/barinside.jpg"></center>'
@@ -814,8 +741,7 @@ if $ARGS[0] = 'bartalk':
 	'"This place is packed." you say to <<$boydesc>>'
 	'"Yeah, it''s pretty cool, I think it''s the night when there is a band playing live here, so I guess that''s why it''s so packed."'
 	act 'Continue on':
-		*clr
-		cla
+		*clr & cla
 		minut += 10
 		gs 'stat'
 		'<center><img src="images/locations/shared/date/barband.jpg"></center>'
@@ -824,8 +750,7 @@ if $ARGS[0] = 'bartalk':
 		'<<$boydesc>> nods his head. "Yeah they are, do you want another drink?"'
 		!!add to buzz
 		act 'Sure':
-			*clr
-			cla
+			*clr & cla
 			alko += 2
 			minut += 20
 			gs 'stat'
@@ -835,8 +760,7 @@ if $ARGS[0] = 'bartalk':
 			'"Well, I''m having a great time so why not." <<$boydesc>> goes over to the counter and returns with two new drinks.'
 			if pcs_danc > 30:
 				act 'Dance':
-					*clr
-					cla
+					*clr & cla
 					minut += 10
 					gs 'stat'
 					'<center><img src="images/locations/shared/date/bardancing.jpg"></center>'
@@ -845,8 +769,7 @@ if $ARGS[0] = 'bartalk':
 					'He shakes his head. "I am no dancer, but you should if you want to dance." He says indicating you should get out on the dance floor yourself.'
 					'You get up from the chair and walk up near the stage and begin moving sensually, teasing <<$boydesc>>.'
 					act 'Return to your date':
-						*clr
-						cla
+						*clr & cla
 						minut += 15
 						gs 'stat'
 						!!add buzz
@@ -856,8 +779,7 @@ if $ARGS[0] = 'bartalk':
 						'You chug the drink down, quenching some of the thirst. "Look at you go. I love a girl that can keep a drink down."'
 						'By now you''re feel quite tipsy, feeling your inhibitions fading away. You panic a little at feeling and feel you must get a breather before you lose control.'
 						act 'Excuse yourself':
-							*clr
-							cla
+							*clr & cla
 							minut += 10
 							gs 'stat'
 							'<center><img src="images/locations/shared/date/barrestroom.jpg"></center>'
@@ -866,8 +788,7 @@ if $ARGS[0] = 'bartalk':
 							'Recognizing <<$boydesc>> voice, you come to your senses and open the door, quickly pulling him in.'
 							'"What''s happening?" he asks as you lean into him and begin kissing him.'
 							act 'Make out':
-								*clr
-								cla
+								*clr & cla
 								'<center><img src="images/locations/shared/date/barmakeout.jpg"></center>'
 								'<<$boydesc>> doesn''t seem to mind your brashness. He begins grabbing you all over your body, adding even more to your arousal.'
 								'As you''re kissing you feel his fingers playing with your wet clit through the panties.'
@@ -875,8 +796,7 @@ if $ARGS[0] = 'bartalk':
 								gs 'arousal', 'foreplay', 2
 								gs 'stat'
 								act 'Get down on your knees':
-									*clr
-									cla
+									*clr & cla
 									'<center><img src="images/locations/shared/date/barbj.jpg"></center>'
 									'You''re too aroused to do anything else. You quickly drop down on your knees, grabbing hold of his pants, ripping them open.'
 									'His erect penis pops out and you can clearly see some pre-cum around the foreskin.'
@@ -884,8 +804,7 @@ if $ARGS[0] = 'bartalk':
 									gs 'arousal', 'bj', 3, 'deepthroat'
 									gs 'stat'
 									act 'Stand up':
-										*clr
-										cla
+										*clr & cla
 										'<center><img src="images/locations/shared/date/barfuck.jpg"></center>'
 										'You tell him to rest for a moment while you get ready. You pull down your panties exposing your wet cunt, you play with yourself as <<$boydesc>> catches his breath. "That''s enough rest." you tell him.'
 										'You have him stand behind you as you grab hold of the sink. "Come on, fuck me good." you tell him.'
@@ -898,8 +817,7 @@ if $ARGS[0] = 'bartalk':
 										gs 'stat'
 										'It doesn''t take long before <<$boydesc>> is panting heavily and just as you''re about to say not to cum inside you, you feel a warm stream shoot up deep inside of you.'
 										act 'Clean up':
-											*clr
-											cla
+											*clr & cla
 											cumspclnt = 15
 											gs 'cum_cleanup'
 											'<center><img src="images/locations/shared/date/barcream.jpg"></center>'
@@ -910,8 +828,7 @@ if $ARGS[0] = 'bartalk':
 									end
 								end
 								act 'Decide to stop':
-									*clr
-									cla
+									*clr & cla
 									gs 'arousal', 'end'
 									'<center><img src="images/locations/shared/date/barinside.jpg"></center>'
 									'You can''t get yourself to go through this. Excusing yourself you walk back to the table and sit down.'
@@ -924,8 +841,7 @@ if $ARGS[0] = 'bartalk':
 				end
 			end
 			act 'Keep talking':
-				*clr
-				cla
+				*clr & cla
 				minut += 20
 				gs 'stat'
 				'<center><img src="images/locations/shared/date/bardiscuss_'+ rand(1,4) +'.jpg"></center>'
@@ -937,19 +853,16 @@ if $ARGS[0] = 'bartalk':
 		end
 	end
 end
-				
 
 if $ARGS[0] = 'barend':
-	*clr
-	cla
+	*clr & cla
 	minut += 5
 	gs 'stat'
 	'<center><img src="images/locations/shared/date/bardiscuss_'+ rand(1,4) +'.jpg"></center>'
 	'You tell <<$boydesc>>, "I''ve had a great time but we should be on our way."'
 	'"I had a great time, you''re really fun to hang out with." <<$boydesc>> tells you. "Could I get your number?"'
 	act 'Sure':
-		*clr
-		cla
+		*clr & cla
 		gs 'boyfrend', 'start'
 		'<center><img src="images/locations/shared/date/givenumber.jpg"></center>'
 		'You give <<$boydesc>> your number. "Now I really hope you don''t forget to call me." you tell him. "Oh, don''t worry about that I''ll be in touch." he says.'
@@ -957,8 +870,7 @@ if $ARGS[0] = 'barend':
 		act 'Leave':gt $loc, $metka
 	end
 	act 'Sorry':
-		*clr
-		cla
+		*clr & cla
 		'<center><img src="images/locations/shared/date/barreject.jpg"></center>'
 		'"I''ve really enjoyed the date but I just can''t I''ve made a fool of myself..."'
 		'"No you didn''t, I understand..." Before he continues you stop him telling him that you''re sorry once again but you''re too ashamed to see him again.'

+ 4 - 0
locations/dima.qsrc

@@ -9,6 +9,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 128 - 207
locations/dimaRevenge.qsrc

@@ -1,6 +1,5 @@
 # dimaRevenge
 
-
 !! dimaRevChoice = stores the option selected from bathroom scene.
 !! ARGS[0] - day
 !! $ARGS[1] - time of day i.e. morning
@@ -65,15 +64,13 @@ if ARGS[0] = 3:
 				'You seethe with rage, but decide to keep quiet. Soon they leave and you exit the stall and head for the mirror.
 				You apply makeup as you think of ways out of your current situation. You know it''s important not to react to rumors, but to instead cut them off at the source.
 				With that in mind you make a decision.'
-				act 'fight fire with fire':
-					*clr
-					cla
+				act 'Fight fire with fire':
+					*clr & cla
 					dimaRevChoice = 1
 					'Dimka isn''t the only one who can spread rumors. You head into the hallway and get to work.
 					You talk to many people, but you can tell most of them don''t believe you. This is harder than you thought. You need a master of gossip.'
 					act 'enlist Lizaveta':
-						*clr
-						cla
+						*clr & cla
 						'<center><img src="images/characters/pavlovsk/school/head/31.jpg"></center>'
 						'Lizaveta is the one to go to for all things gossip. You find her standing by a classroom door, looking inside. She is startled when you greet her. "Oh, you scared me, <<$pcs_nickname>>."'
 						'"What are you doing," you ask her, "what are you looking at in there?"'
@@ -85,8 +82,7 @@ if ARGS[0] = 3:
 					end
 				end
 				act 'Go to class':
-					*clr
-					cla
+					*clr & cla
 					dimaRevChoice = 0
 					'<center><b><font color="maroon">Classroom</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'
@@ -102,8 +98,7 @@ if ARGS[0] = 3:
 				'They hurriedly leave the restroom, giving you time to think. It seems Dimka wasn''t full of shit after all. You need to find some way to shut him up.
 				You consider just beating him up, but if you''re caught it could keep you off any teams. Unfortunately you have to take an indirect approach.'
 				act 'Find muscle':
-					*clr
-					cla
+					*clr & cla
 					dimaRevChoice = 2
 					'<center><img src="images/locations/pavlovsk/school/building/locker.jpg"></center>'
 					'Dimka needs to be taught a lesson. Who says you need to be the one to teach it? You know some of the strongest boys in the school who would jump at the chance to prove how macho they are. You head to the lockers where the other athletes hang out.
@@ -112,8 +107,7 @@ if ARGS[0] = 3:
 					'"It''s Dimka," you answer. "He''s been saying terrible things about me, and people are starting to believe him. I don''t know what to do."'
 					'He gives you a sympathetic look and says, "That guy is such an asshole. I''ll straighten him out. You coming Erast?" Erast give a nod in response and the two of them head down the hall to where Dimka is talking to some other guys.'
 					act 'Watch what happens':
-						*clr
-						cla
+						*clr & cla
 						'<center><img src="images/characters/pavlovsk/school/girl/katja/punch.jpg"></center>'
 						'"<<$pcs_firstname>> is a hopeless cumslut," Dimka tells the other boys. "I was just minding my own business at home and she starts knocking frantically on my door. When I answered, she got on her knees and begged for permission to blow me."'
 						'"What did you do," one of the boys asks.'
@@ -121,8 +115,7 @@ if ARGS[0] = 3:
 						'The two guys laugh, but then after seeing an angry Ivan moving towards them, they quickly run away. Dimka doesn''t react in time and is punched square in the nose. "Fuck, Ivan! What the hell is your problem?!"'
 						'"Your damn mouth," Ivan responds while grabbing Dimka by the collar. Dimka quickly gets free and tries to run away, but is blocked by Erast who punches Dimka in the face and knocks him out.'
 						act 'thank Ivan and Erast':
-							*clr
-							cla
+							*clr & cla
 							'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/cheekkiss.jpg"></center>'
 							'"Thanks, you two. I''m sure he will stop spreading rumors about me now." You give both of them a peck on the cheek. Erast blushes red. Ivan just grins.
 							"It was our pleasure," Ivan says. "Dimka was due a beating anyway. If he starts talking shit again, give us a call." The three of you head to class.'
@@ -131,8 +124,7 @@ if ARGS[0] = 3:
 					end
 				end
 				act 'Go to class':
-					*clr
-					cla
+					*clr & cla
 					dimaRevChoice = 0
 					'<center><b><font color="maroon">Classroom</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'
@@ -150,8 +142,7 @@ if ARGS[0] = 3:
 					dimaRevChoice = 3
 					!!if Nerd social group 50 or higher this is a option
 					act 'Review the situation':
-						*clr
-						cla
+						*clr & cla
 						'<center><b><font color="maroon">Classroom</font></b></center>'
 						'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/gilthinking.jpg"></center>'
 						'You go to class but can''t really focus on today''s lessons. Instead you think about your problem. Dimka has been running around the school spreading rumors about you.
@@ -161,8 +152,7 @@ if ARGS[0] = 3:
 						Feofan can tell you everything about superheroes including their shoe size, but somehow you don''t think that''s going to help. Admittedly, you don''t know much about Zinaida since you can''t get more than a few words out of her before she goes back to her phone.
 						Evgeny lives and breathes chess and probably won''t be of much use. That leaves Gerasim.'
 						act 'Talk to Gerasim':
-							*clr
-							cla
+							*clr & cla
 							'<center><b><font color="maroon">Classroom</font></b></center>'
 							'<center><img src="images/characters/pavlovsk/school/head/37.jpg"></center>'
 							'After class you sit next to Gerasim and try to convince him to hack Dimka''s computer. "I wish I could help, <<$pcs_nickname>>, but that isn''t really something I know how to do. Have you tried asking Artem?"'
@@ -170,15 +160,13 @@ if ARGS[0] = 3:
 							'"Well he would be the one to go to for this kind of thing, but I guess you have a good reason for not telling him. I won''t pry."'
 							'He thinks for a few seconds and says "I think Feofan knows a bit about hacking. You should ask him." You thank him and head out into the hall.'
 							act 'Look for Feofan':
-								*clr
-								cla
+								*clr & cla
 								'<center><b><font color="maroon">School Hallway</font></b></center>'
 								'<center><img src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
 								'You search the hallway for Feofan. The hallway is crowded with students preparing to leave school. You spot him at the end of the hall talking to Zinaida. He must be hitting on her again. All the nerd boys ask her out.
 								You swear you even saw Julia asking her out once. She always turns them down. Feofan is an incorrigible flirt though and doesn''t let rejection dampen his spirit. You almost envy that about him. You approach him as Zinaida turns him down yet again.'
 								act 'Talk to Feofan':
-									*clr
-									cla
+									*clr & cla
 									'<center><b><font color="maroon">School Hallway</font></b></center>'
 									'<center><img src="images/characters/pavlovsk/school/head/36.jpg"></center>'
 									'"She turn you down again?" you ask him. "How many times is that?"'
@@ -189,8 +177,7 @@ if ARGS[0] = 3:
 									'"Well, yeah, but I don''t see how you''re going to do that."'
 									'"Stay here I''ll talk to her."'
 									act 'Look for Zinaida':
-										*clr
-										cla
+										*clr & cla
 										'<center><b><font color="maroon">School Hallway</font></b></center>'
 										'<center><img src="images/characters/pavlovsk/school/head/38.jpg"></center>'
 										'You catch up to Zinaida as she leaves the school building. She''s glued to her phone as always. You tap her on the shoulder and say, "Hey, Zinaida. You''re looking nice today."'
@@ -205,16 +192,14 @@ if ARGS[0] = 3:
 										'Suddenly you aren''t so sure about this, but you don''t really have a choice if you want to get back at Dimka. "Okay I''ll do it," you tell her.'
 										'"Great. I''ll go tell Feofan to take me on that date now. I know you''ll get the job done. Just don''t get caught."'
 										act 'Go to the computer science room':
-											*clr
-											cla
+											*clr & cla
 											'<center><b><font color="maroon">Computer Science Room</font></b></center>'
 											'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/flashdrive.jpg"></center>'
 											'You head into the computer room and attach the adapter to the computer like you were told. Curious, you don''t turn off the monitor right away and you see several programs opening and changing various setting.'
 											'You turn the screen off and wait ten minutes, then shut down the computer. When you reach behind the computer to grab the flash drive, you hear a voice coming from the door.'
 											'"What are you doing in here, pig?"'
 											act 'Face the door':
-												*clr
-												cla
+												*clr & cla
 												'<center><img src="images/characters/pavlovsk/school/head/1.jpg"></center>'
 												'You turn to face the door and see Dimka staring at you. "What are you up to, <<$pcs_nickname>>?" he asks you as he slowly walks towards you.'
 												'"None of your business," you tell him trying to sound tough.'
@@ -223,19 +208,18 @@ if ARGS[0] = 3:
 												'Dimka puts his hand on your shoulder and asks, "So what''s it going to be, pig? Are you going to do what I say? Yes or no?" If you say yes he''ll have you under his heel again. You aren''t going back to that.
 												He has you trapped though and you''ll have to use your wits to get by.'
 												act 'Use your wits':
-													*clr
-													cla
+													*clr & cla
 													npc_rel['A1'] -= 10
 													'<center><img src="images/locations/pavlovsk/school/events/rand_scoolboy8.jpg"></center>'
 													'Sometimes "using your wits" means doing what people least expect. So you gather up your saliva and spit in his eye. "Arrgh you bitch!" Dimka yells as he wipes the spit from his eye.
 													You seize the opportunity and kick him in the balls as hard as you can, then run out of the classroom. Remembering the flashdrive you run back and grab it, kicking Dimka again on the way out.'
 													act 'Run home':
-														*clr
-														cla
+														*clr & cla
 														minut +=10
+														gs 'stat'
 														'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/hammer-1.jpg"></center>'
 														'You run home as fast as you can. When you get home you grab a hammer from your stepfather''s toolbox and use it to crush the flashdrive into tiny pieces, then flush those pieces down the toilet. Finally you take a deep breath.'
-														act 'fly to school': minut +=10 & gt 'gschool_lessons', 'short_break'
+														act 'Run to school': minut += 10 & gt 'gschool_lessons', 'short_break'
 													end
 												end
 											end
@@ -247,8 +231,7 @@ if ARGS[0] = 3:
 					end
 				end
 				act 'Go to class':
-					*clr
-					cla
+					*clr & cla
 					dimaRevChoice = 0
 					'<center><b><font color="maroon">Classroom</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'
@@ -270,8 +253,7 @@ if ARGS[0] = 3:
 				You comply with an evil laugh and, as she crawls out the restroom. You give her a kick on the ass for good measure. All this excitement almost made you forget who really deserves a kick on the ass.
 				Dimka is going to regret messing with you. You know just what to do.'
 				act 'Ruin Dimka''s face':
-					*clr
-					cla
+					*clr & cla
 					dimaRevChoice = 4
 					npc_rel['A20'] += 5
 					npc_rel['A21'] += 5
@@ -282,34 +264,32 @@ if ARGS[0] = 3:
 					'"I''m going to kick Dimka''s ass, and I''ll kick your ass to if you don''t move."'
 					'"Who the hell do you think you''re talking to?"'
 					'"Actually that sounds like fun," says Lena. "We''ll join you." And with that all three of you head into the hall.'
-					act 'in the hall':
-						*clr
-						cla
+					act 'Continue':
+						*clr & cla
 						'The three of you roam the hall looking for Dimka. Most of the girls and some of the boys quickly head into different classrooms just to avoid you.
 						You catch one girl who was too slow and, while you press her against a wall, you make her tell you where Dimka is. "I, I saw him hanging out by the lockers, I swear! Please don''t hurt me."'
 						'You slap her in the face lightly, eliciting a whimper from her, then leave her there and head to the lockers. You see Dimka flirting with a girl while she checks her locker.
 						You approach him quickly, your hands already curled into fists.'
 						act 'Punch him in the face':
-							*clr
-							cla
+							*clr & cla
 							npc_rel['A1'] -= 20
-							'He hears you walking up and turns to meet you. Before he can say anything you punch him as hard as you can in the face.'
 							if pcs_stren > 80:
-								!!if high strength 80+ then this text is used, make sure the image is above all the text
 								grupvalue[4] += 10
 								money += 10000
 								'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/guyknockedout.jpg"></center>'
+								'He hears you walking up and turns to meet you. Before he can say anything you punch him as hard as you can in the face.'
 								'He falls to the ground, unconscious. Lena and Lera look at you with surprised looks on their faces. "Damn, <<$pcs_nickname>>! You knocked him out! How are you so strong?"'
 								'That felt good. Really good. Lena and Lera enjoyed it too. You can see in their faces that they have new respect for you. "Check his pockets," says Lena, "I''ll keep his watch."'
 								'You check his pockets and find 10000 roubles in his wallet. Fucking rich kid. This should teach him. "The teacher is coming," says Lera. "Let''s get out of here."'
 								act 'Continue': gt 'gschool_lessons', 'short_break'
 							elseif pcs_stren < 80:
-								!!if strength lower than 80
 								grupvalue[4] += 5
 								'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/punch.jpg"></center>'
+								'He hears you walking up and turns to meet you. Before he can say anything you punch him as hard as you can in the face.'
 								'"Ow! My fucking nose!" He says while holding his nose, then he looks at you with anger in his eyes. "I''m going to beat your ass bitch."'
 								act 'Fight':
 									!!stats
+									gs 'boyStat', 'A1'
 									strenV = 100
 									speedV = 50
 									agilV = 40
@@ -339,8 +319,7 @@ if ARGS[0] = 3:
 					end
 				end
 				act 'Go to class':
-					*clr
-					cla
+					*clr & cla
 					dimaRevChoice = 0
 					'<center><b><font color="maroon">Classroom</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'
@@ -356,8 +335,7 @@ if ARGS[0] = 3:
 				Hearing nothing, you gather up your courage and exit the stall. Luckily you''re all alone. You wipe your tears away and wrack your brain trying to figure out what to do.
 				You can''t let Dimka win. School life is unbearable now, but at least you aren''t being passed around like a cheap piece of meat. There must be something you can do.'
 				act 'Outcasts unite':
-					*clr
-					cla
+					*clr & cla
 					dimaRevChoice = 5
 					'<center><b><font color="maroon">School Hall</font></b></center>'
 					'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/girlnosebroke.jpg"></center>'
@@ -370,16 +348,14 @@ if ARGS[0] = 3:
 					'"You just want people to stop talking about you, so you try to get us involved in your business because you can''t close your legs," says a girl you don''t know.
 					"Why don''t you leave the rest of us alone so we don''t get picked on for hanging out with a wh-." You lose control. The next thing you know, she is clutching her nose and crying.
 					Moments later a teacher is pulling you away by the arm and sending you to the principals office.'
-					act 'Face the Music':
-						*clr
-						cla
+					act 'Face the music':
+						*clr & cla
 						'<center><img src="images/characters/pavlovsk/school/head/50.jpg"></center>'
 						'Miss. Volkov looks at you. "Hitting girls is not an appropriate behaviour miss <<$pcs_lastname>> it''s better you think on what you have done"'
 						!!sent to principal''s office and earn 20 demerits. Once you leave it goes to this scene below.
 						demerit += 20
 						act 'Oh no! It''s Petia':
-							*clr
-							cla
+							*clr & cla
 							'<center><b><font color="maroon">School Hall</font></b></center>'
 							'<center><img src="images/characters/pavlovsk/school/head/47.jpg"></center>'
 							'As you leave the principals office you are thinking what you might be able to do about your situation. You are distracted from your angry thoughts by an awful smell.'
@@ -388,9 +364,8 @@ if ARGS[0] = 3:
 							I''m not in the mood to deal with you."'
 							'As you walk off, Petia says, "Yeah, I heard what Dimka has been saying about you. What if you had something that could shut him up?"'
 							'You stop and ask, "What are you talking about?" He pulls out his phone and opens a video and shows it to you.'
-							act 'watch the video':
-								*clr
-								cla
+							act 'Watch the video':
+								*clr & cla
 								'<center><b><font color="maroon">School Hall</font></b></center>'
 								'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/drugdeal.jpg"></center>'
 								'You see the side of the school building. Judging by the angle, it seems to be hidden camera footage. Dimka walks into view and looks around nervously. Soon a shady looking guy in a hoodie shows up.
@@ -415,8 +390,7 @@ if ARGS[0] = 3:
 					end
 				end
 				act 'Go to class':
-					*clr
-					cla
+					*clr & cla
 					dimaRevChoice = 0
 					'<center><b><font color="maroon">Classroom</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'
@@ -426,8 +400,7 @@ if ARGS[0] = 3:
 			end
 			if otnBoyFrend['A2'] > 50:
 				act 'Talk with Artem':
-					*clr
-					cla
+					*clr & cla
 					npc_rel['A2'] += 5
 					dimaRevChoice = 6
 					'<center><b><font color="maroon">School Hallway</font></b></center>'
@@ -439,8 +412,7 @@ if ARGS[0] = 3:
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
 				act 'Go to class':
-					*clr
-					cla
+					*clr & cla
 					dimaRevChoice = 0
 					dimaRevenge += 1
 					'<center><b><font color="maroon">Classroom</font></b></center>'
@@ -455,12 +427,11 @@ end
 
 if dimaRevChoice = 0:
 	menu_off = 1
-	menu_off = 1
 !!bad ending!!
 	if ARGS[0] = 4:
 		!!fourth day in the hallway after lunch.!!
 		dimaRevenge += 1
-		pav_sex +=60
+		pav_sex += 60
 		'<center><b><font color="maroon">School Hallway</font></b></center>'
 		'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/behindherback.jpg"></center>'
 		'People are still talking about you. You do your best to ignore them. You haven''t seen Dimka since morning rollcall. You know he must be up to something.'
@@ -469,55 +440,49 @@ if dimaRevChoice = 0:
 	if ARGS[0] = 5:
 		!!fifth day after school.!!
 		dimaRevenge += 1
-		pav_sex +=60
-		pav_prostitute +=60
+		pav_sex += 60
+		pav_prostitute += 60
 		'<center><b><font color="maroon">School Hall</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
 		'As you start to leave school, you start to hear nasty comments from the students in the hall. They get louder and louder until one boy loudly calls you a slut to your face. Then they start chanting "Slut! Slut! Slut!" as other kids join in.
 		Soon the whole hallway is yelling "Slut!" until you run to the girl''s bathroom with your eyes full of tears.'
 		act 'In the girls room':
-			*clr
-			cla
+			*clr & cla
 			'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 			'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/crying.jpg"></center>'
 			'As you hide in the stall, crying hysterically, all you can think about is how your life is over. All the girls are going to give you the cold shoulder. The boys are going to treat you like a whore and make you give them blowjobs alongside Sonia.
 			Your mother will disown you. You continue to cry for what seems like a few hours until you run out of tears. Soon the bell rings and kids start heading home. You know the boys will be waiting for you so you wait an hour before daring to leave.
 			You wash your face and then head out the door. The first thing you see as you open the door is Dimka''s sneering face.'
 			'"About time. You know I hate to be kept waiting, whore. Now are you ready for your new life?"'
-			act 'try to run away':
-				*clr
-				cla
+			act 'Try to run away':
+				*clr & cla
 				'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/mensrape3.mp4"></video></center>'
 				'You try to push your way past him but to no avail. He forces you back into the restroom and starts ripping your clothes off. Soon the restroom door opens and a few more guys enter. Some you recognize as students but a few of them are too old to be in school.
 				After ripping off your clothes, Dimka forces his dick into your mouth and commands you to suck. You try to resist so he keeps slapping you until you have red hand prints all over your face. Finally, when your will to resist is completely gone, you start moving your head up and down his shaft.
 				You don''t want to be here and it shows in your reluctant and unenthusiastic blowjob. Soon he gets bored and forces his cock all the way down your throat, causing you to gag. He pulls his dick back out and pushes you to the ground. He puts you on your hands and knees and lines his cock up with your ass.'
-				act 'pain':
-					*clr
-					cla
+				act 'Scream':
+					*clr & cla
 					'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/community/bathroom/womens/sex/analpain.jpg"></center>'
 					'Dimka forces his cock into your ass as far as it will go, not caring if he damages you. The pain causes you to scream out loud. "Someone shut this bitch up!" One of the guys forces his cock into your mouth while Dimka continues hammering away, intent on causing as much pain as possible.
 					Two others put your hands on their members. Dimka picks up his pace, causing you to scream around some guy''s cock, sending both of them over the edge. Dimka pulls out and his cum drips out of your loosened asshole. He gets cleaned up and heads for the door.
 					"You''re in for a long night, whore. Oh but look. You have a friend." As he leaves a few more guys enter the restroom with Sonia in tow.'
 					act 'It continues':
-						*clr
-						cla
+						*clr & cla
 						'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 						'<center><img src="images/locations/pavlovsk/community/bathroom/mens/sex/gangbangbath.jpg"></center>'
 						'As soon as Dimka leaves a guy flips you over on your back and sticks his cock into your unlubricated vagina causing you to wince from the pain. Another guy shoves his cock down your throat until you almost suffocate.
 						They spitroast you like that for a while, then, just as you''re about to pass out, they finish inside you and pull out. You gasp for air while coughing up semen as two more guys take up position. They continue to use your body for their pleasure for hours. Your mouth, pussy, ass and hands.
 						The ones who are left out turn their attention to Sonia or jack off onto your body. Your whole body is defiled over and over.'
 						act 'Continue':
-							*clr
-							cla
+							*clr & cla
 							'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 							'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/reidgangbang.jpg"></center>'
 							'In the beginning most of the guys were focused on you. As the novelty of an unwilling victim wore off, though, they started moving over to Sonia. She is a lot more enthusiastic than you and seems to genuinely enjoy being treated like an animal.
 							You remember she was a nice girl - a good girl - but now she''ll do anything for any guy, no matter how degrading. Is that what you are going to become? The thought of it causes more tears to fall. You keep crying until you fall asleep.'
-							act 'wake up':
-								*clr
-								cla
+							act 'Wake up':
+								*clr & cla
 								hour = 20
 								minut = 0
 								minut = 60 * 4
@@ -525,9 +490,8 @@ if dimaRevChoice = 0:
 								'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/coveredincum.jpg"></center>'
 								'You wake in Sonia''s lap, covered in cum. "They all left but I stayed to make sure you were okay," she answers to your unspoken question. You start to cry again. Sonia holds you in her arms and tries to console you. "It will be okay," she says. "No, it won''t," you answer as you start to cry harder.
 								Sonia holds you tighter and says "It will get easier. And I''m here if you need someone to talk to or a shoulder to cry on. Now let''s get you cleaned up and I''ll walk you home." She helps you up and cleans you off as best as she can.'
-								act 'walk home with Sonia':
-									*clr
-									cla
+								act 'Walk home with Sonia':
+									*clr & cla
 									npc_rel['A25'] += 10
 									!!use the resident night image here
 									'Sonia walks you home to your apartment. She lets you wear her coat since your clothes are torn. You can barely stand and she pretty much has to carry you the whole way. As you reach your door, she hugs you and tells you it will be okay again. You almost believe her this time. You thank her and head inside.'
@@ -554,8 +518,7 @@ if dimaRevChoice = 1:
 		'"I heard he tries to get girls hooked too so they''ll keep going out with him." You smile. Things are coming along. As you exit the school, though, you hear something that gives you pause.'
 		'"I heard <<$pcs_firstname>> gave Lesco a blowjob just because he told her she''s pretty. She is so self conscious that she''ll have sex with anyone if they tell her she''s pretty." You turn red. None of that is true! Not a bit! So that''s how it''s going to be. You change your mind and go for Lizaveta.'
 		act 'Find Lizaveta':
-			*clr
-			cla
+			*clr & cla
 			'<center><img src="images/characters/pavlovsk/school/head/31.jpg"></center>'
 			'You head back into the school building to look for Lizaveta. You see her talking to Dimka, probably about some sort of secret he has about you. He leaves her and walks toward the school entrance you just came through. "Hey pig," he says mockingly.'
 			'"Kill yourself," you reply. You don''t have the patience to deal with him right now. He laughs as he leaves the school. You talk to Lizaveta about some more secrets you have about Dimka, making sure to be real creative about what you tell her. You also make sure that she knows Dimka is lying about everything he says.
@@ -567,7 +530,7 @@ if dimaRevChoice = 1:
 	if ARGS[0] = 5:
 		if $ARGS[1] = 'before':
 			!!fourth day before class!!
-			pav_sex +=60
+			pav_sex += 60
 			'You enter the school and walk around listening to the other students. "I heard Dimka sucked some guy off for crack."'
 			'"I heard <<$pcs_firstname>> gets passed around by everyone in her apartment building." The rumors only get worse. You head to class.'
 			act 'Continue': gt 'gschool_lessons', 'short_break'
@@ -606,8 +569,7 @@ if dimaRevChoice = 1:
 			'You go around the hallway spreading rumors about Dimka, but everyone looks at you like you are full of it. It seems Lizaveta was true to her word, after all. You see Dimka having the same trouble. It seems you''ve both lost your credibility. At least your reputation is safe, since no one believes Dimka anymore. You are too stubborn to notice that though and keep trying to spread rumors while Dimka does the same.'
 			'Soon the two of you get into an argument, which turns into a screaming match. You are both screaming at the top of your lungs when the principal comes to break things up. "Miss <<$pcs_lastname>>, Mr Nosov, in my office now!"'
 			act 'Go to the principal''s office':
-				*clr
-				cla
+				*clr & cla
 				'<center><img src="images/characters/pavlovsk/school/head/50.jpg"></center>'
 				'You and Dimka sit as Miss. Volkov scolds you. "I don''t know why you two were arguing about and I don''t care. I won''t have it in my school, do you understand?" She gives you both a stern look. "Now I want you to look me in the eye and tell me this won''t happen again."'
 				'You look her in the eye. "I''m sorry," you say.'
@@ -642,7 +604,7 @@ if dimaRevChoice = 2:
 	if ARGS[0] = 4:
 		if $ARGS[1] = 'day4jockbefore':
 			!!fourth day before class!!
-			pav_sex +=60
+			pav_sex += 60
 			'As you enter the school you hear students talking excitedly. "I heard Lena is a huge slut, but she has to keep it a secret because Vitek beats up any guy who hits on her."'
 			'"I heard that too. I also heard that if you can catch her when she is all alone, she will happily go down on you." Someone is going to get their ass kicked.
 			Who would be stupid enough to talk shit about Lena? Your first thought is Dimka, but what would he have to gain? You think about it as you head to class.'
@@ -655,18 +617,16 @@ if dimaRevChoice = 2:
 			'Something is wrong. Rumors about Lena continue to spread, but that isn''t what worries you. As you walk the halls, you notice the other kids avoiding you. When you approach them, they run away.
 			You grab one girl and make her tell you what is going on. "Vitek and Lena are after you," she says.'
 			'"They know you are the one spreading rumors. Please let me go, he''s coming." True enough, Vitek comes walking around the corner. You let the girl go and duck into an unused classroom.'
-			act 'hide':
-				*clr
-				cla
+			act 'Hide':
+				*clr & cla
 				'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/hidingdesk.jpg"></center>'
 				'You hide by the door listening for Vitek. You hear footsteps outside which get closer and closer. When you see the doorknob turn, you hide under a teacher''s desk.
 				Vitek enters the room and looks around. After a while the door closes again. You are just about to come out of hiding when you hear the flick of a lighter. You freeze.
 				Vitek lights his cigarette and smokes it while sitting on the desk you are hiding under. The smoke makes your eyes water and you struggle not to cough as you hide.
 				After a few minutes, Vitek finishes his cigarette and leaves the room. You start coughing and head for the window. That was so close. You stick your head out the window and take a deep breath.
 				Afterwards, you continue to hide in the room since you are sure Vitek and Lena are still looking for you. You play on your phone until school lets out.'
-				act 'slip out with the crowd':
-					*clr
-					cla
+				act 'Slip out with the crowd':
+					*clr & cla
 					'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/girlgangup.jpg"></center>'
 					'You slip out with crowd, grab your stuff from your locker and leave the school building. As you sneak around the back of the school, you see Lena looking around angrily.
 					Lera is not far behind. When they spot you watching them, they run towards you. You try to run, but Lera is surpsingly fast, she tackles you from behind before you make it far.
@@ -686,16 +646,14 @@ if dimaRevChoice = 2:
 						'The two of them are too strong for you and you get knocked to the ground. They start kicking you. You do your best to block their kicks while trying to get up, but they keep knocking you down.
 						You are about to give up when Ivan and Fedor show up. Fedor tosses Lera aside and Ivan grabs Lena by the shoulders and tries to calm her down. Suddenly you hear an angry yell, and you see Vitek charging towards Ivan.
 						You get up in time to see Dan, Vasily Paulina, and Ekaterina arrive, followed by Erast and Lazar. Things get crazy after that, with Roman showing up last.'
-						act 'school brawl':
-							*clr
-							cla
+						act 'School brawl':
+							*clr & cla
 							'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/bigbrawl.jpg"></center>'
 							'Ivan and Vitek trade blows that would knock anyone else out. Roman, crazy little shit that he is, takes on Erast. Dan and Vasily double up on Fedor, Ekaterina decides she wants to fight Lazar who refuses to hit a girl. Ekaterina scoffs at him and proceeds to kick his ass anyway.
 							You lose track of Lena and Lera. As you look around you see a security camera looking straight at you. Before you can tell anyone about it, a brick hits you in the back causing a great deal of pain. You turn around and see Pauline. "Fucking bitch," you shout as you run at her.
 							"I''ll fucking kill you!"'
-							act 'fight':
-								*clr
-								cla
+							act 'Fight':
+								*clr & cla
 								'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/thepopo.jpg"></center>'
 								'You and Pauline go at at for quite a while. Eventually you are both tired and catch your breath before having another go. As you try to catch your breath, exhausted, you see how the others are doing.
 								You see Ivan and Vitek still at it, neither one of them running out of energy, though it looks like Ivan''s superior skill is starting to become the deciding factor.
@@ -704,9 +662,8 @@ if dimaRevChoice = 2:
 								'You see battered and bloody Roman pull out a knife and charge at Erast, who seems to have taken his fair share of blow from Roman. As Roman charges him though, Erast side steps just in time and delivers and powerful blow, that sends Roman sprawling unconscious.
 								Erast looks around and then heads over to help Fedor. Lazar is trying to block Ekaterina''s attacks but his refusal to hit her back means she is beating him down. He goes down and once he does, it is all over.
 								Just then you catch sight of Lena and Lera walking towards you. Apparently they were waiting for you to tire yourself out. Lera grabs you and hold you for Lena, but before she can do anything, you hear the sounds of sirens. Several officers show up and arrest everyone.'
-								act 'in holding':
-									*clr
-									cla
+								act 'In custody':
+									*clr & cla
 									'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/jailcell.jpg"></center>'
 									'How did it come to this? The reason you went to Ivan for help was to avoid something like this. If you had known this was going to happen, you would have kicked Dimka''s ass yourself. You sit in holding trying to avoid the glares of Vitek and Lena.
 									You feel a little safer with Ivan sitting next to you, but what happens if he leaves before you? "You are going to pay for talking shit about me," Lena tells you. "You can''t avoid me."'
@@ -731,7 +688,7 @@ if dimaRevChoice = 2:
 			dimaRevenge += 1
 			!dimaRevenge = 6!
 			!!fifth day before class!!
-			pav_sex -=60
+			pav_sex -= 60
 			'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/bulliedinhall.jpg"></center>'
 			'You enter the school building and head to your locker. You listen to the other students for any new gossip. Predictably they are all talking about the fight yesterday. At least one good thing came out of that. You can see Dimka down the hall at his locker. Every jock and gopnik who passes him shoves him into the lockers as they pass.
 			Dimka is in for a rough day.'
@@ -755,7 +712,7 @@ if dimaRevChoice = 3:
 		dimaRevenge += 1
 		!dimarevenge = 5!
 		!!fourth day during lunch!!
-		pav_sex +=60
+		pav_sex += 60
 		npc_rel['A152'] += 10
 		'<center><b><font color="maroon">Cafeteria</font></b></center>'
 		'<center><img src="images/characters/pavlovsk/school/head/38.jpg"></center>'
@@ -772,7 +729,7 @@ if dimaRevChoice = 3:
 	end
 	if ARGS[0] = 5:
 		!!fifth day before class!!
-		pav_sex -=100
+		pav_sex -= 100
 		dimaRevenge += 1
 		!dimarevenge = 6!
 		'<center><b><font color="maroon">School Hallway</font></b></center>'
@@ -781,9 +738,8 @@ if dimaRevChoice = 3:
 		In the video Dimka is snorting line after line of coke. More than he did when you were with him. Watching him, it is obvious how much of an addict he really is. Then someone knocks on his door and a male voice says, "Dimka I need to talk with you," which causes Dimka to panic and rush to hide his stash.'
 		'"The male voice has to be his dad," reasons Feofan, "and he doesn''t know about his sons habit."'
 		'"I can use that to my advantage," you tell him, "He''ll do whatever I say so his father doesn''t see this. Thanks Feofan. Send the video to my phone and keep a copy for yourself just in case. I''m off to see Dimka."'
-		act 'confront Dimka':
-			*clr
-			cla
+		act 'Confront Dimka':
+			*clr & cla
 			npc_rel['A1'] -= 20
 			'<center><b><font color="maroon">School Hall</font></b></center>'
 			'<center><img src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
@@ -808,14 +764,12 @@ if dimaRevChoice = 3:
 			'"That''s more like it. You have until the end of the day to get results, or else you know what will happen. don''t you? I don''t want to see you in class until you get it done." He nods and heads into the hall. You breathe a sigh of relief.
 			You were seriously scared there, but it was also exciting seeing him so scared himself. You think about following him around to make sure he keeps his word, but that would mean skipping class. You know he won''t cross you as long as you have dirt on him. You head to class.'
 			act 'Go to class':
-				*clr
-				cla
+				*clr & cla
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				'<center><img src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'
 				'You sit in class listening to the lesson. Looking around you see Dimka isn''t here. Good. He must be doing what he promised. Or he''s up to something. You hear some chatter from the other students, but none of it seems to be about you.'
 				act 'Continue':
-					*clr
-					cla
+					*clr & cla
 					'<center><b><font color="maroon">School Hall</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
 					'The student chatter continues until a girl you don''t know walks through the hallway. All the girls go quiet and turn away from her while the boys make dirty comments behind her back while laughing among themselves. Instantly, it occurs to you: this is Dimka''s doing.
@@ -856,9 +810,8 @@ if dimaRevChoice = 4:
 			'"What do I get for helping you?"'
 			'"I''m sure I can think of something," you answer as you glide a finger across his chest. "After you help me that is. So what will it be."'
 			'"Okay let''s do it. Follow me."'
-			act 'follow Lavrenti':
-				*clr
-				cla
+			act 'Follow Lavrenti':
+				*clr & cla
 				'<center><img src="images/characters/pavlovsk/school/head/40.jpg"></center>'
 				'You follow Lavrenti to an unused room. "Me and Dimka used to hang out here. We stole the key and made a couple of copies before returning it."'
 				'He pulls out a key and slips it into the lock. You get ready as he unlocks the door. When he opens it, you run inside to confront Dimka, but the room is empty. "Shit," you say, "He isn''t here."'
@@ -872,8 +825,7 @@ if dimaRevChoice = 4:
 				*nl
 				'"That should do it," he says as he tapes the note under the desk. "Lets go and wait for him." The two of you head for the locker rooms.'
 				act 'Wait for Dimka to arrive':
-					*clr
-					cla
+					*clr & cla
 					npc_rel['A1'] -= 20
 					grupvalue[4] += 5
 					'<center><img src="images/locations/pavlovsk/school/gym/showers.jpg"></center>'
@@ -888,8 +840,7 @@ if dimaRevChoice = 4:
 						'"Thanks Lavrenti," you gasp, "Give me a minute." After a few minutes, you catch your breath. You check yourself in a nearby mirror. You have bruises on your neck.'
 						'"He''s going to pay for this. Let''s take him to the showers."'
 						act 'In the shower room':
-							*clr
-							cla
+							*clr & cla
 							npc_rel['A155'] += 5
 							money += 10000
 							'Lavrenti puts Dimka on the tile floor and restrains him. You start the shower and spray cold water on Dimka''s face. He wakes up angry and starts shouting obscenities at you until Lavrenti hits him in the head.'
@@ -933,25 +884,22 @@ if dimaRevChoice = 4:
 			dimaDisco = 1
 			'It isn''t hard to find Dimka as he is often surrounded by girls clamoring for his attention. He''s wearing the bruises you gave him as battle scars, and the girls are fawning all over him, calling him brave.
 			If only they knew how he practically cried when his drugs washed down the drain. You need to lure him out somehow. And someone to back you up and block Dimka''s escape when he inevitably tries to run.'
-			act 'find help':
-				*clr
-				cla
+			act 'Find help':
+				*clr & cla
 				'You head to where some of the gopniks are drinking. One of them hands you a beer and you drink it while chatting for a bit. You ask some of the girls for help luring Dimka out, but most of them are too drunk to understand you.
 				Anushka and Alyona seem to be at least somewhat sober, though. You ask them for help.'
 				'"Sure, I can help out," says Anushka. "I''m sure Alyona will help too. For a favor."'
 				'The look at each other and smile mischievously. The look worries you a little. Anushka is pretty wild and her idea of fun can get pretty far out there. Whatever the favor is, you''re sure it will be interesting and likely fun.'
 				'"It''s a deal," you lean in and say. "Okay, Anushka, I need you to lure Dimka to the girl''s restroom where I will be waiting. Alyona will follow after and block him if he tries to run. Then we bash his face in."'
 				act 'Lay the trap':
-					*clr
-					cla
+					*clr & cla
 					npc_rel['A143'] += 5
 					npc_rel['A144'] += 5
 					'You and Alyona watch as Anushka puts the moves on Dimka. After a bit of flirting, she whispers something in his ear, then grabs him by the hand and heads to the restroom.
 					No one can resist her charms, when she wants to use them. You head to the restroom as Alyona hides in the crowd. When you get to the restroom, you hide in a stall. You hear the door open.'
 					'"Just a little further. In this stall." They stop in front the stall you''re waiting in and open the door.'
 					act 'Spring the trap':
-						*clr
-						cla
+						*clr & cla
 						'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/girlbeatsguy2.jpg"></center>'
 						'"What''s up asshole," you say as you punch Dimka in the face. He runs for the exit right away. Straight into Alyona''s fist which knocks him to the ground.'
 						'"Fucking slut set me up," he yells just before Anushka kicks him repeatedly in the side.'
@@ -962,8 +910,7 @@ if dimaRevChoice = 4:
 						'"Lets find out," you say. "But first I have an idea. Help me lift him."'
 						'The three of you pick him up and put him in a stall and sit him on the toilet. Then you pull all his clothes off, leaving him completely naked in one of the stalls in the girls restroom. You take a few pictures.'
 						act 'Back to the dance':
-							*clr
-							cla
+							*clr & cla
 							'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/thepopo.jpg"></center>'
 							'You, Anushka, and Alyona head back to the dance and have a few beers, tossing his clothes in the trash. After a few minutes, you hear a scream coming from the restroom.
 							One of the girls must have found Dimka. She runs out screaming pervert. A few minutes later you hear sirens as the cops arrive. Everyone heads towards them to see who they are arresting.
@@ -976,12 +923,13 @@ if dimaRevChoice = 4:
 			end
 		end
 	end
+	
 	if ARGS[0] = 6:
 		if dimaDisco = 1:
 			dimaRevenge += 1
 			!dimaRevenge = 8!
 			!!fifth day before class!!
-			pav_sex -=40
+			pav_sex -= 40
 			'<center><img src="images/characters/pavlovsk/school/head/44.jpg"></center>'
 			'The first thing you hear when you enter the school is how Dimka was caught jacking off in the girls restroom at the disco.
 			Only three people know the truth, but they aren''t going to tell anyone. You feel someone tap your shoulder and you turn around to see Anuska. "Forty," she says.'
@@ -989,8 +937,7 @@ if dimaRevChoice = 4:
 			'"Bottles of Zhiguljovskoje. 10000 roubles buys forty bottles of Zhiguljovskoje! We''re having a little party in the old building. Get your ass there."
 			She''s in a good mood, today. You wanted to listen to gossip, but getting drunk sounds like way more fun. You head up there.'
 			act 'Party!':
-				*clr
-				cla
+				*clr & cla
 				grupvalue[4] += 2
 				'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/cheers.jpg"></center>'
 				'You head to the old school building, with Anushka. Inside is the old music room, built to be soundproof. It is the perfect place to avoid being heard, even if most of the windows are now just borded up.
@@ -1003,8 +950,7 @@ if dimaRevChoice = 4:
 				Radomir''s band finishes their song and grab some beers. Anushka comes over to you and Alyona. Alyona offers her a bottle as well. Anushka accepts it from her with one hand and grabs Alyona''s head with the other and brings her into a deep kiss, causing the boys in the room to cheer.
 				Alyona is unable to resist her and melts into her arms. Anushka eyes you while she kisses Alyona as if inviting you to join.'
 				act 'Join in':
-					*clr
-					cla
+					*clr & cla
 					npc_rel['A143'] += 5
 					npc_rel['A144'] += 5
 					'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/threegirlskiss.jpg"></center>'
@@ -1016,9 +962,8 @@ if dimaRevChoice = 4:
 					Emboldened by the atmosphere of sex in the room, you grab Alyona''s face and give her the best kiss you can muster. You lock lips for a minute before pulling away and showing her how to perform real cunnilingus.
 					You work your tongue along Anushka''s pussy lips and clit, bringing her close to orgasm, but you hold back each time, just before she cums. You repeat this until she begs you to make her cum. You comply and Anushka screams as she orgasms.
 					The three of you lie on the ground together and cuddle before passing out.'
-					act 'wake up':
-						*clr
-						cla
+					act 'Wake up':
+						*clr & cla
 						'<center><img src="images/locations/pavlovsk/resident/rekshome/party/party_iralena_6_7.jpg"></center>'
 						'As you wake up, you see a partially dressed Anushka sitting on the window sill smoking a cigarette. Alyona is still sleeping like a baby. "She looks so content," Anushaka says in a somewhat sad tone, which makes you wonder just how rough Alyona''s life is, "and so adorable when she''s like this. Are you going home?"'
 						'"Yeah," you say as you get dressed. "I''ll see you later."'
@@ -1030,8 +975,8 @@ if dimaRevChoice = 4:
 			end
 		else
 			dimaRevenge -= 3
-			pav_sex +=40
-			pav_prostitute +=40
+			pav_sex += 40
+			pav_prostitute += 40
 			!dimaRevenge = 8!
 			dimaRevChoice = 0
 			'<center><b><font color="maroon">Outside School</font></b></center>'
@@ -1042,9 +987,8 @@ if dimaRevChoice = 4:
 			end
 			'Pavlovsk''s only school, all the local children go here for their education. Next to the school is the athletic field, a parking lot for the teachers, just beyond the parking lot is a grove of trees, and past that is the old school building. After the new school was built the old one was supposed to get renovated and used for advance classes but budget cuts meant the project was canceled and now the old school building stands empty. Though many of the kids use it to skip class or as a place to sneak off to drink or have sex.'
 
-
 			'It seems Dimka didn''t finished to spread dirt about you, maybe you have to talk to your group again, hopefully it''s not too late...'
-			act 'continue': gt $loc,$metka
+			act 'Continue': gt $loc,$metka
 		end
 	end
 end
@@ -1056,32 +1000,29 @@ if dimaRevChoice = 5:
 		dimaRevenge += 1
 		!dimarevenge = 5!
 		!!fourth day after school at train station. he''ll wait all day, but if you don''t meet him, bad ending plays on fifth day!!
-		pav_sex +=60
+		pav_sex += 60
 		npc_rel['A159'] += 10
 		dimaTrain = 1
 		'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
 		'You enter the train station and see Petia waiting by the ticket office. He waves you over, and the two of you wait in line for tickets. "I''m afraid I don''t have any money on me at the moment," he says, "so you''ll have to pay for everything."'
 		'Fucking cheapskate. He probably has money. He just doesn''t want to pay for anyone but himself even though he''s the one who wanted this stupid date.
 		"Let''s just go," you say as you pay for two tickets to the city. Then the two of you head to the train and find seats.'
-		act 'to the city':
-			*clr
-			cla
+		act 'Head to the city':
+			*clr & cla
 			minut += 45
 			'<center><img <<$set_imgh>> src="images/locations/shared/train/ride2.jpg" ></center>'
 			'You sit on the train listening to Petia''s terrible pickup lines. You do your best to ignore him and play with your phone.
 			He is wearing the same outfit as usual but now his hair is combed back in an attempt to look nice. He is absolutely covered in cologne as if he just decided to use a whole bottle of the stuff rather than take a bath.
 			When he opens his mouth, you see that he brushed his teeth, but you smell that he ate something rank before meeting up with you. He makes inappropriate remarks about your body every chance he can get and keeps brushing against you on "accident."
 			He is offensive to four of your five sense, and you don''t want to find out about the fifth one. You feel uncomfortable and wish for the train to go faster so you don''t have to sit so close to this guy. Soon you arrive at in the city center, and, after leaving the station, head to Diner Bystroeshka.'
-			act 'in the diner':
-				*clr
-				cla
+			act 'Go inside the diner':
+				*clr & cla
 				minut += 30
 				'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/baddate.jpg"></center>'
 				'You enter and pay for your meals, then find a table. You sit and eat your food while trying to avoid looking at Petia, who chews with his mouth open. He keeps complimenting you on your body, and you are finding it difficult not to ditch him.
 				You just keep reminding yourself why you are doing this. After an excruciating twenty minutes, you leave and head for central park.'
-				act 'walk in the park':
-					*clr
-					cla
+				act 'Walk in the park':
+					*clr & cla
 					minut += 15
 					'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/rejectedkiss.jpg"></center>'
 					'The two of you walk for a while until he decides to try to kiss you. You immediately push him away. "I''m not kissing you," you tell him.'
@@ -1090,17 +1031,15 @@ if dimaRevChoice = 5:
 					'"Come on. It''s not like you haven''t tasted more disgusting thing. Am I right?"'
 					'"What the hell is that supposed to mean?!"'
 					'"Every rumor has a bit of truth, and with the rumors about you, I''m sure you''ve sucked off plenty of guys, so you should be glad that I would even want to kiss you." You turn red with embarrassment, then rage. You kick Petia in the balls as hard as you can.'
-					act 'The video':
-						*clr
-						cla
+					act 'Look for the video':
+						*clr & cla
 						minut += 5
 						'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/greatpain.jpg"></center>'
 						'He doubles over in pain as you kick him in the balls again and again. When he goes to cover them, you kick him in the head.
 						All your bottled up feelings come pouring out as you continue to kick Petia: the anger for Dimka, the helplessness from being picked on, the loneliness from being an outcast. After a while you regain control and tell him to give you his phone.
 						Not wanting to be kicked again, he hands it over then goes back to lying on the ground. You find several videos on his phone. One of them is Labeled "Dimka Drug Deal." You open up the video and play it with sound.'
 						act 'Play video':
-							*clr
-							cla
+							*clr & cla
 							minut += 10
 							'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/drugdeal.jpg"></center>'
 							'You fast forward the video a bit to get to the conversation between Dimka and his dealer. "I''m taking a big risk bringing this to a school. You should come to me my place in the city."'
@@ -1111,9 +1050,8 @@ if dimaRevChoice = 5:
 							'"Fine here! Now hand it over." So he doesn''t want his father to find out. You can use that. You send the video to your phone.'
 							'"You have what you came fore so you can hand me my phone now," Petia says while still curled up on the ground.'
 							'"Not so fast," you say.'
-							act 'check other videos':
-								*clr
-								cla
+							act 'Check the other videos':
+								*clr & cla
 								minut += 5
 								npc_rel['A159'] -= 20
 								'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/checkphone.jpg"></center>'
@@ -1132,7 +1070,7 @@ if dimaRevChoice = 5:
 		if dimaTrain = 1:
 			if $ARGS[1] = 'before':
 				!!Fifth day before class!!
-				pav_sex -=80
+				pav_sex -= 80
 				npc_rel['A1'] -= 20
 				'<center><img src="images/characters/pavlovsk/school/head/1.jpg"></center>'
 				'The first thing you do when you enter the school is look for Dimka. You find him by his locker, checking his phone. Years of pent up anger gives you courage and you confront him. "Hey, asshole," you say to get his attention.'
@@ -1162,13 +1100,11 @@ if dimaRevChoice = 5:
 				Without thinking you shove her against a locker, placing your forearm against her throat. You apply pressure, causing her to wheeze. She looks at you with tears in her eyes. She wasn''t expecting this. No one was, but they should have.
 				After all the shit you had to take from everyone, you were bound to reach a boiling point sooner or later. She chose the wrong time to mess with you. Looking at her, you see fear and...'
 				act 'This isn''t you':
-					*clr
-					cla
+					*clr & cla
 					'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/guiltygirl.jpg"></center>'
 					'You feel like a monster, getting off on someone''s pain. You let her go. She looks at you with fear, then runs away. You don''t think she will mess with you again. You almost lost yourself today, and you feel so bad about it. You head to class.'
 					act 'End':
-						*clr
-						cla
+						*clr & cla
 						'<center><b><font color="maroon">School Hallway</font></b></center>'
 						'<center><img src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
 						'As you walk through the halls leaving school, things seem to be back to normal. No one is talking about you anymore, and you are back to being mostly unnoticed and occasionally picked on.
@@ -1177,23 +1113,20 @@ if dimaRevChoice = 5:
 						act 'leave school': gt 'gschool_grounds', 'main'
 						!!normal end of school
 						act 'No more':
-							*clr
-							cla
+							*clr & cla
 							grupvalue[4] += 10
 							'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/chokegirl.jpg"></center>'
 							'You''ve been picked on for the last time. You put your hands on her throat and continue choking her. She tries to pry your finger off, but you are running on hysterical strength now. As she passes out, the principal grabs you and throw you off her.
 							She calls for a nurse then drags you to her office.'
 							act 'In trouble':
-								*clr
-								cla
+								*clr & cla
 								demerit += 40
 								'<center><img src="images/characters/pavlovsk/school/head/50.jpg"></center>'
 								'Miss. Volkov looks at you. "I don''t know what''s on your mind miss <<$pcs_lastname>> but what have you done will have serious consequences...now go"'
 								!!sent to princeipal''s office and earn 20 demerits, afterwards it goes to this scene.
 								!!Office doesn''t exist yet according to gschool_grounds.
 								act 'Back to class':
-									*clr
-									cla
+									*clr & cla
 									dimaRevenge += 1
 									minut += 60 * 2
 									hour = 14
@@ -1209,8 +1142,8 @@ if dimaRevChoice = 5:
 			end
 		else
 			dimaRevChoice = 0
-			pav_sex +=40
-			pav_prostitute +=40
+			pav_sex += 40
+			pav_prostitute += 40
 			'<center><b><font color="maroon">Outside School</font></b></center>'
 			if month > 2 and month < 9:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool.jpg"></center>'
@@ -1219,9 +1152,8 @@ if dimaRevChoice = 5:
 			end
 			 'Pavlovsk''s only school, all the local children go here for their education. Next to the school is the athletic field, a parking lot for the teachers, just beyond the parking lot is a grove of trees, and past that is the old school building. After the new school was built the old one was supposed to get renovated and used for advance classes but budget cuts meant the project was canceled and now the old school building stands empty. Though many of the kids use it to skip class or as a place to sneak off to drink or have sex.'
 
-
 			'It seems Dimka didn''t finished to spread dirt about you, maybe you have to talk to your group again, hopefully it''s not too late...'
-			act 'continue': gt $loc,$metka
+			act 'Continue': gt $loc,$metka
 		end
 	end
 end
@@ -1229,8 +1161,7 @@ end
 if dimaRevChoice = 6:
 	menu_off = 1
 	if ARGS[0] = 4:
-		*clr
-		cla
+		*clr & cla
 		dimaRevenge += 1
 		!dimarevenge = 5!
 		!!fourth day in the hall!!
@@ -1238,12 +1169,11 @@ if dimaRevChoice = 6:
 		'<center><b><font color="maroon">School Hallway</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
 		'You see Artem in the hall talking with Ivan. When you greet him he says "Don''t worry, <<$pcs_nickname>>. I have a plan. I can''t talk about it now, though." Saying that he rushes off. What is he up to?'
-		act 'continue': gt 'gschool_lessons', 'short_break'
+		act 'Continue': gt 'gschool_lessons', 'short_break'
 	end
 
 	if ARGS[0] = 5:
-		*clr
-		cla
+		*clr & cla
 		dimaRevenge += 1
 		!dimarevenge = 6!
 		!!fifth day after lunch!!
@@ -1253,8 +1183,7 @@ if dimaRevChoice = 6:
 		'As you exit the cafeteria, you start to hear nasty comments from the students in the hall. They get louder and louder until one boy loudly calls you a slut to your face. Then they start chanting "Slut! Slut! Slut!" as other kids join in.
 		Soon the whole hallway is yelling "Slut!" until you run to the girl''s bathroom with your eyes full of tears.'
 		act 'In the girls room':
-			*clr
-			cla
+			*clr & cla
 			minut += 5
 			'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 			'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/crying.jpg"></center>'
@@ -1263,16 +1192,14 @@ if dimaRevChoice = 6:
 			'"Come out, <<$pcs_nickname>>. you can''t stay in their forever." It''s Dimka, that fucking asshole.'
 			'"Your public is waiting for you, slut. Come out and show us what a good cocksuc- Ow! Fuck! Get the hell off me Artem!"'
 			act 'peek your head out':
-				*clr
-				cla
+				*clr & cla
 				minut += 15
 				'<center><b><font color="maroon">School Hallway</font></b></center>'
 				'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/fightinginhall.jpg"></center>'
 				'You peek your head out and see Artem on top of Dimka, punching him in the face over and over with no sign of stopping. Igor is behind Artem, about to pull him off, but is knocked aside by Ivan.
 				This rather one sided fight goes on until a teacher hears the commotion and comes to investigate. Ivan pulls Artem off of Dimka before the teacher can see what''s happening.'
-				act 'act innocent':
-					*clr
-					cla
+				act 'Act innocent':
+					*clr & cla
 					minut += 10
 					'<center><b><font color="maroon">School Hallway</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
@@ -1284,8 +1211,7 @@ if dimaRevChoice = 6:
 					'"That''s enough Mr. Nosov. Do you really expect me to believe an honor roll student did this to you. I''m giving you a demerit for lying. Now go see the nurse."'
 					'Dimka looks at him in disbelief then at you and Artem. Finally he leaves in a huff and heads for the nurse''s office.'
 					act 'Go to class':
-						*clr
-						cla
+						*clr & cla
 						minut += 60
 						'<center><b><font color="maroon">Classroom</font></b></center>'
 						'<center><img src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
@@ -1299,8 +1225,7 @@ if dimaRevChoice = 6:
 						'"Well, he is kinda cute."'
 						'Hmm. So that''s what they''re talking about. You wonder if this was Artem''s plan all along.'
 						act 'Sit with Artem':
-							*clr
-							cla
+							*clr & cla
 							minut += 60
 							npc_rel['A25'] += 5
 							'<center><b><font color="maroon">Classroom</font></b></center>'
@@ -1313,9 +1238,8 @@ if dimaRevChoice = 6:
 							*nl
 							'You can''t help but think there''s more to it to that. You decide that he''s entitled to a litle deviousness and decide not to go into it.
 							"I really appreciate you standing up for me," you tell him as you give him a kiss on the cheek. Soon after the bell rings. As the students leave the classroom you suggest that Artem should walk you home.'
-							act 'walk home with Artem':
-								*clr
-								cla
+							act 'Walk home with Artem':
+								*clr & cla
 								minut += 10
 								npc_rel['A25'] += 10
 								'<center><b><font color="maroon">After School</font></b></center>'
@@ -1323,9 +1247,8 @@ if dimaRevChoice = 6:
 								'As you leave the school with Artem, you hear the other students talking about the two of you. Mostly talking about what a lucky bastard Artem is and how cute the two of you look together.
 								When you reach your apartment you check to see if your parents are home and when you see that they aren''t, you invite Artem into your room. You tell him to undress and relax and let you take care of him. Artem undresses and sits on your bed and eagerly waits for what you have planned.
 								You find your sexiest outfit and put it on in the bathroom then return to him.'
-								act 'strip tease':
-									*clr
-									cla
+								act 'Do a strip tease':
+									*clr & cla
 									minut += 15
 								!!if high erotic dancing skill!!
 									'<center><b><font color="maroon">Home</font></b></center>'
@@ -1335,16 +1258,14 @@ if dimaRevChoice = 6:
 									!!if low erotic dancing skill!!
 									'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/dimka/revenge/stripfail.mp4"></video></center>'
 									'You decide to give him a show. You really should have practiced first. You fell down a couple time and had to get his help to unclasp your bra, and when you tried a complicated move you tripped on your sisters bed. Laughing, you get up and get on the bed in front of him.'
-									act 'foot worship':
-										*clr
-										cla
+									act 'Foot worship':
+										*clr & cla
 										minut += 10
 										'" Don''t think I haven''t seen you staring at my feet. Do you find them sexy?" you ask him seductively.'
 										'"Yes, I love them," he replies while looking at them.'
 										'"Show me how much you love them," you say commandingly as you wave your foot in his face. He immediately starts massaging it with a lustful look on his face. After a while he starts sucking on your toes. You don''t know if it''s the foot treatment or the control you have over him, but you really enjoy it and you start to get wet.'
-										act 'ride him':
-											*clr
-											cla
+										act 'Ride him':
+											*clr & cla
 											minut += 25
 											'<center><b><font color="maroon">Home</font></b></center>'
 											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/dimka/revenge/reversecowgirl.mp4"></video></center>'

+ 1 - 16
locations/din_van.qsrc

@@ -971,22 +971,7 @@ if $ARGS[0] = 'private':
 			act 'Finish':menu_off = 0 & gt $loc, $metka
 		end
 	end
-
-	!!breast pump is now in the menu, not on the screen
-	if breastcounter <= 0:
-		temp_var = 50
-	else
-		temp_var = (50/breastcounter)
-	end
-	if breastpump > 0 and bp_unbox >= 1:
-		act 'Use breast pump':
-			gt 'lact_lib', 'bp_milking'
-		end
-	elseif breastpump > 0 and bp_unbox <= 0:
-		'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
-	elseif breastpump <= 0 and pcs_horny >= temp_var:
-		act 'Massage your breasts': gt 'lact_lib','man_milking'
-	end
+	gs 'lact_lib', 'massage'
 end
 
 if $ARGS[0] = 'misery':

+ 23 - 23
locations/dinsister.qsrc

@@ -29,7 +29,7 @@ $sischecks = {
 			*nl
 			'I can not approach her junked up like this.'
 			
-			act '<B>Move away</B>':gt $loc, $metka
+			act 'Move away':gt $loc, $metka
 		end
 		
 		if StrongNarkota <= 20:
@@ -43,7 +43,7 @@ $sischecks = {
 			*nl
 			'You tell yourself, "Come on <<$pcs_nickname>>, deep breath, focus, you can do this."'
 			'You feel your head is clear enough to talk to your sister once more.'
-			act '<B>Move away</B>':gt $loc, $metka
+			act 'Move away':gt $loc, $metka
 		end
 	end
 
@@ -231,26 +231,26 @@ $narkosisterspalila = {
 	!'sister slept on drugs.'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
 	*nl
-    '"Come on, keep it together, act sober." You think. "I have just got talk normal and not think about it."'
-    'Your sister looks at you quizzically. "Are you stoned <<$pcs_nickname>>?"'
-    act'No':
-	    cla
-	    set narkossister = 1
-	    gs'stat'
-	    'You adversely shake your head "No." You back away, but it''s very clear you sister could tell that you are stoned.'
-        act '<B>Move away</B>':gt $loc, $metka
+	'"Come on, keep it together, act sober." You think. "I have just got talk normal and not think about it."'
+	'Your sister looks at you quizzically. "Are you stoned <<$pcs_nickname>>?"'
+	act'No':
+		cla
+		set narkossister = 1
+		gs'stat'
+		'You adversely shake your head "No." You back away, but it''s very clear you sister could tell that you are stoned.'
+		act 'Move away':gt $loc, $metka
 	end
 	act'Share':
-		    cls
-		    set narkossista = 1
-		    gs'stat'
-		    '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
-		    *nl
-		    'You tell your sister, that you learned where to buy drugs, and you really wanted to try and it is just this once never again.'
-		    'Your sister strictly looks at you and says, "<<$pcs_nickname>> I''m not your mother, who would kill you if she found out, but this is the first and last time. It''s not worth it!'
-			'If you continue, then your whole life will not be worth shit.'
-            act '<B>Move away</B>':gt $loc, $metka
-        exit
+		cls
+		set narkossista = 1
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
+		*nl
+		'You tell your sister, that you learned where to buy drugs, and you really wanted to try and it is just this once never again.'
+		'Your sister strictly looks at you and says, "<<$pcs_nickname>> I''m not your mother, who would kill you if she found out, but this is the first and last time. It''s not worth it!'
+		'If you continue, then your whole life will not be worth shit.'
+		act 'Move away':gt $loc, $metka
+		exit
 	end
 }
 
@@ -264,7 +264,7 @@ $d_sister[1]={
 		npc_rel['A33'] +=(pcs_intel/10)+(pcs_apprnc/20)
 		gs'stat'
 		'You apologize to your sister and it seems she forgives you.'
-		act '<B>Move away</B>':gt $loc, $metka
+		act 'Move away':gt $loc, $metka
 		end
 	end
 }
@@ -278,7 +278,7 @@ $d_sister[2]={
 		npc_rel['A33'] +=(pcs_intel/10)+(pcs_apprnc/20)
 		gs'stat'
 		'You suck up to your sister and she appears to be slowly treating you better.'
-		act '<B>Move away</B>':gt $loc, $metka
+		act 'Move away':gt $loc, $metka
 		end
 	end
 }
@@ -334,7 +334,7 @@ $d_sister[3]={
 			'You chat with your sister and she advises you where you can earn some money.'
 		end
 		if sisterTalk = 15:
-			'You chat with your sister and she tells you that you can find a lot of interesting bargins if you wander through the market.'
+			'You chat with your sister and she tells you that you can find a lot of interesting bargains if you wander through the market.'
 		end
 		if sisterTalk = 16:
 			'Anya tells you horror stories about a pretty girl who didn''t wash or shave her legs, and how it became so terrible, that she looked like a bum and had no friends. She advises you to take care of your body.'

+ 7 - 3
locations/dolls.qsrc

@@ -15,6 +15,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -43,9 +47,9 @@ if $ARGS[0] = 'start':
 		''
 		'The store has a small front on a side street but one glance is all you need to tell this is not your average clothing store. Inside the store, shelves and racks of alternative clothes crammed into every available space - anybody setting out to find an inch of wall would have their work cut out for them. The checkout counter is near the entrance.'
 
-		act 'Clothing':gt 'dolls', 'clothing'
-		act 'Shoes':gt 'dolls', 'shoes'
-		act 'Purses':gt 'dolls', 'purses'
+		act 'View clothing':gt 'dolls', 'clothing'
+		act 'View shoes':gt 'dolls', 'shoes'
+		act 'View purses':gt 'dolls', 'purses'
 		!act 'Jewelery':gt 'dolls', 'jewelry'
 		!act 'Piercings':gt 'dolls', 'piecrings'
 

+ 4 - 0
locations/dom_gor.qsrc

@@ -11,6 +11,10 @@ if night_mode = 1:
 	fcolor = rgb(255, 255, 255)
 	bcolor = rgb(0, 0, 0)
 	lcolor = rgb(106, 90, 205)
+elseif night_mode = 2:
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(20, 20, 20)
+	lcolor = rgb(106, 90, 205)
 else
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/dorm.qsrc

@@ -8,6 +8,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 4 - 0
locations/downlibrary.qsrc

@@ -9,6 +9,10 @@ gs 'stat'
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 1 - 4
locations/exercise.qsrc

@@ -1,6 +1,5 @@
 # exercise
 
-
 !{This will centralize calls for exercise. For calls where you wish to allow multiple types of exercises, such as a bedroom or yard, use gs 'exercise', 'start'
 For direct calls use this format: gs 'exercise', $ARGS[0], ARG[1], $ARGS[2], $ARGS[3], $ARGS[4]
 $ARGS[0] is the workout tier and the higher the tier, the greater the workout intensity.
@@ -10,10 +9,8 @@ ARG[1] is the time override. By default the tiers are in 15 minute segments if b
 $ARGS[2] and on are the stats to be affected by the workout NOTE: use the _exp variant, not the pcs_!!!!
 	Values: 'stren_exp' 'vital_exp' 'agil_exp' 'sprt_exp' 'react_exp'
 	Other stats can be added if desired - for a dance-a-thon you might use gs 'exercise', 'tier1', 0, 'agil_exp', 'danc_exp'
-
 }
 
-
 if $ARGS[0] = 'start':
 	if (pcs_stam >=15 or pcs_stam >= 10 and bookYog + obruch > 0):
 		'There is enough space in the room to <a href="exec: gt ''exercise'', ''workout''">exercise</a>.'
@@ -49,7 +46,7 @@ if $ARGS[0] = 'workout':
 		if $sportloc = 'Meadow': gs 'underwear', 'wear'
 		act 'Leave': gt $loc, $metka
 	end
-	gs 'wardrobe', 'sports_outfit_option', 'workout'
+	if $loc ! 'experiment': gs 'wardrobe', 'sports_outfit_option', 'workout'
 	act 'Manual': gt 'exercise', 'manual'
 	if exer_stam[1] ! 0 and pcs_stam > exer_stam[1]: act '<<$excer_name[1]>> - (<<exer_stam[1]>> stamina)': exercisex = 1 & gt 'exercise', 'auto'
 	if exer_stam[2] ! 0 and pcs_stam > exer_stam[2]: act '<<$excer_name[2]>> - (<<exer_stam[2]>> stamina)': exercisex = 2 & gt 'exercise', 'auto'

+ 4 - 0
locations/exhibitionistshop.qsrc

@@ -13,6 +13,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

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


+ 4 - 0
locations/fight.qsrc

@@ -7,6 +7,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 12 - 0
locations/fit.qsrc

@@ -9,6 +9,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -257,6 +261,10 @@ if $ARGS[0] = 'gym':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -525,6 +533,10 @@ if $ARGS[0] = 'kickboxing':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 5 - 0
locations/food_menu.qsrc

@@ -6,6 +6,11 @@ if night_mode = 1:
 	$bcolor1 = '#202020'
 	$bcolor2 = '#303030'
 	$bcolor3 = '#000000'
+elseif night_mode = 2:
+	$fcolor1 = '#FFFFFF'
+	$bcolor1 = '#202020'
+	$bcolor2 = '#303030'
+	$bcolor3 = '#141414'
 else
 	$fcolor1 = '#000000'
 	$bcolor1 = '#FFFFFF'

+ 282 - 209
locations/foto.qsrc

@@ -139,6 +139,10 @@ if $ARGS[0] = 'studio':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -940,8 +944,11 @@ if $ARGS[0] = 'practicemodel':
 	gs 'stat'
 	'<center><b><font color="maroon">Photographer</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-	'	"Hello <<$pcs_firstname>>. We''ve already done a paid shoot with you this week, so we can''t do another one. '
-	'	But would you like to get some practice in?"'
+	if model_week = (daystart - week) / 7 and model_job_week >= 2:
+		'	"Hello <<$pcs_firstname>>. We''ve already done a paid shoot with you this week, so we can''t do another one. But would you like to get some practice in?"'
+	else
+		'"Oh, you want to practice today?"'
+	end
 	act '"Maybe not today"' :gt 'foto','studio'
 	act '"Yes, please"':
 		cla
@@ -1758,161 +1765,153 @@ if $ARGS[0] = 'model':
 	if model = 0:model = 1
 	*clr & cla
 	minut += 5
-	modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
+	modelpay = (pcs_mdlng/2 * 10) + ((city_modelling + pcs_apprnc)/2)
+	modelpayfin = 900 + (15*rand(0,5))
 	gs 'stat'
 	'<center><b><font color="maroon">Photographer</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'	"Hello <<$pcs_firstname>>. Are you here to work? What kind of shoot would you like to do today?"'
 	*nl
-	'	(A "nude shoot" qualifies as any job that explicitly shows genitals. Jobs like bikini or lingerie modelling count as clothed shoots.)'
-
-	act'"I''d like to do a clothed shoot"':
+!!	'	<a href="exec:gs ''shortgs'',''msg'',''There are three types of shoots: Catalog, Fashion, and Glamour. A catalog shoot is any shoot that is meant to appear in a shopping magazine or online catalog. They don''t do much for your fame but the base pay is steady. A fashion shoot is more stylized and though the base pay is not as high, there will be a bonus tip based on your modelling skill and fame. A glamour shoot will always involve nudity or risqué clothing and will typically be erotic in nature. This type of modelling will have good pay with good bonuses based on skill and fame, but also will spread your fame beyond the city far more quickly. If you grew up in a small town outside St. Petersburg, the pictures may reach its populace sooner rather than later.''">Modelling Shoot Guide</a>'
+	
+	act'Never mind':
+		cla
+		'"Sorry, I just realized that I have something to do right now. Can I come back later?"'
+		'"Sure, no problem <<$pcs_lastname>>, just let us know when you''re ready to work.'
+		act'Leave':gt 'foto','studio'
+	end
+	
+	act'Actually I''d like to practice':gt'foto','practicemodel'
+		
+	act'"I''d like to do a catalog shoot"':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-		'	"Alright, we can do that. What would you like to do?"'
-
-		act 'Fashion':
-			cla
-			act 'Maybe not today':gt 'foto','studio'
-
-			act 'Agree (2:00)':
-				*clr & cla
-				minut += 120
-				modelpayfin = 600 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc)
-				modelfoto_fashion += 1
-				mdlng_exp += rand(5,8)
-				city_modelling += rand(7,12)
-				pav_modelling += rand(1,city_modelling)/10
-				shoot_type = rand(1,2)
-				gs 'stat'
-				if shoot_type = 1:
-					'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion<<rand(1,2)>>.mp4"></video></center>'
-					'	You dress up in the latest in fashion wear and spend the next two hours sexily posing for the photographer.'
-				elseif shoot_type = 2:
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fashion<<rand(1,3)>>.jpg"></center>'
-					'	You dress up in the latest in fashion wear and spend the next two hours sexily posing for the photographer.'
-				else
-					'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion3.mp4"></video></center>'
-					'	You spend two hours modelling for the online catalogs of retail clothing stores, wearing various different dresses but the same expression. It''s boring but it still gets you paid.'
-				end
-				*nl
-				'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
-				act 'Leave':gt 'foto', 'end'
-			end
+		'	"Alright, what kind of shoot? Clothing or swimsuits?"'
+		
+		act'Clothing':
+			modelfoto_catalog += 1
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion3.mp4"></video></center>'
+			'You spend two hours modelling for the online catalogs of retail clothing stores, wearing various different dresses but the same expression. It''s boring but it still gets you paid.'
+			act 'Leave':gt 'foto', 'end'
 		end
-
-		act 'Bikini modelling':
-			if pcs_inhib < 20:
-				msg'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
-				gt 'foto', 'model'
-			else
+		act'Swimsuits':
+			modelfoto_catalog += 1
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini<<rand(3,5)>>.mp4"></video></center>'
+			bikinicatalog += 1
+			'	You change in and out of various different bikinis, modelling them with the same pose and expression for use in online and department store catalogs.'
+			act 'Leave':gt 'foto', 'end'
+		end
+	end
+	
+	act'"I''d like to do a fashion shoot"':
+		if pcs_mdlng < 20:
+			msg'"Sorry, but you aren''t a skilled enough model to do this kind of publication yet. Maybe get some practice in on your off days."'
+		else
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'	"Alright, what kind of shoot would you like to do? Fashion, bikini, or lingerie?"'
+			act 'Fashion':
 				cla
 				act 'Maybe not today':gt 'foto','studio'
 
 				act 'Agree (2:00)':
 					*clr & cla
 					minut += 120
-					modelpayfin = 650 + (modelpay) + (15*rand(0,5))
-					modelfoto_bikini += 1
+					modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+					modelfoto_fashion += 1
+					mdlng_exp += rand(5,8)
 					city_modelling += rand(7,12)
 					pav_modelling += rand(1,city_modelling)/10
-					mdlng_exp += rand(6,10)
-					if pcs_inhib < 50:inhib_exp += 1
-					bikinishoot = rand(1,3)
+					fashionshoot = rand(1,2)
 					gs 'stat'
-					if bikinishoot = 1:
-						city_modelling += rand(1,5)
-						pav_modelling += rand(1,city_modelling)/25
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini.mp4"></video></center>'
-						'	As you''re putting on a bikini the photographer tells you that you''ll be participating in a glamour shoot today, the product from today going to end up in the spreads of a magazine. You spend the duration of the shoot posing somewhat suggestively, though never in an explicitly erotic fashion.'
-					elseif bikinishoot = 2:
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini2.mp4"></video></center>'
-						'	You change in and out of various designer label bikinis, posing suggestively for the photos to be used in the company''s online catalog.'
-						if bikinicatalog = 1:
-							bikinicatalog = 2
-							'	It appears that unlike more low-end and retail companies that want your posing to be consistent, designer labels want your posing to be evocative and varied. Whatever works you guess.'
-						end
-					elseif bikinishoot = 3:
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini<<rand(3,5)>>.mp4"></video></center>'
-						if bikinicatalog = 0:bikinicatalog = 1
-						'	You change in and out of various different bikinis, modelling them with the same pose and expression for use in online catalogs.'
-					end
-					*nl
-					'	Two hours later, you''re all done. The photographer thanks you for your time, pays you <<modelpayfin>> <b>₽</b> for the job.'
-					if pcs_mdlng >= 40 and commercial = 0:
-						act 'Leave':gt'foto','commercial'
+					if fashionshoot = 1:
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion<<rand(1,2)>>.mp4"></video></center>'
 					else
-						act 'Leave':gt 'foto', 'end'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fashion<<rand(1,5)>>.jpg"></center>'
 					end
-				end
-			end
-		end
-
-		act 'Erotic clothed':
-			if pcs_inhib < 25:
-				msg'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
-				gt 'foto', 'model'
-			else
-				cla
-				act 'Maybe not today':gt 'foto','studio'
-
-				act 'Agree (2:00)':
-					*clr & cla
-					minut += 120
-					modelpayfin = 650 + (modelpay) + (15*rand(0,5))
-					modelfoto_ero_clo += 1
-					mdlng_exp += rand(5,10)
-					city_modelling += rand(7,12)
-					pav_modelling += rand(1,city_modelling)/10
-					inhib_exp += 1
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/ero<<rand(1,3)>>.jpg"></center>'
-					'	You dress up in sexy clothes and spend the next two hours posing for the photographer.'
+					'	You dress up in the latest in fashion wear and spend the next two hours posing for the photographer.'
 					*nl
 					'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
 					act 'Leave':gt 'foto', 'end'
 				end
 			end
-		end
 
-		act 'Lingerie modelling':
-			if pcs_inhib < 25:
-				msg'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
-				gt 'foto', 'model'
-			else
-				cla
-				act 'Maybe not today':gt 'foto','studio'
+			act 'Bikini':
+				if pcs_inhib < 20:
+					msg'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
+				else
+					cla
+					act 'Maybe not today':gt 'foto','studio'
 
-				act 'Agree (2:00)':
-					*clr & cla
-					minut += 120
-					modelpayfin = 650 + (modelpay) + (15*rand(0,5))
-					modelfoto_lingerie += 1
-					mdlng_exp += rand(6,10)
-					city_modelling += rand(7,13)
-					pav_modelling += rand(0,city_modelling)/10
-					inhib_exp += 2
-					shoot_type = rand(1,2)
-					gs 'stat'
-					if shoot_type = 1:
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie<<rand(1,2)>>.mp4"></video></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/lingerie<<rand(1,3)>>.jpg"></center>'
+					act 'Agree (2:00)':
+						*clr & cla
+						minut += 120
+						modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+						modelfoto_bikini += 1
+						city_modelling += rand(7,12)
+						pav_modelling += rand(1,city_modelling)/10
+						mdlng_exp += rand(6,10)
+						if pcs_inhib < 50:inhib_exp += 1
+						bikinishoot = rand(1,3)
+						gs 'stat'
+						if bikinishoot = 1:
+							'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini.mp4"></video></center>'
+						elseif bikinishoot = 2:
+							'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini2.mp4"></video></center>'
+						end
+						'	You spend the shoot in designer bikinis, modelling them to appear in various higher end magazines.'
+						*nl
+						'	Two hours later, you''re all done. The photographer thanks you for your time, pays you <<modelpayfin>> <b>₽</b> for the job.'
+						if pcs_mdlng >= 40 and commercial = 0:
+							act 'Leave':gt'foto','commercial'
+						else
+							act 'Leave':gt 'foto', 'end'
+						end
 					end
-					'	You put on some sexy lingerie and spend the next two hours striking various poses for a photographer.'
-					*nl
-					'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
-					if pcs_mdlng >= 40 and commercial = 0:
-						act 'Leave':gt'foto','commercial'
-					else
-						act 'Leave':gt 'foto', 'end'
+				end
+			end
+
+
+			act 'Lingerie modelling':
+				if pcs_inhib < 25:
+					msg'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
+				else
+					cla
+					act 'Maybe not today':gt 'foto','studio'
+
+					act 'Agree (2:00)':
+						*clr & cla
+						minut += 120
+						modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+						modelfoto_lingerie += 1
+						mdlng_exp += rand(6,10)
+						city_modelling += rand(7,13)
+						pav_modelling += rand(0,city_modelling)/10
+						inhib_exp += 2
+						shoot_type = rand(1,2)
+						gs 'stat'
+						if shoot_type = 1:
+							'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie<<rand(1,3)>>.mp4"></video></center>'
+						else
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/lingerie<<rand(1,2)>>.jpg"></center>'
+						end
+						'	You put on some high end lingerie and spend the next two hours striking various poses for a photographer for use in fashion magazines.'
+						*nl
+						'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+						if pcs_mdlng >= 40 and commercial = 0:
+							act 'Leave':gt'foto','commercial'
+						else
+							act 'Leave':gt 'foto', 'end'
+						end
 					end
 				end
 			end
 		end
 	end
 
-	act'"I''d like to do a nude shoot"':
+	act'"I''d like to do a glamour shoot"':
 		if pcs_inhib < 30:
 			msg'You toy with the idea of exposing yourself on camera but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 		else
@@ -1925,6 +1924,13 @@ if $ARGS[0] = 'nude_shoot':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'	"Alright, we can do that. What kind of nude shoot?"'
+	
+!!	'Info guides:'
+!!	'<a href="exec:gs ''shortgs'',''msg'',''This type of shoot is not particularly more explicit, but the clothes being modelled are inherently more sensual and will require some confidence to be able to wear them.''">Erotic clothed</a>'
+!!	'<a href="exec:gs ''shortgs'',''msg'',''A topless shoot is any shoot that has you baring your breasts and shoulders while still wearing bottoms of some kind, whether that be trousers, skirt, or underwear.''">Topless</a>'
+!!	'<a href="exec:gs ''shortgs'',''msg'',''A tastefully nude shoot is one that does not show genitals of any kind, neither vagina or nipple. Your pay will be based more on your fame and appearance than your skill.''">Tasteful nude</a>'
+!!	'<a href="exec:gs ''shortgs'',''msg'',''A topless nude shoot is one step further in eroticism while still maintaining class. Your nipples will be exposed but your vagina will remain hidden. It is considered erotic without being slutty, like a character nude scene in a film. Skill plays a larger role in this type of shoot.''">Topless nude</a>'
+!!	'<a href="exec:gs ''shortgs'',''msg'',''A fully nude shoot bares all. Your breasts, nipples, and vagina will be visible. It is the most erotic, gives the highest bonus from appearance and fame, but will also spread your fame further and faster. If you are an aspiring star, this may be good for your publicity. But if there are people you want to hide your work from, this might reach them sooner than expected.''">Fully nude</a>'
 
 !!	act 'Erotic clothing with breast nudity':
 		!!already matched the exhibitionism value above
@@ -1953,6 +1959,33 @@ if $ARGS[0] = 'nude_shoot':
 !!			end
 !!		end
 !!	end
+	act 'Erotic clothed':
+		if pcs_inhib < 30:
+			msg'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
+			gt 'foto', 'model'
+		else
+			cla
+			act 'Maybe not today':gt 'foto','studio'
+
+			act 'Agree (2:00)':
+				*clr & cla
+				minut += 120
+				modelpayfin = 400 + (modelpay) + (15*rand(0,5))
+				modelfoto_glamour += 1
+				modelfoto_ero_clo += 1
+				mdlng_exp += rand(5,10)
+				city_modelling += rand(7,12)
+				pav_modelling += rand(1,city_modelling)/10
+				inhib_exp += 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/ero<<rand(1,3)>>.jpg"></center>'
+				'	You dress up in sexy clothes and spend the next two hours posing for the photographer.'
+				*nl
+				'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+				act 'Leave':gt 'foto','end'
+			end
+		end
+	end
 
 	act 'Transparent clothing':
 		!!already matched the exhibitionism value above
@@ -1961,16 +1994,16 @@ if $ARGS[0] = 'nude_shoot':
 
 		act 'Agree (2:00)':
 			*clr & cla
-
 			minut += 120
-			modelpayfin = 700 + (modelpay) + (15*rand(0,5))
+			modelpayfin = 500 + (modelpay) + (15*rand(0,5))
+			modelfoto_glamour += 1
 			modelfoto_nip += 1
 			mdlng_exp += rand(6,10)
 			city_modelling += rand(7,13)
 			pav_modelling += rand(1,city_modelling)/10
 			inhib_exp += rand(1,3)
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru1.jpg"><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru<<rand(1,6)>>.jpg"></center>'
 			'	You put on a transparent top and spend the next two hours in various poses for the photographer, a flash highlighting your breasts with every click of the camera.'
 			*nl
 			'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
@@ -1981,6 +2014,40 @@ if $ARGS[0] = 'nude_shoot':
 			end
 		end
 	end
+	
+	act 'Transparent Lingerie':
+		if pcs_inhib < 55:
+			msg'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
+		else
+			cla
+			act 'Not for me':gt 'foto','studio'
+
+			act 'Agree (2:00)':
+				*clr & cla
+				minut += 120
+				modelpayfin = 525 + (modelpay * 2) + (15*rand(0,7))
+				modelfoto_glamour += 1
+				modelfoto_nip += 1
+				modelfoto_lingerie += 1
+				mdlng_exp += rand(8,10)
+				city_modelling += rand(9,14)
+				pav_modelling += rand(0,city_modelling)/10
+				inhib_exp += 4
+				gs 'stat'
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie_trans<<rand(1,3)>>.mp4"></video></center>'
+				'	You put on some very lacy, very transparent underwear and get to posing, your nipples often showing through the thin fabric.'
+				*nl
+				'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+				*nl
+				if pornstudio = 0:pornstudio = 2 & '	At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You''re shocked to see that it''s for a porn production company in St. Petersburg. "Since you''ve shown that you''re willing to go full nude, we figure we might as well let you know this opportunity exists. We share a couple of models with them and from what we can tell, it increases sales for both of us. If you feel like you''re up to it, use this card and tell them we sent you. That will get you a special audition. But we understand if you don''t go. We know it''s not for everyone and that some of you want more legitimate fame."'
+				if pcs_mdlng >= 40 and commercial = 0:
+					act 'Leave':gt'foto','commercial'
+				else
+					act 'Leave':gt 'foto', 'end'
+				end
+			end
+		end
+	end
 
 	act 'Topless':
 		if pcs_inhib < 50:
@@ -1989,28 +2056,20 @@ if $ARGS[0] = 'nude_shoot':
 		else
 			cla
 			act 'Maybe not today':gt 'foto','studio'
+			
 			act 'Agree (2:00)':
 				*clr & cla
 				minut += 120
-				modelpayfin = 750 + (modelpay) + (15*rand(0,5))
+				modelpayfin = 550 + (modelpay) + (15*rand(0,5))
 				modelfoto_nip += 1
 				modelfoto_topless += 1
 				mdlng_exp += rand(6,10)
 				city_modelling += rand(8,14)
 				pav_modelling += rand(1,city_modelling)/10
 				inhib_exp += 3
-				shoot_type = rand(1,3)
 				gs 'stat'
-				if shoot_type = 1:
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topless<<rand(1,5)>>.jpg"></center>'
-					'	You put on some pants and omit a top leaving your breasts exposed. You spend two hours striking various poses, covering and uncovering your breasts, and listen to instruction while the photographer takes pictures of you.'
-				elseif shoot_type = 2:
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topless<<rand(6,12)>>.jpg"></center>'
-					'	Putting on some sexy panties, you spend the next two hours having photos taken of you with exposed breasts.'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topless13.jpg"></center>'
-					'	You dress up in special one piece bunny suit, put on some floppy ears, and pull the top down to expose your breasts. The photographer takes pictures of you for some kind of special issue.'
-				end
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topless<<rand(1,22)>>.jpg"></center>'
+				'	You spend two hours striking various posing with topless breasts, listening to instruction while the photographer takes pictures of you.'
 				*nl
 				'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
 				if pcs_mdlng >= 40 and commercial = 0:
@@ -2022,31 +2081,28 @@ if $ARGS[0] = 'nude_shoot':
 		end
 	end
 
-	act 'Transparent Lingerie':
+	act 'Tasteful nude':
 		if pcs_inhib < 55:
 			msg'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
-			gt 'foto', 'nude_shoot'
 		else
 			cla
-			act 'Not for me':gt 'foto','studio'
-
+			act 'Maybe not today':gt 'foto','studio'
+			
 			act 'Agree (2:00)':
 				*clr & cla
 				minut += 120
-				modelpayfin = 800 + (modelpay * 2) + (15*rand(0,7))
-				modelfoto_nip += 1
-				modelfoto_lingerie += 1
-				mdlng_exp += rand(8,10)
-				city_modelling += rand(9,14)
-				pav_modelling += rand(0,city_modelling)/10
-				inhib_exp += 4
-				gs 'stat'
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie_trans<<rand(1,3)>>.mp4"></video></center>'
-				'	You put on some very lacy, very transparent underwear and get to posing, your nipples often showing through the thin fabric.'
-				*nl
-				'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+				modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
+				modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
+				modelfoto_glamour += 1
+				modelfoto_nude += 1
+				mdlng_exp += rand(9,10)
+				city_modelling += rand(10,20)
+				pav_modelling += rand(0,city_modelling)/4
+				inhib_exp += 5
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(1,5)>>.jpg"></center>'
+				'	Already naked, you step onto set and begin the shoot immediately.'
 				*nl
-				if pornstudio = 0:pornstudio = 2 & '	At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You''re shocked to see that it''s for a porn production company in St. Petersburg. "Since you''ve shown that you''re willing to go full nude, we figure we might as well let you know this opportunity exists. We share a couple of models with them and from what we can tell, it increases sales for both of us. If you feel like you''re up to it, use this card and tell them we sent you. That will get you a special audition. But we understand if you don''t go. We know it''s not for everyone and that some of you want more legitimate fame."'
+				'	You spend two hours posing confidently for a photographer taking pictures of you, often being asked to carefully position your hands or legs in ways that tastefully hides your pussy and nipples. These images, though incredibly provocative, are still somehow considered to be conservative enough to be allowed on the front cover of fashion, sports, and other tabloid magazines. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
 				if pcs_mdlng >= 40 and commercial = 0:
 					act 'Leave':gt'foto','commercial'
 				else
@@ -2055,58 +2111,31 @@ if $ARGS[0] = 'nude_shoot':
 			end
 		end
 	end
-
-
-	act 'Nude':
+	
+	act 'Topless nude':
 		if pcs_inhib < 60:
 			msg'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
-			gt 'foto', 'nude_shoot'
 		else
 			cla
 			act 'Maybe not today':gt 'foto','studio'
-
+			
 			act 'Agree (2:00)':
 				*clr & cla
+				modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
 				minut += 120
-				modelpayfin = 800 + (modelpay * 2) + (15*rand(0,7))
+				modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
+				modelfoto_glamour += 1
 				modelfoto_nude += 1
 				mdlng_exp += rand(9,10)
 				city_modelling += rand(10,20)
 				pav_modelling += rand(0,city_modelling)/4
 				inhib_exp += 5
-				shoot_type = rand(1,4)
-				gs 'stat'
-				if shoot_type <= 2:
-					modelfoto_pussy += 1
-					modelfoto_nip += 1
-					if pcs_pubes <= 20:
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(1,3)>>.jpg"></center>'
-						'	Already naked, you step onto set and begin the shoot immediately.'
-						*nl
-						'	You spend two hours posing confidently for a photographer taking pictures of you that fully expose your breasts and pussy. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(13,19)>>.jpg"></center>'
-						'	Already naked, you step onto set and begin the shoot immediately.'
-						*nl
-						'	You spend two hours posing confidently for a photographer taking pictures of you, your thick bush being used as a simple censor of your pussy and make it more "acceptable" as art while still maintaining the feeling of eroticism. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
-					end
-				elseif shoot_type = 3:
-					modelfoto_nip += 1
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(4,11)>>.jpg"></center>'
-					'	Already naked, you step onto set and begin the shoot immediately.'
-					*nl
-					'	You spend two hours posing confidently for a photographer taking pictures of you, often being asked to carefully position your hands or legs in ways that tastefully shields your pussy while simultaneously teasing the would-be readers of what they cannot see. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
-				else
-					city_modelling += rand(0,5)
-					pav_modelling += rand(0,2)
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude12.jpg"></center>'
-					'	Already naked, you step onto set and begin the shoot immediately.'
-					*nl
-					'	You spend two hours posing confidently for a photographer taking pictures of you, often being asked to carefully position your hands or legs in ways that tastefully hides your pussy and nipples. These images, though incredibly provocative, are still somehow considered to be conservative enough to be allowed on the front cover of fashion, sports, and other tabloid magazines. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
-				end
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(6,26)>>.jpg"></center>'
+				'	Already naked, you step onto set and begin the shoot immediately.'
 				*nl
+				'	You spend two hours posing confidently for a photographer taking pictures of you, often using props, hands, legs, or shadow to shield your pussy while simultaneously teasing the would-be readers of what they cannot see. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
 				if pornstudio = 0:pornstudio = 2 & '	At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You''re shocked to see that it''s for a porn production company in St. Petersburg. "Since you''ve shown that you''re willing to go full nude, we figure we might as well let you know this opportunity exists. We share a couple of models with them and from what we can tell, it increases sales for both of us. If you feel like you''re up to it, use this card and tell them we sent you. That will get you a special audition. But we understand if you don''t go. We know it''s not for everyone and that some of you want more legitimate fame."'
-
+						
 				if pcs_mdlng >= 40 and commercial = 0:
 					act 'Leave':gt'foto','commercial'
 				else
@@ -2115,11 +2144,10 @@ if $ARGS[0] = 'nude_shoot':
 			end
 		end
 	end
-
-	act 'Variety shoot':
+	
+	act 'Full nude':
 		if pcs_inhib < 60:
 			msg'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
-			gt 'foto', 'nude_shoot'
 		else
 			cla
 			act 'Maybe not today':gt 'foto','studio'
@@ -2127,21 +2155,29 @@ if $ARGS[0] = 'nude_shoot':
 			act 'Agree (2:00)':
 				*clr & cla
 				minut += 120
-				modelpayfin = 825 + (modelpay * 2) + (15*rand(0,7))
-				mdlng_exp += 10
-				city_modelling += rand(10,20)
-				pav_modelling += rand(0,city_modelling)/10
-				inhib_exp += 3
+				modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
+				modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
+				modelfoto_glamour += 1
+				modelfoto_nude += 1
 				modelfoto_nip += 1
-				modelfoto_fashion += 1
-				modelfoto_lingerie += 1
-				modelfoto_topless += 1
 				modelfoto_pussy += 1
-				gs 'stat'
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/vmodel.mp4"></video></center>'
-				'	You spend two hours posing for the photographer, changing in and out of various underwears, sexy clothings, and lingeries until you end the shoot fully striped down and dancing naked.'
-				*nl
-				'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+				mdlng_exp += rand(9,10)
+				city_modelling += rand(10,20)
+				pav_modelling += rand(10,15)
+				inhib_exp += 5
+				if pcs_pubes <= 20:
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(27,35)>>.jpg"></center>'
+					'	Already naked, you step onto set and begin the shoot immediately.'
+					*nl
+					'	You spend two hours posing confidently for a photographer taking pictures of you that fully expose your breasts and pussy. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(36,41)>>.jpg"></center>'
+					'	Already naked, you step onto set and begin the shoot immediately.'
+					*nl
+					'	You spend two hours posing confidently for a photographer taking pictures of you, your thick bush being used as a simple censor of your pussy and make it more "acceptable" as art while still maintaining the feeling of eroticism. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
+				end
+				if pornstudio = 0:pornstudio = 2 & '	At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You''re shocked to see that it''s for a porn production company in St. Petersburg. "Since you''ve shown that you''re willing to go full nude, we figure we might as well let you know this opportunity exists. We share a couple of models with them and from what we can tell, it increases sales for both of us. If you feel like you''re up to it, use this card and tell them we sent you. That will get you a special audition. But we understand if you don''t go. We know it''s not for everyone and that some of you want more legitimate fame."'
+
 				if pcs_mdlng >= 40 and commercial = 0:
 					act 'Leave':gt'foto','commercial'
 				else
@@ -2152,6 +2188,43 @@ if $ARGS[0] = 'nude_shoot':
 	end
 end
 
+!!	act 'Variety shoot':
+!!		if pcs_inhib < 60:
+!!			msg'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
+!!			gt 'foto', 'nude_shoot'
+!!		else
+!!			cla
+!!			act 'Maybe not today':gt 'foto','studio'
+!!
+!!			act 'Agree (2:00)':
+!!				*clr & cla
+!!				minut += 120
+!!				modelpayfin = 825 + (modelpay * 2) + (15*rand(0,7))
+!!				mdlng_exp += 10
+!!				city_modelling += rand(10,20)
+!!				pav_modelling += rand(0,city_modelling)/10
+!!				inhib_exp += 3
+!!				modelfoto_glamour += 1
+!!				modelfoto_nip += 1
+!!				modelfoto_fashion += 1
+!!				modelfoto_lingerie += 1
+!!				modelfoto_topless += 1
+!!				modelfoto_pussy += 1
+!!				gs 'stat'
+!!				'<center><video autoplay loop src="images/locations/city/citycenter/photo/vmodel.mp4"></video></center>'
+!!				'	You spend two hours posing for the photographer, changing in and out of various underwear, sexy clothings, and lingeries until you end the shoot fully striped down and dancing naked.'
+!!				*nl
+!!				'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+!!				if pcs_mdlng >= 40 and commercial = 0:
+!!					act 'Leave':gt'foto','commercial'
+!!				else
+!!					act 'Leave':gt 'foto', 'end'
+!!				end
+!!			end
+!!		end
+!!	end
+!!end
+
 if $ARGS[0] = 'commercial':
 	*clr & cla
 	commercial = 1

+ 149 - 45
locations/foto_models.qsrc

@@ -1065,69 +1065,173 @@ if $ARGS[0] = 'anastasia_chat':
 				anastasia_exercise = 1
 				act'Keep chatting':gt 'foto_models','anastasia_chat'
 			end
+!!			if guy > 0:
+!!				act'Oh! You mean like fucking!':
+!!					*clr & cla
+!!					'	"Oh! You mean like fucking!"'
 		end
 	end
 
 	if anastasiasex = 0:
-		act 'Tell her you saw her having sex in the empty set':
-			cla
-			'	"Oh you saw that?" She barely even reacts to what you said. She doesn''t appear to be surprised or embarrassed at all.'
-			act 'Continue':
+		act 'Tell her you saw her having sex in the empty set':gt'foto_models','anastasiasex'
+	end
+	if anastasiasex = 1:
+		act 'Ask for sex advice':gt 'foto_models','anastasiasextalk'
+	end
+!	if city_modelling > 100 and anastasiasex = 1 and anastasia_ask = 0:
+!		act'Ask Anastasia how to start selling yourself like she does':gt'foto_models','anastasia_ask'
+!	end
+end
+
+if $ARGS[0] = 'anastasiasex':
+	cla
+	anastasiasex = 1
+	'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/1.jpg"></center>'
+	'	"Oh you saw that?" She barely even reacts to what you said. She doesn''t appear to be surprised or embarrassed at all.'
+	act 'Continue':
+		*clr & cla
+		'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/2.jpg"></center>'
+		'	"Just one of the perks of being the top model in Russia." She pauses for a moment to run her hands through her hair, almost like she''s stretching...'
+		'	"All the men end up wanting to fuck you."'
+		act 'Uh...':
+			*clr & cla
+			'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/3.jpg"></center>'
+			'	Her candor catches you off guard, especially with how nonchalantly she says it. You didn''t expect her to be so open about her sexuality like that.'
+			'	"What''s the matter <<$pcs_nickname>>? You look shocked." She says, laying down on a couch of one of the nearby sets. Your teeth make a clicking sound as they snap together, not realizing your mouth had been agape. Following that, you can''t help but be excruciatingly aware of her wide open legs and her pussy that is spreading with them.'
+			'	"Oh come now darling, you know that even I have my needs don''t you? Sexually and financially that is."'
+			'	The word "financially" makes you pause, making you forget whatever it was you were about to say.'
+			act'"Financially?"':
 				*clr & cla
-				'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/2.jpg"></center>'
-				'	"Just one of the perks of being the top model in Russia." She pauses for a moment to run her hands through her hair, almost like she''s stretching...'
-				'	"All the men end up wanting to fuck you."'
-				act 'Uh...':
+				'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/5.jpg"></center>'
+				'	Anastasia sits up a bit. "Yes, financially. I need money to live don''t I?"'
+				'	"No, wait! That''s not what I meant! Who were those men?"'
+				act'Continue':
 					*clr & cla
-					'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/3.jpg"></center>'
-					'	Her candor catches you off guard, especially with how nonchalantly she says it. You didn''t expect her to be so open about her sexuality like that.'
-					'	"What''s the matter <<$pcs_nickname>>? You look shocked." She says, laying down on a couch of one of the nearby sets. Your teeth make a clicking sound as they snap together, not realizing your mouth had been agape. Following that, you can''t help but be excruciatingly aware of her wide open legs and her pussy that is spreading with them.'
-					'	"Oh come now darling, you know that even I have my needs don''t you? Sexually and financially that is."'
-					'	The word "financially" makes you pause, making you forget whatever it was you were about to say.'
-					act'"Financially?"':
+					'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/4.jpg"></center>'
+					'	She leans back again and closes her eyes as if she were tired. "My clients of course. I''m the number one model in the city, it makes it easy to do some escorting on the side. It''s a good deal for everyone. They get to live their dream, the studio makes more money on set rental, and in the end I get to supplement my sexual and financial needs. Men will pay a lot of money to have sex with a model like me."'
+					act'"But-"':
 						*clr & cla
-						'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/5.jpg"></center>'
-						'	Anastasia sits up a bit. "Yes, financially. I need money to live don''t I?"'
-						'	"No, wait! That''s not what I meant! Who were those men?"'
-						act'Continue':
+						'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/6.jpg"></center>'
+						'	Before you can say anything she interrupts you as she gets on her knees and sticks her ass out towards you, saying, "Especially like this." The pose is particularly provacative, now showing her slightly parted pussy. "A tip for you <<$pcs_nickname>>, if you ever get to a position in your career like mine, you''ll find that this position is especially versatile."'
+						'	"If they want to fuck you from behind, they can pick either hole. If you''re on top, all you have to do is work your bum like this," she starts moving her hips up and down, simulating a cowgirl position, "and they''ll hit all the right spots. For you and for them. They cum in no time and so do I! As you saw, this position is also great if you want to service two, or even three men at once."'
+						act '"No, wait! I wasn''t asking about any of this!"':
 							*clr & cla
-							'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/4.jpg"></center>'
-							'	She leans back again and closes her eyes as if she were tired. "My clients of course. I''m the number one model in the city, it makes it easy to do some escorting on the side. It''s a good deal for everyone. They get to live their dream, the studio makes more money on set rental, and in the end I get to supplement my sexual and financial needs. Men will pay a lot of money to have sex with a model like me."'
-							act'"But-"':
+							'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/9.jpg"></center>'
+							'	"<<$pcs_nickname>>," she says, "if you''re going to have a career in this industry you can''t be naive about how it works. This is just another way to use your fame."'
+							'	She sounds vaguely disappointed in you, like a mother trying to teach her child manners.'
+							act'Continue':
 								*clr & cla
-								'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/6.jpg"></center>'
-								'	Before you can say anything she interrupts you as she gets on her knees and sticks her ass out towards you, saying, "Especially like this." The pose is particularly provacative, now showing her slightly parted pussy. "A tip for you <<$pcs_nickname>>, if you ever get to a position in your career like mine, you''ll find that this position is especially versatile."'
-								'	"If they want to fuck you from behind, they can pick either hole. If you''re on top, all you have to do is work your bum like this," she starts moving her hips up and down, simulating a cowgirl position, "and they''ll hit all the right spots. For you and for them. They cum in no time and so do I! As you saw, this position is also great if you want to service two, or even three men at once."'
-								act '"No, wait! I wasn''t asking about any of this!"':
-									*clr & cla
-									'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/9.jpg"></center>'
-									'	"<<$pcs_nickname>>," she says, "if you''re going to have a career in this industry you can''t be naive about how it works. This is just another way to use your fame."'
-									'	She sounds vaguely disappointed in you, like a mother trying to teach her child manners.'
-									act'Continue':
-										*clr & cla
-										'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/1.jpg"></center>'
-										'	She picks up her panties and gets up again. "Listen <<$pcs_nickname>>, you''re great at this job, and one day you might be as famous or even more famous a model than I am. And I want you to be ready when it happens. So just in case, my advice to you is to make sure you''re on birth control, make sure you enjoy yourself, and <i>always</i> charge extra for creampies and swallowing."'
-										'	And with that, she walks away, leaving you in the confused state of feeling like your <<$npc_nickname[''A29'']>> just gave you advice on how to make the transition from nude model to professional hooker.'
-										anastasiasex = 1
-										act 'Leave':gt 'foto','studio'
-									end
-								end
+								'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/1.jpg"></center>'
+								'	She picks up her panties and gets up again. "Listen <<$pcs_nickname>>, you''re great at this job, and one day you might be as famous or even more famous a model than I am. And I want you to be ready when it happens. So just in case, my advice to you is to make sure you''re on birth control, make sure you enjoy yourself, and <i>always</i> charge extra for creampies, swallowing, and anal."'
+								'	And with that, she walks away, leaving you in the confused state of feeling like your <<$npc_nickname[''A29'']>> just gave you advice on how to make the transition from nude model to professional hooker.'
+								act 'Leave':gt 'foto','studio'
 							end
 						end
 					end
 				end
 			end
 		end
+		
+		if guy >= 10:
+			act'I know what you mean':
+				*clr & cla
+				'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/3.jpg"></center>'
+				'"Oh yeah, I know what you mean," you nod.'
+				'"Oh?"'
+				act'Being pretty makes people want you':
+					cla & *nl
+					'"It''s not like I wasn''t pretty before I became a model," you shrug, smiling back. "Men want to fuck pretty girls."'
+					'"Men want to fuck anything that has two legs and a pussy dear. Though they will pay more to fuck <i>famous</i> pretty girls," she smirks.'
+					act'Pay?':gt'foto_models','anastasiasex2'
+					if slutty > 0:
+						act'Oh! We can do that here?':gt'foto_models','anastasiasex3'
+					end
+				end
+				
+				if pcs_cupsize >= 25:
+					act'I''ve got big boobs':
+						cla & *nl
+						'"I had big boobs in high school too," you grin, looking down meaningfully at your <<$titsize>> breasts. "Boys wouldn''t be boys if they didn''t drool over the thought of fucking busty girls like me.'
+						'"True," she smirks. "Though they will pay more to fuck <i>famous</i> busty girls,"'
+						act'Pay?':gt'foto_models','anastasiasex2'
+						if slutty > 0:
+							act'Oh! We can do that here?':gt'foto_models','anastasiasex3'
+						end
+					end
+				end
+				if exhibitionist_lvl > 1:
+					act'Showing them your tits does that':
+						cla & *nl
+						'"Yeah, flashing your tits in the park tends to make boys want to fuck you," you say, biting your lip with a smile.'
+						'"You sly little minx you!" she chuckles. "I won''t deny that, I certainly teased enough boys during my youth as well. Though grown men tend to pay more for a fuck when they see your breasts on a magazine cover instead of pulled out of your blouse in the park."'
+						act'Pay?':gt'foto_models','anastasiasex2'
+						if slutty > 0:
+							act'Oh! We can do that here?':gt'foto_models','anastasiasex3'
+						end
+					end
+				end
+			end
+		end
 	end
-	if anastasiasex = 1:
-		act 'Ask for sex advice':gt 'foto_models','anastasiasex'
+end
+
+if $ARGS[0] = 'anastasiasex2':
+	*clr & cla
+	'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/5.jpg"></center>'
+	'"Pay?" you ask quizzically.'
+	'"Yes. Pay."'
+	'Anastasia regards you with a slight tilt of the head. "Those men were my clients. Who did you think they were?"'
+	'"Oh," you say. "I thought you were just doing it for fun."'
+	'"Well, I do still fuck for fun," she smiles. "But it''s much more efficient to charge for it as well. I''m the number one model in the city after all, it makes it easy to do some escorting on the side. It''s a good deal for everyone. They get to live their dream, the studio makes more money on set rental, and in the end I get to supplement my sexual and financial needs. Men will pay a lot of money to have sex with a model like me."'
+	act'Makes sense':
+		*clr & cla
+		'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/1.jpg"></center>'
+		'"Makes sense I suppose," you say, musing what Anastasia''s just told you. She picks up her panties and stands, regarding you warmly with a motherly touch on your cheek.'
+		'"Oh <<$pcs_firstname>>, you''re such a big girl," she says. "Not everyone would understand like you do. With an attitude like yours, you''ll go far in this industry. I see the potential in you to be as famous or even more famous than I am one day! Can I give you some advice?"'
+		'"Of course Anastasia," you nod, leaning in.'
+		'"Three important things," she says, whispering in your ear. "Make sure to enjoy yourself, never forget your birth control, and <i>always</i> charge extra for creampies, swallowing, and anal."'
+		'With that, she stands back and gives you an eager smile. "Got it?"'
+		act'Uhh, yeah...':
+			*clr & cla
+			'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/1.jpg"></center>'
+			'"Uhh, yeah..." you say, trailing off. You weren''t sure what kind of advice you were expecting, but it sure wasn''t professional hooking tips.'
+			'"Words to live by dear," she smiles. "Words to live by. If you ever need more advice on that kind of thing, don''t be afraid to ask. Don''t be a stranger!"'
+			'With that, she bids you farewell, walking towards another part of the studio.'
+			act 'Leave':gt 'foto','studio'
+		end
+		
+		act'Yes':
+			*clr & cla
+			'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/1.jpg"></center>'
+			'"Yes Anastasia" you say, nodding obediently.'
+			'"Words to live by dear," she smiles. "Words to live by. If you ever need more advice on that kind of thing, don''t be afraid to ask. Don''t be a stranger!"'
+			'With that, she bids you farewell, walking towards another part of the studio.'
+			act 'Leave':gt 'foto','studio'
+		end
 	end
-!	if city_modelling > 100 and anastasiasex = 1 and anastasia_ask = 0:
-!		act'Ask Anastasia how to start selling yourself like she does':gt'foto_models','anastasia_ask'
-!	end
 end
 
-if $ARGS[0] = 'anastasiasex':
+if $ARGS[0] = 'anastasiasex3':
+	*clr & cla
+	'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/face.jpg"></center>'
+	'"We can do that here?" you exclaim.'
+	'"But of course," she smiles at you. "We''re erotic models in the cultural capital of the nation my dear, it makes it easy to do some escorting on the side. The studio won''t complain because it makes more money on set rental, and at the same time, girls like you and me get to supplement our financial needs, not to mention all the enjoyable fucking we get to do. Men will pay a lot of money to have sex with a models like us."'
+	act'Wow!':
+		*clr & cla
+		'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/1.jpg"></center>'
+		'"Wow!"'
+		'"Yes indeed, we are quite privileged to have the opportunities we do. However, I really must be going deary. I have an appointment soon." You nod as she stand and picks up her panties. "Let me know if you''d like to get started on escorting. I''d love to help introduce you to the company. But before I go, may I offer some advice?"'
+		'You listen eagerly as Anastasia leans in to whisper in your ear.'
+		'"There are three things you need to know in this business. Make sure to enjoy yourself, never forget your birth control, and <i>always</i> charge extra for creampies, swallowing, and anal."'
+		'She stands back, meeting your eyes with a smile. "Words to live by my dear. Words to live by. But I must be off now. Don''t be a stranger!"'
+		'With that, she bids you farewell, walking towards another part of the studio.'
+		
+		'<b>dev note: escorting business still WIP</b>'
+		act 'Leave':gt 'foto','studio'
+	end
+end
+
+if $ARGS[0] = 'anastasiasextalk':
 	cla
 	'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/face.jpg"></center>'
 	'	"Sure <<$pcs_nickname>>, what would you like help with?"'
@@ -1202,7 +1306,7 @@ if $ARGS[0] = 'anastasiasex':
 			'	You blush even harder as she casually slips in the option of using this position for girls with strap-ons. Just when you thought it couldn''t get any more embarrassing...'
 			*nl
 			'	"Is there anything else you wanted to ask about?"'
-			act '"Yeah, I actually wanted to ask..."':gt'foto_models','anastasiasex'
+			act '"Yeah, I actually wanted to ask..."':gt'foto_models','anastasiasextalk'
 			act '"No, that was all"':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/city/citycenter/studio/sex/pornwalk1.mp4"></video></center>'

+ 1 - 1
locations/gLakeNude.qsrc

@@ -222,7 +222,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				end
 			end
 		end
-	elseif voyeurism_start = 2 and (psc_horny < 90 or pav_slut < 50):
+	elseif voyeurism_start = 2 and (pcs_horny < 90 or pav_slut < 50):
 		act 'Spy on other nudists on the beach':
 			if voyeurism_nudist <= 14 or pav_slut > 50:
 				voyeurism_nudist += 1

+ 1 - 1
locations/gLakeNudeForest.qsrc

@@ -27,7 +27,7 @@ if temper >= 20 and month >= 5 and month <= 9 and hour >= 6 and hour <= 20:
 			cla
 			*clr
 			minut += 10
-			psc_horny += 10
+			pcs_horny += 10
 			voyeurism += 1
 			kol_foto_piss = 169
 			viewforestpiss = rand(1,kol_foto_piss)

+ 103 - 44
locations/gadfield.qsrc

@@ -1,10 +1,24 @@
 # gadfield
 
-$metka = $ARGS[0]
-$loc = 'gadfield'
+!MiraLoc tells us where Mira is Located
+!----------------------------------------------
+!MiraLoc = 0 (Mira at home)
+!MiraLoc = 1 (Mira at river)
+!MiraLoc = 2 (Mira at meadow)
+!MiraLoc = 3 (Mira at forest)
+!MiraLoc = 4 (Mira at field)
+!MiraLoc = 5 (Mira with gop)
+!---------------------------------------------
 
 if $ARGS[0] = 'field':
+	$loc = 'gadfield'
+	$metka = 'field'
 	$location_type = 'secluded'
+
+	$menu_loc = 'gadfield'
+	$menu_arg = 'field'
+	menu_off = 0
+
 	gs 'gadukino_event', 'sound'
 	gs'stat'
 
@@ -24,8 +38,8 @@ if $ARGS[0] = 'field':
 		end
 	end
 
-	
 	'A field outside the village.'
+
 	if hour >= 9 and hour <= 19 and week < 6:'Grandfather''s horse <a href="exec: gt ''gadfield'',''horse''">Desperado</a> is grazing the field.'
 	if hour >= 9 and hour <= 19 and graze_cow = 0:'You see <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a> in the middle of the field.'
 	if hour >= 6 and hour <= 20 and graze_cow = 1:'You notice <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a>.'
@@ -33,12 +47,13 @@ if $ARGS[0] = 'field':
 
 	if hour >= 7 and hour <= 20 and haying_time = 1:
 		act 'Go to the hayfield':
-			gs 'food', 'm_meal'&!use current one, *clr & cla will clear messages
+			gs 'food', 'm_meal'
 			*clr & cla
+
 			if npc_rel['A60'] >= 15:
 				npc_rel['A60'] += 1
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/haying_time_mira.jpg"></center>'
-				'Most of the village has shown up to help out with the hay. You and Mira also partake in the activities. You are really enjoying yourself, especially considering you spending time, sitting on the fresh cut hay, talking to Mira.'
+				'Most of the village has shown up to help out with the hay. You and Mira also partake in the activities. You are really enjoying yourself, especially considering you''re spending time, sitting on the fresh cut hay, talking to Mira.'
 			else
 				fat -= 5
 				stren_exp += 1
@@ -48,20 +63,29 @@ if $ARGS[0] = 'field':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/haying_time.jpg"></center>'
 				'Almost all of the villagers have shown up to help out with the fresh cut hay. You decide to join them.'
 			end
+
 			minut += 360
 			grandmahelp += 1
 			haying_time = 0
-			hndiwrk_exp += rand(0,2) 
+			hndiwrk_exp += rand(0,2)
 			gs 'stat'
 
-			act 'Further':gt'gadfield','field'
+			act 'Continue':gt'gadfield','field'
 		end
 	end
 
-	act 'Go back to the road':minut += 10 & gt'gadroad'
+	act 'Back to the road':minut += 10 & gt'gadroad'
 end
 
 if $ARGS[0] = 'horse':
+	$loc = 'gadfield'
+	$metka = 'horse'
+	$location_type = 'public_outdoors'
+
+	$menu_loc = 'gadfield'
+	$menu_arg = 'horse'
+	menu_off = 0
+
 	gs 'gadukino_event', 'sound'
 	gs'stat'
 
@@ -75,19 +99,27 @@ if $ARGS[0] = 'horse':
 			'You spot your grandfather''s horse wandering loose in the field and decide to help out by taking Desperado home. Reaching for the bridle, you start leading Desperado towards the village.'
 			minut += 60
 			grandmahelp += rand(0,1)
-			hndiwrk_exp += rand(0,3) 
+			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
-			act 'Go back to your grandparent''s barn':gt'Gadsarai'
+			act 'To your grandparent''s barn':gt'Gadsarai'
 		end
 	end
-	act 'Back':gt'gadfield','field'
+	act 'To the field':gt'gadfield','field'
 end
 
 if $ARGS[0] = 'cow':
+	$loc = 'gadfield'
+	$metka = 'cow'
+	$location_type = 'secluded'
+
+	$menu_loc = 'gadfield'
+	$menu_arg = 'cow'
+	menu_off = 0
+
 	gs 'gadukino_event', 'sound'
-	temp = rand(1,5)
 	gs'stat'
+	temp = rand(1,5)
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow.jpg"></center>'
 	'The cow herd is standing in the middle of the field.'
@@ -100,10 +132,10 @@ if $ARGS[0] = 'cow':
 			'Seeing the cow herd on the field, you decide to help your grandfather bring the cows home...'
 			minut += 60
 			grandmahelp += rand(0,1)
-			hndiwrk_exp += rand(0,3) 
+			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
-			act 'Go back to your grandparent''s barn':gt'Gadsarai'
+			act 'To your grandparent''s barn':gt'Gadsarai'
 		end
 	end
 	if graze_cow = 1:
@@ -113,12 +145,13 @@ if $ARGS[0] = 'cow':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_wait.jpg"></center>'
 				if graze_cow_exp = 0:'Some time flies by while waiting for the locals to finish their gathering.'
 				if graze_cow_exp = 1:'Some time flies by while waiting for the locals and their children to finish their gathering.'
+
 				if hour >= 9:minut += 20
 				if hour < 9:minut += 60
-				hndiwrk_exp += rand(0,4) 
+				hndiwrk_exp += rand(0,4)
 				gs 'stat'
 
-				act 'Further':gt'gadfield','cow'
+				act 'Continue':gt'gadfield','cow'
 			end
 		end
 		if hour >= 10 and hour < 13:
@@ -126,20 +159,23 @@ if $ARGS[0] = 'cow':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow'+rand(1,4)+'.jpg"></center>'
 				'You manage to herd all the cows within the hour. Instead of letting your grandfather do all the work, you roll up the sleeves and do most of the work.'
+
 				minut += 60
 				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 				graze_cow_exp = 1
 				grandmahelp += 1
-				hndiwrk_exp += rand(0,3) 
+				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
-				act 'Further':gt'gadfield','cow'
+				act 'Continue':gt'gadfield','cow'
 			end
+
 			if mira = 0:
 				act 'Take a run on the field (1:00)':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_run.jpg"></center>'
 					'Since you have nothing to do, you run intervals across the field for an hour.'
+
 					frost = 0
 					minut += 60
 					fat -= 5
@@ -149,7 +185,7 @@ if $ARGS[0] = 'cow':
 					if temper >= 25 and sunWeather = 1:pcs_hydra -= 24
 					gs 'stat'
 
-					act 'Further':gt'gadfield','cow'
+					act 'Continue':gt'gadfield','cow'
 				end
 			end
 			if temper >= 15 and sunWeather = 1 and mira = 0:
@@ -163,20 +199,21 @@ if $ARGS[0] = 'cow':
 					pcs_sweat += 10
 					gs 'stat'
 
-					act 'Further':gt'gadfield','cow'
+					act 'Continue':gt'gadfield','cow'
 				end
 				if pcs_sleep < 40:
 					act 'Take a nap (1:00)':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_lying.jpg"></center>'
 						'You lie down on the grass and doze off for an hour.'
+
 						minut += 60
 						pcs_mood += 10
 						pcs_sleep+= 9
 						if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 						gs 'stat'
 
-						act 'Further':gt'gadfield','cow'
+						act 'Continue':gt'gadfield','cow'
 					end
 				end
 				act 'Pick flowers (1:00)':
@@ -188,7 +225,7 @@ if $ARGS[0] = 'cow':
 					if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 					gs 'stat'
 
-					act 'Further':gt'gadfield','cow'
+					act 'Continue':gt'gadfield','cow'
 				end
 				act 'Read a book (1:00)':
 					*clr & cla
@@ -219,13 +256,14 @@ if $ARGS[0] = 'cow':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go.jpg"></center>'
 			'Looking at his watch, grandpa turns to you and says "The time is around lunchtime so it''s time to take the herd to the watering hole." You begin to gather the cows and lead them to the river.'
+
 			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 			grandmahelp += 1
 			minut += 60
-			hndiwrk_exp += rand(0,3) 
+			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
-			act 'Further':gt'gadfield','cow2'
+			act 'Herd the cows to the river':gt'gadfield','cow2'
 		end
 	end
 	if graze_cow = 0:act 'Back':gt'gadfield','field'
@@ -251,18 +289,28 @@ if graze_cow = 1 and npc_rel['A60'] >= 15 and mira = 0 and sunWeather = 1 and ho
 	mira = 1
 	gs 'stat'
 
-	act 'Further':pcs_hydra +=40 & gt'gadfield','cow'
+	act 'Continue':pcs_hydra +=40 & gt'gadfield','cow'
 end
 
 if $ARGS[0] = 'cow2':
+	$loc = 'gadfield'
+	$metka = 'cow2'
+	$location_type = 'secluded'
+
+	$menu_loc = 'gadfield'
+	$menu_arg = 'cow2'
+	menu_off = 0
+
 	gs 'gadukino_event', 'sound'
 	gs'stat'
 
 	'<center><H4>River</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_river.jpg"></center>'
+
 	'The cow herd is standing by the river.'
-	if mira = 1: MiraLoc = 42 & 'S<a href="exec: gt ''Miroslava'', ''Start''">Mira</a> is sitting next to you.'
-	if temper >= 15 and sunWeather = 1:'- "You can go for a swim while there is time, <<$pcs_nickname>>. I`ll keep an eye on the herd," said you grandpa.'
+
+	if mira = 1: MiraLoc = 42 & '<a href="exec: gt ''Miroslava'', ''Start''">Mira</a> is sitting next to you.'
+	if temper >= 15 and sunWeather = 1:'- "You can go for a swim while there is time, <<$pcs_nickname>>. I`ll keep an eye on the herd," said your grandfather.'
 
 	if graze_cow = 1:
 		if hour < 16:
@@ -274,10 +322,10 @@ if $ARGS[0] = 'cow2':
 				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 				grandmahelp += 1
 				graze_cow_exp = 1
-				hndiwrk_exp += rand(0,3) 
+				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
-				act 'Further':gt'gadfield','cow2'
+				act 'Continue':gt'gadfield','cow2'
 			end
 			if temper >= 15 and sunWeather = 1 and mira = 0:
 				act 'Swim (0:15)':
@@ -292,7 +340,7 @@ if $ARGS[0] = 'cow2':
 					if pcs_stren < 30:stren_exp += 1
 					gs 'stat'
 
-					act 'Further':gt'gadfield','cow2'
+					act 'Continue':gt'gadfield','cow2'
 				end
 				act 'Tan (0:30)':
 					*clr & cla
@@ -304,7 +352,7 @@ if $ARGS[0] = 'cow2':
 					pcs_tan += 1
 					gs 'stat'
 
-					act 'Further':gt'gadfield','cow2'
+					act 'Continue':gt'gadfield','cow2'
 				end
 				act 'Read a book (1:00)':
 					*clr & cla
@@ -338,22 +386,31 @@ if $ARGS[0] = 'cow2':
 			grandmahelp += 1
 			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 			minut += 60
-			hndiwrk_exp += rand(0,3) 
+			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
-			act 'Further':gt'gadfield','cow3'
+			act 'Herd the cows to the forest':gt'gadfield','cow3'
 		end
 	end
 end
 
-
 if $ARGS[0] = 'cow3':
+	$loc = 'gadfield'
+	$metka = 'cow3'
+	$location_type = 'secluded'
+
+	$menu_loc = 'gadfield'
+	$menu_arg = 'cow3'
+	menu_off = 0
+
 	gs 'gadukino_event', 'sound'
 	gs'stat'
 
 	'<center><H4>Field near the forest</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_forest.jpg"></center>'
+
 	'The cow herd is standing on a field near the forest.'
+
 	if mira = 1: MiraLoc = 43 & '<a href="exec: gt ''Miroslava'', ''Start''">Mira</a> is sitting next to you.'
 
 	if graze_cow = 1:
@@ -366,10 +423,10 @@ if $ARGS[0] = 'cow3':
 				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 				grandmahelp += 1
 				graze_cow_exp = 1
-				hndiwrk_exp += rand(0,3) 
+				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
-				act 'Further':gt'gadfield','cow3'
+				act 'Continue':gt'gadfield','cow3'
 			end
 			if mira = 0:
 				act 'Take a run (1:00)':
@@ -385,7 +442,7 @@ if $ARGS[0] = 'cow3':
 					if temper >= 25 and sunWeather = 1:pcs_hydra -= 24
 					gs 'stat'
 
-					act 'Further':gt'gadfield','cow3'
+					act 'Continue':gt'gadfield','cow3'
 				end
 			end
 			if temper >= 15 and sunWeather = 1 and mira = 0:
@@ -398,7 +455,7 @@ if $ARGS[0] = 'cow3':
 					if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 					gs 'stat'
 
-					act 'Further':gt'gadfield','cow3'
+					act 'Continue':gt'gadfield','cow3'
 				end
 				act 'Tan (1:00)':
 					*clr & cla
@@ -410,10 +467,10 @@ if $ARGS[0] = 'cow3':
 					pcs_sweat += 10
 					gs 'stat'
 
-					act 'Further':gt'gadfield','cow3'
+					act 'Continue':gt'gadfield','cow3'
 				end
 				if pcs_sleep < 40:
-					act 'Take a nap on the grass (1:00)':
+					act 'Nap on the grass (1:00)':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_lying.jpg"></center>'
 						'You lie down on the grass and doze off for an hour.'
@@ -423,7 +480,7 @@ if $ARGS[0] = 'cow3':
 						if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 						gs 'stat'
 
-						act 'Further':gt'gadfield','cow3'
+						act 'Continue':gt'gadfield','cow3'
 					end
 				end
 				act 'Read a book (1:00)':
@@ -453,17 +510,19 @@ if $ARGS[0] = 'cow3':
 		end
 		if hour >= 19:
 			*clr & cla
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go_home.jpg"></center>'
-			'Looking at his watch, grandpa says that it is late and time to drive the herd home. You hurry up and gather up the cows and rush them towards the village. You are barely keeping up with the herd.'
+			'Looking at his watch, grandpa says that it is late and time to drive the herd home. You hurry and gather up the cows and drive them towards the village.'
+
 			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 			minut += 60
 			mira = 0
 			graze_cow = 0
 			grandmahelp += 1
-			hndiwrk_exp += rand(0,3) 
+			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
-			act 'Go back to the village':gt'gadukino'
+			act 'Back to the village':gt'gadukino'
 		end
 	end
 end

+ 198 - 125
locations/gadforest.qsrc

@@ -1,60 +1,71 @@
 # gadforest
 
+!MiraLoc tells us where Mira is Located
+!----------------------------------------------
+!MiraLoc = 0 (Mira at home)
+!MiraLoc = 1 (Mira at river)
+!MiraLoc = 2 (Mira at meadow)
+!MiraLoc = 3 (Mira at forest)
+!MiraLoc = 4 (Mira at field)
+!MiraLoc = 5 (Mira with gop)
+!---------------------------------------------
+	
 if $ARGS[0] = '1':
+	*clr & cla
+	! figure out if Sveta came from Mira code or not. events play out differently whether with Mira or not
 	PC_arrive = iif($loc ! 'Miroslava', 1 , 0)
-	!out skirt
+
+	! edge of forest
+	$loc = 'gadforest'	
+	$metka = '1'
 	$location_type = 'secluded'
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	
+	$menu_loc = 'gadforest'
+	$menu_arg = '1'
+	menu_off = 0
+	
 	clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 	gs 'gadukino_event', 'sound'
-	*clr & cla
 	gs'stat'
-	!gs'time'
-
-	!MiaLoc tells us where Mira is Located
-	!----------------------------------------------
-	!MiraLoc = 0 (Mira at home)
-	!MiraLoc = 1 (Mira at river)
-	!MiraLoc = 2 (Mira at meadow)
-	!MiraLoc = 3 (Mira at forest)
-	!MiraLoc = 4 (Mira at field)
-	!MiraLoc = 5 (Mira with gop)
-	!---------------------------------------------
-
+	
+	*clr & cla
+	
+	! Add to knowledge of forest
 	if goforest < 20:goforest += rand(0,1)
+	! chance to get lost
 	lost = 1
-	!to determine the continuation of the way if he got lost
-	lostrand = rand(1,30)
-	!the chance to get lost
+	lostrand = rand(1,20)
+	! Determine where Sveta got lost in the forest
 	foresteventrand = rand(1,20)
 	new_boletus = 0
 	new_bilberry = 0
 
-	'<center><H4>Forest</H4></center>'
+	'<center><H4>Edge of the Forest</H4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest1.jpg"></center>'
-			'The edge of the forest. There are a few mushrooms and you can often see mushroom pickers.'
+			'Your are at the edge of the forest. Mushrooms and berries grow here and you can often find other people picking them.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_night1.jpg"></center>'
-			'The edge of the forest. Night in the woods is scary and uncomfortable.'
+			'You are at the edge of the forest. Night in the woods is scary and uncomfortable.'
 		end
 	else
 		if hour >= 8 and hour < 18:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter1.jpg"></center>'
-			'The edge of the forest. The forest in the winter is very beautiful.'
+			'You are at the edge of the forest. The forest in winter is very beautiful.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter_night1.jpg"></center>'
-			'The edge of the forest. Night in the winter forest is very scary and uncomfortable.'
+			'You are at the edge of the forest. Night in the forest during wintertime is very scary and uncomfortable.'
 		end
 	end
+	
 	if forestpicnic = 1:'On the edge of the forest you see people. Apparently they are having a family <a href="exec:gt ''gadforest_event'',''picnic''">picnic</a>.'
-	if MiraLoc = 3:'Near you wandering in the forest is <a href="exec: gt ''Miroslava'' ">Mira</a>.'
-	if clothesAtLocation = 1:'On the ground lay your clothes.'
-	if findvel = 2:'Near the tree is your old <a href="exec:gt ''bicycle'',''forest''">bike</a>.'
-	if goforest < 10:'You don''t know this forest very well, it''s best if you don''t wander too far.'
-
+	if MiraLoc = 3:'Nearby is <a href="exec: gt ''Miroslava'' ">Mira</a>.'
+	if clothesAtLocation = 1:'Your clothes are nearby on the ground.'
+	if findvel = 2:'Leaning up against a tree is your old <a href="exec:gt ''bicycle'',''forest''">bike</a>.'
+	if goforest < 10:'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
+	
+	! Sveta arrive without Mira events
 	if PC_arrive = 1:
 		if temper >= 15 and sunWeather = 1 and hour>=6 and hour<=20 and miratalkforest = 1:gt 'gadforest_event', 'nude_event'
 		if foresteventrand < 3 and month >= 6 and month <= 9 and mushroom_pickersday ! daystart:mushroom_pickers = 1 & gt'gadforest_event', 'mushroom_pickers1'
@@ -67,56 +78,82 @@ if $ARGS[0] = '1':
 		if foresteventrand = 9 and hour >= 8 and hour <= 15 and month >= 4 and month <= 10 and gadboyday ! daystart and week > 5: gt 'gadforest_event', 'gopforest_3boys'
 	end
 
-	if $clothingworntype ! 'nude' and clothesAtLocation = 0 and temper >= 15 and sunWeather = 1 and hour>=6 and hour<=20 and miratalkforest > 1 and MiraLoc ! 3 and inhib > 50:
+	! can only be naked if successfully complete Mira gadforest_event, nude_event
+	if $clothingworntype ! 'nude' and clothesAtLocation = 0 and temper >= 15 and sunWeather = 1 and hour>=6 and hour<=20 and miratalkforest > 1 and MiraLoc ! 3 and (pcs_inhib >= 25 or exhibitionist_lvl > 1):
 		act'Strip naked':
 			if forestpicnic = 0:
-				inhib_exp += rand(1,3)
 				cla
 				*clr
-				minut+=5
-				gs 'underwear', 'remove'
+				if pcs_inhib < 50:inhib_exp += rand(1,3)
+				minut += 5
 				if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
 				if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+				gs 'underwear', 'remove'
 				gs 'clothing', 'strip', 'gadforest'
+				gs 'exhibitionism', 3
+				gs 'stat'
+				
 				'You don''t hesitate and quickly get undressed, your clothes are left laying in a pile.'
 
-				act'Back':gt'gadforest','1'
+				act'Continue':gt'gadforest','1'
 			else
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/noundress.jpg"></center>'
-				'You see a number of people you are ashamed of.'
+				'You see a number of people nearby and decide not to undress right now.'
 
-				act'Back':gt'gadforest','1'
+				act'Continue':gt'gadforest','1'
 			end
 		end
 	end
+	
 	if clothesAtLocation = 1 and $clothingworntype = 'nude':
-		act 'Dress':
+		act 'Get dressed':
 			cla
 			*clr
-			swamp_clothes = 0
 			minut += 5
+			gs 'clothing', 'swamp_clothes', 0
 			gs 'underwear', 'wear'
 			gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
+			gs 'stat'
 			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
-			 if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
-			'You change into your clothes.'
+			if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+			'You change back into your clothes.'
 			act 'Back': gt 'gadforest','1'
 		end
 	end
-	!if he had gone from the forest and put in another place
+	
+	! if Sveta left the forest without retrieving her clothes
 	if clothesAtLocation = 1 and $clothingworntype ! 'nude':
-		act 'Pick up the abandoned clothing':
-			cla
-			*clr
-			gs 'clothing', 'recover_lost_clothes', 'gadforest'
-			'You pick up your clothes.'
-			act 'Back': gt 'gadforest','1'
+		if $clothingworntype = 'cheap' and clothingwornnumber = 414:
+			act 'Pick up your abandoned clothing':
+				cla
+				minut += 2
+				gs 'clothing', 'swamp_clothes', 0
+				gs 'underwear', 'wear'
+				gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
+				gs 'stat'
+				*nl
+				'You pick up your abandoned clothing and change out of the hessian sack the hunters gave you.'
+				act 'Back': gt 'gadforest','1'
+			end
+		else
+			act 'Pick up your abandoned clothing':
+				cla
+				minut += 5
+				gs 'clothing', 'swamp_clothes', 0
+				gs 'underwear', 'wear'
+				gs 'clothing', 'recover_lost_clothes', 'gadforest'
+				gs 'stat'
+				*nl
+				'You pick up your abandoned clothing.'
+				act 'Back': gt 'gadforest','1'
+			end
 		end
 	end
+	
 	if hour >= 6 and hour <= 20 and sunWeather = 1:
-		act 'Walking in the woods':
+		act 'Go for a walk in the woods':
 			cla
 			*clr
 			minut += 60
@@ -134,7 +171,7 @@ if $ARGS[0] = '1':
 					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':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_nude0.'+rand(1,4)+'.jpg"></center>'
-					'You are walking through the woods, enjoying the sounds of forest and the fresh air.'
+					'You are walking through the woods, enjoying the sounds of the forest and the fresh air.'
 				else
 					if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest'+rand(1,3)+'.jpg"></center>'
 					if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest_nude'+rand(1,3)+'.jpg"></center>'
@@ -143,16 +180,17 @@ if $ARGS[0] = '1':
 			else
 				if MiraLoc ! 3:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforestwinter0.'+rand(1,2)+'.jpg"></center>'
-					'You walk through the winter woods, enjoying the sounds of the forest and the fresh air.'
+					'You walk through the snowy woods, enjoying the sounds of the forest and the fresh air.'
 				else
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforestwinter.jpg"></center>'
-					'You walk with Mira through the winter woods, enjoying the sounds of the forest and the fresh air.'
+					'You walk with Mira through the snowy woods, enjoying the sounds of the forest and the fresh air.'
 				end
 			end
-
-			act 'Further':gt 'gadforest','1'
+			
+			act 'Continue':gt 'gadforest','1'
 		end
 	end
+	
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and edge_forestday ! daystart:
 		act 'Look for mushrooms and berries':
 			cla
@@ -162,7 +200,8 @@ if $ARGS[0] = '1':
 			edge_forestday = daystart
 			if goforest < 20:goforest += rand(0,1)
 			gs 'stat'
-
+			
+			! no mushroom pickers or mushroom pickers moved deeper into the forest
 			if mushroom_pickers = 0 or mushroom_pickers = 2:
 				cla
 				new_boletus += rand(0,1)
@@ -173,9 +212,10 @@ if $ARGS[0] = '1':
 				gs 'stat'
 
 				gs 'gadforest', 'clothes1'
-				if new_boletus = 0 and new_bilberry > 0:'You`re in for hours of wandering through the woods in search of mushrooms or berries and you found <<new_bilberry>> kg of berries.'
-				if new_boletus > 0 and new_bilberry > 0:'You`re in for hours of wandering through the woods in search of mushrooms or berries and you found <<new_boletus>> kg mushrooms and <<new_bilberry>> kg of berries.'
+				if new_boletus = 0 and new_bilberry > 0:'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
+				if new_boletus > 0 and new_bilberry > 0:'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
 			end
+			! mushroom pickers are at the edge of the forest
 			if mushroom_pickers = 1 and temp_gf = 1:
 				cla
 				new_bilberry += rand(0,1)
@@ -184,8 +224,8 @@ if $ARGS[0] = '1':
 
 				if new_bilberry > 0: gs 'gadforest', 'clothes1'
 				if new_bilberry = 0: gs 'gadforest', 'clothes2'
-				if new_bilberry > 0:'Within half an hour of wandering through the woods in search of mushrooms or berries, you found <<new_bilberry>> kg of berries.'
-				if new_bilberry = 0:'You are wandering through the woods in search of mushrooms or berries for half an hour, but you found nothing.'
+				if new_bilberry > 0:'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
+				if new_bilberry = 0:'After searching for mushrooms and berries for half an hour you found nothing.'
 			end
 			if mushroom_pickers = 1 and temp_gf = 2:
 				cla
@@ -193,96 +233,111 @@ if $ARGS[0] = '1':
 				gs 'stat'
 
 				gs 'gadforest', 'clothes2'
-				'You are wandering through the woods in search of mushrooms or berries for half an hour, but found nothing.'
+				'After searching for mushrooms and berries for half an hour you found nothing.'
 			end
-			act 'Further':gt 'gadforest','1'
+			act 'Continue':gt 'gadforest','1'
 		end
  	end
+ 	
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and MiraLoc ! 3:
 		act 'Go further into the forest':
 			if goforest >= lostrand:minut += 30 & gt 'gadforest','2'
 			if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
 	 	end
 	end
+	
 	if goswamp = 1 and MiraLoc ! 3:
+		! day time chance to get stuck in swamp. ps. use bike to get there 100% of the time by illume
 		if hour >= 6 and hour < 20:
 			act 'Go to the swamp':
 				minut += 75
-				!random chance to swamp road. It a pity to use it only in lost. ps. use bike to 100% there by illume
 				if goforest >= lostrand:
 					gt 'swamp'
 				else
 					gt 'gadforestswamp','1'
 				end
 			end
+		! night time chased by wolves
 		else
 			act 'Go to the swamp':gt 'gadforest_event', 'swamp_road'
 		end
 	end
-	act 'Out of the woods':
-		dirtyclothes = 0 & swamp_clothes = 0
+	
+	act 'Leave the woods':
+		dirtyclothes = 0
+		gs 'clothing', 'swamp_clothes', 0
+		gs 'stat'
 		if $clothingworntype = 'nude':
 			if $CloLosTyp[$CURLOC] = '' or gadforest_clothestorn = 1:
-				!no cloth here, it must be broken. There may be a good exhibi or rape event entry point.
+				! no clothes here, they must be ripped apart enough times in the woods or swamp to get destroyed.
+				! This may be a good exhibition or rape event entry point
 				inhib_exp += rand(0,2)
 				gadforest_clothestorn = 0
-				'You sneak out the woods, hiding your naked body in shadow and moving toward grandparents house.'
-				'You Successfully reach home without witness.'
+				'You sneak out the woods, hiding your naked body in the shadows and moving toward grandparents house.'
+				'You successfully reach home without anyone noticing.'
 				cla
-				act 'Further':gt'Gadhouse'
+				act 'Go home':gt'Gadhouse'
 			else
-				'<B>You should dress before leave</B>'
+				'<B>You should get dressed before leaving the woods.</B>'
 			end
 		else
 			minut += 30 & gt'gadroad'
 		end
 	end
 	if rand(1,10)> 9: gs 'gadforest', 'torncloth'
+	gs 'stat'
 end
 
 if $ARGS[0] = '2':
+	*clr & cla
+	! slightly inside forest
+	$loc = 'gadforest'	
+	$metka = '2'
 	$location_type = 'secluded'
-	!inside
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	
+	$menu_loc = 'gadforest'
+	$menu_arg = '2'
+	menu_off = 0
+	
 	gs 'gadukino_event', 'sound'
-	*clr & cla
 	gs'stat'
-	!gs'time'
+	
+	! Add to knowledge of forest
 	if goforest < 40:goforest += rand(0,1)
+	! Determine where Sveta got lost in the forest
 	lost = 2
-	!to determine the continuation of the path YY lost
+	! chance to get lost
 	lostrand = rand(1,60)
-	!the chance to get lost
 	foresteventrand = rand(1,10)
 	new_boletus = 0
 	new_bilberry = 0
+	
 	'<center><H4>Forest</H4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest2.jpg"></center>'
-			'Forest. The intoxicating fresh air and singing birds light up your soul with joy.'
+			'You are in the forest. The fresh air and singing birds light up your soul with joy.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_night2.jpg"></center>'
-			'Forest. Night in the woods is scary and uncomfortable.'
+			'You are in the forest. Night in the woods is scary and uncomfortable.'
 		end
 	else
 		if hour >= 8 and hour < 18:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter2.jpg"></center>'
-			'Forest. The forest in the winter is very beautiful, the fresh air makes you happy.'
+			'You are in the forest. The forest in the winter is very beautiful, the fresh air makes you happy.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter_night2.jpg"></center>'
-			'Forest. Night in the winter forest is very scary and uncomfortable.'
+			'You are in the forest. Night in the forest during wintertime is very scary and uncomfortable.'
 		end
 	end
-	if goforest < 20:'You do not know this part of the forest, it''s better not to wander too far.'
+	if goforest < 20:'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
 
 	if foresteventrand = 1 and month >= 6 and month <= 9 and mushroom_pickersday ! daystart:mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers1'
 	if foresteventrand = 2 and hour > 8 and hour < 20 and foresteventday ! daystart:gt 'gadforest_event', 'forest_hanters'
 	if foresteventrand > 7 and month >= 6 and month <= 9 and foresteventday ! daystart:mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers3'
 
 
-	act 'Back':
+	act 'To the edge of the forest':
 		lostrand = rand(1,30)
 		if goforest >= lostrand:minut += 30 & gt 'gadforest','1'
 		if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
@@ -297,6 +352,7 @@ if $ARGS[0] = '2':
 			if goforest < 40:goforest += rand(0,1)
 			gs 'stat'
 
+			! mushroom_pickers either not seen today or still at the edge of the forest
 			if mushroom_pickers < 2:
 				cla
 				new_boletus += 1
@@ -307,7 +363,7 @@ if $ARGS[0] = '2':
 				gs 'stat'
 
 				gs 'gadforest', 'clothes1'
-				'Within half an hour of wandering through the woods in search of mushrooms or berries, you found <<new_boletus>> kg mushrooms and <<new_bilberry>> kg of berries.'
+				'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
 			end
 			if mushroom_pickers = 2 and temp_gf = 1:
 				cla
@@ -318,8 +374,8 @@ if $ARGS[0] = '2':
 				gs 'stat'
 
 				if new_boletus > 0 or new_bilberry > 0: gs 'gadforest', 'clothes1'
-				if new_boletus = 0 and new_bilberry > 0:'Within half an hour of wandering through the woods in search of mushrooms or berries, you found <<new_bilberry>> kg of berries.'
-				if new_boletus > 0 and new_bilberry > 0:'Within half an hour of wandering through the woods in search of mushrooms or berries, you found <<new_boletus>> kg mushrooms and <<new_bilberry>> kg of berries.'
+				if new_boletus = 0 and new_bilberry > 0:'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
+				if new_boletus > 0 and new_bilberry > 0:'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
 			end
 			if mushroom_pickers = 2 and temp_gf = 2:
 				cla
@@ -327,11 +383,12 @@ if $ARGS[0] = '2':
 				gs 'stat'
 
 				gs 'gadforest', 'clothes2'
-				'You are wandering through the woods in search of mushrooms or berries for half an hour, but found nothing.'
+				'After searching for mushrooms and berries for half an hour you found nothing.'
 			end
-			act 'Further':gt 'gadforest','2'
+			act 'Continue':gt 'gadforest','2'
 		end
 	end
+	
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9:
 		act 'Go further into the forest':
 			if goforest >= lostrand:minut += 30 & gt 'gadforest','3'
@@ -342,52 +399,60 @@ if $ARGS[0] = '2':
 end
 
 if $ARGS[0] = '3':
-	!deep forest
+	*clr & cla
+	! deep inside forest
+	$loc = 'gadforest'	
+	$metka = '3'
 	$location_type = 'secluded'
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	
+	$menu_loc = 'gadforest'
+	$menu_arg = '3'
+	menu_off = 0
+	
 	gs 'gadukino_event', 'sound'
-	*clr & cla
 	gs'stat'
-	!gs'time'
+	
+	! Add to knowledge of forest
 	if goforest < 60:goforest += rand(0,1)
 	lost = 3
-	!to determine the continuation of the path YY lost
+	! Determine where Sveta got lost in the forest
 	lostrand = rand(1,100)
-	!the chance to get lost
+	! chance to get lost
 	foresteventrand = rand(1,10)
 	new_boletus = 0
 	new_bilberry = 0
-	'<center><H4>Thicket</H4></center>'
+	
+	'<center><H4>Deep Forest</H4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest3.jpg"></center>'
-			'Forest. The intoxicating fresh air and singing birds light up your soul with joy.'
+			'You are deep in the forest. The fresh air and singing birds light up your soul with joy.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_night3.jpg"></center>'
-			'Forest. Night in the woods is scary and uncomfortable.'
+			'You are deep in the forest. Night in the woods is scary and uncomfortable.'
 		end
 	else
 		if hour >= 8 and hour < 18:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter3.jpg"></center>'
-			'Forest. The forest in the winter is very beautiful, the fresh air makes you happy.'
+			'You are deep in the forest. The forest in the winter is very beautiful, the fresh air makes you happy.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter_night3.jpg"></center>'
-			'Forest. Night in the winter forest is very scary and uncomfortable.'
+			'You are deep in the forest. Night in the forest during wintertime is very scary and uncomfortable.'
 		end
 	end
-	if goforest < 30:'You do not know this part of the forest, it''s better not to wander too far.'
+	if goforest < 30:'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
 
 	if foresteventrand = 1 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'basket'
 	if foresteventrand = 2 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'bilberry'
 	if foresteventrand = 3 and foresteventday ! daystart: gt 'gadforest_event', 'mushroom'
 	if foresteventrand = 4 and hour > 8 and hour < 20 and foresteventday ! daystart:gt 'gadforest_event', 'forest_hanters'
 
-	act 'Back':
+	act 'Go back to the forest':
 		lostrand = rand(1,60)
 		if goforest >= lostrand:minut += 30 & gt 'gadforest','2'
 		if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
 	end
+	
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and thicketday ! daystart:
 
 	act 'Look for mushrooms and berries':
@@ -402,11 +467,12 @@ if $ARGS[0] = '3':
 			pcs_mood += 5
 			gs 'stat'
 			gs 'gadforest', 'clothes1'
-			'Within half an hour of wandering through the woods in search of mushrooms or berries, you found <<new_boletus>> kg mushrooms and <<new_bilberry>> kg of berries.'
+			'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
 
-			act 'Further':gt 'gadforest','3'
+			act 'Continue':gt 'gadforest','3'
 		end
 	end
+	
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9:
 
 		act 'Go further into the forest':
@@ -418,28 +484,35 @@ if $ARGS[0] = '3':
 end
 
 if $ARGS[0] = '4':
-	!near swamp
+	*clr & cla
+	! forest near swamp
+	$loc = 'gadforest'	
+	$metka = '4'
 	$location_type = 'secluded'
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	
+	$menu_loc = 'gadforest'
+	$menu_arg = '4'
+	menu_off = 0
+	
 	gs 'gadukino_event', 'sound'
-	*clr & cla
 	gs'stat'
-	!gs'time'
+	
+	! Add to knowledge of forest
 	if goforest < 80:goforest += rand(0,1)
 	lost = 4
-	!to determine the continuation of the path YY lost
+	! Determine where Sveta got lost in the forest
 	lostrand = rand(1,120)
-	!the chance to get lost
+	! chance to get lost
 	foresteventrand = rand(1,10)
 	dirty = 0
 	new_boletus = 0
 	new_bilberry = 0
-	'<center><H4>Woods near swamps</H4></center>'
+	
+	'<center><H4>Forest near the Swamp</H4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest4.jpg"></center>'
-			'Forest. The intoxicating fresh air and singing birds light up your soul with joy.'
+			'You are in the forest near the swamp. The fresh air and singing birds light up your soul with joy.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_night4.jpg"></center>'
 			'Forest. Night in the woods is scary and uncomfortable.'
@@ -447,19 +520,19 @@ if $ARGS[0] = '4':
 	else
 		if hour >= 8 and hour < 18:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter4.jpg"></center>'
-			'Forest. The forest in the winter is very beautiful, the fresh air makes you happy.'
+			'You are in the forest near the swamp. The forest in the winter is very beautiful, the fresh air makes you happy.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter_night4.jpg"></center>'
-			'Forest. Night in the winter forest is very scary and uncomfortable.'
+			'You are in the forest near the swamp. Night in the forest during wintertime is very scary and uncomfortable.'
 		end
 	end
-	if goforest < 60:'You do not know this part of the forest. It is better not to go too far in.'
+	if goforest < 60:'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
 
 	if foresteventrand < 2 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'bilberry'
 	if foresteventrand > 7 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'mushroom'
 	if foresteventrand = 5 and hour > 8 and hour < 20 and foresteventday ! daystart:gt 'gadforest_event', 'forest_hanters'
 
-	act 'Back':
+	act 'Go back to the deep woods':
 		lostrand = rand(1,100)
 		if goforest >= lostrand:minut += 30 & gt 'gadforest','3'
 		if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
@@ -479,12 +552,13 @@ if $ARGS[0] = '4':
 			gs 'stat'
 
 			gs 'gadforest', 'clothes1'
-			'Within half an hour of wandering through the woods in search of mushrooms or berries, you found <<new_boletus>> kg mushrooms and <<new_bilberry>> kg of berries.'
+			'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
 
-			act 'Further':gt 'gadforest','4'
+			act 'Continue':gt 'gadforest','4'
 		end
 	end
-	act 'Go further into the forest':
+	
+	act 'Go further into the swamp':
 		if goforest >= lostrand and goswamp = 1:minut += 30 & gt 'swamp'
 		if goforest >= lostrand and goswamp = 0:minut += 30 & gt 'gadforestswamp','1'
 		if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
@@ -521,7 +595,6 @@ end
 if $ARGS[0] = 'gadforestloststart':
 	cla
 	*clr
-	!gs'time'
 	gs 'stat'
 
 	'<center><H4>Somewhere in the woods</H4></center>'
@@ -531,16 +604,16 @@ if $ARGS[0] = 'gadforestloststart':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadfear3.jpg"></center>'
 	end
-	'You suddenly realize in horror that you are not familiar with the area you are in... you get lost.'
+	'You suddenly realize in horror that you are not familiar with the area you are in... you are lost!.'
 
-	act 'Further':
+	act 'Look for a way out':
 		if lost = 1: gt 'gadforestlost','1'
 		if lost = 2: gt 'gadforestlost','2'
 		if lost = 3: gt 'gadforestlost','3'
 		if lost = 4: gt 'gadforestlost','4'
 	end
 
-	!add for realistic, rescue in forest! by illume
+	! add for rescue in forest by illume
 	forest_lost = 1
 	if StoryLine = 1: forest_lostday = daystart + rand(1,3)
 end
@@ -550,11 +623,11 @@ if $ARGS[0] = 'torncloth':
 	if $clothingworntype ! 'nude':
 		if (PCloThinness = 1 or PCloSkirt > 0) and PCloQuality < 5:
 			!skirts, not fit, and not high-class enough by illume
-			'Oops, your clothes get snagged and tears slightly.'
+			'Oops, your clothes get snagged and tear slightly.'
 			dynamic $clothingworntype + 'H[<<clothingwornnumber>>] -= 1'
-			!add remove cloth if worn out, need better texting by illume.
+			!add remove clothes if worn out
 			if dyneval('RESULT = <<$clothingworntype>>H[<<clothingwornnumber>>]') <= 0:
-				'Your raggedy clothes have finally had enough and fall apart. You are naked now.'
+				'Your ripped clothes were barely holding together, but now they have finally fell apart. You are naked now.'
 				gadforest_clothestorn = 1
 				gs 'clothing', 'strip', 'gadforest', 2
 			end

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


+ 142 - 87
locations/gadforestlost.qsrc

@@ -2,51 +2,79 @@
 
 !make this trigger after 2 days in swamp house, minus a countdown per hour
 if $ARGS[0] = 'forestrescue':
-	!rescue in forest by illume. I think we need good texts.
 	cls
+	$loc = 'gadforestlost'
+	$metka = 'forestrescue'
+	$location_type = 'secluded'
+
+	$menu_loc = 'gadforestlost'
+	$menu_arg = 'forestrescue'
+	menu_off = 0
+
+	gs 'gadukino_event', 'sound'
+	gs'stat'
+
 	minut += 150
 	lost_girl = 0
-	dirtyclothes = 0 & swamp_clothes = 0
+	dirtyclothes = 0
 	forest_lostday = 0
 	hanters = 0
+	gs 'clothing', 'swamp_clothes', 0
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/forester.jpg"></center>'
-	'You wander in the forest trying to find your way out, suddenly you spot a man dressed as a forest ranger.'
-	'"And here is our lost girl." he said wearily, "Your grandfather and grandmother are very worried about you. They asked me to help find you. Follow me, I will take you home."'
+
+	'Suddenly you spot a man dressed as a forest ranger.'
+	'He walks up to you and says, "And here is our lost girl. Your grandfather and grandmother are very worried about you. They asked me to help find you. Follow me, I will take you home."'
+
+	!rescued during rest
 	if $loc = 'gadforestrelax':
-		!rescued during rest
+		!have fire
 		if bonfire = 1:
-			!have fire
-			'When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visable to others.'
+			'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.'
 		else
 			'Staying in one place is a good idea when you are lost.'
 		end
 	end
-	'You get ready quickly and you follow the forest ranger out of the woods.'
+
+	'You get ready quickly and follow the forest ranger out of the woods.'
+
 	if $clothingworntype ! 'nude':
-		act 'Further':gt'Gadhouse'
+		'You can''t wait to get back to your grandparents house and have a bath and a nice hot meal.'
+
+		act 'To your grandparents house':gt'Gadhouse'
 	elseif $clothingworntype = 'nude':
-		act 'Further':gt'gadforest', '1'
+		'The ranger looks you up and down and you feel like he is about to ask you something but he decides against it.'
+		'You remember you left your clothes by the edge of the woods and ask the ranger to take you there instead.'
+
+		act 'To the edge of the woods':gt'gadforest', '1'
 	end
 end
 if $ARGS[0] = '1':
-	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 7: gt 'gadforestlost', 'forestrescue' & !add rescue by illume
+	*clr & cla
+	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 7: gt 'gadforestlost', 'forestrescue'
+	$loc = 'gadforestlost'
+	$metka = '1'
 	$location_type = 'secluded'
-	$metka = $ARGS[0]
-	 $loc = $CURLOC
+
+	$menu_loc = 'gadforestlost'
+	$menu_arg = '1'
+	menu_off = 0
+
 	gs 'gadukino_event', 'sound'
-	cla
-	*clr
+	gs'stat'
+
+	riprand = rand(1,10)
+	rescuerand = rand(1,10)
 	wolfrand = rand(1,10)
 	hantrand = rand(1,10)
-	gs'stat'
-	!gs'time'
+
+
 	gs 'gadforestlost', 'gadforestlost'
 
 	if wolfrand = 1 and (hour = 23 or hour >= 0 and hour < 6):gt 'gadforest_event', 'lost'
 
-	act 'Look for the road':
+	act 'Look for a way out':
 		cla
 		*clr
 		minut += 60
@@ -57,25 +85,32 @@ if $ARGS[0] = '1':
 
 		gs 'gadforestlost', 'lostclothes'
 		if goforest > lostrand:
-			act 'Look for the road':gs 'gadforestlost', 'gadforestlostfinish1'
+			act 'Look for a way out':gs 'gadforestlost', 'gadforestlostfinish1'
 		else
-			act 'Look for the road':gt 'gadforestlost','1'
+			act 'Look for a way out':gt 'gadforestlost','1'
 		end
-		act 'To take a break':gt 'gadforestrelax'
+		act 'Take a break':gt 'gadforestrelax'
 	end
 	if rand(1,10)> 8: gs 'gadforest', 'torncloth'
 	gs 'gadforestlost', 'searchfood'
 end
 if $ARGS[0] = '2':
-	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 8: gt 'gadforestlost', 'forestrescue' & !add rescue by illume
+	*clr & cla
+	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 8: gt 'gadforestlost', 'forestrescue'
+	$loc = 'gadforestlost'
+	$metka = '2'
 	$location_type = 'secluded'
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+
+	$menu_loc = 'gadforestlost'
+	$menu_arg = '2'
+	menu_off = 0
+
 	gs 'gadukino_event', 'sound'
-	cls
+	gs'stat'
 	wolfrand = rand(1,10)
+	hantrand = rand(1,10)
 	gs'stat'
-	!gs'time'
+
 	gs 'gadforestlost', 'gadforestlost'
 
 	if wolfrand <= 2 and (hour = 23 or hour >= 0 and hour < 6):gt 'gadforest_event', 'lost'
@@ -92,25 +127,33 @@ if $ARGS[0] = '2':
 
 		gs 'gadforestlost', 'lostclothes'
 		if goforest > lostrand:
-			act 'Look for the road ':gs 'gadforestlost', 'gadforestlostfinish2'
+			act 'Look for a way out':gs 'gadforestlost', 'gadforestlostfinish2'
 		else
-			act 'Look for the road':gt 'gadforestlost','2'
+			act 'Look for a way out':gt 'gadforestlost','2'
 		end
-		act 'To take a break':gt 'gadforestrelax'
+		act 'Take a break':gt 'gadforestrelax'
 	end
 	if rand(1,10)> 7: gs 'gadforest', 'torncloth'
 	gs 'gadforestlost', 'searchfood'
 end
 if $ARGS[0] = '3':
-	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 9: gt 'gadforestlost', 'forestrescue' & !add rescue by illume
+	*clr & cla
+	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 9: gt 'gadforestlost', 'forestrescue'
+	$loc = 'gadforestlost'
+	$metka = '3'
 	$location_type = 'secluded'
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+
+	$menu_loc = 'gadforestlost'
+	$menu_arg = '3'
+	menu_off = 0
+
 	gs 'gadukino_event', 'sound'
-	cls
+	gs'stat'
+
 	wolfrand = rand(1,10)
+	hantrand = rand(1,10)
 	gs'stat'
-	!gs'time'
+
 	gs 'gadforestlost', 'gadforestlost'
 	if wolfrand <= 3 and (hour = 23 or hour >= 0 and hour < 6):gt 'gadforest_event', 'lost'
 	if hantrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hanters'
@@ -126,25 +169,37 @@ if $ARGS[0] = '3':
 
 		gs 'gadforestlost', 'lostclothes'
 		if goforest > lostrand:
-			act 'Look for the road ':gs 'gadforestlost', 'gadforestlostfinish3'
+			act 'Look for a way out':gs 'gadforestlost', 'gadforestlostfinish3'
 		else
-			act 'Look for the road':gt 'gadforestlost','3'
+			act 'Look for a way out':gt 'gadforestlost','3'
 		end
-		act 'To take a break':gt 'gadforestrelax'
+		act 'Take a break':gt 'gadforestrelax'
 	end
 	if rand(1,10)> 6: gs 'gadforest', 'torncloth'
 	gs 'gadforestlost', 'searchfood'
 end
 if $ARGS[0] = '4':
-	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 9: gt 'gadforestlost', 'forestrescue' & !add rescue by illume
+	*clr & cla
+	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 9: gt 'gadforestlost', 'forestrescue'
+	$loc = 'gadforestlost'
+	$metka = '4'
 	$location_type = 'secluded'
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+
+	$menu_loc = 'gadforestlost'
+	$menu_arg = '4'
+	menu_off = 0
+
 	gs 'gadukino_event', 'sound'
-	cls
+	gs'stat'
+
+	cla
+	*clr
+
+
 	wolfrand = rand(1,10)
+	hantrand = rand(1,10)
 	gs'stat'
-	!gs'time'
+
 	gs 'gadforestlost', 'gadforestlost'
 
 	if wolfrand <= 4 and (hour = 23 or hour >= 0 and hour < 6):gt 'gadforest_event', 'lost'
@@ -161,12 +216,12 @@ if $ARGS[0] = '4':
 		gs 'stat'
 
 		gs 'gadforestlost', 'lostclothes'
-		act 'Look for the road ':
+		act 'Continue looking for the road':
 			if goforest > lostrand: gs 'gadforestlost', 'gadforestlostfinish4'
 			if goforest < lostrand and temp > 7:gt 'gadforestswamp','1'
 			if goforest < lostrand and temp <= 7:gt 'gadforestlost','4'
 		end
-		act 'To take a break':gt 'gadforestrelax'
+		act 'Take a break':gt 'gadforestrelax'
 	end
 	if rand(1,10)> 7: gs 'gadforest', 'torncloth'
 	gs 'gadforestlost', 'searchfood'
@@ -195,26 +250,30 @@ if $ARGS[0] = 'lostclothes':
 	if $clothingworntype ! 'nude' and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch0.'+rand(1,4)+'.jpg"></center>'
 	if $clothingworntype ! 'nude' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_ski0.'+rand(1,4)+'.jpg"></center>'
 	if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_nude0.'+rand(1,4)+'.jpg"></center>'
-	'Within an hour of wandering through the woods you decide....'
+	'After wandering through the woods for an hour you decide to....'
 end
 if $ARGS[0] = 'gadforestlostfinish':
 	'<center><H4>Somewhere in the woods</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadjoy.jpg"></center>'
-	'You look over and realize that you finally see lights shining from distnat houses, glad to get out of this alive you rush forward.'
+	'You look over and realize that you finally see lights shining from distant houses, glad to get out of this alive you rush forward.'
+
 	!clear lost flags by illume, clear dirtyclothes flag by rachels
 	lost_girl = 0
-	dirtyclothes = 0 & swamp_clothes = 0
+	dirtyclothes = 0
 	forest_lostday = 0
 	hanters = 0
+	gs 'clothing', 'swamp_clothes', 0
+	gs 'stat'
 	if $clothingworntype = 'nude':
-		act 'Out of the woods':
+		act 'Leave the woods':
 			minut += 25
-			'You find your way out of the woods, hiding your naked body in shadow and moving toward the edge of the forest, where you left your clothes.'
+			'You find your way out of the woods, hiding your naked body in shadows.'
+			'You make your way back towards the edge of the forest where you left your clothes.'
 			cla
 			act 'Continue':gt'gadforest', '1'
 		end
+		!disable further actions from being added
 		temp=0
-		!disable further act add.
 	end
 end
 if $ARGS[0] = 'gadforestlostfinish1':
@@ -223,15 +282,13 @@ if $ARGS[0] = 'gadforestlostfinish1':
 	temp = RAND(1,3)
 	lost = 0
 	pcs_mood += 20
-	!gs'time'
 	gs 'stat'
 
 	gs 'gadforestlost', 'gadforestlostfinish'
-	''
 
-	if temp = 1:act 'Out of the woods':minut += 15 & gt'gadforest','1'
-	if temp = 2:act 'Out of the woods':minut += 15 & gt'gadfield','field'
-	if temp = 3:act 'Out of the woods':minut += 15 & gt'gadroad'
+	if temp = 1:act 'Leave the woods':minut += 15 & gt'gadforest','1'
+	if temp = 2:act 'Leave the woods':minut += 15 & gt'gadfield','field'
+	if temp = 3:act 'Leave the woods':minut += 15 & gt'gadroad'
 
 end
 if $ARGS[0] = 'gadforestlostfinish2':
@@ -240,17 +297,15 @@ if $ARGS[0] = 'gadforestlostfinish2':
 	temp = RAND(1,5)
 	lost = 0
 	pcs_mood += 20
-	!gs'time'
 	gs 'stat'
 
 	gs 'gadforestlost', 'gadforestlostfinish'
-	''
 
-	if temp = 1:act 'Out of the woods':minut += 15 & gt'gadforest','1'
-	if temp = 2:act 'Out of the woods':minut += 15 & gt'gadfield','field'
-	if temp = 3:act 'Out of the woods':minut += 15 & gt'gadroad'
-	if temp = 4:act 'Out of the woods':minut += 15 & gt'Gadriver','start'
-	if temp = 5:act 'Out of the woods':minut += 15 & gt'Meadow'
+	if temp = 1:act 'Leave the woods':minut += 15 & gt'gadforest','1'
+	if temp = 2:act 'Leave the woods':minut += 15 & gt'gadfield','field'
+	if temp = 3:act 'Leave the woods':minut += 15 & gt'gadroad'
+	if temp = 4:act 'Leave the woods':minut += 15 & gt'gadriver','start'
+	if temp = 5:act 'Leave the woods':minut += 15 & gt'Meadow'
 end
 if $ARGS[0] = 'gadforestlostfinish3':
 	cls
@@ -258,19 +313,17 @@ if $ARGS[0] = 'gadforestlostfinish3':
 	temp = RAND(1,7)
 	lost = 0
 	pcs_mood += 20
-	!gs'time'
 	gs 'stat'
 
 	gs 'gadforestlost', 'gadforestlostfinish'
-	''
-
-	if temp = 1:act 'Out of the woods':minut += 15 & gt'gadforest','1'
-	if temp = 2:act 'Out of the woods':minut += 15 & gt'gadfield','field'
-	if temp = 3:act 'Out of the woods':minut += 15 & gt'gadroad'
-	if temp = 4:act 'Out of the woods':minut += 15 & gt'Gadriver','start'
-	if temp = 5:act 'Out of the woods':minut += 15 & gt'Meadow'
-	if temp = 6:act 'Out of the woods':minut += 15 & nroad = 15 & gt'road'
-	if temp = 7:act 'Out of the woods':minut += 15 & nroad = 10 & gt'road'
+
+	if temp = 1:act 'Leave the woods':minut += 15 & gt'gadforest','1'
+	if temp = 2:act 'Leave the woods':minut += 15 & gt'gadfield','field'
+	if temp = 3:act 'Leave the woods':minut += 15 & gt'gadroad'
+	if temp = 4:act 'Leave the woods':minut += 15 & gt'gadriver','start'
+	if temp = 5:act 'Leave the woods':minut += 15 & gt'Meadow'
+	if temp = 6:act 'Leave the woods':minut += 15 & nroad = 15 & gt'road'
+	if temp = 7:act 'Leave the woods':minut += 15 & nroad = 10 & gt'road'
 end
 if $ARGS[0] = 'gadforestlostfinish4':
 	cls
@@ -278,22 +331,22 @@ if $ARGS[0] = 'gadforestlostfinish4':
 	temp = RAND(1,9)
 	lost = 0
 	pcs_mood += 20
-	!gs'time'
 	gs 'stat'
 
 	gs 'gadforestlost', 'gadforestlostfinish'
-	''
-
-	if temp = 1:act 'Out of the woods':minut += 15 & gt'gadforest','1'
-	if temp = 2:act 'Out of the woods':minut += 15 & gt'gadfield','field'
-	if temp = 3:act 'Out of the woods':minut += 15 & gt'gadroad'
-	if temp = 4:act 'Out of the woods':minut += 15 & gt'Gadriver','start'
-	if temp = 5:act 'Out of the woods':minut += 15 & gt'Meadow'
-	if temp = 6:act 'Out of the woods':minut += 15 & nroad = 15 & gt'road'
-	if temp = 7:act 'Out of the woods':minut += 15 & nroad = 10 & gt'road'
-	if temp = 8:act 'Out of the woods':minut += 15 & nroad = 10 & gt'road'
-	if temp = 9 and goswamp = 0:act 'Out of the woods':minut += 15 & gt 'gadforestswamp','1'
-	if temp = 9 and goswamp = 1:act 'Out of the woods':minut += 15 & gt 'swamp'
+
+
+
+	if temp = 1:act 'Leave the woods':minut += 15 & gt'gadforest','1'
+	if temp = 2:act 'Leave the woods':minut += 15 & gt'gadfield','field'
+	if temp = 3:act 'Leave the woods':minut += 15 & gt'gadroad'
+	if temp = 4:act 'Leave the woods':minut += 15 & gt'gadriver','start'
+	if temp = 5:act 'Leave the woods':minut += 15 & gt'Meadow'
+	if temp = 6:act 'Leave the woods':minut += 15 & nroad = 15 & gt'road'
+	if temp = 7:act 'Leave the woods':minut += 15 & nroad = 10 & gt'road'
+	if temp = 8:act 'Leave the woods':minut += 15 & nroad = 10 & gt'road'
+	if temp = 9 and goswamp = 0:act 'Leave the woods':minut += 15 & gt 'gadforestswamp','1'
+	if temp = 9 and goswamp = 1:act 'Leave the woods':minut += 15 & gt 'swamp'
 
 end
 if $ARGS[0] = 'searchfood':
@@ -314,11 +367,13 @@ if $ARGS[0] = 'searchfood':
 				'Within half an hour of wandering through the woods in search of mushrooms or berries, you found <<new_boletus>> kg mushrooms and <<new_bilberry>> kg of berries.'
 			else
 				pcs_mood -= 5
+				gs 'stat'
+
 				gs 'gadforest', 'clothes2'
 				'After half an hour of wandering through the woods in search of mushrooms or berries, you found nothing.'
 			end
-			gs 'stat'
-			act 'Further':gt $loc, $metka
+
+			act 'Continue':gt $loc, $metka
 		end
 	end
 end

+ 61 - 25
locations/gadforestswamp.qsrc

@@ -2,11 +2,17 @@
 
 $location_type = 'secluded'
 if $ARGS[0] = '1':
-	$metka = '1'
 	$loc = 'gadforestswamp'
+	$metka = '1'
+	$location_type = 'secluded'
+
+	$menu_loc = 'gadforestswamp'
+	$menu_arg = '1'
+	menu_off = 0
 
 	gs 'gadukino_event', 'sound'
 	gs 'stat'
+
 	'<center><H4>Swamp</H4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
@@ -21,11 +27,12 @@ if $ARGS[0] = '1':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp_winter_night.jpg"></center>'
 		end
 	end
-	'You went to the marsh, behind it you can see some kind of hut. You can go back into the woods or try to get to the hut through the mash, but will you have enough strength and agility to overcome this obstacle?'
+	'You come to the edge of the swamp; you can see a hut in the distance.'
+	'You can go back into the woods or try to get to the hut through the marsh, but will you have enough strength and agility to overcome this obstacle?'
 
 	act 'Go back to the forest':gt 'gadforestlost','4'
 
-	act 'Try to go forward through the mire':
+	act 'Try to go through the mire':
 		*clr & cla
 		minut += 10
 		swamprand = pcs_stren + pcs_agil
@@ -37,27 +44,42 @@ if $ARGS[0] = '1':
 		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
 		'You entered the swamp and felt your feet starting to sink into the mud...'
 		temp_gads = RAND(1,100)
-		act 'Go further':
+		act 'Give it another try':
 			if swamprand > temp_gads:gt 'swamp_yard'
-			if swamprand < temp_gads and temp_gads >= 90:over = 10 & gt 'gameover'
-			if swamprand < temp_gads and temp_gads < 90:gt 'gadforestswamp', '2'
+			if Enable_nogameover = 0:
+				if swamprand < temp_gads and temp_gads >= 90:over = 10 & gt 'gameover'
+				if swamprand < temp_gads and temp_gads < 90:gt 'gadforestswamp', '2'
+			else
+				gt 'gadforestswamp', '2'
+			end
 		end
 	end
 end
 
 if $ARGS[0] = '2':
-	$metka = '2'
 	$loc = 'gadforestswamp'
+	$metka = '2'
+	$location_type = 'secluded'
+
+	$menu_loc = 'gadforestswamp'
+	$menu_arg = '2'
+	menu_off = 0
+
 	gs 'gadukino_event', 'sound'
+	gs 'stat'
 
+	! unbrush hair and remove makeup
 	pcs_hairbsh = 0
 	if pcs_makeup > 1:pcs_makeup = 0
-	!clothes wear out, "dirty" to avoid at a time 
+
+	! clothes wear out, "dirty" to avoid at a time
 	if dirty = 0 and ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):dirty = 1 & dirtyclothes = 1 & dynamic $clothingworntype + 'H[<<clothingwornnumber>>] -= 10'
-	!add remove cloth if worn out, need better texting by illume.
+	! add remove clothes if worn out
 	if dyneval('RESULT = <<$clothingworntype>>H[<<clothingwornnumber>>]') <= 0:
-		'Your clothes are torn to pieces, you are naked now.'
-		gs 'clothing', 'strip'
+		'Your ripped clothes were barely holding together, but now they have finally fell apart.'
+		'You are naked now.'
+		gadforest_clothestorn = 1
+		gs 'clothing', 'strip', 'gadforestswamp', 2
 	end
 	gs 'stat'
 	'<center><H4>Swamp</H4></center>'
@@ -67,12 +89,14 @@ if $ARGS[0] = '2':
 	act 'Call for help':
 		*clr & cla
 		minut += 10
-		if pcs_sweat < 10: pcs_sweat += 10	
+		if pcs_sweat < 10: pcs_sweat += 10
 		if week = 6 or week = 7:temp_gads = RAND(1,3)
 		if week < 6:temp_gads = RAND(1,5)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlosthelp.jpg"></center>'
-		'You are exhausted and begin to scream for help, suddenly you see people...'
+
+		'You are exhausted and begin to scream for help...'
+
 
 		act 'Wait':
 			if temp_gads = 1:
@@ -82,15 +106,19 @@ if $ARGS[0] = '2':
 				hanterhelp = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/handshelp.jpg"></center>'
-				'You hear men speaking and begin to shouting louder. The voices come closer and finally, someone''s strong hands grabbed you and dragged back to solid ground.'
+				'You hear men speaking and begin to shout louder. The voices come closer and finally, someone''s strong hands grabbed you and dragged back to solid ground.'
+				'You are so tired from your ordeal you pass out.'
 
-				act 'Further':gt 'swamp_yard'
+				act 'Wake up':gt 'swamp_yard'
 			else
 				*clr & cla
 				minut += 10
+				gs 'stat'
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/panicswamp.jpg"></center>'
 				'No one responds to your call, looks like you are all alone.'
-				act 'Further':gt 'gadforestswamp','2'
+
+				act 'Contemplate your life':gt 'gadforestswamp','2'
 			end
 		end
 	end
@@ -106,12 +134,16 @@ if $ARGS[0] = '2':
 		gs 'stat'
 
 		dynamic $swampclothes
-		'You decided not to tempt fate more and turn back...'
 
-		act 'Go':
+		'You decide it''s wisest to try and turn back...'
+		act 'Give it another try':
 			if swamprand > temp_gads:gt 'gadforestswamp','1'
-			if swamprand < temp_gads and temp_gads <= 20:over = 10 & gt'gameover'
-			if swamprand < temp_gads and temp_gads > 20:gt 'gadforestswamp','2'
+			if Enable_nogameover = 0:
+				if swamprand < temp_gads and temp_gads >= 90:over = 10 & gt 'gameover'
+				if swamprand < temp_gads and temp_gads < 90:gt 'gadforestswamp', '2'
+			else
+				gt 'gadforestswamp', '2'
+			end
 		end
 	end
 	act 'Try to go on to the hut':
@@ -126,13 +158,17 @@ if $ARGS[0] = '2':
 		gs 'stat'
 
 		dynamic $swampclothes
-		'You thought more about it and decided against it. You move on from the house...'
 
-		act 'Go':
+		'You decide you might as well keep going forward at this point...'
+		act 'Give it another try':
 			if swamprand > temp_gads:gt 'swamp_yard'
-			if swamprand < temp_gads and temp_gads <= 30:over = 10 & gt'gameover'
-			if swamprand < temp_gads and temp_gads > 30:gt 'gadforestswamp','2'
-		end 
+			if Enable_nogameover = 0:
+				if swamprand < temp_gads and temp_gads >= 90:over = 10 & gt 'gameover'
+				if swamprand < temp_gads and temp_gads < 90:gt 'gadforestswamp', '2'
+			else
+				gt 'gadforestswamp', '2'
+			end
+		end
 	end
 end
 

+ 45 - 42
locations/gadprostitutes.qsrc

@@ -1,68 +1,71 @@
 # gadprostitutes
-!!NOTE:  This is a placeholder.  I intend to flesh this out and maybe expand it to include the PC taking part as well.
 
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
-    $location_type = 'public_outdoors'
+	*clr & cla
+	$loc = 'gadprostitutes'
+	$metka = 'start'
+	$location_type = 'public_outdoors'
+
+	$menu_loc = 'gadprostitutes'
+	$menu_arg = 'start'
+	menu_off = 0
+
 	CLOSE ALL
+	gs 'gadukino_event', 'sound'
+	gs'stat'
 
-	if sound = 0:
-		if month >=11 and month <= 12 or month >=1 and month <=3:
-			if hour >= 8 and hour <= 23: PLAY 'sound/zima2.mp3',30
-			if hour >= 0 and hour <= 7: PLAY 'sound/zima2.mp3',30
-		else
-			if hour >= 8 and hour <= 23: PLAY 'sound/ptica.mp3',30
-			if hour >= 0 and hour <= 7: PLAY 'sound/ptica.mp3',30
-		end
+	'<center><h4>Main Road near Gadukino</h4></center>'
+	if month >= 11 or month <= 3:
+		'<center><img <<$set_imgh>> src="images/locations/highway/roadwinter.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/highway/road.jpg"></center>'
 	end
-	clr
-	gs 'stat'
-	'<center><h4>Highway near Gadukino Village</h4></center>'
 	'You walk out to the highway '
-	
-	! commented out to make it more likely and similiar to the choices in miroslavaHome
-					!and hour <= 23:
-	if hour >= 18:
+	if hour < 18:
+		'You a look around for Mira but don''t see her here, maybe come back later in the evening.'
+
+		act 'Walk back to the village': gt 'gadukino'
+	elseif hour >= 18 and hour <= 23:
 		if miraprost > 0 and npc_QW['A60'] > 30:
-			!last events end after 1.2.5 will be 31 by illume
 			'You a look around for Mira and spot her standing below a streetlight down the road a little ways.'
 			if mirapimp = 0:
 				pcs_dom += RAND(2,6)
 				mirapimp = 1
-				'You call her over to you.  Mira, hurries over and looks at you with downcast eyes.  "Hi, <<$pcs_nickname>>.  You having a good night?"'
-				'You look at her angryly.  "A better question, my lovely whore, is ''Are you having a good night''?  I want 300 <b>₽</b> per customer you have each night."  You tell her earnestly.'
-				'Mira looks up in shock and with a hurt look on her face.  "What are you talking about?  Do you think I am a hooker?"'
-				'You step up to her and place your hand on her face.  Mira closes her eyes and leans into your hand.  You look into her eyes once she opens them and then SLAP her hard across the face.  Mira falls to the ground and starts to cry.  "You''re my property whore.  You will do whatever I tell you.  You will never lie to me ever again, or I swear I will make you pay.  Understand me?!"'
-				'Mira nods and she wipes away tears.'
-				'You  reach down and help her back to her feet.  You brush her off and help her fix her makeup.  "Good, now get that cute ass back out on that road and earn us some money."'
-				act 'You smile wickedly as you watch Mira start her life as your prostitute-slave':gt 'gadprostitutes', 'start'
+				'You call her over to you. Mira, hurries over and looks at you with downcast eyes.  "Hi, <<$pcs_nickname>>.  You having a good night?"'
+					'You look at her angryly. "A better question, my lovely whore, is are you having a good night"?  I want 300 <b>₽</b> per customer you have each night." You tell her earnestly.'
+					'Mira looks up in shock and with a hurt look on her face. "What are you talking about?  Do you think I am a hooker?"'
+				'You step up to her and place your hand on her face. Mira closes her eyes and leans into your hand. You look into her eyes once she opens them and then SLAP her hard across the face. Mira falls to the ground and starts to cry. "You''re my property whore. You will do whatever I tell you. You will never lie to me ever again, or I swear I will make you pay. Understand me?!"'
+					'Mira nods and she wipes away tears.'
+					'You reach down and help her back to her feet. You brush her off and help her fix her makeup. "Good, now get that cute ass back out on that road and earn us some money."'
+					'You give Mira a little slap on the ass and smile as you watch Mira start her life as your prostitute.'
+
+				act 'Finish':gt 'gadprostitutes', 'start'
 			else
-				act 'Watch her perform a trick...':
-					pcs_dom += RAND(0,2)  
-					cls	
+				act 'Watch Mira and the customer':
+					pcs_dom += RAND(0,2)
+					cls
 					minut += 30
-					temp = RAND(0,5)
-					if temp = 0:
+					temp_gad_pro = RAND(0,5)
+					if temp_gad_pro = 0:
 						miraprost += 1
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirawish2_2.jpg"></center>'
-						'It isn''t long before Mira''s first customer pulls up in a nice vehicle.  She takes a deep breath, looks you in the eyes, you nod and wink, as she approachs the vehicle and starts talking to the driver.'
+						'It isn''t long before a customer pulls up in a nice vehicle. Mira approaches the vehicle and starts talking to the driver.'
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/miraprost.jpg"></center>'
-						'You can''t hear what she is saying but after only a few minutes the door opens and Mira steps into the vehicle.  It pulls away, but doesn''t go far.  You see it pull off the main road and head down a dirt road. Smiling and wanting to see the action, you run into the woods trying to head off the vehicle.'
-					elseif temp = 1:
+						'You can''t hear what she is saying but after only a few minutes the door opens and Mira steps into the vehicle. It pulls away, but doesn''t go far. You see it pull off the main road and head down a dirt road. Smiling and wanting to see the action, you run into the woods trying to head off the vehicle.'
+					elseif temp_gad_pro = 1:
 						miraprost += 1
 						cls
+						gs 'arousal', 'voyeur', 25
 						gs 'stat'
-						'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1.mp4"></video></center>'	
-						'You walk up and look into the car.  You see Mira giving one hell of a blowjob to her first customer.  Her head is bobbing up and down on his 17cm cock.'
+						'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1.mp4"></video></center>'
+						'You walk up and look into the car. You see Mira giving one hell of a blowjob to her customer. Her head is bobbing up and down on his cock.'
 						'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_1.mp4"></video></center>'
 						'You duck for cover as the guy suddenly gets out of the car and opens the passenger door, grabs Mira''s head and starts forcing his cock deep into her throat.'
 						'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_2.mp4"></video></center>'
-						'Eventually, the guys grunts and cums all over Mira''s face and into her mouth.  The nicely dressed man pulls Mira out of the car, hands her a few bills and then drives off.'
+						'Eventually, the guy grunts and cums all over Mira''s face and into her mouth. The nicely dressed man pulls Mira out of the car, hands her a few bills and then drives off.'
+						'Mira walks back towards the road counting the money he gave her as she absentmindedly licks the cum as it drips down her face. She smiles at you and shows you the money as you join her.'
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/miramoney.jpg"></center>'
-						gs 'arousal', 'voyeur', 25
-						gs 'stat'
-					elseif temp = 2:
+					elseif temp_gad_pro = 2:
 						cls
 						pcs_horny += 20
 						minut += 20
@@ -83,7 +86,7 @@ if $ARGS[0] = 'start':
 					act 'Walk back to the village': gt 'gadukino'
 				end
 			end
-			act 'Walk back to the village': 
+			act 'Walk back to the village':
 				gs 'arousal', 'end'
 				gs 'stat'
 				gt 'gadukino'

+ 160 - 166
locations/gadriver.qsrc

@@ -1,8 +1,11 @@
 # gadriver
 
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$metka = 'start'
+	$loc = 'gadriver'
+	menu_off = 0
+	$menu_loc = 'gadriver'
+	$menu_arg = 'start'
 	$location_type = 'public_outdoors'
 
 	gs 'stat'
@@ -25,11 +28,11 @@ if $ARGS[0] = 'start':
 
 	'A large river flows lazily a for a few hundred meters in the northern outskirts of Gadukino.'
 
-	if hour >= 6 and hour < 21 and sunWeather = 1: 'You see the local <a href="exec:gt ''Gadriver'', ''fishers''">fishermen</a> fishing with their rods on the riverbank.'
+	if hour >= 6 and hour < 21 and sunWeather = 1: 'You see the local <a href="exec:gt ''gadriver'', ''fishers''">fishermen</a> fishing with their rods on the riverbank.'
 
 	temp_gr = rand(0,20)
 
-	if temp_gr = 1 and hour < 5 and month >= 5 and month <= 9 and npc_QW['A60'] >= 20: 'Right next to the path leading to the river, you see <a href="exec: gt ''Gadriver'', ''mirapunish'' ">Mira</a> naked, bound with ropes between two trees...'
+	if temp_gr = 1 and hour < 5 and month >= 5 and month <= 9 and npc_QW['A60'] >= 20: 'Right next to the path leading to the river, you see <a href="exec: gt ''gadriver'', ''mirapunish'' ">Mira</a> naked, bound with ropes between two trees...'
 
 	if temp_gr = 4 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5 and sub > 0:
 		if mitkaguysriver ! daystart:
@@ -61,13 +64,12 @@ if $ARGS[0] = 'start':
 					gs 'dinSex','boy_wants_anal','lubri'
 					gs 'dinsex','analsex',20,'sub','gangbang'
 				end
-				gs 'arousal', 'end'
 				gs 'stat'
 
 				act 'Finish':minut += 10 & gt'gadukino'
 			end
 		else
-			act 'Go to the beach':minut += 5 & gt 'Gadriver', 'Gadbitch'
+			act 'Go to the beach':gt 'gadriver', 'gadbitch'
 			act 'Go to Gadukino':minut += 20 & MiraLoc ! 1 & gt 'gadukino'
 		end
 	elseif temp_gr = 5 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5 and sub > 0:
@@ -79,26 +81,26 @@ if $ARGS[0] = 'start':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex18.jpg"></center>'
 				'The boys lead you to Vasyan''s house, where they spend an hour fucking you in the ass...'
+				gs 'arousal', 'anal', 20, 'gangbang', 'sub'
+				gs 'arousal', 'anal', 20, 'gangbang', 'sub'
+				gs 'arousal', 'anal', 20, 'gangbang', 'sub'
+				gs 'arousal', 'end'
 				gs 'boyStat', 'A63'
 				npc_sex[$boy] += 1
-				gs 'arousal', 'anal', 20, 'gangbang', 'sub'
 				gs 'cum_call','butt',$boy,1
 				gs 'boyStat', 'A61'
 				npc_sex[$boy] += 1
-				gs 'arousal', 'anal', 20, 'gangbang', 'sub'
 				gs 'cum_call','butt',$boy,1
 				gs 'boyStat', 'A62'
 				npc_sex[$boy] += 1
-				gs 'arousal', 'anal', 20, 'gangbang', 'sub'
 				gs 'cum_call','butt',$boy,1
-				gs 'arousal', 'end'
 				pcs_ass += 3
 				gs 'stat'
 
-				act 'Leave':minut += 10 & gt'gadukino'
+				act 'Leave': gt'gadukino'
 			end
 		else
-			act 'Go to the beach':minut += 5 & gt 'Gadriver', 'Gadbitch'
+			act 'Go to the beach':gt 'gadriver', 'gadbitch'
 			act 'Go to Gadukino':minut += 20 & MiraLoc ! 1 & gt 'gadukino'
 		end
 	elseif temp_gr = 6 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5 and sub > 0:
@@ -126,23 +128,24 @@ if $ARGS[0] = 'start':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Finish':minut += 10 & gt'gadukino'
+				act 'Finish': gt'gadukino'
 			end
 		else
-			act 'Go to the beach':minut += 5 & gt 'Gadriver', 'Gadbitch'
+			act 'Go to the beach':gt 'gadriver', 'gadbitch'
 			act 'Go to Gadukino':minut += 20 & MiraLoc ! 1 & gt 'gadukino'
 		end
 	else
-		act 'Go to the beach':minut += 5 & gt 'Gadriver', 'Gadbitch'
+		act 'Go to the beach':gt 'gadriver', 'gadbitch'
 		act 'Go to Gadukino':minut += 20 & MiraLoc ! 1 & gt 'gadukino'
 	end
 end
 
-if $ARGS[0] = 'Gadbitch':
-	PC_arrive = iif($metka ! $ARGS[0], 1 , 0)
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+if $ARGS[0] = 'gadbitch':
+	PC_arrive = iif($metka ! 'gadbitch', 1 , 0)
 	$location_type = 'public_outdoors'
+	$metka = 'gadbitch'
+	$loc = 'gadriver'
+	menu_off = 1
 	gs 'stat'
 
 	'<center><H4>Village Beach</H4></center>'
@@ -172,26 +175,26 @@ if $ARGS[0] = 'Gadbitch':
 
 	if sunWeather = 1 and MiraLoc = 1:
 		if RAND(0,10) < 5:
-			'<a href="exec:sun = 1 & gt ''Gadriver'', ''Mira'' ">Mira</a> is laying on the beach sunbathing.'
+			'<a href="exec:sun = 1 & gt ''gadriver'', ''Mira'' ">Mira</a> is laying on the beach sunbathing.'
 			if npc_rel['A60'] < 15:npc_rel['A60'] += 1
 		else
-			'<a href="exec:sun = 0 & gt ''Gadriver'', ''Mira'' ">Mira</a> is in the river splashing water around and having fun.'
+			'<a href="exec:sun = 0 & gt ''gadriver'', ''Mira'' ">Mira</a> is in the river splashing water around and having fun.'
 			if npc_rel['A60'] < 15:npc_rel['A60'] += 1
 		end
 	end
 
-	if MiraLoc ! 1 and npc_QW['A63'] >= 13 and RAND(0,10) = 0 and hour >= 8 and hour < 20 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1:'<a href="exec: gt ''Gadriver'', ''GuysRiver'' ">Bob Colby</a> is resting on the riverbank.'
+	if MiraLoc ! 1 and npc_QW['A63'] >= 13 and RAND(0,10) = 0 and hour >= 8 and hour < 20 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1:'<a href="exec: gt ''gadriver'', ''GuysRiver'' ">Bob Colby</a> is resting on the riverbank.'
 
 	if temper >= 15 and month >= 5 and month <= 9:
 		temp_gr = RAND(0,9)
-		if $clothingworntype ! 'nude' and pcs_inhib > 50:
+		if $clothingworntype ! 'nude' and (pcs_inhib >= 25 or exhibitionist_lvl > 1):
 			act 'Strip naked':
 				cla
 				minut += 5
 				gs 'underwear', 'remove'
 				gs 'clothing', 'strip', 'VillageRiver'
 				'Without hesitation, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
-				act 'Continue': gt 'Gadriver', 'Gadbitch'
+				act 'Continue': gt 'gadriver', 'gadbitch'
 			end
 		end
 		if $clothingworntype = 'swimwear':
@@ -228,36 +231,27 @@ if $ARGS[0] = 'Gadbitch':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex13.jpg"></center>'
 						'When you decide it''s time to get out of the river, you hear the sound of men laughing as they walk on the river bank approaching you. As they get closer you see the smirking faces of the village boys led by Mitya headed towards the river bank while you are still in the shallow waters.'
 						'They quickly undress and jump in the water. Within a few seconds you are surrounded by the grinning boys. Without a word they reach for you and roughly take turns forcing you to suck their cocks.'
+						gs 'arousal', 'bj', 15, 'gangbang', 'sub', 'rough'
+						gs 'arousal', 'hj', 15, 'gangbang', 'sub', 'rough'
+						gs 'arousal', 'end'
 						gs 'boyStat', 'A63'
 						npc_sex[$boy] += 1
-						gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-						minut -= 10
 						gs 'cum_call','face',$boy, 1,'','',20
 						gs 'cum_call','hair',$boy, 1,'','',20
 						gs 'boyStat', 'A61'
 						npc_sex[$boy] += 1
-						gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-						minut -= 10
 						gs 'cum_call','face',$boy, 1,'','',20
 						gs 'cum_call','mouth',$boy, 1,'','',20
 						gs 'boyStat', 'A62'
 						npc_sex[$boy] += 1
-						gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
 						minut -= 10
 						gs 'cum_call','face',$boy, 1,'','',20
 						gs 'cum_call','mouth',$boy, 1,'','',20
 						swallow += RAND(0,3)
 						gang +=1
-						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Finish':minut += 5 & gt'Gadriver', 'Gadbitch'
+						act 'Finish':gt'gadriver', 'gadbitch'
 					elseif MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 1 and hour >= 8 and hour < 20 and sub > 0:
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex19.jpg"></center>'
@@ -272,9 +266,9 @@ if $ARGS[0] = 'Gadbitch':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Finish':minut += 5 & gt'Gadriver', 'Gadbitch'
+						act 'Finish':gt'gadriver', 'gadbitch'
 					else
-						minut += 5 & gt'Gadriver', 'Gadbitch'
+						gt'gadriver', 'gadbitch'
 					end
 				end
 			end
@@ -312,34 +306,27 @@ if $ARGS[0] = 'Gadbitch':
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex12.jpg"></center>'
 							'As soon as you step out of the water, you find yourself standing naked in front of a couple of the village boys, judging from the fishing poles they are carrying, you know they were coming to the river to do some fishing.'
 							'But, seeing you skinny dipping, they instead start talking amongst themselves about how much of a slut you are and the only good thing you are for is sucking cock. You tell them to fuck off, but they are too worked up and not listening to you at all.'
+							gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'hj', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'end'
 							gs 'boyStat', 'A63'
 							npc_sex[$boy] += 1
-							gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
-							gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
 							gs 'cum_call','butt',$boy, 1
 							gs 'boyStat', 'A61'
 							npc_sex[$boy] += 1
-							gs 'arousal', 'bj', 5, 'gangbang', 'sub', 'rough'
-							minut -= 10
-							gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
-							gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
 							gs 'cum_call','anus',$boy, 1,'','',20
 							gs 'boyStat', 'A62'
 							npc_sex[$boy] += 1
-							gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
-							gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-							gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-							minut -= 10
 							gs 'cum_call','mouth',$boy
 							swallow += RAND(0,1)
 							gs 'stat'
-							gs 'arousal', 'end'
-							gs 'stat'
 							gang +=1
 
-							act 'Finish':minut += 5 & gt'Gadriver', 'Gadbitch'
+							act 'Finish': gt'gadriver', 'gadbitch'
 						else
-							minut += 5 & gt'Gadriver', 'Gadbitch'
+							gt'gadriver', 'gadbitch'
 						end
 					end
 				end
@@ -364,7 +351,7 @@ if $ARGS[0] = 'Gadbitch':
 						end
 						'You are sunbathing by the river when Mira comes along. You smile, she undresses and lays her towel next to yours.'
 
-						act 'Further': gt'Gadriver', 'Gadbitch'
+						act 'Continue': gt'gadriver', 'gadbitch'
 					elseif $clothingworntype = 'nude':
 						*clr & cla
 						minut += 60
@@ -391,34 +378,26 @@ if $ARGS[0] = 'Gadbitch':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex14.jpg"></center>'
 								'You hear several men''s voices rapidly approaching. All of a sudden a couple of the village boys emerge in front of you. Noticing that you are nude, they brighten up greatly and in a few minutes, despite you protesting lively, they have you on all fours and are roughly fucking you...'
+								gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
+								gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
+								gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
+								gs 'arousal', 'hj', 10, 'gangbang', 'sub', 'rough'
 								gs 'boyStat', 'A62'
 								npc_sex[$boy] += 1
-								gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
 								gs 'cum_call','butt',$boy, 1
 								gs 'boyStat', 'A63'
 								npc_sex[$boy] += 1
-								gs 'arousal', 'bj', 5, 'gangbang', 'sub', 'rough'
-								minut -= 10
-								gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
 								gs 'cum_call','anus',$boy, 1,'','',20
 								gs 'boyStat', 'A61'
 								npc_sex[$boy] += 1
-								gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-								minut -= 10
 								gs 'cum_call','mouth',$boy
-								swallow += RAND(0,1)
-								gs 'stat'
+								swallow += 1
 								gs 'arousal', 'end'
-								gang +=1
 								gs 'stat'
 
-								act 'Get dressed':minut += 5 & gt'Gadriver', 'Gadbitch'
+								act 'Get dressed':gt'gadriver', 'gadbitch'
 							else
-								gt'Gadriver', 'Gadbitch'
+								gt'gadriver', 'gadbitch'
 							end
 						end
 					else
@@ -447,32 +426,25 @@ if $ARGS[0] = 'Gadbitch':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex15.jpg"></center>'
 								'After a while, you hear some familiar voices quickly approaching you. A couple minutes later you see the village boys emerge from the bushes. Noticing you sunbathing, they brighten up greatly. In a short amount of time, despite you protesting lively, all of your holes have been violated...'
+								gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
+								gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
+								gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
+								gs 'arousal', 'hj', 10, 'gangbang', 'sub', 'rough'
+								gs 'arousal', 'end'
 								gs 'boyStat', 'A61'
 								npc_sex[$boy] += 1
-								gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
 								gs 'cum_call','butt',$boy, 1
 								gs 'boyStat', 'A62'
 								npc_sex[$boy] += 1
-								gs 'arousal', 'bj', 5, 'gangbang', 'sub', 'rough'
-								minut -= 10
-								gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
 								gs 'cum_call','anus',$boy, 1,'','',20
 								gs 'boyStat', 'A63'
 								npc_sex[$boy] += 1
-								gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-								minut -= 10
 								gs 'cum_call','mouth',$boy
-								swallow += RAND(0,1)
-								gs 'stat'
-								gs 'arousal', 'end'
+								swallow += 1
 								gang +=1
 								gs 'stat'
 
-								act 'Finish':minut += 5 & gt'Gadriver', 'Gadbitch'
+								act 'Finish':gt'gadriver', 'gadbitch'
 							elseif MiraLoc = 1 and npc_QW['A60'] >= 15 and temp_gr = 1 and hour >= 8 and hour < 20:
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex16.jpg"></center>'
@@ -482,10 +454,10 @@ if $ARGS[0] = 'Gadbitch':
 								gs 'arousal', 'end'
 								gs 'stat'
 
-								act 'Finish':minut += 5 & gt'Gadriver', 'Gadbitch'
+								act 'Finish': gt'gadriver', 'gadbitch'
 							else
 								minut += 5
-								gt'Gadriver', 'Gadbitch'
+								gt'gadriver', 'gadbitch'
 							end
 						end
 					end
@@ -493,7 +465,7 @@ if $ARGS[0] = 'Gadbitch':
 			end
 		end
 	end
-	if $clothingworntype ! 'nude': act 'Get changed':gt 'changingroom', 'view_swim_list'
+	if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'nude': act 'Get changed':gt 'changingroom', 'view_swim_list'
 	if $clothingworntype = 'nude':
 		act 'Get dressed':
 			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
@@ -501,7 +473,7 @@ if $ARGS[0] = 'Gadbitch':
 			minut += 5
 			gs 'underwear', 'wear'
 			if clothesAtLocation = 1: gs 'clothing', 'recover_lost_clothes', 'VillageRiver', 1
-				act 'Continue': gt 'Gadriver', 'Gadbitch'
+				act 'Continue': gt 'gadriver', 'gadbitch'
 		end
 	end
 
@@ -510,13 +482,13 @@ if $ARGS[0] = 'Gadbitch':
 		if $clothingworntype = 'swimwear':
 			cla
 			'You need to dress in regular clothes first.'
-			act'Return':gt'Gadriver', 'Gadbitch'
+			act'Return':gt'gadriver', 'gadbitch'
 		elseif $clothingworntype = 'nude':
 			'You need to put some clothes on first.'
-			act'Return':gt'Gadriver', 'Gadbitch'
+			act'Return':gt'gadriver', 'gadbitch'
 		else
 			minut += 5
-			gt 'Gadriver', 'start'
+			gt 'gadriver', 'start'
 		end
 	end
 !! extraordinary events at the river beach. Be aware, this part has to be at the end because it removes actions, which were set before.
@@ -532,42 +504,54 @@ if $ARGS[0] = 'Gadbitch':
 		else
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home.jpg"></center>'
 		end
+		*nl
 		'"<<$pcs_nickname>>, I have to go home, " Mira said to you and began to gather her stuff.'
 
-		act 'Further': gt'Gadriver', 'Gadbitch'
-	elseif Mira_no = 0 and MiraLoc ! 1 and rand(1,10) < 3 and hour > 8 and hour < 20 and sunWeather = 1 and temper >= 15 and PC_arrive = 1:
+		act 'Continue': gt'gadriver', 'gadbitch'
+	elseif Mira_no = 0 and MiraLoc = 1 and hour > 8 and hour < 20 and sunWeather = 1 and temper >= 15 and PC_arrive = 1:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_in_river.jpg"></center>'
+		*nl
 		'Arriving at the beach, you see Mira laying down, sunbathing on a towel.'
 		MiraLoc = 1
 		minut += 5
 		mira_go_blok = 1
 		gs 'stat'
 
-		act 'Further':
-			if rand(0,3) = 0 and Miraswimday ! daystart:
+		act 'Continue':
+			if Miraswimday ! daystart:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/mirariver.jpg"></center>'
+				*nl
 				'"<<$pcs_nickname>>, Why are you moping about on the shore, get in the water and swim with me?" - Mira called out to you as she waded into the river.'
 				minut += 1
 				Miraswimday = daystart
 				gs 'stat'
-
-				act'Agree':
-					cla
-					if exhibitionist_lvl > 1:
+				act 'Agree and get changed':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/undressbch1.jpg"></center>'
+					*nl
+					'"Wait Mira, I have to change out of my clothes!" you cry in response, although she could hardly hear you as she is already splashing around in the river.'
+					'You start to take off your clothes.'
+					if ARRSIZE('swimwear') > 0:
+						act 'Change into swimwear':
+							gs 'gadriver','get_changed','start'
+						end
+					end
+					if pcs_inhib >= 25 or exhibitionist_lvl > 1:
 						act 'Strip naked':
 							cla
 							minut += 5
 							gs 'underwear', 'remove'
 							gs 'clothing', 'strip', 'VillageRiver'
 							inhib_exp += rand(1,3)
-							'Without hesitation, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
+							'Without hesitation, you take off all your clothes and neatly fold them before putting them down in a pile. Without your clothes holding you back, you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
 
 							act 'Swim':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
-								'You wade into the river, you have fun with Mira spraying each other with water.'
+								*nl
+								'You wade into the river, and have fun with Mira spraying each other with water.'
 								temp_gr = RAND(0,15)
 								cumspclnt = 4 & gs 'cum_cleanup'
 								minut += 30
@@ -576,59 +560,74 @@ if $ARGS[0] = 'Gadbitch':
 								pcs_sweat = 10 + rand(0,4)
 								gs'stat'
 
-								act 'Get out of the water':gt'Gadriver', 'Gadbitch'
+								act 'Get out of the water':gt'gadriver', 'gadbitch'
 							end
 						end
 					end
-					act 'Get changed':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/undressbch.jpg"></center>'
-						'"Wait Mira, I have to change into my swimsuit!" you cry in response, although she could hardly hear you as she is already splashing around in the river.'
-						'You take off your clothes, put on a swimsuit and run into the water after Mira.'
-						$metka = 'Gadbitch'
-
-						act 'Swim':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
-							'You wade into the river, you have fun with Mira spraying each other with water.'
-							temp_gr = RAND(0,15)
-							cumspclnt = 4 & gs 'cum_cleanup'
-							minut += 30
-							if pcs_inhib < 50:inhib_exp += rand(1,2)
-							gs 'exercise', 'tier1', 1, 'stren_exp'
-							pcs_sweat = 10 + rand(0,4)
-							gs'stat'
-
-
-							act 'Get out of the water':gt'Gadriver', 'Gadbitch'
-						end
-						gs 'Gadriver','Get changed','start' &! this call has to be last
-					end
-				end
-				act'Refuse':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirariver.jpg"></center>'
-					'"No, Mira I don''t feel like swimming just now," you replied you her. "I''m going to stay on the shore for a bit."'
-					minut += 1
-					npc_rel['A60'] -= 1
-					gs 'stat'
-
-					act 'Further': gt'Gadriver', 'Gadbitch'
+					act'Second thoughts': gt 'gadriver', 'second_thoughts'
 				end
+				act'Refuse': gt 'gadriver', 'second_thoughts'
 			else
-				gt'Gadriver', 'Gadbitch'
+				gt'gadriver', 'gadbitch'
 			end
 		end
 	end
 end
 
+if $ARGS[0] = 'get_changed':
+	menu_off = 1
+	$metka = 'get_changed'
+	if $ARGS[1] = 'start':
+		gt 'changingroom', 'view_swim_list'
+	else
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/river/undressbch.jpg"></center>'
+		*nl
+		'You put on our swimwear and neatly fold your clothes before putting them down in a pile, now you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
+		if $clothingworntype = 'swimwear':
+			act 'Swim':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
+				*nl
+				'You wade into the river, and have fun with Mira spraying each other with water.'
+				temp_gr = RAND(0,15)
+				cumspclnt = 4 & gs 'cum_cleanup'
+				minut += 30
+				if pcs_inhib < 50:inhib_exp += rand(1,2)
+				gs 'exercise', 'tier1', 1, 'stren_exp'
+				pcs_sweat = 10 + rand(0,4)
+				gs'stat'
+
+				act 'Get out of the water':gt'gadriver', 'gadbitch'
+			end
+		else
+			act'Second thoughts': gt 'gadriver', 'second_thoughts'
+		end
+	end
+end
+
+if $ARGS[0] = 'second_thoughts':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/village/mira/mirariver.jpg"></center>'
+	*nl
+	if ARRSIZE('swimwear') = 0:
+		'"Actually Mira, I can''t come in right now, as I didn''t bring a swimsuit" you replied you her. "I''m going to stay on the shore for a bit."'
+	else
+		'"Actually Mira, I''ve changed my mind, I don''t feel like swimming just now," you replied you her. "I''m going to stay on the shore for a bit."'
+	end
+	minut += 1
+	npc_rel['A60'] -= 1
+	gs 'stat'
+
+	act 'Continue': gt'gadriver', 'gadbitch'
+end
 
 if $ARGS[0] = 'Mira':
 	*clr & cla
+	menu_off = 1
 	minut += 2
 	gs 'stat'
 
-
 	if sun = 1:
 		if npc_QW['A60'] < 12:
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirabeach.jpg"></center>'
@@ -642,7 +641,7 @@ if $ARGS[0] = 'Mira':
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirarivernude.jpg"></center>'
 		end
 	end
-	act 'Leave':minut += 5 & gt 'Gadriver', 'Gadbitch'
+	act 'Leave':gt 'gadriver', 'gadbitch'
 
 	act 'Chat':
 		*clr & cla
@@ -684,12 +683,13 @@ if $ARGS[0] = 'Mira':
 				'You and Mira are chatting about trivial things.'
 			end
 		end
-		act 'Leave':minut += 5 & gt 'Gadriver', 'Gadbitch'
+		act 'Leave':gt 'gadriver', 'gadbitch'
 	end
 end
 
 if $ARGS[0] = 'mirapunish':
 	*clr & cla
+	menu_off = 1
 	minut += 10
 	pcs_horny += RAND(25,75)
 	gs 'stat'
@@ -698,11 +698,12 @@ if $ARGS[0] = 'mirapunish':
 	'You approach Mira, she is looking distressed and embarrassingly smiles as you start asking what happened. She pleads you to release her. As you untie her, she explains that Kolyamba punished her for barely biting his cock as she sucked it...'
 	'"Thank God you showed up." she says with a sigh of relief as you untie her. "I''m glad it was you who found me and not one of those old hags from the village. They would be calling me a whore and I would get scolded about being promiscuous. Those old hags hate us you know. We''re young and beautiful and they are just mean old wrenches." said the naked Mira, revealing her true feelings about the villagers. She continues quietly, "Or it could have been even worse, someone could have abused me, raped me or even killed m..." All of a sudden she stops and lunges herself in your arms weeping. "Thank you," she tells you. "You saved my life!"'
 
-	act 'Leave':minut += 5 & gt 'Gadriver', 'Gadbitch'
+	act 'Leave':gt 'gadriver', 'gadbitch'
 end
 
 if $ARGS[0] = 'GuysRiver':
 	*clr & cla
+	menu_off = 1
 	minut += 5
 	pcs_horny += 10
 	gs 'stat'
@@ -766,7 +767,7 @@ if $ARGS[0] = 'GuysRiver':
 					gs 'arousal', 'end'
 					gs 'stat'
 				end
-				act 'Leave':minut += 5 & gt'Gadriver', 'Gadbitch'
+				act 'Leave':gt'gadriver', 'gadbitch'
 			end
 		end
 	elseif temp_gr < 8:
@@ -816,7 +817,7 @@ if $ARGS[0] = 'GuysRiver':
 					gs 'arousal', 'end'
 					gs 'stat'
 				end
-				act 'Leave':minut += 5 & gt'Gadriver', 'Gadbitch'
+				act 'Leave':gt'gadriver', 'gadbitch'
 			end
 		end
 	else
@@ -881,17 +882,18 @@ if $ARGS[0] = 'GuysRiver':
 					gs 'arousal', 'end'
 					gs 'stat'
 				end
-				act 'Leave':minut += 5 & gt'Gadriver', 'Gadbitch'
+				act 'Leave':gt'gadriver', 'gadbitch'
 			end
 		end
 	end
 	if pcs_dom > 0:
-		act 'Leave':minut += 5 & gt'Gadriver', 'Gadbitch'
+		act 'Leave':gt'gadriver', 'gadbitch'
 	end
 end
 
 if $ARGS[0] = 'fishers':
 	*clr & cla
+	menu_off = 1
 	minut += 2
 	gs 'stat'
 
@@ -920,7 +922,7 @@ if $ARGS[0] = 'fishers':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
 					'You keep watching as the fishermen throw out their lures, one of them catches a fish and shows off his trophy before putting it into the fish bail. The two of you chat about fishing.'
 
-					act 'Leave':minut += 5 & gt 'Gadriver', 'start'
+					act 'Leave':gt 'gadriver', 'start'
 				end
 			end
 			if fishersQW = 4:
@@ -934,7 +936,7 @@ if $ARGS[0] = 'fishers':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
 					'You decide to try your luck at fishing and ask the fishermen if they could lend you a fishing rod. A friend of the family, Uncle Stepan points to a pile of spare rods and tells you to pick one.'
 
-					act 'Fishing':gt 'Gadriver', 'fishing'
+					act 'Fishing':gt 'gadriver', 'fishing'
 				end
 			end
 			if fishersQW = 5:
@@ -947,20 +949,21 @@ if $ARGS[0] = 'fishers':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
 					'You decide to join your new friends, Uncle Stepan tells you he has plenty of spare rods, and he hands you a rod while his eyes travel up and down your body.'
 
-					act 'Fishing':gt 'Gadriver', 'fishing'
+					act 'Fishing':gt 'gadriver', 'fishing'
 				end
 			end
 
-			act 'Leave':minut += 5 & gt 'Gadriver', 'start'
+			act 'Leave':gt 'gadriver', 'start'
 		end
 	else
-		act 'Leave':minut += 5 & gt 'Gadriver', 'start'
+		act 'Leave':gt 'gadriver', 'start'
 	end
 end
 
 if $ARGS[0] = 'fishing':
 	cla
 	*clr
+	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver.jpg"></center>'
 	'The stream quietly flows over the rocks, pleasantly tickling your ears. You gaze at the village that''s completely peaceful, there is a sense of serenity about it today.'
 	'You caught <<fish>> fish.'
@@ -1013,11 +1016,11 @@ if $ARGS[0] = 'fishing':
 						'You strike, but the lack of tension makes the fish escape from the hook.'
 
 					end
-					act 'Throw another bait':gt 'Gadriver', 'fishing'
+					act 'Throw another bait':gt 'gadriver', 'fishing'
 				end
 			else
 				'The bobber remains perfectly still, eventually you decide to try a different lure.'
-				act 'Retrieve bait':gt 'Gadriver', 'fishing'
+				act 'Retrieve bait':gt 'gadriver', 'fishing'
 			end
 		end
 		act 'Finish':
@@ -1039,7 +1042,7 @@ if $ARGS[0] = 'fishing':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
 					'You decide to release all the fish you caught today, the other fishermen shake their heads disapprovingly, throwing sidelong glances at your body as you dump the fish back into the river.'
 
-					act 'Leave':minut += 5 & gt $loc, $metka
+					act 'Leave':gt $loc, $metka
 				end
 				act 'Give the fish to Uncle Stepan':
 					cla
@@ -1051,7 +1054,7 @@ if $ARGS[0] = 'fishing':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
 					'You give all the fish you caught to uncle Stepan and he makes a show out of reluctantly accepting them, but you can see that he is actually quite happy with this arrangement.'
 
-					act 'Leave':minut += 5 & gt $loc, $metka
+					act 'Leave':gt $loc, $metka
 				end
 				act 'Bring a fish to Boniface':
 					cla
@@ -1077,7 +1080,7 @@ if $ARGS[0] = 'fishing':
 					act 'Finish': gt 'Gadhouse'
 				end
 			else
-				act 'Leave':minut += 5 & gt $loc, $metka
+				act 'Leave':gt $loc, $metka
 			end
 		end
 	else
@@ -1101,7 +1104,7 @@ if $ARGS[0] = 'fishing':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
 				'You decide to release all the fish you caught today, the other fishermen shake their heads disapprovingly, throwing sidelong glances at your body as you dump the fish back into the river.'
 
-				act 'Leave':minut += 5 & gt $loc, $metka
+				act 'Leave':gt $loc, $metka
 			end
 			act 'Give to Uncle Stepan':
 				cla
@@ -1113,7 +1116,7 @@ if $ARGS[0] = 'fishing':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
 				'You give all the fish caught to uncle Stepan and he reluctantly accepts them, you can see he is quite happy with this arrangement.'
 
-				act 'Leave':minut += 5 & gt $loc, $metka
+				act 'Leave':gt $loc, $metka
 			end
 			act 'Bring a fish to Boniface':
 				cla
@@ -1139,18 +1142,9 @@ if $ARGS[0] = 'fishing':
 				act 'Finish': gt 'Gadhouse'
 			end
 		else
-			act 'Leave':minut += 5 & gt $loc, $metka
+			act 'Leave':gt $loc, $metka
 		end
 	end
 end
-if $ARGS[0] = 'Get changed':
-	$metka = 'Get changed'
-	if $ARGS[1] = 'start':
-		gs 'saveposition'
-		gt 'changingroom', 'view_swim_list'
-	else
-		gt 'restoreposition'
-	end
-end
 --- gadriver ---------------------------------
 

+ 26 - 21
locations/gadukino.qsrc

@@ -1,15 +1,19 @@
 # gadukino
 
 if $ARGS[0] = '':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc = 'gadukino'
+	$metka = ''
 	$location_type = 'public_outdoors'
 	CLOSE ALL
 	gs 'gadukino_event', 'gadukino'
-	!125s
+
+	$menu_loc = 'gadukino'
+	$menu_arg = ''
+	menu_off = 0
+
 	!exec before everything
-	mitkarand = rand(1,12)
 	!lower chance (1/3 to 1/12) and once per day by illume
+	mitkarand = rand(1,12)
 	if mitkaday ! daystart and mitka = 0 and hour >= 7 and hour < 20 and mitkarand = 1:
 		*clr & cla
 		minut += 5
@@ -18,7 +22,7 @@ if $ARGS[0] = '':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
 		'In the village you are approached by your old friend Mitka.'
 
-		act 'Further':gt 'mitka'
+		act 'Continue':gt 'mitka'
 	elseif mitkaday ! daystart and mitka = 1 and hour >= 17 and hour < 20 and mitkarand = 1 and mitkaday ! daystart and npc_QW['A63'] < 13:
 		*clr & cla
 		minut += 5
@@ -27,7 +31,7 @@ if $ARGS[0] = '':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
 		'In the village you are approached by your old friend Mitka.'
 
-		act 'Further':gt 'mitka'
+		act 'Continue':gt 'mitka'
 	else
 		mitkarand = rand(1,20)
 		if gadriver_gang < 3:
@@ -70,7 +74,7 @@ if $ARGS[0] = '':
 		end
 		if npc_rel['A60'] > 0: 'Just down the road from your grandparents house is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s</a> house.'
 		*nl
-		!125s
+
 		if month >= 6 and month <= 9:
 			if hour >= 9 and hour <= 11:
 				'A truck from the city has come to <a href="exec: gt ''gadukino'',''collection_point''">collect</a> mushrooms and berries. Will stay around until noon.'
@@ -184,14 +188,14 @@ if $ARGS[0] = 'succubus_hunt':
 		'God, this place is dull! After searching for an hour, you find no one; not even a stray cat seems to be out and about tonight. You give up reluctantly, pondering how else you are going to feed tonight.'
 		act 'Continue': gt 'gadukino'
 	else
-		'You are getting really antsy to feed, and after finding absolutely no one outside, you decide that breaking into someone''s house, risky as it is, is still better than going hungry.' 
+		'You are getting really antsy to feed, and after finding absolutely no one outside, you decide that breaking into someone''s house, risky as it is, is still better than going hungry.'
 		*nl
 		!Another rand_check here to choose the scene?
-		'You break the lock of the first house you see and go inside. You sneak around the house, looking for a meal, but there''s nobody there. This entire night is a bust... Well, since you''re here, you might as well try and see if there''s any regular food that helps with your hunger, even though you doubt it.' 
+		'You break the lock of the first house you see and go inside. You sneak around the house, looking for a meal, but there''s nobody there. This entire night is a bust... Well, since you''re here, you might as well try and see if there''s any regular food that helps with your hunger, even though you doubt it.'
 		'You head to the kitchen for a midnight snack, and as you tear through the fridge, eating whatever looks appetizing, you hear a man curse.'
 		'"Shit, what the hell happened to my door?!"'
 		'You freeze on the spot. You didn''t think anybody would actually come home while you were still here, but now that they did, maybe you can still salvage this mess.'
-		
+
 		act 'Strip':
 			*clr
 			cla
@@ -204,10 +208,10 @@ if $ARGS[0] = 'succubus_hunt':
 			'You give him a good look at your body; according to your plan, that should be enough to calm him down. Unfortunately, he doesn''t seem to be aware of the plan, cause he is having none of it.'
 			'"Have you been eating my food?! Get the hell out of my house!"'
 			*nl
-			'He grabs you and starts dragging you towards the door. You protest and try in vain to seduce him, wondering how anyone could resist your charms like this. Then you remember that you are stronger than him - weird how easily superhuman strength can slip your mind.' 
+			'He grabs you and starts dragging you towards the door. You protest and try in vain to seduce him, wondering how anyone could resist your charms like this. Then you remember that you are stronger than him - weird how easily superhuman strength can slip your mind.'
 			'As soon as you resist his pull, he grinds to a halt, confused by the fact that he can''t move you further. With the tables turned, you grab him and half-drag, half-throw him into his own living room where he lands on his back, stunned by the fact that this woman so easily overpowered him.'
 			'You pull his pants off and, already nude yourself, lower your pussy to his cock. He may have played the angry man, but the fact that it stands at attention soothes your bruised ego - your seduction efforts didn''t go completely unnoticed - and you plunge yourself down on top of him.'
-			
+
 			act 'Feed on him':
 				*clr
 				cla
@@ -230,13 +234,13 @@ if $ARGS[0] = 'succubus_hunt':
 				sucabscum = 1
 				minut += 15 + (20 * scfeed) / succublvl
 				'<center><img <<$set_imgh>> src="images/pc/body/succubusself.jpg"></center>'
-				
-				'You ride him hard, desperate to get your hungry pussy the nourishment it requires.' 
+
+				'You ride him hard, desperate to get your hungry pussy the nourishment it requires.'
 				if scrand < succublvl:
-					'Your seduction and succubus powers were strong enough to get your victim hard, but they weren''t enough to make him forget about his situation: He is giving you hateful looks, clearly pissed about his door and food and, oh yeah, the fact you are raping him, but you simply ignore that.' 
-					'All you need is his sperm. You could care less about his happiness, and if he wants to complain about a woman like you fucking his brains out, that''s his problem. Just as you''re thinking that, your powers surge and force him to come, unloading his jizz deep into your waiting cunt.' 
+					'Your seduction and succubus powers were strong enough to get your victim hard, but they weren''t enough to make him forget about his situation: He is giving you hateful looks, clearly pissed about his door and food and, oh yeah, the fact you are raping him, but you simply ignore that.'
+					'All you need is his sperm. You could care less about his happiness, and if he wants to complain about a woman like you fucking his brains out, that''s his problem. Just as you''re thinking that, your powers surge and force him to come, unloading his jizz deep into your waiting cunt.'
 					*nl
-					'You don''t know how long you go at it with him exactly, but after coming inside you <<$scxcum>>, and thus making you come too, he runs out of energy and falls unconscious. You lift yourself off of your passed-out plaything and head for the kitchen to collect your clothes as well as one last snack, feeling wonderfully relaxed after getting your fix.' 
+					'You don''t know how long you go at it with him exactly, but after coming inside you <<$scxcum>>, and thus making you come too, he runs out of energy and falls unconscious. You lift yourself off of your passed-out plaything and head for the kitchen to collect your clothes as well as one last snack, feeling wonderfully relaxed after getting your fix.'
 					'Then you head out the back door, making sure to break the handle on the way out - you''re nothing if not consistent.'
 				else
 					'He was resisting you initially, but after a while, your powers break any resistance he had in him. By the time his first orgasm hits and he shoots his sperm into your needy cunt, he would have betrayed his own mother, much less broken his front door and laid his fridge at your feet, just to be inside you a little longer.'
@@ -291,14 +295,14 @@ if $ARGS[0] = '1':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_path.jpg"></center>'
 					' A few minutes later, snacking on an apple, you stumble upon the remains of an overgrown dirt road running through the middle of a majestic meadow filled with wildflowers. Judging by its undisturbed state no one uses it.'
 
-					act 'Further':
+					act 'Claim the meadow':
 						*clr & cla
 						minut += 20
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
-						'You spend another twenty minutes exploring the meadow and its surroundings. You''re positive no one visits this location. You loudly proclaim the meadow to be your domain and you are its ruler. Eventually, you decide to head back to the village and to your surprise, the path you follow back emerges into your grandparents back yard.'
+						'You spend another twenty minutes exploring the meadow and its surroundings. You''re positive no one visits this location. You loudly proclaim the meadow to be your domain and you are its ruler. Eventually, you decide to head back to the village. To your surpise, your discover a quick shortcut that leads from the meadow back to your grandparents house.'
 
-						act 'Return to the village': gt 'Gaddvor'
+						act 'Return to the house': gt 'Gaddvor'
 					end
 				end
 			end
@@ -307,6 +311,7 @@ if $ARGS[0] = '1':
 end
 
 if $ARGS[0] = '2':
+	! never met mira before
 	if npc_rel['A60'] = 0:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/miroslava.jpg"></center>'
@@ -320,7 +325,7 @@ if $ARGS[0] = '2':
 			'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 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 to 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...", so they were destitute and could only afford to buy a house in this run down dust covered village. You walk with her and chat until you reach her house, which is close by to your grandparent''s place. Mira invites you to come and visit her at any time. She is just as bored in the village as you are.'
 
-			act 'Finish': gt 'gadukino'
+			act 'Finish your walk': gt 'gadukino'
 		end
 
 		act 'Walk away': gt 'gadukino'

+ 48 - 46
locations/gadukino_event.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'mira_apologise':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/turn_back.jpg"></center>'
 	'Walking through the village you hear someone catching up to you. Turning around, you see Mira nearing you.'
 
-	act 'Further':
+	act 'Continue':
 		*clr & cla
 		minut += 5
 		gs 'stat'
@@ -33,7 +33,7 @@ if $ARGS[0] = 'mira_apologise':
 			'"Ok, I agree to a truce," you say smiling, genuinely filled with joy ending all the drama. "I forgive you."'
 			'"And...?" Mira asks you.'
 			'Instead of answering her, you grab her by the arm and pull her into the bushes.'
-			act 'Further': gt 'mirasex','miralick_first'
+			act 'Continue': gt 'mirasex','miralick_first'
 		end
 		act 'Refuse':
 			*clr & cla
@@ -63,7 +63,7 @@ if $ARGS[0] = 'mitka_apologise':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/turn_back.jpg"></center>'
 	'Walking through the village you hear someone catching up to you. Turning around, you see Mitka running towards you. Knowing from experience, that boys are faster runners, you stop and wait for him to catch up.'
 
-	act 'Further':
+	act 'Continue':
 		*clr & cla
 		minut += 5
 		gs 'stat'
@@ -110,7 +110,7 @@ if $ARGS[0] = 'gang_apologise':
 		'He looked at you with sorrow in his eyes. You did not expect that anyone of them would be sorry.'
 		'"I had a talk with the other men in the morning, and, uh," uncle Stepan losing his composure. "Well, in short, I decided that I wanted to talk to you, apologize and ask if you could forget about yesterday... I''m really sorry and I''m worried that we might have damaged you physically."'
 		'You looked skeptically at "your uncle", not really knowing if he''s joking or not.'
-		act 'Further':
+		act 'Continue':
 			*clr & cla
 			minut += 5
 			gs 'stat'
@@ -165,12 +165,13 @@ if $ARGS[0] = 'gang_apologise':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/girl_escapes.jpg"></center>'
 		'You started running away from the road, not stopping before you felt you were in the clear.'
 		'"Good thing I ran away from that evil man." you thought to yourself, looking around.'
-		act 'Further':gt'Meadow'
+		act 'Continue':gt'Meadow'
 	end
 end
 
 if $ARGS[0] = 'gadriver_gang':
 	minut += 5
+	menu_off = 1
 	gadriver_gang = 1
 	gadboyday = daystart
 	npc_QW['A63'] = 21
@@ -182,7 +183,7 @@ if $ARGS[0] = 'gadriver_gang':
 	'You walked along the path, fully immersed in your inner thoughts, you didn''t immediately notice the crowd of drunken village men. Noticing you alone the men turn their attention towards you.'
 	'One of the men grabs you and forces you away from the village. They start stripping you, surround you on all sides, taking out their cocks, warming up for what''s supposed to come. You think about resisting, but considering your reputation in the village, you find it''s not worth fighting, plus there was no way you could fight against this many men so you humbly kneel.'
 
-	act 'Suck':
+	act 'Suck the nearest cock':
 		*clr & cla
 		gs 'underwear', 'wear'
 		gs 'clothing', 'strip'
@@ -197,7 +198,7 @@ if $ARGS[0] = 'gadriver_gang':
 		minut -= 5
 		gs 'stat'
 
-		act 'Keep sucking':
+		act 'Suck the next guy':
 			*clr & cla
 			gs 'npcgeneratec', 0, 'some country guy', rand(19,45)
 			gs 'boyStat', $npclastgenerated, 'a'
@@ -208,7 +209,7 @@ if $ARGS[0] = 'gadriver_gang':
 			gs 'arousal', 'bj', 5, 'sub', 'gangbang'
 			gs 'stat'
 
-			act 'Further':
+			act 'Deepthroat two at once':
 				*clr & cla
 				gs 'npcgeneratec', 0, 'some country guy', rand(19,45)
 				gs 'boyStat', $npclastgenerated, 'b'
@@ -219,7 +220,7 @@ if $ARGS[0] = 'gadriver_gang':
 
 				gs 'arousal', 'bj', 5, 'sub', 'gangbang', 'deepthroat'
 				gs 'stat'
-				act 'Further':
+				act 'Make the first trio cum':
 					*clr & cla
 					minut += 5
 					gs 'cum_call', 'mouth', $boy, 1
@@ -227,11 +228,11 @@ if $ARGS[0] = 'gadriver_gang':
 					gs 'cum_call', 'stomach', $boy2, 1
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/river/gadriver_gang_cum1.jpg"></center>'
-					'It doesn''t take long before the first men finish, cumming in your mouth, on the face and chest. You continue sucking the men off, however...'
+					'It doesn''t take long before the first men finish, cumming in your mouth, on the face and chest. You continue sucking more men off, however...'
 
 					gs 'arousal', 'bj', 5, 'sub', 'gangbang', 'deepthroat'
 					gs 'stat'
-					act 'Further':
+					act 'Continue':
 						*clr & cla
 						gs 'npcgeneratec', 0, 'some country man', rand(19,45)
 						gs 'boyStat', $npclastgenerated
@@ -245,7 +246,7 @@ if $ARGS[0] = 'gadriver_gang':
 						minut -= 5
 						gs 'stat'
 
-						act 'Further':
+						act 'Continue':
 							*clr & cla
 							minut += 5
 							gs 'npcgeneratec', 0, 'man', rand(19,45)
@@ -264,7 +265,7 @@ if $ARGS[0] = 'gadriver_gang':
 							pose = 1
 							if rand(1,2) = 1:gs 'dinsex','sexcum'
 
-							act 'Further':
+							act 'Continue':
 								*clr & cla
 								gs 'npcgeneratec', 0, 'drunk man', rand(19,45)
 								gs 'boyStat', $npclastgenerated
@@ -283,7 +284,7 @@ if $ARGS[0] = 'gadriver_gang':
 								minut -= 5
 								gs 'stat'
 
-								act 'Further':
+								act 'Continue':
 									*clr & cla
 									gs 'boyStat', 'A63'
 									npc_sex[$boy] += 1
@@ -298,7 +299,7 @@ if $ARGS[0] = 'gadriver_gang':
 									minut -= 5
 									gs 'stat'
 
-									act 'Further':
+									act 'Continue':
 										*clr & cla
 										gs 'boyStat', 'A171'
 										npc_sex[$boy] += 1
@@ -316,7 +317,7 @@ if $ARGS[0] = 'gadriver_gang':
 										minut -= 5
 										gs 'stat'
 
-										act 'Further':
+										act 'Continue':
 											*clr & cla
 											gs 'npcgeneratec', 0, 'village man', rand(19,45)
 											gs 'boyStat', $npclastgenerated
@@ -333,7 +334,7 @@ if $ARGS[0] = 'gadriver_gang':
 											if rand(1,2) = 1:gs 'dinsex','sexcum'
 											gs 'stat'
 
-											act 'Further':
+											act 'Continue':
 												*clr & cla
 												minut += 5
 												gs 'boyStat', 'A62'
@@ -352,7 +353,7 @@ if $ARGS[0] = 'gadriver_gang':
 												gs 'stat'
 												*pl
 
-												act 'Further':
+												act 'Continue':
 													*clr & cla
 													minut += 5
 													if pcs_health <= 100:pcs_health += 100
@@ -365,7 +366,7 @@ if $ARGS[0] = 'gadriver_gang':
 													'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/river/gadriver_gang_oral4.jpg"></center>'
 													'The men decide that your holes need a rest, so the next few men are only going to get oral pleasure. They tell you to get on your knees and ordered you to suck.'
 
-													act 'Further':
+													act 'Continue':
 														*clr & cla
 														gs 'cum_call', 'mouth', $boy, 1
 														swallow += 1
@@ -386,7 +387,7 @@ if $ARGS[0] = 'gadriver_gang':
 														'They finish and walk away.'
 														gs 'stat'
 
-														act 'Further':
+														act 'Continue':
 															*clr & cla
 															gs 'npcgeneratec', 0, 'man', rand(19,45)
 															gs 'boyStat', $npclastgenerated
@@ -404,7 +405,7 @@ if $ARGS[0] = 'gadriver_gang':
 															'The men cum and walk away feeling satisfied.'
 															gs 'stat'
 
-															act 'Further':
+															act 'Continue':
 																*clr & cla
 																gs 'npcgeneratec', 0, 'unfamiliar guy', rand(19,45)
 																gs 'boyStat', $npclastgenerated
@@ -422,7 +423,7 @@ if $ARGS[0] = 'gadriver_gang':
 																'The men cum and walk away feeling satisfied.'
 																gs 'stat'
 
-																act 'Further':
+																act 'Continue':
 																	*clr & cla
 																	gs 'npcgeneratec', 0, 'guy', rand(19,45)
 																	gs 'boyStat', $npclastgenerated
@@ -438,7 +439,7 @@ if $ARGS[0] = 'gadriver_gang':
 																	minut -= 5
 																	gs 'stat'
 
-																	act 'Further':
+																	act 'Continue':
 																		*clr & cla
 																		gs 'npcgeneratec', 0, 'Drunk man', rand(19,45)
 																		gs 'boyStat', $npclastgenerated
@@ -453,7 +454,7 @@ if $ARGS[0] = 'gadriver_gang':
 																		minut -= 5
 																		gs 'stat'
 
-																		act 'Further':
+																		act 'Continue':
 																			*clr & cla
 																			gs 'boyStat', 'A172'
 																			npc_sex[$boy] += 1
@@ -470,7 +471,7 @@ if $ARGS[0] = 'gadriver_gang':
 																			minut -= 5
 																			gs 'stat'
 
-																			act 'Further':
+																			act 'Continue':
 																				*clr & cla
 																				gs 'npcgeneratec', 0, 'a man', rand(19,45)
 																				gs 'boyStat', $npclastgenerated
@@ -487,7 +488,7 @@ if $ARGS[0] = 'gadriver_gang':
 																				if rand(1,2) = 1:gs 'dinsex','sexcum'
 																				gs 'stat'
 
-																				act 'Further':
+																				act 'Continue':
 																					*clr & cla
 																					minut += 5
 																					if pcs_health <= 100:pcs_health += 100
@@ -497,7 +498,7 @@ if $ARGS[0] = 'gadriver_gang':
 																					'"I really hope that that was the last one..." you thought.'
 																					'This was just unfortunately wishful thinking. The men soon put you on your knees and then several men shoved their cocks in your face.'
 
-																					act 'Further':
+																					act 'Continue':
 																						*clr & cla
 																						gs 'npcgeneratec', 0, 'stranger', rand(19,45)
 																						gs 'boyStat', $npclastgenerated
@@ -514,7 +515,7 @@ if $ARGS[0] = 'gadriver_gang':
 																						if rand(1,2) = 1:gs 'dinsex','sexcum'
 																						gs 'stat'
 
-																						act 'Further':
+																						act 'Continue':
 																							*clr & cla
 																							gs 'npcgeneratec', 0, 'drunk guy', rand(19,45)
 																							gs 'boyStat', $npclastgenerated
@@ -534,7 +535,7 @@ if $ARGS[0] = 'gadriver_gang':
 																							if rand(1,2) = 1:gs 'dinsex','sexcum'
 																							*pl
 
-																							act 'Further':
+																							act 'Continue':
 																								*clr & cla
 																								gs 'npcgeneratec', 0, 'a man', rand(19,45)
 																								gs 'boyStat', $npclastgenerated
@@ -553,7 +554,7 @@ if $ARGS[0] = 'gadriver_gang':
 																								minut -= 5
 																								gs 'stat'
 
-																								act 'Further':
+																								act 'Continue':
 																									*clr & cla
 																									gs 'npcgeneratec', 0, 'unknown man', rand(19,45)
 																									gs 'boyStat', $npclastgenerated
@@ -570,7 +571,7 @@ if $ARGS[0] = 'gadriver_gang':
 																									minut -= 5
 																									gs 'stat'
 
-																									act 'Further':
+																									act 'Continue':
 																										*clr & cla
 																										gs 'npcgeneratec', 0, 'a villager', rand(19,45)
 																										gs 'boyStat', $npclastgenerated
@@ -587,7 +588,7 @@ if $ARGS[0] = 'gadriver_gang':
 																										minut -= 5
 																										gs 'stat'
 
-																										act 'Further':
+																										act 'Continue':
 																											*clr & cla
 																											minut += 5
 																											if pcs_health <= 100:pcs_health += 100
@@ -598,7 +599,7 @@ if $ARGS[0] = 'gadriver_gang':
 																											gs 'arousal', 'bj', 5, 'sub', 'gangbang', 'deepthroat'
 																											gs 'stat'
 
-																											act 'Further':
+																											act 'Continue':
 																												*clr & cla
 																												minut += 5
 																												gs 'npcgeneratec', 0, 'stranger', rand(19,45)
@@ -616,20 +617,21 @@ if $ARGS[0] = 'gadriver_gang':
 
 																												'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/river/gadriver_gang_cum3.jpg"></center>'
 																												'Like a panicked animal being pushed against a wall you gave it all, using all your might to please them. Your endeavor didn''t go unnoticed, some of men began cumming in your mouth and some of them on your face. There was so much sperm that your chest and abdomen also got covered.'
-																												act 'Further':
+																												act 'Continue':
 																													*clr & cla
 																													minut += 5
 																													gs 'cum_call', 'mouth', $boy3, 1
 																													gs 'cum_call', 'face', $boy4, 1
-																													swallow += 1
+																													swallow += 2
 																													gang += 1
+																													menu_off = 0
 																													gs 'stat'
 
 																													'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/river/gadriver_gang_cum4.jpg"></center>'
 																													'When the last men finally came, the crowd began to disperse, leaving you wrapped in a tattered blanket. You hear them sharing impressions of their drunken antics.'
 																													gs 'arousal', 'end'
 																													gs 'stat'
-																													act 'Further':minut += 5 & gt'Gadriver', 'Gadbitch'
+																													act 'Leave':minut += 5 & gt'gadriver', 'gadbitch'
 																												end
 																											end
 																										end
@@ -670,7 +672,7 @@ if $ARGS[0] = 'gadukino_mitka':
 	'Walking through the village you met Mitka. Seeing you, he started rubbing his crotch and said with a grin.'
 	'"Hey, <<$pcs_nickname>>, let''s go have some fun getting rid of this boner you just gave me."'
 
-	act 'Further': gt 'mitkasex', 'gad1', 'A63'
+	act 'Go with him': gt 'mitkasex', 'gad1', 'A63'
 end
 
 if $ARGS[0] = 'gadukino_kolyamba':
@@ -682,7 +684,7 @@ if $ARGS[0] = 'gadukino_kolyamba':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/kolyamba.jpg"></center>'
 	'Walking through the village you met Kolyamba. Seeing you, he reached into his pants and started playing with his balls. He then grabbed you by the arm and dragged into the bushes next to the road.'
 
-	act 'Further': gt 'mitkasex', 'gad1', 'A61'
+	act 'Go with him': gt 'mitkasex', 'gad1', 'A61'
 end
 
 if $ARGS[0] = 'gadukino_vasyan':
@@ -690,11 +692,11 @@ if $ARGS[0] = 'gadukino_vasyan':
 	vasyanday = daystart
 	gs 'stat'
 
-	'<center><b><font color = maroon>Vasya Paket</font></b></center>'
+	'<center><b><font color = maroon>Vasyan Paket</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vasyan.jpg"></center>'
 	'Walking through the village you met Vasya. Seeing you, he smiled and waved you over to him. He kisses you on the lips and asks you to join him as he walked into the bushes next to the road.'
 
-	act 'Further': gt 'mitkasex', 'gad1', 'A62'
+	act 'Go with him': gt 'mitkasex', 'gad1', 'A62'
 end
 
 if $ARGS[0] = 'gadukino_2boys':
@@ -712,7 +714,7 @@ if $ARGS[0] = 'gadukino_2boys':
 	if mitboyrand = 2:'Walking through the village you met Mitka and Vasya. Seeing you, they grin, grab you by the arms and drag you into the bushes.'
 	if mitboyrand = 3:'Walking through the village you met Kolyamba and Vasya. Seeing you, they grin, grab you by the arms and drag you into the bushes.'
 
-	act 'Further': gt 'mitkasex', 'gad2'
+	act 'Go with them': gt 'mitkasex', 'gad2'
 end
 
 if $ARGS[0] = 'mira_mitka':
@@ -725,7 +727,7 @@ if $ARGS[0] = 'mira_mitka':
 	'Walking with Mira in the village you met Mitka. Seeing Mira, he started playing with his balls and said with a grin.'
 	'"Oh hey Mira, let''s go have some fun getting rid of this boner you just gave me."'
 
-	act 'Further': gt 'mitkasex', 'forest1', 'A63'
+	act 'Go with them': gt 'mitkasex', 'forest1', 'A63'
 end
 
 if $ARGS[0] = 'mira_kolyamba':
@@ -737,7 +739,7 @@ if $ARGS[0] = 'mira_kolyamba':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/kolyamba.jpg"></center>'
 	'Walking with Mira in the village you met Kolyamba. Seeing Mira, he started playing with his balls, dragging her into the bushes next to the road.'
 
-	act 'Further': gt 'mitkasex', 'forest1', 'A61'
+	act 'Go with them': gt 'mitkasex', 'forest1', 'A61'
 end
 
 if $ARGS[0] = 'mira_vasyan':
@@ -749,7 +751,7 @@ if $ARGS[0] = 'mira_vasyan':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vasyan.jpg"></center>'
 	'Walking with Mira in the village you met Vasyan. Seeing Mira, he smiled and dragged her into the bushes next to the road.'
 
-	act 'Further': gt 'mitkasex', 'forest1', 'A62'
+	act 'Go with them': gt 'mitkasex', 'forest1', 'A62'
 end
 
 if $ARGS[0] = 'mira_2boys':
@@ -767,7 +769,7 @@ if $ARGS[0] = 'mira_2boys':
 	if mitboyrand = 2:'Walking with Mira in the village you met Mitka and Vasyan. Seeing Mira, they grin, grab her arms and drag her into the bushes.'
 	if mitboyrand = 3:'Walking with Mira in the village you met Kolyamba and Vasyan. Seeing Mira, they grin, grab her arms and drag her into the bushes.'
 
-	act 'Further': gt 'mitkasex', 'forest2', mitboyrand
+	act 'Go with them': gt 'mitkasex', 'forest2', $ARGS[1]
 end
 
 if $ARGS[0] = 'mira_3boys':
@@ -783,7 +785,7 @@ if $ARGS[0] = 'mira_3boys':
 
 	'Walking with Mira in the village you met Mitka, Kolyamba and Vasyan. Seeing Mira, they grin, grab her arms and drag her into the bushes.'
 
-	act 'Further': gt 'mitkasex', 'forest3'
+	act 'Go with them': gt 'mitkasex', 'forest3'
 end
 
 if $ARGS[0] = 'go_home':

+ 1 - 1
locations/gdk.qsrc

@@ -7,7 +7,7 @@ $location_type = 'public_outdoors'
 gs 'stat'
 '<center><b><font color="maroon">Community Centre</font></b></center>'
 
-act 'Leave':gt 'pavResidential'
+act 'Leave': minut += 2 & gt 'pavResidential'
 
 if hour >= 20 and hour <= 23 and week >= 5 and week < 7:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'

+ 4 - 0
locations/gdkbibl.qsrc

@@ -9,6 +9,10 @@ gs 'stat'
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 62 - 72
locations/gdkin.qsrc

@@ -5,12 +5,19 @@ if $ARGS[0] = '':
 	$metka = ''
 	$loc = 'gdkin'
 	$location_type = 'public_indoors'
+	$menu_loc = 'gdkin'
+	$menu_arg = ''
+	menu_off = 0
 	boynumBlock = 0
 	gs 'stat'
 	if night_mode = 1:
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -47,14 +54,13 @@ if $ARGS[0] = '':
 			'You notice Sonia from your class. She is talking to Victor about something.'
 
 			act 'View Sonya':gt 'soniaDisco'
-
 			exit
 		end
 
 		act 'Go outside':gt 'gdk'
 		
 		act 'Dance (0:15)':
-			cls
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
 			if pcs_inhib < 40:inhib_exp += rand(1,2)
 			if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1:
@@ -77,16 +83,16 @@ if $ARGS[0] = '':
 				gs 'stat'
 
 				if rand(0,7)=1 and katja_disco_end=1 and (alko > 1 or pcs_horny => 80) and KatjaHorny > 60:
-					*CLR
+					*clr
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance.jpg"></center>'
 					'While you are dancing you notice Katya out on the dance floor as well.'
 					Act 'Dance with Katya':gt 'gdkin', 'Katja_dance'
 				end
 
-				if alko >= 4:
+				if alko >= 6:
 					'You''re too drunk to try and dance, you are barely able to stay on your feet and mostly just drunkenly bump into other people as you try and dance.'
 					if rand (0,1) = 0:gt 'gdkin', 'too_drunk_dance'
-				elseif alko = 1:
+				elseif alko >= 3:
 					if $pantyworntype = 'none' and PCloSkirt > 2:
 						*clr
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/club_dance2.mp4"></video></center>'
@@ -96,7 +102,7 @@ if $ARGS[0] = '':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance7.jpg"></center>'
 						'You''re a bit tipsy, but you''re having a lot of fun out on the dance floor anyways, you''re not paying much attention to anyone else or even the music.'
 					end
-				elseif alko > 1:
+				elseif alko > 3:
 					if $pantyworntype = 'none' and PCloSkirt > 2:
 						*clr
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/club_dance2.mp4"></video></center>'
@@ -110,7 +116,7 @@ if $ARGS[0] = '':
 					'The music is quite old, but catchy. You have fun dancing, not paying attention to anyone.'
 				end
 
-				if alko < 4:
+				if alko < 6:
 					verprigrand = rand(0, 100)
 
 					if verprigrand <= pcs_danc:
@@ -118,25 +124,20 @@ if $ARGS[0] = '':
 						gs 'stat'
 						'<<$din_disc_dance2>>'
 
+						act 'Move away': gt 'gdkin'
 						act 'Dance with the guy':gt 'gdkin', 'dance_vrp'
-
-						act 'Move away':
-							cls
-							gt 'gdkin'
-						end
-
 						exit
 					end
 				end
 
 				gs 'stat'
 
-				act 'Further':gt 'gdkin'
+				act 'Continue':gt 'gdkin'
 			end
 		end
 
 		act 'Stand at the wall':
-			cls
+			*clr & cla
 			minut += 5
 			!!fat -= 1
 			pcs_mood -= 5
@@ -155,11 +156,9 @@ if $ARGS[0] = '':
 				exit
 			end
 		
-			if alko >= 6 and rand (1, 100) < 3:
-				gt 'gevent', '6'
-			end
+			if alko >= 6 and rand (1, 100) < 3:	gt 'gevent', '6'
 
-			if alko >= 4:
+			if alko >= 6:
 				'You''re too drunk to dance and you lean against the wall for support to keep from falling down.'
 				if rand (0,1) = 0:gt 'gdkin', 'too_drunk_dance'
 			elseif alko = 1:
@@ -170,7 +169,7 @@ if $ARGS[0] = '':
 				'You are standing next to the wall while watching the others dance.'
 			end
 
-			if alko < 4:
+			if alko < 6:
 				verodance = 0
 
 				if pcs_hairbsh = 1:verodance += 1
@@ -189,20 +188,15 @@ if $ARGS[0] = '':
 					gs 'stat'
 					'<<$din_disc_dance>>'
 
+					act 'Refuse': gt 'gdkin'
 					act 'Dance':gt 'gdkin', 'dance_vrp'
-
-					act 'Refuse':
-						cls
-						gt 'gdkin'
-					end
-
 					exit
 				end
 			end
 
 			gs 'stat'
 
-			act 'Further':gt 'gdkin'
+			act 'Continue':gt 'gdkin'
 		end
 	elseif hour < 20:
 		'The Club closes. The main lights go on, the music fades and everyone beings to leave.'
@@ -210,7 +204,6 @@ if $ARGS[0] = '':
 	end
 	
 	act 'Go to the toilets': gt 'gdktoilet', 'start'
-
 end
 
 if $ARGS[0] = 'Katja_dance':	
@@ -316,7 +309,7 @@ if $ARGS[0] = 'kotov_love':
 end
 
 if $ARGS[0] = 'reakt_dance':
-	if alko > 0:
+	if alko >= 3:
 		'You feel yourself getting aroused by the guy''s actions.'
 		gs 'arousal', 'foreplay', 5
 		gs 'arousal', 'end'
@@ -332,14 +325,14 @@ if $ARGS[0] = 'reakt_dance':
 end
 
 if $ARGS[0] = 'reverse_reakt_dance':
-	if alko <= 0:
+	if alko < 3:
 		pcs_mood += 20
 		'You enjoy dancing with him a great deal.'
 		if pcs_inhib < 40:inhib_exp += rand(1,2)
 		gs 'arousal', 'foreplay', 5
 		gs 'arousal', 'end'
 		gs 'stat'
-	elseif alko > 0:
+	elseif alko > 3:
 		if pcs_horny > 0:pcs_horny -= 5
 
 		pcs_mood -= 5
@@ -350,7 +343,7 @@ if $ARGS[0] = 'reverse_reakt_dance':
 end
 
 if $ARGS[0] = 'dance_vrp':
-	cls
+	*clr & cla
 	minut += 5
 	if pcs_danc < 50 and pcs_agil >=pcs_danc:danc_exp += 1
 	if pcs_inhib < 40:inhib_exp += rand(1,2)
@@ -398,28 +391,12 @@ if $ARGS[0] = 'dance_vrp':
 		end
 	end
 
-		if pcs_danc >= 50 and alko > 0 and pcs_horny >= 50:
-		act 'Sexy dance':
-			cls
-			if $pantyworntype = 'none' and PCloSkirt > 2:
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance4.jpg"></center>'
-				'Trying to move your body as erotically as possible, you lean forward while doing a complex dance move, completely forgetting that you''re not wearing panties. Now your dance partner knows as well and it seems he will likely never forget.'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance3.jpg"></center>'
-				'You are taking advantage of your ability to dance, sexy moves cause your partner to stare at you. But he seems stunned by how great you look or maybe by how well you move, either way he suddenly moves away and disappears into the crowd.'
-			end
-			danc_exp += 1
-			gs 'arousal', 'flash', 5
-			gs 'stat'
-			act 'Further':gt'gdkin'
-
-		end
-	end
-
-	act 'Further':
-		cls
+	act 'Stop and move away': gt 'gdkin'
+	
+	act 'Continue to dance with him':
+		*clr & cla
 		gs 'stat'
-		if $pantyworntype = 'none' and alko > 0 and PCloSkirt > 2:
+		if $pantyworntype = 'none' and alko >= 3 and PCloSkirt > 2:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance9.jpg"></center>'
 		elseif alko > 0:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance10.jpg"></center>'
@@ -427,6 +404,13 @@ if $ARGS[0] = 'dance_vrp':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
 		end
 
+		if alko < 6 or pcs_horny <= 75 or pav_slut <= 25:
+			act 'Refuse':
+				if pcs_sprt <= 30: sprt_exp += rand(0, 1)
+				gt 'gdkin'
+			end
+		end
+		
 		if DPgrup = 1:
 			$npc_usedname[$npclastcalled] = $npc_nickname[$npclastcalled]
 			$boydesc = $npc_nickname[$npclastcalled]
@@ -442,33 +426,33 @@ if $ARGS[0] = 'dance_vrp':
 				'For the entire dance the guy was grabbing your ass, breasts and kissing you, he was clearly excited. When you would press up against him, you could feel something hard in his pants. Finally the song ended and the guy offers to take you outside for a drink.'
 				gs 'arousal', 'foreplay', 5
 				gs 'stat'
-				act 'Go drink':gt 'gdksex', 'outside', 'aggressiv'
+				act 'Go outside':gt 'gdksex', 'outside', 'aggressiv'
 			elseif DPtipe = 2:
 				'For the entire dance the guy was grabbing your ass, breasts and kissing you, he was clearly excited. When you would press up against him, you could feel something hard in his pants. Finally the song ended and the guy offers to take you outside for a drink.'
 				gs 'arousal', 'foreplay', 5
 				gs 'stat'
-				act 'Go drink':gt 'gdksex', 'outside', 'aggressiv'
+				act 'Go outside':gt 'gdksex', 'outside', 'aggressiv'
 			end
 		elseif DPgrup = 3:
 			if DPtipe = 1:
 				'The man danced with confidence and elegance, finally the song was over and the man offers to go out for some fresh air and talk.'
 
 				act 'Go with the man':
-					cls
+					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 					$npc_usedname[$npclastcalled] = $npc_nickname[$npclastcalled]
 					$boydesc = $npc_nickname[$npclastcalled]
 					'You went outside with the man. As you walked he put his arm around your waist. "My name is <<$boydesc>>. What''s your name?" You answered "<<$pcs_nickname>>." The man continued, "<<$pcs_nickname>>, I''m in town on a business trip. I am staying at a nearby hotel, I live in the city itself. There is virtually nothing to do in this town you know. Come back to my hotel with me and we can drink whiskey, while we sit and have a nice chat."'
 
-					act 'Go to the hotel':gt 'gdksex', 'hotel'
-
-					if alko <= 2 or pcs_horny <= 75 or pav_slut <= 25:
+					if alko < 6 or pcs_horny <= 75 or pav_slut <= 25:
 						act 'Refuse':
 							if pcs_sprt <= 30: sprt_exp += rand(0, 1)
 							gt 'gdkin'
 						end
 					end
+					
+					act 'Go to the hotel':gt 'gdksex', 'hotel'
 				end
 			elseif DPtipe = 2:
 				$npc_usedname[$npclastcalled] = $npc_nickname[$npclastcalled]
@@ -479,19 +463,25 @@ if $ARGS[0] = 'dance_vrp':
 				act 'Go to the hotel':gt 'gdksex', 'hotel'
 			end
 		end
-
-		if alko <= 2 or pcs_horny <= 75 or pav_slut <= 25:
-			act 'Refuse':
-				if pcs_sprt <= 30: sprt_exp += rand(0, 1)
-				gt 'gdkin'
-			end
-		end
+				
 		if kotovLoveQW > 0: gt 'gdkin', 'kotov_love'
 	end
-
-	act 'Stop dancing':
-		cls
-		gt 'gdkin'
+	
+	if pcs_danc >= 50 and alko >= 3 and pcs_horny >= 50:
+		act 'Dance sexily':
+			*clr & cla
+			if $pantyworntype = 'none' and PCloSkirt > 2:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance4.jpg"></center>'
+				'Trying to move your body as erotically as possible, you lean forward while doing a complex dance move, completely forgetting that you''re not wearing panties. Now your dance partner knows as well and it seems he will likely never forget.'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance3.jpg"></center>'
+				'You are taking advantage of your ability to dance, sexy moves cause your partner to stare at you. But he seems stunned by how great you look or maybe by how well you move, either way he suddenly moves away and disappears into the crowd.'
+			end
+			danc_exp += 1
+			gs 'arousal', 'flash', 5
+			gs 'stat'
+			act 'Continue':gt'gdkin'
+		end
 	end
 end
 
@@ -591,10 +581,10 @@ if $ARGS[0] = 'too_drunk_dance':
 		cls
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance_alco1.jpg"></center>'
-		'Katja Meynold approached you. "<<$pcs_nickname>>, are you too drunk? Let''s go home, I''ll take you."'
+		'Katja Meynold approached you. "<<$pcs_nickname>>, are you drunk? Let''s get you home, I''ll help you."'
 
 		act 'Go with Katja':
-			*clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
 			minut += 15
 			npc_rel['A14'] = 100

+ 4 - 0
locations/gdkkru.qsrc

@@ -11,6 +11,10 @@ if night_mode = 1:
 	fcolor = rgb(255, 255, 255)
 	bcolor = rgb(0, 0, 0)
 	lcolor = rgb(106, 90, 205)
+elseif night_mode = 2:
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(20, 20, 20)
+	lcolor = rgb(106, 90, 205)
 else
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)

+ 16 - 26
locations/gdksex.qsrc

@@ -23,8 +23,8 @@ if $ARGS[0] = 'outside':
 		act'Don''t drink the beer':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
-			if alko<3:'You smile at him but say: "No thanks, I''m not really in the mood for beer right now..."'
-			if alko>=3:'You''re already fairly tipsy and mumble: "I don''t thi-*hic* think I should... *hic*"'
+			if alko < 6:'You smile at him but say: "No thanks, I''m not really in the mood for beer right now..."'
+			if alko >= 6:'You''re already fairly tipsy and mumble: "I don''t thi-*hic* think I should... *hic*"'
 			'<<$boydesc>> offers you a disarming smile and says: "Alright, no problem! We can just chat!"'
 				act'Chat with him':
 				*clr & cla
@@ -63,7 +63,7 @@ if $ARGS[0] = 'outside':
 		end
 		act 'Have a beer':
 			*clr & cla
-			alko += 1
+			alko += rand(1,2)
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0
@@ -72,7 +72,7 @@ if $ARGS[0] = 'outside':
 			gs 'stat'
 			'You accept the beer and have a lot of fun chatting with the guy, while you drink the beer and have some chips. He''s very funny, and tells you some hilarious stories.'
 
-			if alko >= 3:
+			if alko >= 6:
 				pcs_horny += 20
 				'<<$boydesc>> scoots over until he''s right next to you on the fallen tree, and closes his arms around you. He pulls you in and kisses your lips passionately, making your heart flutter. Wow, he''s a good kisser!'
 				'Then you feel his hands on your chest.'
@@ -130,7 +130,7 @@ if $ARGS[0] = 'outside':
 							gs 'gdksex', 'blowjob', 'unpaid'
 						end
 
-						gs 'gdksex', 'handjob', 'unpaid'
+						gs 'gdksex', 'handjob'
 					end
 				end
 
@@ -161,7 +161,7 @@ if $ARGS[0] = 'outside':
 
 					act 'Leave':gt 'gdk'
 				end
-			elseif alko < 3:
+			elseif alko < 6:
 				if DPtipe = 1:
 					randvnesh = rand(40,120)
 					deystrand = rand(0,1)
@@ -374,7 +374,7 @@ if $ARGS[0] = 'outside':
 
 									if pcs_horny <= 90:act 'Go back to the disco':gt 'gdkin'
 
-									gs 'gdksex', 'handjob', 'unpaid'
+									gs 'gdksex', 'handjob'
 									gs 'gdksex', 'blowjob', 'unpaid'
 								end
 							end
@@ -384,7 +384,7 @@ if $ARGS[0] = 'outside':
 			end
 		end
 	elseif (gdk_nice_guy = 1 and pav_slut >= 35 and pav_slut < 65) or (gdk_nice_guy = 0 and pav_slut >= 15 and pav_slut < 35):
-			alko += 1
+			alko += rand(1,2)
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0
@@ -405,14 +405,14 @@ if $ARGS[0] = 'outside':
 			'He pulls his cock out of his pants while he says it, and looks at you expectantly.'
 		end
 			gs 'gdksex', 'decline'
-			gs 'gdksex', 'handjob', 'unpaid'
+			gs 'gdksex', 'handjob'
 			gs 'gdksex', 'blowjob', 'unpaid'
 	elseif (gdk_nice_guy = 1 and pav_slut >= 100 and pav_slut < 125) or (gdk_nice_guy = 0 and pav_slut >= 65 and pav_slut < 75):
 		'<<$boydesc>> says: "<<$pcs_nickname>>, my buddies told me you''re a <<$gnikname>>. I want to have some fun with you too!"'
 		'He pulls his cock out of his pants while he says it, and looks at you expectantly.'
 		
 		gs 'gdksex', 'decline'	
-		gs 'gdksex', 'handjob', 'unpaid'
+		gs 'gdksex', 'handjob'
 		gs 'gdksex', 'blowjob', 'unpaid'	
 	elseif (gdk_nice_guy = 1 and pav_slut >= 125) or (gdk_nice_guy = 0 and pav_slut >= 75):
 		gs 'boymass', 'B'
@@ -420,7 +420,6 @@ if $ARGS[0] = 'outside':
 		'He pulls his cock out of his pants while he says it, and looks at you expectantly.'
 		
 		gs 'gdksex', 'decline'
-		gs 'gdksex', 'handjob', 'paid'
 		gs 'gdksex', 'blowjob', 'paid'
 	end
 
@@ -585,19 +584,10 @@ if $ARGS[0] = 'handjob':
 			minut += 5
 			pcs_dom += 1
 			gs 'boymass', 'B'
-			bmHJ[Tboynum] += 1
-			if $ARGS[1] = 'paid': 
-				slutty += 1
-				money += 100
-				if gdk_nice_guy = 1:
-					pav_prostitute += rand (1,2)
-				elseif gdk_nice_guy = 0:
-					pav_prostitute += rand (3,6)
-				end
-			end		
+			bmHJ[Tboynum] += 1	
 			gs 'stat'
 
-			if gdk_nice_guy = 1 or $ARGS[1] = 'unpaid':
+			if gdk_nice_guy = 1:
 				if boynumBlock = 0:guy += 1
 				if boynumBlock > 0 and bmTOTSEX[Tboynum] = 0:guy += 1
 
@@ -607,7 +597,7 @@ if $ARGS[0] = 'handjob':
 				'When his moans grow shorter and more intent, you aim his cock away from you and watch it. Mere seconds later his cock erupts, sending his sperm flying through the air and landing on the ground a little ways away.'
 
 				act 'Go back to the disco':gt 'gdkin'
-			elseif gdk_nice_guy = 0 or $ARGS[1] = 'paid':
+			elseif gdk_nice_guy = 0:
 				'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj.jpg"></center>'
 				'You begin to move your hand up and down his shaft slowly, but slowly pick up the pace while you kiss him dominantly.'
 				'<<$boydesc>> wants more however, and suddenly places his hands on your shoulder. He firmly pushes downwards, forcing you to squat before him.'
@@ -775,7 +765,7 @@ if $ARGS[0] = 'kissing':
 								end
 							end
 
-							gs 'gdksex', 'handjob', 'unpaid'
+							gs 'gdksex', 'handjob'
 						end
 					end
 				end
@@ -803,7 +793,7 @@ if $ARGS[0] = 'kissing':
 
 					if pcs_horny <= 90:act 'Go back to the disco':gt 'gdkin'
 
-					gs 'gdksex', 'handjob', 'unpaid'
+					gs 'gdksex', 'handjob'
 					gs 'gdksex', 'blowjob', 'unpaid'
 				end
 			end
@@ -839,7 +829,7 @@ if $ARGS[0] = 'hotel':
 			
 			act 'Have a drink with him':
 				*clr & cla
-				alko += 2
+				alko += rand(3,4)
 				cumspclnt = 2
 				gs 'cum_cleanup'
 				pcs_breath = 0

+ 5 - 1
locations/gdksport.qsrc

@@ -28,6 +28,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -1190,7 +1194,7 @@ if $ARGS[0] = 'Fedor First Date':
 		minut += 15
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/park/walk.jpg"></center>'
-		'"I would like that." you said with a smile and Fedor respondes "Good, I hear that this movie will have us in stiches." with a delighted look on his face as he wraps his arm around yours then walks you to the movie theater.'
+		'"I would like that." you said with a smile and Fedor responds: "Good, I hear that this movie will have us in stiches." with a delighted look on his face as he wraps his arm around yours then walks you to the movie theater.'
 
 		act 'Watch a movie':
 			cls

+ 4 - 0
locations/gdktoilet.qsrc

@@ -12,6 +12,10 @@ if $ARGS[0] = 'start':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)

+ 28 - 20
locations/gevent.qsrc

@@ -1,14 +1,18 @@
 # gevent
 CLOSE ALL
 if $ARGS[0] = '1':
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	dyadyamishaevent = 1
 	dick = 18
 	if night_mode = 1:
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -23,8 +27,7 @@ if $ARGS[0] = '1':
 	'"Not bad <<$pcs_nickname>>, not bad. Lie down, I''m going to have some fun with you."'
 
 	act 'Lie down on the bed':
-		cla
-		cls
+		*clr & cla
 		'You are no longer resisting, having lost all hope of getting yourself out of this situation. Lying wearily on the bed, he quickly takes your clothes off and sits down at your feet, examining your pussy with his fingers as much as his eyes.'
 
 		if pcs_vag = 0 and stat['vaginal'] = 0:
@@ -45,7 +48,7 @@ if $ARGS[0] = '1':
 		end
 		
 		act 'Swallow his cum':
-			cls
+			*clr & cla
 			stat['vaginal'] += 1
 			stat['bj'] += 1
 			swallow += 1
@@ -73,8 +76,8 @@ if $ARGS[0] = '1':
 end
 
 if $ARGS[0] = '1-1':
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	dmishaday = daystart
 	dick = 18
 	stat['vaginal'] += 1
@@ -96,6 +99,10 @@ if $ARGS[0] = '1-1':
 		fcolor = rgb(255, 255, 255)
 		bcolor = rgb(0, 0, 0)
 		lcolor = rgb(106, 90, 205)
+	elseif night_mode = 2:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(20, 20, 20)
+		lcolor = rgb(106, 90, 205)
 	else
 		fcolor = rgb(0, 0, 0)
 		bcolor = rgb(255, 255, 255)
@@ -116,8 +123,8 @@ if $ARGS[0] = '1-1':
 end
 
 if $ARGS[0] = '2':
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	minut += 15
 	spafinloc = 11
 	gs 'cum_manage'
@@ -139,8 +146,8 @@ if $ARGS[0] = '2':
 end
 
 if $ARGS[0] = '3':
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	alko += 10
 	cumspclnt = 2
 	gs 'cum_cleanup'
@@ -180,8 +187,8 @@ if $ARGS[0] = '3':
 end
 
 if $ARGS[0] = '4':
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	guy += 1
 	alko += 2
 	cumspclnt = 2
@@ -202,8 +209,8 @@ if $ARGS[0] = '4':
 end
 
 if $ARGS[0] = '5':
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	guy += 1
 	stat['vaginal'] += 1
 	pcs_vag += 1
@@ -214,7 +221,7 @@ if $ARGS[0] = '5':
 	minut += 15
 	money += 100
 	slutty += 1
-	pav_prostitute += 2
+	pav_prostitute += rand(2,4)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/5.jpg"></center>'
 	'The guy quickly pulls you into the bushes, separated enough from the main roads to get a quick fuck in without being noticed. Not even bothering to undress you, he simply pulls your clothes to the side and thrusts his dick inside you. Within minutes, his breathing grows heavier and he growls as he shoots his load onto your ass cheeks. He pants: "Nice, babe... you''re definitely worth the money", as he hands you 100 <b>₽</b> and leaves.'
@@ -223,10 +230,12 @@ if $ARGS[0] = '5':
 end
 
 if $ARGS[0] = '6':
+	*clr & cla
+	menu_off = 1
 	gs 'cikl'
 	hour = 12
 	minut = 17
-	pav_sex += 8
+	pav_sex += rand(8,16)
 	guyondisco = rand(5, 10)
 	guy += guyondisco
 	stat['bj'] += guyondisco
@@ -266,7 +275,6 @@ if $ARGS[0] = '6':
 	if guyondisco > 0: jump 'geventgondloop'
 	gs 'stat'
 	
-
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/6.1.jpg"></center>'
 	'You barely remember what happened. You were standing against the wall at the disco, quietly enjoying the admittedly rather outdated music when a guy approached you. He started groping you, but you were too drunk to stop him. It also felt kind of nice to be wanted, so you just went along with it.'
 	'The next thing you remember: you were on your knees, sucking him off in the bathroom stalls. After he came in your mouth he took you away from the disco to a different place, where several of his friends had already gathered. "Dude, nice!" they praised his catch, while you unsteadily tried to move to the couch to sit down. You never made it to the couch, the guys immediately surrounded you and started to maul you from all sides.'
@@ -277,8 +285,8 @@ if $ARGS[0] = '6':
 end
 
 if $ARGS[0] = '7':
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	guy += 2
 	stat['anal'] += 2
 	stat['bj'] += 2

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