58 Commits 5c20aa8373 ... dcbc8df77b

Author SHA1 Message Date
  KevinSmarts dcbc8df77b Merge remote-tracking branch 'julzor/master' 4 years ago
  KevinSmarts 3658221d0d [fixed] Mom scedule numbered up correctly 4 years ago
  KevinSmarts aa1e6e22c2 [Fixed] Journal has recovered from its identity crisis 4 years ago
  KevinSmarts e5f8ab5e26 [fixes] Kendra will remember you in the sexshop now and will leave it atleast a week between sessions 4 years ago
  julzor 40c9a5629d [changed] the new quick dress link in the bedrooms to remove an additional click 4 years ago
  KevinSmarts 0dd5d43c2f [added] Stepfather and Kolka schedules without notes 4 years ago
  KevinSmarts 2f120bedba Merge remote-tracking branch 'julzor/master' 4 years ago
  KevinSmarts 8cb7dc9247 [Added] Mom schedule to the family schedule file. Stuff to be set in cikl not set. 4 years ago
  KevinSmarts f2b46ec99c [fixes] Increased the gain and loss of max willpower as they were not changing fast enough 4 years ago
  julzor a15ac46ff6 [changed] pay and model events chance is capped at city fame of 700 (which means sveta has reached the max rank in her career) and changed a lot of if if if into if elseif 4 years ago
  KevinSmarts e0465770ec Merge remote-tracking branch 'julzor/master' 4 years ago
  sovietmercader 1af68f1fe7 [changed] merge gadukino_wip into master 4 years ago
  sovietmercader 0d54aad1c6 [changed] rewrite gadukino forest, balance village time and money, new conversations and consequences with grandparents 4 years ago
  sovietmercader dfdde94d05 [removed] files no longer needed for the village 4 years ago
  sovietmercader 3019186746 [fixed] typo and analyzer 4 years ago
  julzor b3f1eca5f1 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  julzor 54c94ac53d [fixed] errors in mother 4 years ago
  KevinSmarts 0df20a67b2 [fixed] Variable not set 4 years ago
  KevinSmarts 63a29373bb Merge remote-tracking branch 'julzor/master' 4 years ago
  KevinSmarts 87ed37cab5 Merge remote-tracking branch 'Sicaa/master' 4 years ago
  KevinSmarts 16098a3d7d [fixes] Duplicate outfit replaced with something more colourful and racy, image on Sunday and fixed post office job start time to make finishes fit the times you are told. 4 years ago
  julzor d8ac0f0c41 [fixed] anal scenes in the camgirl overhaul 4 years ago
  Sicaa d58e567f11 [added] daily repeat message to reduce confusion + [fixed] sisterbfspy counter threshold 4 years ago
  KevinSmarts 1a42671a93 (Fixes) Could wonder market long after it had shut and could get phone out of bag in class when you had no bag. Spotted by Robgor95 4 years ago
  Sicaa 612fa3028f [fixed] my sloppy find&replace relationship calls 4 years ago
  Sicaa f1e384e564 [fixed] months where the winter school image appears 4 years ago
  KevinSmarts 497ed2065c [changed] Updated the body messages and links to reflect the new pube ranges 4 years ago
  KevinSmarts 3140ad708c [fixed] Text edit 4 years ago
  KevinSmarts ec65fbef9c [fixed] typo 4 years ago
  KevinSmarts 6b385e9199 Merge remote-tracking branch 'Sicaa/master' 4 years ago
  Sicaa 15f124ae01 [fixed] a few missing bits and some adjustments by Nutluck 4 years ago
  Sicaa cc895fcdb3 [fixed] forgot to limit Luda's apartment by day and time 4 years ago
  julzor ea317de7a3 [added] camwhore mod content provided by pb2eb and tendaris 4 years ago
  KevinSmarts 2e1240ede8 Merge remote-tracking branch 'julzor/master' 4 years ago
  julzor 8d2a5cf508 [changed] implant now adds pain to the left arm for the first few days 4 years ago
  Sicaa be94c82414 [fixed] city clinic milk donation text 4 years ago
  Sicaa 29a7ccd6d0 [fixed] foto_models sister incest chat conditions, 4 years ago
  Sicaa c101688bdd [fixed] some pube_image variable typos, set medium bush upper limit to 35, unified pubestyle shaving across game files + [added] colour specific shaving menu images 4 years ago
  KevinSmarts 8c546e8ab1 [Fixed] Sicaa so huge hole in my logic 4 years ago
  KevinSmarts f76c591f13 Merge remote-tracking branch 'Sicaa/master' 4 years ago
  KevinSmarts e3955c4689 [fixes] Changed some of the lengths to make them work together and reduce duplication and added some new colours to a couple of styles 4 years ago
  KevinSmarts d93ea3d4e4 [Fixed] return setting for the city clinic not set correctly 4 years ago
  Sicaa 601e1c31b2 [fixed] variable typo 4 years ago
  KevinSmarts aabcb36b47 [added] Direct link to default outfits thanks to TESTER127 4 years ago
  KevinSmarts 3ee943f142 [fixed] Error spotted by analyser 4 years ago
  KevinSmarts a9bd46ddcf Merge remote-tracking branch 'KeyMasterOfGozer/master' 4 years ago
  KevinSmarts b7be8a54ca Merge branch 'master' of https://git.catrenelle.com/Sicaa/glife 4 years ago
  KeyMasterOfGozer 742b761794 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  Sicaa 070b3b3cc6 [fixed] STD fixes 2: Egg on my face version 4 years ago
  KeyMasterOfGozer 9b1575c8b8 Make sure images are resized to telefon standards. 4 years ago
  KevinSmarts 7422aa77c2 Merge branch 'master' of https://git.catrenelle.com/Sicaa/glife 4 years ago
  Sicaa 323230bc35 [fixed] STD fixes (no more immunity) 4 years ago
  KevinSmarts 95dc99b23e Merge remote-tracking branch 'Sicaa/master' 4 years ago
  KevinSmarts a48d8aaab4 [fixed] Blocked exit to csg start during csb custom setup 4 years ago
  Sicaa bb06fc35c8 [changed] updated relationship modifications to the new npc_relationship calls 4 years ago
  Sicaa e45e0abbf5 [fixed] olu chat image & no exit act in ludaroom 4 years ago
  Sicaa d3b3c8cdd6 [fixed] chat goto-s in ludahome 4 years ago
  KevinSmarts 8ef2787296 [fixes] General pube related fixes 4 years ago
97 changed files with 5176 additions and 5396 deletions
  1. 2 6
      glife.qproj
  2. 2 0
      locations/FedorEv4.qsrc
  3. 6 0
      locations/HotelRoom.qsrc
  4. 361 158
      locations/Komp.qsrc
  5. 2 0
      locations/MDressing.qsrc
  6. 1 1
      locations/MagEncounterFairy.qsrc
  7. 3 3
      locations/MartinSex.qsrc
  8. 2 0
      locations/ParChurch.qsrc
  9. 5 6
      locations/_attributes_cheap.qsrc
  10. 29 29
      locations/_attributes_exhibit.qsrc
  11. 105 80
      locations/_pube_image.qsrc
  12. 8 8
      locations/anushkachat.qsrc
  13. 15 15
      locations/anushkaev1.qsrc
  14. 2 0
      locations/bedr.qsrc
  15. 1 1
      locations/bedr2x.qsrc
  16. 2 0
      locations/bedrPar.qsrc
  17. 1 1
      locations/begin.qsrc
  18. 206 232
      locations/bicycle.qsrc
  19. 7 20
      locations/body.qsrc
  20. 10 5
      locations/bordel.qsrc
  21. 9 10
      locations/cikl.qsrc
  22. 2 0
      locations/dachain.qsrc
  23. 24 33
      locations/dinSex.qsrc
  24. 7 13
      locations/din_van.qsrc
  25. 8 18
      locations/dinsexFX.qsrc
  26. 2 0
      locations/dom_gor.qsrc
  27. 0 13
      locations/famdorfride.qsrc
  28. 270 0
      locations/family_schedule.qsrc
  29. 0 28
      locations/farmhomeride.qsrc
  30. 2 0
      locations/fit.qsrc
  31. 22 11
      locations/foto.qsrc
  32. 21 12
      locations/foto_albums.qsrc
  33. 20 10
      locations/foto_events.qsrc
  34. 1 1
      locations/foto_models.qsrc
  35. 18 38
      locations/foto_shoot.qsrc
  36. 12 31
      locations/gadbana.qsrc
  37. 0 12
      locations/gaddvor.qsrc
  38. 794 516
      locations/gadforest.qsrc
  39. 266 2198
      locations/gadforest_event.qsrc
  40. 713 288
      locations/gadforestlost.qsrc
  41. 0 203
      locations/gadforestrelax.qsrc
  42. 0 210
      locations/gadforestswamp.qsrc
  43. 333 143
      locations/gadhouse.qsrc
  44. 47 47
      locations/gadprostitutes.qsrc
  45. 34 32
      locations/gadriver.qsrc
  46. 11 11
      locations/gadroad.qsrc
  47. 13 20
      locations/gadsarai.qsrc
  48. 53 105
      locations/gadukino.qsrc
  49. 21 79
      locations/gadukino_event.qsrc
  50. 2 0
      locations/gdksport.qsrc
  51. 26 26
      locations/grandmahelp.qsrc
  52. 10 13
      locations/grandpahelp.qsrc
  53. 12 10
      locations/grigory.qsrc
  54. 5 3
      locations/gschool_grounds.qsrc
  55. 3 0
      locations/gschool_lessons4.qsrc
  56. 1 1
      locations/gschool_lessonsev3.qsrc
  57. 2 2
      locations/hunters.qsrc
  58. 2 2
      locations/journal.qsrc
  59. 171 170
      locations/kompMFC.qsrc
  60. 543 0
      locations/kompMFCanal.qsrc
  61. 223 0
      locations/kompMFCoral.qsrc
  62. 111 109
      locations/kompMFCtwo.qsrc
  63. 2 0
      locations/leonid.qsrc
  64. 128 89
      locations/ludahome.qsrc
  65. 50 42
      locations/meadow.qsrc
  66. 2 0
      locations/mey_home.qsrc
  67. 5 5
      locations/mirasex.qsrc
  68. 9 42
      locations/miroslava.qsrc
  69. 1 1
      locations/miroslavahome.qsrc
  70. 57 56
      locations/mother.qsrc
  71. 1 1
      locations/natbelapt.qsrc
  72. 2 0
      locations/nichBedroomServant.qsrc
  73. 3 0
      locations/obroom.qsrc
  74. 2 2
      locations/olu.qsrc
  75. 5 4
      locations/pavSharedApt.qsrc
  76. 57 19
      locations/pavtrain_market.qsrc
  77. 9 9
      locations/poli.qsrc
  78. 1 0
      locations/postmaster.qsrc
  79. 1 1
      locations/preSYS2.qsrc
  80. 2 0
      locations/sauna.qsrc
  81. 3 1
      locations/saveupdater.qsrc
  82. 4 2
      locations/sexshop.qsrc
  83. 2 0
      locations/shulgahall.qsrc
  84. 3 2
      locations/sistersleep.qsrc
  85. 4 6
      locations/spell.qsrc
  86. 3 2
      locations/stat.qsrc
  87. 9 10
      locations/stat_display.qsrc
  88. 2 0
      locations/stwork.qsrc
  89. 178 58
      locations/swamp.qsrc
  90. 19 23
      locations/swamp_woods.qsrc
  91. 10 33
      locations/swamp_yard.qsrc
  92. 3 0
      locations/tanspalnya.qsrc
  93. 1 1
      locations/telefon.qsrc
  94. 1 1
      locations/treeCircle.qsrc
  95. 9 1
      locations/wardrobe.qsrc
  96. 2 2
      locations/willpower.qsrc
  97. 2 0
      locations/ybedr.qsrc

+ 2 - 6
glife.qproj

@@ -235,6 +235,8 @@
 		<Location name="Komp"/>
 		<Location name="kompMFC"/>
 		<Location name="kompMFCtwo"/>
+		<Location name="kompMFCanal"/>
+		<Location name="kompMFCoral"/>
 		<Location name="webcam_site"/>
 		<Location name="mirror"/>
 		<Location name="stol"/>
@@ -506,10 +508,6 @@
 	<Folder name="Sonia">
 		<Location name="soniadisco"/>
 	</Folder>
-	<Folder name="Village">
-		<Location name="famdorfride"/>
-		<Location name="farmhomeride"/>
-	</Folder>
 	<Folder name="Gadyukino">
 		<Location name="gadhouse"/>
 		<Location name="grandmahelp"/>
@@ -539,10 +537,8 @@
 		<Location name="gadforest"/>
 		<Location name="gadforest_event"/>
 		<Location name="gadforestlost"/>
-		<Location name="gadforestrelax"/>
 	</Folder>
 	<Folder name="Swamp">
-		<Location name="gadforestswamp"/>
 		<Location name="swamp"/>
 		<Location name="swamp_yard"/>
 		<Location name="swamphouse"/>

+ 2 - 0
locations/FedorEv4.qsrc

@@ -2713,6 +2713,8 @@ if $ARGS[0] = 'Hallway':
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/hallway.jpg"></center>'
 	'This is the central hallway which connects the whole house. There is a <a href="exec:gt ''mirror'', ''start''">mirror</a>, a coat rack and multiple paintings on the walls.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	act'<b>Leave the house</b>':
 		if $clothingworntype = 'nude':

+ 6 - 0
locations/HotelRoom.qsrc

@@ -19,6 +19,8 @@ gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal.jpg"></center>'
 	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a <a href="exec:gt ''HotelRoom'',''tv''">TV</a>.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			gt'hotelHole'
@@ -57,6 +59,8 @@ gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better.jpg"></center>'
 	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a small flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>, right across the bed.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			gt'hotelHole'
@@ -94,6 +98,8 @@ gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best.jpg"></center>'
 	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a huge flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>, right across the bed.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			gt'hotelHole'

File diff suppressed because it is too large
+ 361 - 158
locations/Komp.qsrc


+ 2 - 0
locations/MDressing.qsrc

@@ -15,6 +15,8 @@ gs 'stat'
 'A huge dressing room. Mostly used by submissives to dress as staff and because of this, it is a safe space and games are not allowed.'
 'It contains several <a href="exec:gt ''wardrobe'', ''start''">wardrobes</a> (where you can choose outfits and organize your clothing).'
 'There are whole cabinets filled with designer clothing belonging to various club members and plenty of <a href="exec:gt ''mirror'',''start''">mirrors</a> you can use.'
+*nl
+'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 act 'Go to foyer': gt 'MHall', 'foyer'
 act 'Go to east wing hall': gt 'MHall', 'east'

+ 1 - 1
locations/MagEncounterFairy.qsrc

@@ -249,7 +249,7 @@ if $ARGS[0] = 'fairychattopic':
 				spellKnown['teleport'] = 1
 				tpKnown['GadForest'] = 1
 				cla
-				act 'You step out of the circle...':gt 'gadforest', '1'
+				act 'You step out of the circle...':gt 'gadforest', 'forest_edge'
 			end
 		else
 			!take the user to random location

+ 3 - 3
locations/MartinSex.qsrc

@@ -733,7 +733,7 @@ if $ARGS[0] = 'MartinTease3':
 				act 'Get up and tell Martin you wanna ride him (Cowgirl)':$martinpos='cowgirl' & gt 'MartinSex2','MartinSexPrep'
 				act 'Get up and tell Martin you wanna ride him (<b>Reverse</b> Cowgirl)':$martinpos='rev_cowgirl' & gt 'MartinSex2','MartinSexPrep'
 
-				act 'Blueball him - Get dressed and leave':
+				act 'Blueball him. Get dressed and leave':
 					cls
 					minut += 5
 					npc_rel['A216'] -= 1
@@ -880,7 +880,7 @@ if $ARGS[0] = 'MartinTease4':
 					act 'Get up and tell Martin you wanna ride him (Cowgirl)':$martinpos='cowgirl' & gt 'MartinSex2','MartinSexPrep'
 					act 'Get up and tell Martin you wanna ride him (<b>Reverse</b> Cowgirl)':$martinpos='rev_cowgirl' & gt 'MartinSex2','MartinSexPrep'
 
-					act 'Blueball him - Get dressed and leave':
+					act 'Blueball him. Get dressed and leave':
 						cls
 						minut += 5
 						npc_rel['A216'] -= 1
@@ -971,7 +971,7 @@ if $ARGS[0] = 'MartinTeaseDildo':
 			act 'Get up and tell Martin you wanna ride him (Cowgirl)':$martinpos='cowgirl' & gt 'MartinSex2','MartinSexPrep'
 			act 'Get up and tell Martin you wanna ride him (<b>Reverse</b> Cowgirl)':$martinpos='rev_cowgirl' & gt 'MartinSex2','MartinSexPrep'
 
-			act 'Blueball him - Get dressed and leave':
+			act 'Blueball him. Get dressed and leave':
 				cls
 				minut += 5
 				npc_rel['A216'] -= 1

+ 2 - 0
locations/ParChurch.qsrc

@@ -186,10 +186,12 @@ if $ARGS[0] = 'candle':
 		money -= 10
 		'You approach the deacon selling candles and he hands you a candle in exchange for your money.'
 	elseif money >= 10 and money < 20 and owechurch = 1:
+		owechurch = 0
 		money -= 10
 		pcs_mood -= 10
 		'You approach the deacon selling candles and hope that he doesn''t recognize you since you couldn''t pay for your last candle. You give him 10 rubles and he hands you a candle. You hustle away from the counter while guilt gnaws at you.'
 	elseif money >= 20 and owechurch = 1:
+		owechurch = 0
 		money -= 20
 		pcs_mood += 5
 		'You approach the deacon selling candles. He seems confused when you hand him 20 rubles, then he smiles in understanding. You feel relieved that the debt is paid.'

+ 5 - 6
locations/_attributes_cheap.qsrc

@@ -1998,7 +1998,7 @@ elseif ARGS[1] = 321:
 elseif ARGS[1] = 322:
 	CloQuality = 1
 	CloThinness = 3
-	CloTopCut = 2
+	CloTopCut = 4
 	CloPantsShortness = 4
 	CloExhibit = 15
 elseif ARGS[1] = 323:
@@ -2311,11 +2311,10 @@ elseif ARGS[1] = 373:
 	CloPantsShortness = 1
 	CloExhibit = 5
 elseif ARGS[1] = 374:
-	CloQuality = 2
-	CloThinness = 2
-	CloTopCut = 2
-	CloPantsShortness = 1
-	CloExhibit = 0
+	CloQuality = 1
+	CloThinness = 3
+	CloTopCut = 4
+	CloPantsShortness = 5
 elseif ARGS[1] = 375:
 	CloQuality = 1
 	CloThinness = 2

+ 29 - 29
locations/_attributes_exhibit.qsrc

@@ -6,27 +6,27 @@ if ARGS[1] = 1:
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 2:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 4
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 3:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 5
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 4:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 5:
 	CloQuality = 4
@@ -66,7 +66,7 @@ elseif ARGS[1] = 11:
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 12:
 	CloQuality = 4
 	CloThinness = 6
@@ -77,20 +77,20 @@ elseif ARGS[1] = 13:
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 14:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 15:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 16:
 	CloQuality = 4
 	CloThinness = 6
@@ -106,79 +106,79 @@ elseif ARGS[1] = 18:
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 19:
 	CloQuality = 2
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 22:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 24:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 3
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 25:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 26:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 28:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 29:
 	CloQuality = 6
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 5
@@ -201,14 +201,14 @@ elseif ARGS[1] = 33:
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 5
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 34:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 5
@@ -225,21 +225,21 @@ elseif ARGS[1] = 37:
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 5
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 38:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 5
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 39:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 40:
 	CloQuality = 5
 	CloThinness = 6
@@ -261,7 +261,7 @@ elseif ARGS[1] = 43:
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 4
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 44:
 	CloQuality = 3
 	CloThinness = 6
@@ -313,7 +313,7 @@ elseif ARGS[1] = 53:
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 	CloBra = 2
 	CloPanties = 1
@@ -327,13 +327,13 @@ elseif ARGS[1] = 55:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	ClosDress = 1
+	CloDress = 1
 elseif ARGS[1] = 56:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 4
-	ClosDress = 1
+	CloDress = 1
 	CloBimbo = 1
 	CloBra = 1
 elseif ARGS[1] = 57:

+ 105 - 80
locations/_pube_image.qsrc

@@ -1,143 +1,168 @@
 # $pube_image
 
 !!use with - <img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>">
+!! Expanded use that can call specific lengths, colours and styles (for shave menu):
+!! func('$pube_image', [pube length], [pube colour num], [pube style])
 
 
 $RESULT = 'images/pc/body/pussy/'
 
+if ARGS[0] ! 0: temp_pubes = ARGS[0] else temp_pubes = pcs_pubes
+if ARGS[1] ! 0: temp_pubecol = ARGS[1] else temp_pubecol = pcs_pubecol[2]
+if ARGS[2] ! 0: temp_pubestyle = ARGS[2] else temp_pubestyle = pubestyle
 
-if lashair = 0:
-	if pcs_pubes <= 3:
+if $ARGS[0] = 0 and lashair = 0:
+	if temp_pubes <= 3:
 		$RESULT += 'hair/pussy'
-	elseif pcs_pubes <= 10:
+	elseif temp_pubes <= 10:
 		$RESULT += 'hair/stubble'
-	elseif pcs_pubes <= 15:
+	elseif temp_pubes <= 15:
 		$RESULT += 'hair/very_short'
-	elseif pcs_pubes <= 20:
-		if pcs_pubecol[2] = 0:
-			$RESULT += 'hair/black_small'
-		elseif pcs_pubecol[2] = 1:
-			$RESULT += 'hair/brunette_small'
-		elseif pcs_pubecol[2] = 2:
-			$RESULT += 'hair/ginger_small'
-		elseif pcs_pubecol[2] = 3:
-			$RESULT += 'hair/blonde_small'
-		elseif pcs_pubecol[2] = 4:
-			$RESULT += 'hair/red'
-		elseif pcs_pubecol[2] = 5:
-			$RESULT += 'hair/blue'
-		elseif pcs_pubecol[2] = 6:
-			$RESULT += 'hair/green'
-		elseif pcs_pubecol[2] = 7:
-			$RESULT += 'hair/pink'
-		elseif pcs_pubecol[2] = 8:
-			$RESULT += 'hair/purple'
-		end
-	elseif pcs_pubes <= 25:
-		if pubestyle = 2:
+	elseif temp_pubes <= 25:
+		if temp_pubestyle = 2:
 			$RESULT += 'shave/v1'
-		elseif pubestyle = 3:
+		elseif temp_pubestyle = 3:
 			$RESULT += 'shave/triangle1'
-		elseif pubestyle = 4:
+		elseif temp_pubestyle = 4:
 			$RESULT += 'shave/landing1'
-		elseif pubestyle = 5:
+		elseif temp_pubestyle = 5:
 			$RESULT += 'shave/heart1'
-		elseif pubestyle = 6:
-			if pcs_pubecol[2] = 0:
+		elseif temp_pubestyle = 6:
+			if temp_pubecol = 0:
 				$RESULT += 'shave/flame1'
-			elseif pcs_pubecol[2] = 1:
+			elseif temp_pubecol = 1:
 				$RESULT += 'shave/brunette_flame'
-			elseif pcs_pubecol[2] = 2:
+			elseif temp_pubecol = 2:
 				$RESULT += 'shave/ginger_flame'
-			elseif pcs_pubecol[2] = 3:
+			elseif temp_pubecol = 3:
 				$RESULT += 'shave/blonde_flame'
-			elseif pcs_pubecol[2] = 4:
+			elseif temp_pubecol = 4:
 				$RESULT += 'shave/red_flame'
-			elseif pcs_pubecol[2] = 5:
+			elseif temp_pubecol = 5:
 				$RESULT += 'shave/blue_flame'
-			elseif pcs_pubecol[2] = 6:
+			elseif temp_pubecol = 6:
 				$RESULT += 'shave/green_flame'
-			elseif pcs_pubecol[2] = 7:
+			elseif temp_pubecol = 7:
 				$RESULT += 'shave/pink_flame'
-			elseif pcs_pubecol[2] = 8:
+			elseif temp_pubecol = 8:
 				$RESULT += 'shave/purple_flame'
 			end
-		elseif pubestyle = 7:
-			$RESULT += 'shave/cross1'
-		elseif pubestyle = 8:
+		elseif temp_pubestyle = 7:
+			if temp_pubecol = 0:
+				$RESULT += 'shave/cross1'
+			elseif temp_pubecol = 1:
+				$RESULT += 'shave/brunette_cross'
+			elseif temp_pubecol = 2:
+				$RESULT += 'shave/ginger_cross'
+			elseif temp_pubecol = 3:
+				$RESULT += 'shave/blonde_cross'
+			elseif temp_pubecol = 4:
+				$RESULT += 'shave/red_cross'
+			elseif temp_pubecol = 5:
+				$RESULT += 'shave/blue_cross'
+			elseif temp_pubecol = 6:
+				$RESULT += 'shave/green_cross'
+			elseif temp_pubecol = 7:
+				$RESULT += 'shave/pink_cross'
+			elseif temp_pubecol = 8:
+				$RESULT += 'shave/purple_cross'
+			end
+		elseif temp_pubestyle = 8:
 			$RESULT += 'shave/s_bush1'
-		elseif pubestyle = 12:
+		elseif temp_pubestyle = 12:
 			$RESULT += 'shave/mb'
-		elseif pubestyle = 13:
-			$RESULT += 'shave/bstrip'
-		elseif pubestyle = 14:
+		elseif temp_pubestyle = 13:
+			if temp_pubecol = 0:
+				$RESULT += 'shave/bstrip'
+			elseif temp_pubecol = 1:
+				$RESULT += 'shave/brunette_bstrip'
+			elseif temp_pubecol = 2:
+				$RESULT += 'shave/ginger_bstrip'
+			elseif temp_pubecol = 3:
+				$RESULT += 'shave/blonde_bstrip'
+			elseif temp_pubecol = 4:
+				$RESULT += 'shave/red_bstrip'
+			elseif temp_pubecol = 5:
+				$RESULT += 'shave/blue_bstrip'
+			elseif temp_pubecol = 6:
+				$RESULT += 'shave/green_bstrip'
+			elseif temp_pubecol = 7:
+				$RESULT += 'shave/pink_bstrip'
+			elseif temp_pubecol = 8:
+				$RESULT += 'shave/purple_bstrip'
+			end
+		elseif temp_pubestyle = 14:
 			$RESULT += 'shave/rectangle'
 		else
-			if pcs_pubecol[2] = 0:
-				$RESULT += 'hair/black_mid'
-			elseif pcs_pubecol[2] = 1:
-				$RESULT += 'hair/brunette_mid'
-			elseif pcs_pubecol[2] = 2:
-				$RESULT += 'hair/ginger_mid'
-			elseif pcs_pubecol[2] = 3:
-				$RESULT += 'hair/blonde_mid'
-			elseif pcs_pubecol[2] = 4:
+			if temp_pubecol = 0:
+				$RESULT += 'hair/black_small'
+			elseif temp_pubecol = 1:
+				$RESULT += 'hair/brunette_small'
+			elseif temp_pubecol = 2:
+				$RESULT += 'hair/ginger_small'
+			elseif temp_pubecol = 3:
+				$RESULT += 'hair/blonde_small'
+			elseif temp_pubecol = 4:
 				$RESULT += 'hair/red'
-			elseif pcs_pubecol[2] = 5:
+			elseif temp_pubecol = 5:
 				$RESULT += 'hair/blue'
-			elseif pcs_pubecol[2] = 6:
+			elseif temp_pubecol = 6:
 				$RESULT += 'hair/green'
-			elseif pcs_pubecol[2] = 7:
+			elseif temp_pubecol = 7:
 				$RESULT += 'hair/pink'
-			elseif pcs_pubecol[2] = 8:
+			elseif temp_pubecol = 8:
 				$RESULT += 'hair/purple'
 			end
 		end
-	elseif pcs_pubes <= 30:
-		if pcs_pubecol[2] = 0:
+	elseif temp_pubes <= 35:
+		if temp_pubecol = 0:
 			$RESULT += 'hair/black_mid'
-		elseif pcs_pubecol[2] = 1:
+		elseif temp_pubecol = 1:
 			$RESULT += 'hair/brunette_mid'
-		elseif pcs_pubecol[2] = 2:
+		elseif temp_pubecol = 2:
 			$RESULT += 'hair/ginger_mid'
-		elseif pcs_pubecol[2] = 3:
+		elseif temp_pubecol = 3:
 			$RESULT += 'hair/blonde_mid'
-		elseif pcs_pubecol[2] = 4:
+		elseif temp_pubecol = 4:
 			$RESULT += 'hair/red'
-		elseif pcs_pubecol[2] = 5:
+		elseif temp_pubecol = 5:
 			$RESULT += 'hair/blue'
-		elseif pcs_pubecol[2] = 6:
+		elseif temp_pubecol = 6:
 			$RESULT += 'hair/green'
-		elseif pcs_pubecol[2] = 7:
+		elseif temp_pubecol = 7:
 			$RESULT += 'hair/pink'
-		elseif pcs_pubecol[2] = 8:
+		elseif temp_pubecol = 8:
 			$RESULT += 'hair/purple'
 		end
-	elseif pcs_pubes >= 40:
-		if pcs_pubecol[2] = 0:
+	else
+		if temp_pubecol = 0:
 			$RESULT += 'hair/black_full'
-		elseif pcs_pubecol[2] = 1:
+		elseif temp_pubecol = 1:
 			$RESULT += 'hair/brunette_full'
-		elseif pcs_pubecol[2] = 2:
+		elseif temp_pubecol = 2:
 			$RESULT += 'hair/ginger_full'
-		elseif pcs_pubecol[2] = 3:
+		elseif temp_pubecol = 3:
 			$RESULT += 'hair/blonde_full'
-		elseif pcs_pubecol[2] = 4:
+		elseif temp_pubecol = 4:
 			$RESULT += 'hair/red'
-		elseif pcs_pubecol[2] = 5:
+		elseif temp_pubecol = 5:
 			$RESULT += 'hair/blue'
-		elseif pcs_pubecol[2] = 6:
+		elseif temp_pubecol = 6:
 			$RESULT += 'hair/green'
-		elseif pcs_pubecol[2] = 7:
+		elseif temp_pubecol = 7:
 			$RESULT += 'hair/pink'
-		elseif pcs_pubecol[2] = 8:
+		elseif temp_pubecol = 8:
 			$RESULT += 'hair/purple'
 		end
 	end
+else
+	$RESULT += 'hair/pussy'
 end
-	
+
+killvar 'temp_pubes' & killvar 'temp_pubecol' & killvar 'temp_pubestyle'
 
 $RESULT += '.jpg'
 
+
 --- $pube_image ---------------------------------
 

+ 8 - 8
locations/anushkachat.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'chat':
 	act 'Make small talk':
 		*clr & cla
 		minut += 5
-		npc_rel['A144'] += 1
+		gs 'npc_relationship', 'modify', 'A144', 'like'
 		'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 		'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
 		'The two of you chat about a variety of things, mostly school, music, clothes, and what has been going on in Pavlovsk lately.'
@@ -306,7 +306,7 @@ if $ARGS[0] = 'chat':
 		act 'Maybe':
 			*clr & cla
 			minut += 5
-			npc_rel['A144'] += 1
+			gs 'npc_relationship', 'modify', 'A144', 'like'
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 			'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/brtkiss.jpg"></center>'
 			'You feel put on the spot, that is not what you meant... or maybe subconsciously that is why you asked. Either way a part of you would really like to be Anushka''s girlfriend. "I guess maybe, I have been thinking about it a bit."'
@@ -363,7 +363,7 @@ if $ARGS[0] = 'chat':
 							*clr & cla
 							minut += 5
 							nushfedor3s = 1
-							npc_rel['A144'] += 1
+							gs 'npc_relationship', 'modify', 'A144', 'like'
 							'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 							'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
 							'You blush slightly. "Let me think about it and talk to him. Then will see, I''ll let you know if we do."'
@@ -375,7 +375,7 @@ if $ARGS[0] = 'chat':
 							*clr & cla
 							minut += 5
 							nushfedor3s = 1
-							npc_rel['A144'] += 1
+							gs 'npc_relationship', 'modify', 'A144', 'like'
 							'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 							'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
 							'You can''t help but grin at that and then you think about it and it does sound fun. "Sure yeah I will ask him and see what he thinks, it could be fun." You tell her.'
@@ -427,7 +427,7 @@ if $ARGS[0] = 'chat':
 					act 'Maybe':
 						*clr & cla
 						minut += 5
-						npc_rel['A144'] += 1
+						gs 'npc_relationship', 'modify', 'A144', 'like'
 						'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 						'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
 						'You blush slightly. "Let me think about it and talk to him. Then will see, I''ll let you know if we do."'
@@ -438,7 +438,7 @@ if $ARGS[0] = 'chat':
 					act 'I will ask him':
 						*clr & cla
 						minut += 5
-						npc_rel['A144'] += 1
+						gs 'npc_relationship', 'modify', 'A144', 'like'
 						'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 						'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
 						'You can''t help but grin at that and then you think about it and it does sound fun. "Sure yeah I will ask him and see what he thinks, it could be fun. But he is kinda sweet and shy, so I don''t know what he will say." You tell her.'
@@ -529,7 +529,7 @@ if $ARGS[0] = 'chat':
 					gs 'stat'
 					act 'Stop making out': 
 						*clr & cla
-						npc_rel['A144'] -= 3
+						gs 'npc_relationship', 'modify', 'A144', 'hate'
 						'You pull away before things go too far and catch your breath. You see her slightly confused look and you feel a bit bad about it. "Sorry, I got carried away. Can we just go back to talking?" She frowns a little. "Yeah whatever." You know you annoyed her a little and you don''t blame her, you did just give her the girl equivalent of blue balls.'
 						act 'Talk about something else': gt 'anushkachat', 'chat'
 					end
@@ -542,7 +542,7 @@ if $ARGS[0] = 'chat':
 						gs 'stat'
 						act 'Undress her':
 							*clr & cla
-							npc_rel['A144'] += 1
+							gs 'npc_relationship', 'modify', 'A144', 'like'
 							'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 							'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/caughtmast/les2.jpg"></center>'
 							'You don''t waste any time and start pulling her clothes off, she returns the favor and starts removing your clothes as well. It would go a lot faster if the two of you were''t also passionately kissing and caressing each others bodies. Regardless before long, you are both naked.'

+ 15 - 15
locations/anushkaev1.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = 'strapon1':
 	*clr & cla
 	menu_off = 1
 	minut += 2
-	npc_rel['A144'] += 1
+	gs 'npc_relationship', 'modify', 'A144', 'like'
 	gs 'stat'
 	'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/strapon.jpg"></center>'
 	if hotcat >= 5:
@@ -446,7 +446,7 @@ if $ARGS[0] = 'rad3some':
 		gs 'stat'
 		act 'Suck his cock':
 			*clr & cla
-			npc_rel['A154'] += 1
+			gs 'npc_relationship', 'modify', 'A154', 'like'
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/join/rad/radnushs1.jpg"></center>'
 			'You drop to your knees at the edge of the bed where he lays, taking his cock into your mouth, as you start to suck it. Anushka slides off the bed and kneels beside you, watching as you suck his cock. She pushes your head down every so often, forcing you to deepthroat him, helping you in her own way to suck his dick. She also starts taking off your clothes, and before to long you find yourself as naked as she is. For now, Radomir just lies back and moans in pleasure. Eventually, Anushka releases your head and slaps you on the ass. "Come on and mount him already."'
@@ -489,7 +489,7 @@ if $ARGS[0] = 'rad3some':
 						if will_cost <= pcs_willpwr:
 							act 'Push him off (<<will_cost>> Willpower)':
 								*clr & cla
-								npc_rel['A154'] -= 5
+								gs 'npc_relationship', 'modify', 'A154', 'hate'
 								minut += 3
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
@@ -522,7 +522,7 @@ if $ARGS[0] = 'rad3some':
 		end
 	else
 		if pcs_mood > 20: pcs_mood -= 20
-		npc_rel['A154'] -= 1
+		gs 'npc_relationship', 'modify', 'A154', 'dislike'
 		'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/join/walkin2.jpg"></center>'
 		'You walk in, confident you''ll be joining them in their sexcapades. Closing the door, you manage to walk all the way over to the bed where Radomir is still hammering away at Anushka''s pussy. Anushka finally notices you and seems a little surprised to see you. "What the fuck <<$pcs_nickname>>?" She asks through her grunts and moans, as Radomir keeps hammering away. He finally stops when she speaks to you and he turns his head to you as well. He gives you a slight look of disgust. "What the fuck do you want? Can''t you see we are kinda busy here or are you just some loser pervert that likes to watch?" He asks in a mocking tone.'
 		'Your smile falters at Radomir''s comments and tell them, "It looked like you guys were having fun, so I thought I could join in as well."'
@@ -606,7 +606,7 @@ if $ARGS[0] = 'radnush_asspound':
 									*clr & cla
 									radnushdate = 1
 									minut += 1
-									npc_rel['A144'] -= 1
+									gs 'npc_relationship', 'modify', 'A144', 'dislike'
 									gs 'stat'
 									'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 									'"There is more to it than that, where friends right? So why not just tell me." You tell her.'
@@ -624,7 +624,7 @@ if $ARGS[0] = 'radnush_asspound':
 										act 'Why did you break up?':
 											*clr & cla
 											minut += 1
-											npc_rel['A144'] -= 5
+											gs 'npc_relationship', 'modify', 'A144', 'loathe'
 											gs 'stat'
 											'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 											'You need to know why they broke up so you push on. "Why did you guys break up?" You ask her.'
@@ -633,7 +633,7 @@ if $ARGS[0] = 'radnush_asspound':
 											act 'Leave apartment': gt 'pavComplex','start'
 											act 'Say your sorry':
 												*clr & cla
-												npc_rel['A144'] += 1
+												gs 'npc_relationship', 'modify', 'A144', 'like'
 												minut += 1
 												gs 'stat'
 												'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
@@ -740,7 +740,7 @@ if $ARGS[0] = 'val3some':
 		'He grins to her and says to both of you. "Getting to fuck two smoking hot babes at the same time? Fuck yeah, I''m down with that!" Then he climbs off Anushka and stands up as he says. "Well lets party girls."'
 		act 'Suck his cock':
 			*clr & cla
-			npc_rel['A158'] += 1
+			gs 'npc_relationship', 'modify', 'A158', 'like'
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/join/val/valnushs1.jpg"></center>'
 			'You smile as you strip off your clothes, while Anushka gets down on her knees and starts sucking his dick. Once you come over to join them she pulls his dick out of her mouth and offers it to you, you close your lips around his dick and start sucking it while she strokes his cock with her hand just in front of your lips. You swap his cock back and forth sucking on it. She stops and crawls on the bed to lay on her back and spread her lips. She pulls him towards her and they start kissing, while he pushes your head towards her crotch.'
@@ -904,8 +904,8 @@ if $ARGS[0] = 'val3some':
 		end
 	else
 		if pcs_mood > 10: pcs_mood -= 10
-		npc_rel['A144'] -= 1
-		npc_rel['A155'] -= 1
+		gs 'npc_relationship', 'modify', 'A144', 'dislike'
+		gs 'npc_relationship', 'modify', 'A155', 'dislike'
 		'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/join/walkin2.jpg"></center>'
 		'You walk in confident in joining them in their sexcapades, closing the door. As you do Valentin grabs Anushka and flips them both over, she lets out a little squeal as he does and now he is on top, pumping away. You manage to walk all the way over to the bed before Anushka finally notices and seems surprised and confused why you are standing there. "What the fuck <<$pcs_nickname>>, what are you doing?" She says in a confused tone. Valentin seems puzzled looking at her then turns to look at who she is talking to and seems surprised to see you. "Uh hey <<$pcs_nickname>>." He says in a somewhat confused tone.'
 		'Your smile falters at their reaction and tell them. "It looked like you guys was having fun, so I thought I could join in as well."'
@@ -1019,7 +1019,7 @@ if $ARGS[0] = 'mar3some':
 		'Anushka grins to you and then to Marcus as the gets off her knees. Marcus looks intrigued by the suggestion but also still unsure of what to say or do. Anushka walks over to him and shoves him back, so he is laying on his back now. Then she looks back at you. "Well don''t just stand their, take off your clothes and sit on his face." Then she starts sucking his dick.'
 		act 'Sit on his face':
 			*clr & cla
-			npc_rel['A146'] += 1
+			gs 'npc_relationship', 'modify', 'A146', 'like'
 			'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/join/mar/marnushs1.jpg"></center>'
 			'You waste no time taking off your clothes, watching Anushka suck Marcus''s dick. Once you are fully naked you climb on the bed and straddle his face, he begins licking your pussy, as Anushka keeps sucking his dick. You feel yourself getting wet as your arousal grows. Anushka tries to take the full length of his big cock down her throat but she can''t she keeps gagging before she gets the whole thing in her mouth.'
 			gs 'arousal', 'cuni', 5, 'group', 'lesbian'
@@ -1060,7 +1060,7 @@ if $ARGS[0] = 'mar3some':
 		end
 	else
 		if pcs_mood > 10: pcs_mood -= 10
-		npc_rel['A144'] -= 1
+		gs 'npc_relationship', 'modify', 'A144', 'dislike'
 		'You walk in confident in joining them in their sexcapades, closing the door. You manage to walk all the way over to the bed before Anushka finally notices you and gives you a slight wave as she sucks Marcus cock. Perhaps hearing you or noticing her wave, Marcus turns his head and notices you. He is obviously surprised as he steps away and uses his hands to cover himself up. As he does he backs into the bed and ends up sitting on the bed, by virtue of backing into it to hard. He looks very confused at you then Anushka. "I... Uh... I mean..." He stammers obviously not sure what to say.'
 		'Anushka laughs at Marcus''s reaction before turning towards you and now with out a cock in her mouth she asks. "Do you mind <<$pcs_nickname>>? We are kinda busy." Calmly as if she was commenting on the weather instead of just having been caught with a black cock in her mouth.'
 		*nl
@@ -1222,7 +1222,7 @@ end
 if $ARGS[0] = 'couch_strapon_give':
 	*clr & cla
 	menu_off = 1
-	npc_rel['A144'] += 1
+	gs 'npc_relationship', 'modify', 'A144', 'like'
 	nushstrapon = 1
 	'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/couchstrap2.jpg"></center>'
 	'You hold it in front of her face to draw her eyes to it. "I''m going to take this dildo and fuck you, like you''re my personally little fuck toy."'
@@ -1382,7 +1382,7 @@ if $ARGS[0] = 'couch_strapon_get':
 	*clr & cla
 	menu_off = 1
 	minut += 2
-	npc_rel['A144'] += 1
+	gs 'npc_relationship', 'modify', 'A144', 'like'
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/couchstrap2.jpg"></center>'
 	'Turned on by what she said you hand the strapon over to her, she takes it and pulls you into a kiss with her. You passionately kiss each other for a couple of minutes.'
@@ -1511,7 +1511,7 @@ if $ARGS[0] = 'buttplug':
 	*clr & cla
 	menu_off = 1
 	minut += 2
-	npc_rel['A144'] += 1
+	gs 'npc_relationship', 'modify', 'A144', 'like'
 	gs 'stat'
 	'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 	'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/buttplug.jpg"></center>'

+ 2 - 0
locations/bedr.qsrc

@@ -46,6 +46,8 @@ else
 	'A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the door to the corridor. Against the wall, stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
 end
 *nl
+'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
+*nl
 act 'The corridor':gt 'korr'
 
 if husbandrinkday = daystart:

+ 1 - 1
locations/bedr2x.qsrc

@@ -27,7 +27,7 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 'The room is dominated by <a href="exec:gt ''bed'',''start''">full sized bed</a>'
 	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
 *nl
-'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
+'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>. You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
 *nl
 'Against the wall is a table with a <a href="exec:gt ''mirror'',''start''">mirror</a> above it.'
 *nl

+ 2 - 0
locations/bedrPar.qsrc

@@ -69,6 +69,8 @@ end
 *nl
 'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '')+'. Your sister''s bed is in the other corner.'
 *nl
+'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
+*nl
 if popugai2 = 1:
 	'<a href="exec:gt ''popu'',''start2''"><<$namepopu2>></a> is sitting in his cage'
 	if daystart - parbuydate <= 10: '<<$namepopu2>> starts squawking at you when you enter the room.'

+ 1 - 1
locations/begin.qsrc

@@ -81,7 +81,7 @@ if $ARGS[0] = 'warning':
 	'Rape;'
 	'Incest;'
 	'Violent assaults;'
-	'Backmail for sex;'
+	'Blackmail for sex;'
 	'Drug use;'
 	'Extreme character weight (both very skinny and massively obese);'
 	'Urination as sexual fetish;'

+ 206 - 232
locations/bicycle.qsrc

@@ -1,264 +1,238 @@
 # bicycle
-$location_type = 'event_outdoors'
-if $ARGS[0] = 'sarai':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
-	$menu_loc = 'bicycle'
-	$menu_arg = 'sarai'
-	menu_off = 0
-	cla
-	*clr
-	minut += 1
-	gs 'gadukino_event', 'sound'
-	gs 'stat'
-	!gs'time'
 
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
-	if sunWeather = 0:
-		'You notice an old bike. You would love to take a ride with it but you decide not to while it''s raining.'
-	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)':
+! BikeLoc - tells us where bicycle is currently located
+!----------------------------------------------
+! BikeLoc = 1 'gadsarai' ''
+! BikeLoc = 2 'gadforest' 'forest_edge'
+! BikeLoc = 3 'swamp_yard' 'start'
+!----------------------------------------------
+
+! this gs handles biking for Sveta in the various locations of gadukino
+! will only display bicycle actions if the BikeLoc is correct for the location passed in
+! $ARGS[0] - location where this is called from
+! Example: gs 'bicycle', 'gadsarai'
+if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLoc = 2) or ($ARGS[0] = 'swamp_yard' and BikeLoc = 3):
+	act 'Ride your bicycle':
+		*clr & cla
+		menu_off = 1
+		
+		if $clothingworntype = 'nude':
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel_nude.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
+		end
+		*nl
+		'You see your old bike. It looks like it''s still in a good condition, you can probably ride it without any trouble.'
+		
+		if BikeLoc = 1:
+			act 'Leave your bike alone':gt 'gadsarai'
+		elseif BikeLoc = 2:
+			act 'Leave your bike alone':gt 'gadforest','forest_edge'
+		elseif BikeLoc = 3:
+			act 'Leave your bike alone':gt 'swamp_yard','start'
+		end
+		if BikeLoc = 1 and hour >= 6 and hour < 20 and sunWeather = 1 and month >= 4 and month <= 10 and gadbikeday ! daystart:
+			act 'Bike around the village (1:00)':
 				*clr & cla
 				menu_off = 1
-				findvelday = daystart
 				minut += 60
-				run_exp += RAND(0,2)
+				run_exp += rand(0,2)
 				stren_exp += rand(0,2)
-				fat -= 5
-				pcs_mood += 5
-				gs 'sweat', 'add', 2
-				findvelrand = RAND(0,100)
+				fat -= 2
+				pcs_mood += 10
+				pcs_sweat += 2
+				gadbikeday = daystart
+				
 				if $clothingworntype = 'nude':
-					pcs_horny += 20
-					pcs_mood += 10
+					pcs_horny += 15
+					pcs_mood += 15
+					if pcs_inhib < 50: pcs_inhib += rand(0,2)
+					gs 'exhibitionism', 3
 					gs 'stat'
+					
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_nude.jpg"></center>'
+					*nl
 					'You ride nude, avoiding crowded places, exulting from this newfound courage. It''s hard to say what excites you more, fear or desire to be noticed.'
-					act 'Finish the trip':gt $loc, $metka
-					exit
-				end
-				if PCloSkirt > 0 and findvelrand > 70:
-					if $pantyworntype ! 'none':
-						pcs_mood+=5
-						gs'stat'
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_1.jpg"></center>'
-						'During your ride you lift your skirt several times, showing a glimpse of your panties to the passers-by.'
-
-						gs 'arousal', 'flashlite', 5, 'exhibitionism'
-						gs 'stat'
-
+				elseif PCloSkirt > 0:
+					bikerand = rand(0,10)
+					if bikerand >= 8:
+						if $pantyworntype ! 'none':
+							pcs_horny += 5
+							pcs_mood += 5
+							if pcs_inhib < 20: pcs_inhib += rand(0,2)
+							gs 'exhibitionism', 1
+							gs'stat'
+							
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_1.jpg"></center>'
+							*nl
+							'During your ride you lift your skirt several times, showing a glimpse of your panties to a few lucky villagers passing-by.'
+						else
+							pcs_horny += 10
+							pcs_mood += 10
+							if pcs_inhib < 30: pcs_inhib += rand(0,2)
+							gs 'exhibitionism', 2
+							gs'stat'
+							
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_2.jpg"></center>'
+							*nl
+							'During your ride you lift your skirt several times, showing your bare ass to a few lucky villagers passing-by.'
+						end
 					else
-						pcs_mood += 10
-						gs'stat'
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_2.jpg"></center>'
-						'During your ride you lift your skirt several times, showing your bare ass to the passers-by.'
-
-						gs 'arousal', 'flashlite', 10, 'exhibitionism'
-						minut -= 5
+						pcs_mood += 5
 						gs 'stat'
-					end
-					act 'Finish the ride':gt $loc, $metka
-
-					gs 'arousal', 'end'
-					gs 'stat'
-
-					exit
-				end
-				if PCloSkirt > 0 and findvelrand <= 70:
-					pcs_mood += 5
-					gs'stat'
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
-					'You take out the old bike for a ride. You ride by the endless fields enjoying the freedom you''re experiencing.'
-					act 'Finish the ride':gt $loc, $metka
-					exit
-				end
-				if PCloSkirt = 0:
+						
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
+						*nl
+						'You enjoy the breath of fresh air from riding your bike by the seemingly endless fields of the village.'
+					end					
+				elseif PCloSkirt = 0:
 					pcs_mood += 5
-					gs'stat'
+					gs 'stat'
+					
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike.jpg"></center>'
+					*nl
 					'You ride your bike, enjoying the surrounding country-side.'
-					act 'Finish the trip':gt $loc, $metka
-					exit
 				end
+				act 'Finish your ride':gt 'gadsarai'
 			end
 		end
-	end
-	if goforest > 0 and sunWeather = 1 and month >= 4 and month <= 10:
-		act 'Bike to the forest (0:25)':
-			*clr & cla
-			menu_off = 1
-			minut += 25
-			pcs_mood += 5
-			findvel = 2
-			gs'stat'
-
-			gs 'bicycle', 'clothes_findvel'
-			'You jump onto the bike and ride to the forest.'
-			gs 'bicycle', 'ridego', 'gadforest','1'
-		end
-	end
-	if goswamp = 1 and sunWeather = 1 and month >= 4 and month <= 10:
-		act 'Bike to the swamp (1:15)':
-			*clr & cla
-			menu_off = 1
-			minut += 75
-			run_exp += RAND(0,1)
-			stren_exp += rand(0,1)
-			fat -= 1
-			pcs_mood += 5
-			gs 'sweat', 'add', 1
-			findvel = 3
-			gs'stat'
-			!gs'time'
-
-			gs 'bicycle', 'clothes_findvel'
-			'You get on the bike and ride it to the swamp.'
-
-			gs 'bicycle', 'ridego', 'swamp_yard', 'start'
+		
+		if BikeLoc ! 1:
+			if BikeLoc = 2:
+				$bikeaction = 'Bike to your grandparents barn (0:12)'
+			elseif BikeLoc = 3:
+				$bikeaction = 'Bike to your grandparents barn (0:44)'
+			end
+			act '<<$bikeaction>>':
+				*clr & cla
+				menu_off = 1
+				if BikeLoc = 2:
+					minut += 12
+					run_exp += rand(0,1)
+					stren_exp += rand(0,1)
+					fat -= 1
+					pcs_mood += 5
+					pcs_sweat += 1
+					if swamp_clothes = 1:
+						'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear at your grandparents house.'
+						gs 'clothing', 'strip', 'gadforest'
+						gs 'clothing', 'swamp_clothes', 0
+					end
+				elseif BikeLoc = 3:
+					minut += 44
+					run_exp += rand(0,3)
+					stren_exp += rand(0,3)
+					fat -= 3
+					pcs_mood += 15
+					pcs_sweat += 3
+					if swamp_clothes = 1:
+						'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear at your grandparents house.'
+						gs 'clothing', 'strip', 'gadforest'
+						gs 'clothing', 'swamp_clothes', 0
+					end
+				end
+				BikeLoc = 1
+				gs'stat'
+
+				gs 'bicycle', 'clothes'
+				*nl
+				'You jump onto your bike and ride to your grandparent barn.'
+				
+				act 'Finish your ride':gt 'gadsarai'
+			end
 		end
-	end
-	act 'Put the bike away': gt'gadsarai'
-end
-
-if $ARGS[0] = 'forest':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
-	$menu_loc = 'bicycle'
-	$menu_arg = 'forest'
-	menu_off = 0
-	cla
-	*clr
-	minut += 1
-	gs 'gadukino_event', 'sound'
-	gs 'stat'
-	!gs'time'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
-
-	act 'Bike to the village (0:25)':
-		menu_off = 1
-		gs 'clothing', 'swamp_clothes', 0
-		if $clothingworntype ! 'nude' or pcs_inhib > 50:
-			*clr & cla
-			pcs_mood += 10
-			findvel = 1
-			minut += 25
-			inhib_exp += 4
-			gs 'bicycle', 'clothes_findvel'
-			'You ride your bike out of the forest and return to the village.'
-			gs 'bicycle', 'ridego', 'gaddvor'
-			gs'stat'
-		else
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel_nude.jpg"></center>'
-			'You take off your clothes and jump on your bike and ride through the forest. You would never be able to do this in the village.'
-			act 'Further':gt'gadforest','1'
+		
+		if BikeLoc ! 2 and pcs_bushcraft > 0:
+			if BikeLoc = 1:
+				$bikeaction = 'Bike to the forest edge (0:12)'
+			elseif BikeLoc = 3:
+				$bikeaction = 'Bike to the forest edge (0:32)'
+			end
+			act '<<$bikeaction>>':
+				*clr & cla
+				menu_off = 1
+				if BikeLoc = 1:
+					minut += 12
+					run_exp += rand(0,1)
+					stren_exp += rand(0,1)
+					fat -= 1
+					pcs_mood += 5
+					pcs_sweat += 1
+				elseif BikeLoc = 3:
+					minut += 32
+					run_exp += rand(0,2)
+					stren_exp += rand(0,2)
+					fat -= 2
+					pcs_mood += 0
+					pcs_sweat += 2
+				end
+				BikeLoc = 2
+				gs'stat'
+
+				gs 'bicycle', 'clothes'
+				*nl
+				'You jump onto your bike and ride to the edge of the forest.'
+				
+				act 'Finish your ride':gt 'gadforest','forest_edge'
+			end
 		end
-	end
-	if goswamp = 1:
-		act 'Bike to the swamp (0:50)':
-			*clr & cla
-			menu_off = 1
-			minut += 50
-			pcs_mood += 5
-			findvel = 3
-			gs'stat'
-			!gs'time'
+		
+		if BikeLoc ! 3 and hunterscabin = 1 and huntersKnow = 1:
+			if BikeLoc = 1:
+				$bikeaction = 'Bike to the hunters cabin (0:44)'
+			elseif BikeLoc = 2:
+				$bikeaction = 'Bike to the hunters cabin (0:32)'
+			end
+			act '<<$bikeaction>>':
+				*clr & cla
+				menu_off = 1
+				if BikeLoc = 1:
+					minut += 44
+					run_exp += rand(0,3)
+					stren_exp += rand(0,3)
+					fat -= 3
+					pcs_mood += 15
+					pcs_sweat += 3
+				elseif BikeLoc = 2:
+					minut += 32
+					run_exp += rand(0,2)
+					stren_exp += rand(0,2)
+					fat -= 2
+					pcs_mood += 10
+					pcs_sweat += 2
+				end
+				BikeLoc = 3
+				gs'stat'
 
-			gs 'bicycle', 'clothes_findvel'
-			'You ride your bike to the edge of the swamp.'
+				gs 'bicycle', 'clothes'
+				*nl
+				'You jump onto your bike and ride to the hunters cabin.'
 
-			gs 'bicycle', 'ridego', 'swamp_yard', 'start'
+				act 'Finish your ride':gt 'swamp_yard','start'
+			end
 		end
 	end
-	act 'Put the bike aside': gt'gadforest','1'
 end
 
-if $ARGS[0] = 'swamp':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
-	$menu_loc = 'bicycle'
-	$menu_arg = 'swamp'
-	menu_off = 0
-	cla
-	*clr
-	minut += 1
-	gs 'gadukino_event', 'sound'
-	gs 'stat'
-	!gs'time'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
-
-	act 'Bike to the village (1:15)':
-		menu_off = 1
-		gs 'clothing', 'swamp_clothes', 0
-		if $clothingworntype ! 'nude' or pcs_inhib > 50:
-			*clr & cla
-			minut += 75
-			run_exp += RAND(0,1)
-			stren_exp += rand(0,1)
-			fat -= 1
-			gs 'sweat', 'add', 1
-			pcs_mood += 10
-			findvel = 1
-			hunters_here = 0
-			inhib_exp += 4
-			!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'
+! this gs handles images for biking for Sveta in the various locations of gadukino
+! Example: gs 'bicycle', 'clothes'
+if $ARGS[0] = 'clothes':
+	!need images for biking during snow/rain/winter/nighttime: currently only have summer daytime images
+	!if sunWeather = 0 and (month < 4 or month > 10): snowing
+	!else sunWeather = 0 and month >= 4 and month <= 10: raining
+	!elseif month < 4 or month > 10 and hour < 6 or hour >= 22: winter nighttime
+	!elseif month < 4 or month > 10: winter daytme
+	!elseif hour < 6 or hour >= 22: summer nighttime
+	!else summer daytime
+		if $clothingworntype = 'nude':
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_nude.jpg"></center>'
+		elseif PCloSkirt > 0:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
 		else
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel_nude.jpg"></center>'
-			'You take off your clothes and jump on your bike and ride through the swamp. You would never be able to do this in the village.'
-			act 'Further':gt 'swamp_yard', 'start'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike.jpg"></center>'
 		end
-	end
-	act 'Bike to the forest (0:50)':
-		*clr & cla
-		menu_off = 1
-		minut += 50
-		pcs_mood += 5
-		hunters_here = 0
-		findvel = 2
-		!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', 'start'
-end
-
-if $ARGS[0] = 'clothes_findvel':
-	if $clothingworntype = 'nude':
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_nude.jpg"></center>'
-	elseif PCloSkirt > 0:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike.jpg"></center>'
-	end
+	!end
 end
 
-if $ARGS[0] = 'ridego':
-	menu_off = 1
-	!make this args, add a warning, and allow 30% alive by illume
-	$metka = $ARGS[2]
-	$loc = $ARGS[1]
-	if hour >= 6 and hour < 22:
-		act 'Further':gt $loc, $metka
-	else
-		'<B><font color=red>It''s too dark outside to go for a ride.</font></B>'
-		act 'Put the bike away': gt $loc, $metka
-	end
-end
-
-
 --- bicycle ---------------------------------
 

+ 7 - 20
locations/body.qsrc

@@ -2087,21 +2087,6 @@ if lashair = 0:
 		end
 		$pcdesc_pubes = 'stubbly'
 		$pcdesc_pubeswordy = 'scratchy, roughly-stubbled'
-	elseif pcs_pubes <= 20:
-		lobkoef = 0
-		$pcs_pubes = 'You have neatly trimmed section of hair around your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
-		rand_pubes = rand(0,3)
-		if rand_pubes = 0:
-			$pcdesc_pubesrandom = 'wispy-haired'
-		elseif rand_pubes = 1:
-			$pcdesc_pubesrandom = 'lightly-furred'
-		elseif rand_pubes = 2:
-			$pcdesc_pubesrandom = 'trimmed'
-		elseif rand_pubes = 3:
-			$pcdesc_pubesrandom = 'mostly well-kept'
-		end
-		$pcdesc_pubes = 'neatly-trimmed'
-		$pcdesc_pubeswordy = 'trimmed, well-kept'
 	elseif pcs_pubes <= 25:
 		lobkoef = 0
 		if pubestyle = 9:
@@ -2115,16 +2100,18 @@ if lashair = 0:
 		else
 			$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''<<FUNC(''$pube_image'')>>''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 		end
-		rand_pubes = rand(0,2)
+		rand_pubes = rand(0,3)
 		if rand_pubes = 0:
-			$pcdesc_pubesrandom = 'mildly-furred'
+			$pcdesc_pubesrandom = 'wispy-haired'
 		elseif rand_pubes = 1:
-			$pcdesc_pubesrandom = 'slightly-bushy'
+			$pcdesc_pubesrandom = 'lightly-furred'
 		elseif rand_pubes = 2:
+			$pcdesc_pubesrandom = 'trimmed'
+		elseif rand_pubes = 3:
 			$pcdesc_pubesrandom = 'well-maintained'
 		end
-		$pcdesc_pubes = 'bushy'
-		$pcdesc_pubeswordy = 'bushy, thick'
+		$pcdesc_pubes = 'neatly-trimmed'
+		$pcdesc_pubeswordy = 'trimmed, well-kept'
 	elseif pcs_pubes <= 30:
 		lobkoef = 0
 		$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''<<FUNC(''$pube_image'')>>''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'

+ 10 - 5
locations/bordel.qsrc

@@ -33,8 +33,9 @@ if $ARGS[0] = 'brothel':
 	gs 'stat'
 	'<center><b>Your room in a brothel</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/borroom.jpg"></center>'
+	'This is your room in the brothel. In the middle is a huge bed and not much else, there is a small side door to the <a href="exec:gt ''bordel'', ''dysh''">bathroom</a>.'
+	*nl
 	'In a brothel there is a lot of competition, in order to avoid a massacre they introduced a rule - no more than two clients per day'
-	'In the middle is a huge bed, there is a small side door to the <a href="exec:gt ''bordel'', ''dysh''">bathroom</a>.'
 
 	act 'Leave':
 		if $clothingworntype ! 'nude':
@@ -80,10 +81,14 @@ if $ARGS[0] = 'dysh':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/bordysh.jpg"></center>'
-
-	act 'Go to your room':gt 'bordel', 'brothel'
-
-	act 'Bathroom':
+	'The bathroom is well fitted and clean as customers can access it and hygiene is very important in a brothel.'
+	'Your room is so dedicated to it purpose that your clothes are stored in here.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
+	
+	act 'Return to your room':gt 'bordel', 'brothel'
+
+	act 'Bathroom functions':
 		bordysh = 1
 		gt 'vann', 'start'
 	end

+ 9 - 10
locations/cikl.qsrc

@@ -449,9 +449,11 @@ if birth_control['implant_status'] > 1:
 	
 	pillcon2 += ((pillcon2 + 15000) / 25) + 4000
 	if pillcon2 > 40000: pillcon2 = 40000
-	
+		
 	birth_control['implant_timer'] -= 1
-	if birth_control['implant_timer'] > 0 and birth_control['implant_timer'] < 30:
+	if (birth_control['implant_timer'] - 1090) > 0:
+		gs 'pain', '<<(birth_control[''implant_timer''] - 1090)*2>>', 'armL', 'ache'
+	elseif birth_control['implant_timer'] > 0 and birth_control['implant_timer'] < 30:
 		birth_control['implant_status'] = 2
 		'Your birth control implant is only good for <<birth_control[''implant_timer'']>> more'+iif(birth_control['implant_timer'] = 1, 'day.', 'days.')
 	elseif birth_control['implant_timer'] < 0:
@@ -625,14 +627,11 @@ if TriperOnce = 1:
 end
 if KandidozOnce = 1:Kandidoz += 1
 
-VeneraN = 0
-
-if VeneraOnce > 0:VeneraOnce = 0
-if SifacOnce = 1:VeneraN += 1
-if GerpesOnce = 1:VeneraN += 1
-if TriperOnce = 1:VeneraN += 1
+Venera = 0
+if SifacOnce = 1: Venera += 1
+if GerpesOnce = 1: Venera += 1
+if TriperOnce = 1: Venera += 1
 
-Venera = VeneraN
 
 if pcs_ass > 1 and ashrink > 0 and analplugIN = 0:
 	if anusK < 0:anusK = 0
@@ -1554,7 +1553,7 @@ if Mira_no > 0: Mira_no -= 1
 if Mira_no < 0: Mira_no = 0
 
 !! new grandparent chore stuff, for 0.8.0
-if gadstay = 1:
+if gadstay = 1 and lost_girl = 0:
 	if daystart > (grandmaQW['last_day_helped'] + 3) and daystart > (grandpaQW['last_day_helped'] + 3):
 		if (daystart - grandmaQW['last_day_helped']) <= (daystart - grandpaQW['last_day_helped']):
 			'You haven''t helped your grandparents with any chores in <<daystart - grandmaQW[''last_day_helped'']>> days. You should help out more regularly to stay on your grandparents'' good side.'

+ 2 - 0
locations/dachain.qsrc

@@ -26,6 +26,8 @@ if $args[0] = '':
 	*nl
 	'There is a <a href="exec:gt ''bed'', ''start''">bed</a> against one wall. Next to it is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). On the other side of the bed is a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a>'
 	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
+	*nl
 	'There is a sofa in front of the fireplace, a kitchen alcove opposite the bed and the door to the bathroom next to that.'
 	*nl
 	if hour >= 6 and hour <= 20 and etoexhib = 11:'Kopashatsya working in the garden, hmm ... maybe sometime <a href="exec:gt ''etoexhib'', ''pos10''">motivate</a> for them to work quicker and smarter.'

+ 24 - 33
locations/dinSex.qsrc

@@ -44,36 +44,31 @@ if ARGS[0] = 'disease_picker':
 	if cheatHealth = 0:
 		if tipvenerarand = 8:
 			!!herpes
-			if rand(1, 100) > 90:
-				if GerpesOnce = 0:
-					GerpesOnce = 1
-					Venera += 1
-					Gerpes += 1
-					GenHerpes = 1
-					
-				end
+			if rand(1, 100) > 90 and GerpesOnce = 0:
+				GerpesOnce = 1
+				Venera += 1
+				Gerpes += 1
+				GenHerpes = 1
 			end
 		elseif tipvenerarand = 7:
 			!!syphilis
-			if rand(1, 100) > 95: Venera += 1
-			if SifacOnce = 0:
+			if rand(1, 100) > 95 and SifacOnce = 0:
 				SifacOnce = 1
 				Sifilis += 1
+				Venera += 1
 			end
 		elseif tipvenerarand >= 5 and tipvenerarand < 7:
 			!!gonorrhea/triper
-			if rand(1, 100) > 95: Venera += 1
-			if TriperOnce = 0:
+			if rand(1, 100) > 95 and TriperOnce = 0:
 				TriperOnce = 1
 				Triper += 1
+				Venera += 1
 			end
 		elseif tipvenerarand < 5:
 			!!candidiasis/thrush
-			if rand(1, 100) > 85:
-				if KandidozOnce = 0:
-					KandidozOnce = 1
-					Kandidoz += 1
-				end
+			if rand(1, 100) > 85 and KandidozOnce = 0:
+				KandidozOnce = 1
+				Kandidoz += 1
 			end
 		end
 	end	
@@ -91,38 +86,34 @@ end
 if ARGS[0] = 'disease_picker_oral':
 	if cheatHealth = 0:
 		if tipvenerarand >= 5 and tipvenerarand < 7:
-			if rand(1, 100) > 95: Venera += 1
-			if TriperOnce = 0:
+			if rand(1, 100) > 95 and TriperOnce = 0:
 				TriperOnce = 1
 				TriperOral += 1
+				Venera += 1
 				if rand (0,100) < 15: TriperOralSigns = 1 
 			end
 		elseif tipvenerarand = 7:
 			if rand(0,1) = 1:
 				!!syphilis
-				if rand(1, 100) > 95: Venera += 1
-				if SifacOnce = 0:
+				if rand(1, 100) > 95 and SifacOnce = 0:
 					SifacOnce = 1
 					Sifilis += 1
+					Venera += 1
 				end
 			end
 		elseif tipvenerarand < 5:
 			!!candidiasis/thrush
-			if rand(1, 100) > 85:
-				if KandidozOnce = 0:
-					KandidozOnce = 1
-					Kandidoz += 1
-				end
+			if rand(1, 100) > 85 and KandidozOnce = 0:
+				KandidozOnce = 1
+				Kandidoz += 1
 			end
 		elseif tipvenerarand = 8:
 			!!herpes
-			if rand(1, 100) > 90:
-				if GerpesOnce = 0:
-					GerpesOnce = 1
-					Venera += 1
-					Gerpes += 1
-					OrHerpes = 1
-				end
+			if rand(1, 100) > 90 and GerpesOnce = 0:
+				GerpesOnce = 1
+				Venera += 1
+				Gerpes += 1
+				OrHerpes = 1
 			end
 		end
 	end

+ 7 - 13
locations/din_van.qsrc

@@ -259,7 +259,7 @@ $bath = {
 
 $brit = {
 	if shave_menu = 1  and stanok > 1:
-		if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (((pubestyle >= 2 and pubestyle <= 7) or pubestyle = 12) and pcs_pubes >= 15) or (pubestyle = 8 and pcs_pubes >= 20) or ((pubestyle = 9 or pubestyle >= 13) and pcs_pubes > 25) or (pubestyle = 10 and pcs_pubes >= 40) or (pubestyle = 11 and pcs_pubes > 10):
+		if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (((pubestyle >= 2 and pubestyle <= 7) or pubestyle = 12) and pcs_pubes >= 15) or (pubestyle = 8 and pcs_pubes >= 20) or ((pubestyle = 9 or pubestyle >= 13) and pcs_pubes > 25) or (pubestyle = 10 and pcs_pubes >= 35) or (pubestyle = 11 and pcs_pubes > 10):
 			act 'Shave yourself (0:15)':
 				menu_off = 1
 				*clr & cla
@@ -267,13 +267,9 @@ $brit = {
 				pcs_leghair = 0
 				if pubestyle = 1:
 					pcs_pubes = 0
-				elseif (pubestyle >= 2 and pubestyle <=7) or pubestyle = 12:
-					pcs_pubes = 11
-				elseif pubestyle = 8:
+				elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
 					pcs_pubes = 16
-				elseif pubestyle = 9 or pubestyle >= 13:
-					pcs_pubes = 21
-				elseif pubestyle = 10 and pcs_pubes >= 40:
+				elseif pubestyle = 10 and pcs_pubes >= 35:
 					pcs_pubes = 26
 				elseif pubestyle = 11 and pcs_pubes > 10:
 					pcs_pubes = 0
@@ -1619,7 +1615,7 @@ if $ARGS[0] = 'shave_options':
 	!! images handled using FUNC(''$pube_image'')
 	'<h3><center><b><font color="maroon">Shaving optons</b></h3><br><center><font color="maroon">Here you can choose your style for pubic hair and which body parts you wish to shave.</font></center>'
 	'<br><center><table border=0 cellspacing=<<shave_img_hgt/25>> cellpadding=5>'
-	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/pussy.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/mb.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/mb.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/triangle1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/triangle1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/landing1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/landing1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/heart1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/heart1.jpg"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/pussy.jpg"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],2)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],2)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],3)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],3)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],4)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],4)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],5)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],5)>>"></a></center></TD>'
 	'<TR><TD><center>'
 	if pubestyle ! 1:
 		'<a href="exec:pubestyle = 1 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Clean Shave</a>'
@@ -1651,7 +1647,7 @@ if $ARGS[0] = 'shave_options':
 		'Heart-shaped'
 	end
 	'</center></TD>'
-	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/shave/flame1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/flame1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/cross1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/cross1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/s_bush1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/s_bush1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/hair/black_trimmed.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/black_trimmed.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/hair/black_mid.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/black_mid.jpg"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],6)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],6)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],7)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],7)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],8)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],8)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],9)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],9)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',26,pcs_pubecol[2],10)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',26,pcs_pubecol[2],10)>>"></a></center></TD>'
 	'<TR><TD><center>'
 	if pubestyle ! 6 and pcs_pubes > 15:
 		'<a href="exec:pubestyle = 6 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Flame-shaped</a>'
@@ -1677,12 +1673,12 @@ if $ARGS[0] = 'shave_options':
 		'Small Bush'
 	end
 	'</center></TD><TD><center>'
-	if pubestyle ! 10 and pcs_pubes > 30:
+	if pubestyle ! 10 and pcs_pubes > 35:
 		'<a href="exec:pubestyle = 10 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Full Bush</a>'
 	else
 		'Full Bush'
 	end
-	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/stubble.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/stubble.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/mb.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/mb.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/bstrip.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/bstrip.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/rectangle.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/rectangle.jpg"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],13)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],13)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],14)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],14)>>"></a></center></TD>'
 	*nl
 	'<TR><TD><center>'
 	if pubestyle ! 11 and pcs_pubes > 10:
@@ -1712,8 +1708,6 @@ if $ARGS[0] = 'shave_options':
 	end
 	
 	
-	
-	
 	'</center></TD><TR><center>'
 	'Your razor will last for <b><<stanok>></b> more shaves.'
 	*nl

+ 8 - 18
locations/dinsexFX.qsrc

@@ -159,39 +159,29 @@ $veneracheck = {
 		tipvenerarand = rand(1, 10)
 		if tipvenerarand = 8:
 			!!herpes
-
-			if rand(1, 100) > 90:
-				if GerpesOnce = 0:GerpesOnce = 1
-
+			if rand(1, 100) > 90 and GerpesOnce = 0:
+				GerpesOnce = 1
 				Venera += 1
 				Gerpes += 1
 			end
 		elseif tipvenerarand = 7:
 			!!syphilis
-
-			if rand(1, 100) > 97:
+			if rand(1, 100) > 97 and SifacOnce = 0:
+				SifacOnce = 1
 				Venera += 1
-
-				if SifacOnce = 0:SifacOnce = 1
-
 				Sifilis += 1
 			end
 		elseif tipvenerarand >= 5 and tipvenerarand < 7:
 			!!gonorrhea
-
-			if rand(1, 100) > 90:
+			if rand(1, 100) > 90 and TriperOnce = 0:
+				TriperOnce = 1
 				Venera += 1
-
-				if TriperOnce = 0:TriperOnce = 1
-
 				Triper += 1
 			end
 		elseif tipvenerarand < 5:
 			!!thrush
-
-			if rand(1, 100) > 85:
-				if KandidozOnce = 0:KandidozOnce = 1
-
+			if rand(1, 100) > 85 and KandidozOnce = 0:
+				KandidozOnce = 1
 				Kandidoz += 1
 			end
 		end

+ 2 - 0
locations/dom_gor.qsrc

@@ -13,6 +13,8 @@ gs 'themes', 'indoors'
 '<center><b><font color="maroon">Your room</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/vitekhome/kotovkom.jpg"></center>'
 'Your room in a hostel. The room is small, leaving only the bare minimum. 2 <a href="exec:gt ''bed'', ''start''">beds</a>, a <a href="exec:gt ''mirror'', ''start''">mirror</a>, a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a small TV.'
+*nl
+'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 if $clothingworntype = 'exercise' and teachlevel > 20 and parkrunday ! daystart and hour < 21 and hour > 6:
 	act 'Go for a jog around the park (1:00)':

+ 0 - 13
locations/famdorfride.qsrc

@@ -1,13 +0,0 @@
-# famdorfride
-
-menu_off = 1
-if hour < 12: hour = 12 & minut = 0
-gs 'stat'
-minut += 60
-gs 'stat'
-'When the clock strikes noon, your stepfather goes to get the Volga out of its garage. A few minutes later he arrives at your house and you and your mother get in. You quietly sit in the back of the car, watching the surroundings zip by. After roughly an hour you reach the village of Gadukino, where your grandparents live.'
-
-act 'Enter your grandparents'' house':gt 'gadhouse', 'start'
-
---- famdorfride ---------------------------------
-

+ 270 - 0
locations/family_schedule.qsrc

@@ -100,5 +100,275 @@ else
 	end
 end
 
+
+
+!!---MOM--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+if week <= 5:
+	if hour < 5 or (hour = 5 and minut < 30):
+		!!Asleep, if Sveta knocks she''ll ask to wake Kolka
+		momloc = 1
+	elseif hour = 5 and minut < 50:
+		!!shower
+		momloc = 2
+	elseif hour < 6 or (hour = 6 and minut < 10):
+		!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
+		momloc = 3
+	elseif hour = 6 or (hour = 7 and minut < 30):
+		momloc = 4
+		if hour = 6 and minut < 40:
+			!! Make Breakfast
+			momloc[1] = 1
+		elseif hour = 6 and minut < 45:
+			!! Set breakfast table - ask Sveta to do it if she comes into the kitchen at that time
+			momloc[1] = 2
+		elseif hour = 6 or (hour = 7 and minut < 15):
+			!! Family breakfast
+			momloc[1] = 3
+		else
+			!! Clean up breakfast table
+			momloc[1] = 4
+		end
+	elseif hour = 7 or (hour = 8 and minut < 10):
+		!!Cleaning random room in the house
+		!!variable set in cikl
+		momloc = momcleaning
+	elseif hour = 8 and minut < 30:
+		!! Walking to work
+		momloc = 5
+	elseif hour < 16 and week < 5:
+		!!Working in the cafe. On Friday she stays until 18:00
+		momloc = 6
+	elseif hour = 16 and minut < 40 and week < 5:
+		!!Buying groceries for dinner and other stuff needed for home at the supermarket
+		momloc = 7
+	elseif hour < 17 and week < 5:
+		!!Walking home
+		momloc = 8
+	elseif hour = 17 and minut < 50 and week = 5:
+		!!Working in the cafe. On Friday she stays until 17:50
+		momloc = 9
+	elseif hour < 18 and week = 5:
+		!!Walking home
+		momloc = 10
+	elseif hour < 18:
+		!!Making dinner (On Friday she brings home leftovers from the cafe)
+		momloc = 11
+	elseif hour < 19:
+		!! Cleaning dinner table/Doing dishes
+		momloc = 12
+	elseif hour < 20:
+		!! (cleaning the bathroom, sweeping, mopping, dusting, watching TV, taking a bath, etc in different rooms) (once/twice a week goes over to Luda)
+		momloc = momcleaning2
+	elseif hour < 22:
+		!! Watches TV with Vladimir
+		momloc = 13
+	else
+		!! Sleep (Small chance she and step dad have sex before sleep)
+		momloc = 1
+	end
+else
+	if hour < 5 or (hour = 5 and minut < 30):
+		!! Sleep
+		momloc = 1
+	elseif hour = 5 and minut < 50:
+		!! Shower, if Sveta knocks she''ll ask to wake Kolka
+		momloc = 2
+	elseif hour < 6 or (hour = 6 and minut < 10):
+		!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
+		momloc = 3
+	elseif hour = 6 or (hour = 7 and minut < 30):
+		momloc = 4
+		if hour = 6 and minut < 40:
+			!! Make Breakfast
+			momloc[1] = 1
+		elseif hour = 6 and minut < 45:
+			!! Set breakfast table - ask Sveta to do it if she comes into the kitchen at that time
+			momloc[1] = 2
+		elseif hour = 6 or (hour = 7 and minut < 15):
+			!! Family breakfast
+			momloc[1] = 3
+		else
+			momloc[1] = 4
+			!! Clean up breakfast table
+		end
+	elseif hour = 11:
+		!!Cleaning random room in the house/laundry
+!!variable set in cikl
+		momloc = momcleaning
+	elseif hour = 11 and minut < 30:
+		!! Takes the car to town
+		momloc = 14
+	elseif hour < 12 and minut < 30:
+		!! Gets her nails done/hair cut at the salon or such things - On Sunday goes to the church during these hours
+		if week = 5:
+			momloc = 15
+		else
+			momloc = 16
+		end
+	elseif hour = 13 and minut < 30 and week = 6:
+		momloc = 16
+	elseif hour < 14:
+		!! Walks around different shops, looking at and buying stuff - On Sunday goes to church during these hours
+		momloc = 15
+	elseif hour < 17:
+		!!Helping out Sergey/Luda, going to Kolka's games?
+		momloc = rand(14,15)
+	elseif hour < 18:
+		!! Making dinner
+		momloc = 11
+	elseif hour = 18 and minut < 30:
+		!!Family dinner (same as the family breakfast, Sveta doesn''t have to join it but we can have some family interactions like mom and step dad asking about how school was etc)
+		momloc = 12
+	elseif hour < 19:
+		!! Cleaning dinner table/Doing dishes
+		momloc = 13
+	elseif hour < 21:
+		!!Says she goes to see her sister, in reality sometimes see's her sister of fucks around with different people. - Sunday goes to evening mass
+		if week = 5:
+			momloc = 17
+		else
+			momloc = 18
+		end
+	elseif hour < 22:
+		!! Watches TV with Vladimir
+		momloc = 13
+	else
+		!! Sleep (Small chance she and step dad have sex before sleep)
+		momloc = 1
+	end
+end
+
+!!----STEPFATHER------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+if week <= 5:
+	if hour = 6 and minut < 10:
+		sdadloc = 1
+	elseif hour = 6 and minut < 45:
+		sdadloc = 1
+	elseif hour = 7 and minut < 15:
+		sdadloc = 4
+	elseif hour = 7 and minut < 30:
+		sdadloc = 4
+	elseif hour = 8 and minut < 30:
+        sdadloc = 13
+	elseif hour = 8 and minut < 45:
+		sdadloc = 5 
+	elseif hour = 17 and minut < 45:
+		sdadloc = 0	
+	elseif hour < 18:
+		sdadloc = 4
+	elseif hour = 18 and minut < 30:
+		sdadloc = 4
+	elseif hour = 19 and minut < 45:
+		sdadloc = 8
+!!I assume that he meet misha in the garage
+	elseif hour = 21 and minut < 45:
+		sdadloc = 13
+    elseif hour < 22:
+		sdadloc = 5	
+	else
+		sdadloc = 1
+	end
+else
+	if hour = 6 and minut < 45:
+		sdadloc = 1
+	elseif hour = 7 and minut < 15:
+		sdadloc = 1
+	elseif hour = 7 and minut < 30:
+		sdadloc = 1
+	elseif hour < 8:
+		sdadloc = 5
+	elseif hour < 9:
+        sdadloc = 13
+	elseif hour < 11:
+		sdadloc = 8
+!!I assume that he meet misha/sergey in the garage		
+	elseif hour = 11 and minut < 10:
+		if week = 6:
+			sdadloc = 8
+!!I assume that he meet misha/sergey in the garage			
+		else
+			sdadloc = 0
+		end
+	elseif hour < 13:
+		if week = 6:
+			sdadloc = 8
+!!I assume that he meet misha/sergey in the garage			
+		else
+			sdadloc = 16
+		end
+	elseif hour = 13 and minut < 10:
+		if week = 6:
+			sdadloc = 8
+!!I assume that he meet misha/sergey in the garage			
+		else
+			sdadloc = 0
+		end	
+	elseif hour < 18:
+		sdadloc = 8
+	elseif hour = 18 and minut < 30:
+		sdadloc = 4
+	elseif hour < 22:
+		sdadloc = 13
+	else
+		sdadloc = 1
+	end
+end
+
+!!---KOLKA------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+if week <= 5:
+	if hour = 6 and minut < 45:
+		kolloc = 13
+	elseif hour = 7 and minut < 15:
+		kolloc = 4
+	elseif hour < 8:
+		kolloc = 0
+	elseif hour < 14:
+		kolloc = 0
+	elseif hour = 16 and minut < 45:
+        kolloc = rand(10,11,12)
+	elseif hour < 17:
+		kolloc = 0
+	elseif hour < 18:
+		kolloc = 13
+	elseif hour = 18 and minut < 30:
+		kolloc = 4
+	elseif hour = 18 and minut < 45:
+		kolloc = 0
+	elseif hour < 21:
+		kolloc = 10
+	elseif hour = 21 and minut < 15:
+		kolloc = 5
+	elseif hour < 23:
+		kolloc = 13
+	else
+		kolloc = 13
+	end
+else
+	if hour = 6 and minut < 45:
+		kolloc = 13
+	elseif hour = 7 and minut < 15:
+		kolloc = 4
+	elseif hour < 10:
+		kolloc = 13
+	elseif hour = 13 and minut < 10:
+		kolloc = 13
+	elseif hour < 18:
+        kolloc = rand(8,10,11,12)
+	elseif hour = 18 and minut < 30:
+		kolloc = 4
+	elseif hour < 21:
+		kolloc = rand(10,11,12)
+	elseif hour = 21 and minut 15:
+		kolloc = 5
+	elseif hour < 23:
+		kolloc = 13
+	else
+		kolloc = 13
+	end
+end
+
 --- family_schdule ---------------------------------
 

+ 0 - 28
locations/farmhomeride.qsrc

@@ -1,28 +0,0 @@
-# farmhomeride
-
-menu_off = 1
-onceridePerDay=daystart
-indorf = 0
-if month = 6 or month = 7 or month = 8:
-'<<$npc_nickname[''A29'']>> asks you "Well, <<$pcs_nickname>>, do you want to come home with us or spend summer in the village?"'
-	 act'Go home with your parents':
-		*clr & cla
-		if hour < 20: hour = 20 & minut = 0
-		minut += 60
-		gs'stat'
-		'You leave the village by the Volga River with your family and an hour later you have returned home in Pavlovsk.'
-		act 'Go home': gt'korrPar'
-	end
-	act'Stay in village':gt 'gadhouse', 'start'
-else
-	if hour < 20: hour = 20 & minut = 0
-	gs 'stat'
-	minut += 60
-	gs 'stat'
-	'You leave the village by the Volga River with your family and an hour later you have returned home in Pavlovsk.'
-
-	act 'Go home':gt 'korrPar'
-end
-
---- farmhomeride ---------------------------------
-

+ 2 - 0
locations/fit.qsrc

@@ -112,6 +112,8 @@ if $ARGS[0] = 'dressing room':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/razd.jpg"></center>'
 	'Recruiting girls for local track team, the winners will receive cash prizes.'
 	'Attention, visitors to the sports section must wear sports outfits and shoes when using the facilities.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	if nichTanyaKnown = 0 and (rand(1,100) <= 20 or nichDebug = 1):
 		'In the locker room you notice <a href="exec:gt ''fit'', ''fitgirl''">a cute girl</a>.'

+ 22 - 11
locations/foto.qsrc

@@ -145,23 +145,34 @@ if $ARGS[0] = 'studio':
 	*clr & cla
 	killvar '$modelopt'
 
-	if special_model < city_modelling and modelfoto_nip > 0 and hour < 15 and fame_model_event < daystart:gt 'foto_events','fame'
+	if special_model < min(city_modelling, 700) and modelfoto_nip > 0 and hour < 15 and fame_model_event < daystart:gt 'foto_events','fame'
 	if special_skill_model < pcs_mdlng and modelfoto_nip > 0 and hour < 15 and skill_model_event < daystart:gt 'foto_events','skill'
 
 	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
 
-	if city_modelling >= 200 and city_modelling < 240:rank = 1
-	if city_modelling >= 240 and city_modelling < 280:rank = 2
-	if city_modelling >= 280 and city_modelling < 320:rank = 3
-	if city_modelling >= 320 and city_modelling < 360:rank = 4
-	if city_modelling >= 360 and city_modelling < 400:rank = 5
-	if city_modelling >= 400 and city_modelling < 440:rank = 6
-	if city_modelling >= 440 and city_modelling < 560:rank = 7
-	if city_modelling >= 560 and city_modelling < 620:rank = 8
-	if city_modelling >= 620 and city_modelling < 700:rank = 9
-	if city_modelling >= 700:rank = 10
+	if city_modelling >= 200 and city_modelling < 240:
+		rank = 1
+	elseif city_modelling >= 240 and city_modelling < 280:
+		rank = 2
+	elseif city_modelling >= 280 and city_modelling < 320:
+		rank = 3
+	elseif city_modelling >= 320 and city_modelling < 360:
+		rank = 4
+	elseif city_modelling >= 360 and city_modelling < 400:
+		rank = 5
+	elseif city_modelling >= 400 and city_modelling < 440:
+		rank = 6
+	elseif city_modelling >= 440 and city_modelling < 560:
+		rank = 7
+	elseif city_modelling >= 560 and city_modelling < 620:
+		rank = 8
+	elseif city_modelling >= 620 and city_modelling < 700:
+		rank = 9
+	elseif city_modelling >= 700:
+		rank = 10
+	end
 
 	anastasia_in = rand(0,1)
 	mari_in = rand(0,1)

+ 21 - 12
locations/foto_albums.qsrc

@@ -4,18 +4,27 @@ menu_off = 1
 
 if $ARGS[0] = 'model_portraits':
 	
-	if rank = 1:gt 'foto_albums','sveta_10'
-	if rank = 2:gt 'foto_albums','sveta_9'
-	if rank = 3:gt 'foto_albums','sveta_8'
-	if rank = 4:gt 'foto_albums','sveta_7'
-	if rank = 5:gt 'foto_albums','sveta_6'
-	if rank = 6:gt 'foto_albums','sveta_5'
-	if rank = 7:gt 'foto_albums','sveta_4'
-	if rank = 8:gt 'foto_albums','sveta_2'
-	if rank = 9:gt 'foto_albums','sveta_3'
-	if rank = 10:gt 'foto_albums','sveta_1'
-	
-	
+	if rank = 1:
+		gt 'foto_albums','sveta_10'
+	elseif rank = 2:
+		gt 'foto_albums','sveta_9'
+	elseif rank = 3:
+		gt 'foto_albums','sveta_8'
+	elseif rank = 4:
+		gt 'foto_albums','sveta_7'
+	elseif rank = 5:
+		gt 'foto_albums','sveta_6'
+	elseif rank = 6:
+		gt 'foto_albums','sveta_5'
+	elseif rank = 7:
+		gt 'foto_albums','sveta_4'
+	elseif rank = 8:
+		gt 'foto_albums','sveta_2'
+	elseif rank = 9:
+		gt 'foto_albums','sveta_3'
+	elseif rank = 10:
+		gt 'foto_albums','sveta_1'
+	end	
 
 	*clr & cla
 	act'Move away':gt'foto','studio'

+ 20 - 10
locations/foto_events.qsrc

@@ -827,7 +827,7 @@ end
 !!------------------------------------------------------------------- Special Modelling Jobs ------------------------------------------------------------------
 
 if $ARGS[0] = 'special':
-	modelpay = (pcs_mdlng/2 * 25) + (func('shortgs','sqrt', city_modelling) * 50) + pcs_apprnc
+	modelpay = (pcs_mdlng/2 * 25) + (func('shortgs','sqrt', min(city_modelling, 700)) * 50) + pcs_apprnc
 	if specialmodelrequest ! daystart:
 		specialmodelrequest = daystart
 		specialjob1 = rand(1,100)
@@ -1486,12 +1486,19 @@ if $ARGS[0] = 'pool1':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"What''s up?"'
-			if city_modelling < 100:'"We''ve been hearing good things about you lately. Even though you''re pretty new to the industry, we keep hearing your name pop up. Must mean that you''re starting to get recognized and asked for. So that being said, we''d like to do an offsite shoot today to feature you in an upcoming special issue."'
-			if city_modelling >= 100 and city_modelling < 200:'"You''re really starting to make a name for yourself. We''ve even had a few journalists come to the studio asking about you. So that being said, we''d like to do an offsite shoot today so we can feature you in an upcoming special issue.""'
-			if city_modelling >= 200:'"I was hoping to get you for a shoot today. We have an upcoming special issue and we wanted you to feature in it so we can put your name on the cover to increase sales."'
+			if city_modelling < 100:
+				'"We''ve been hearing good things about you lately. Even though you''re pretty new to the industry, we keep hearing your name pop up. Must mean that you''re starting to get recognized and asked for. So that being said, we''d like to do an offsite shoot today to feature you in an upcoming special issue."'
+			elseif city_modelling >= 100 and city_modelling < 200:
+				'"You''re really starting to make a name for yourself. We''ve even had a few journalists come to the studio asking about you. So that being said, we''d like to do an offsite shoot today so we can feature you in an upcoming special issue.""'
+			elseif city_modelling >= 200:
+				'"I was hoping to get you for a shoot today. We have an upcoming special issue and we wanted you to feature in it so we can put your name on the cover to increase sales."'
+			end
 			'"What kind of shoot?"'
-			if city_modelling < 200:'"A nude pool shoot with you and a few of the other name girls we have here. You''ll all have equal part in it but you''ll all also get your own exclusive sections within the spread. This won''t count as your weekly shoot so you''ll get paid for it and it''s sure to give you a bump of fame as well. How about it?"'
-			if city_modelling >= 200:'"A nude pool shoot with you and a few rising girls. We''re hoping that the people who read the issue for you will help get exposure to these other girls, increase their profile. Even so, it''ll still be good publicity for you too. You''ve been working with us long enough that you know the drill and you''ll get paid for this. Are you in?"'
+			if city_modelling < 200:
+				'"A nude pool shoot with you and a few of the other name girls we have here. You''ll all have equal part in it but you''ll all also get your own exclusive sections within the spread. This won''t count as your weekly shoot so you''ll get paid for it and it''s sure to give you a bump of fame as well. How about it?"'
+			elseif city_modelling >= 200:
+				'"A nude pool shoot with you and a few rising girls. We''re hoping that the people who read the issue for you will help get exposure to these other girls, increase their profile. Even so, it''ll still be good publicity for you too. You''ve been working with us long enough that you know the drill and you''ll get paid for this. Are you in?"'
+			end
 			if city_modelling < 100:
 				gs 'willpower', 'exhib', 'resist', 'easy'
 				if will_cost <= pcs_willpwr:
@@ -1583,10 +1590,13 @@ if $ARGS[0] = 'tennis':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"What''s up?"'
-			if city_modelling < 100:'"You''re pretty athletic right? We wanted a girl to help us with a sports issue. Your name has been coming up more and more often so we thought you''d be a good choice."'
-			if city_modelling < 100:'"What would I be doing? What sport?"'
-			if city_modelling < 100:'"Tennis. We''re doing a bit of video for this shoot and you''d be doing tennis swings in slow motion. The thing is, we really do want someone who looks like they know what they''re doing, so that''s why we''d like to have you over someone else. Think you''re up for it? I think it would really increase your exposure and your profile."'
-			if city_modelling >= 100:'"You like tennis right? Some other magazines were talking about how much you liked the sport so we thought it''d be good put out some special material featuring you doing some tennis swings. We''re talking photography and video here. We think it''d be good publicity for you. What do you think? Want to do it?"'
+			if city_modelling < 100:
+				'"You''re pretty athletic right? We wanted a girl to help us with a sports issue. Your name has been coming up more and more often so we thought you''d be a good choice."'
+				'"What would I be doing? What sport?"'
+				'"Tennis. We''re doing a bit of video for this shoot and you''d be doing tennis swings in slow motion. The thing is, we really do want someone who looks like they know what they''re doing, so that''s why we''d like to have you over someone else. Think you''re up for it? I think it would really increase your exposure and your profile."'
+			elseif city_modelling >= 100:
+				'"You like tennis right? Some other magazines were talking about how much you liked the sport so we thought it''d be good put out some special material featuring you doing some tennis swings. We''re talking photography and video here. We think it''d be good publicity for you. What do you think? Want to do it?"'
+			end
 			if city_modelling < 100:
 				gs 'willpower', 'exhib', 'resist', 'easy'
 				if will_cost <= pcs_willpwr:

+ 1 - 1
locations/foto_models.qsrc

@@ -481,7 +481,7 @@ if $ARGS[0] = 'mari_chat':
 					'Mari smiles at you. "That''s sounds nice."'
 					'You think of your siblings and smile. "Yeah. It is."'
 
-				elseif sisterLesb >= 6:
+				elseif sisterLesb >= 6 and brothersex < 1:
                     '    "Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
                     '    Mari smiles at you. "You sound close."'
                     '    Your mind wanders back to your sister and how you sometimes wake her up in the middle of the night to fool around with her. "You could say that..."'

+ 18 - 38
locations/foto_shoot.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'model':
 	if model = 0:model = 1
 	*clr & cla
 	minut += 5
-	modelpay = (pcs_mdlng/2 * 10) + ((city_modelling + pcs_apprnc)/2)
+	modelpay = (pcs_mdlng/2 * 10) + ((min(city_modelling, 700) + pcs_apprnc)/2)
 	modelpayfin = 900 + (15*rand(0,5))
 	gs 'stat'
 	'<center><b><font color="maroon">Manager</font></b></center>'
@@ -463,14 +463,12 @@ end
 if $ARGS[0] = 'fashion':
 	*clr & cla
 	minut += 120
-	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_fashion += 1
 	mdlng_exp += rand(5,8)
 	gs 'fame', 'city', 'modelling', rand(7,12)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
-	if city_modelling > 200: 
-		gs 'fame', 'city', 'modelling', rand(3,6)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
 	fashionshoot = rand(1,2)
 	gs 'stat'
 	if fashionshoot = 1:
@@ -491,13 +489,11 @@ end
 if $ARGS[0] = 'bikini':
 	*clr & cla
 	minut += 120
-	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_bikini += 1
 	gs 'fame', 'city', 'modelling', rand(7,12)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
-	if city_modelling > 200: 
-		gs 'fame', 'city', 'modelling', rand(3,6)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
 	minut += 120
 	mdlng_exp += rand(6,10)
 	if pcs_inhib < 50:inhib_exp += rand(0,1)
@@ -517,14 +513,12 @@ end
 if $ARGS[0] = 'lingerie':
 	*clr & cla
 	minut += 120
-	modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+	modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_lingerie += 1
 	mdlng_exp += rand(6,10)
 	gs 'fame', 'city', 'modelling', rand(7,13)
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
-	if city_modelling > 200: 
-		gs 'fame', 'city', 'modelling', rand(3,6)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
 	inhib_exp += rand(0,2)
 	shoot = rand(1,2)
 	gs 'stat'
@@ -545,15 +539,13 @@ end
 if $ARGS[0] = 'sexy':
 	*clr & cla
 	minut += 120
-	modelpayfin = 500 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+	modelpayfin = 500 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_glamour += 1
 	modelfoto_ero_clo += 1
 	mdlng_exp += rand(5,10)
 	gs 'fame', 'city', 'modelling', rand(7,12)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
-	if city_modelling > 200: 
-		gs 'fame', 'city', 'modelling', rand(1,6)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(1,6)
 	inhib_exp += rand(0,1)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/sexy/<<rand(1,20)>>.jpg"></center>'
@@ -573,9 +565,7 @@ if $ARGS[0] = 'transparent':
 	mdlng_exp += rand(6,10)
 	gs 'fame', 'city', 'modelling', rand(7,13)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
-	if city_modelling > 200: 
-		gs 'fame', 'city', 'modelling', rand(3,8)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
 	inhib_exp += rand(0,2)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru/<<rand(1,10)>>.jpg"></center>'
@@ -600,9 +590,7 @@ if $ARGS[0] = 'trans_ling':
 	mdlng_exp += rand(8,10)
 	gs 'fame', 'city', 'modelling', rand(9,14)
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
-	if city_modelling > 200: 
-		gs 'fame', 'city', 'modelling', rand(3,8)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
 	inhib_exp += rand(0,2)
 	gs 'stat'
 	if rand(0,1) = 1:
@@ -632,9 +620,7 @@ if $ARGS[0] = 'topless':
 	mdlng_exp += rand(6,10)
 	gs 'fame', 'city', 'modelling', rand(8,14)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
-	if city_modelling > 200: 
-		gs 'fame', 'city', 'modelling', rand(3,8)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
 	inhib_exp += rand(0,2)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topless/<<rand(1,27)>>.jpg"></center>'
@@ -651,15 +637,13 @@ end
 if $ARGS[0] = 'tasteful':
 	*clr & cla
 	minut += 120
-	modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
+	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	modelfoto_tastenude += 1
 	mdlng_exp += rand(9,10)
 	gs 'fame', 'city', 'modelling', rand(10,20)
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
-	if city_modelling > 200: 
-		gs 'fame', 'city', 'modelling', rand(3,10)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,10)
 	inhib_exp += rand(0,2)
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/tastenude/<<rand(1,14)>>.jpg"></center>'
 	'Already naked, you step onto the set and begin the shoot immediately.'
@@ -674,7 +658,7 @@ end
 
 if $ARGS[0] = 'topless_nude':
 	*clr & cla
-	modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
+	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
 	minut += 120
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	modelfoto_nude += 1
@@ -682,9 +666,7 @@ if $ARGS[0] = 'topless_nude':
 	mdlng_exp += rand(9,10)
 	gs 'fame', 'city', 'modelling', rand(10,20)
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
-	if city_modelling > 200: 
-		gs 'fame', 'city', 'modelling', rand(3,10)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,10)
 	inhib_exp += rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topnude/<<rand(1,40)>>.jpg"></center>'
 	'Already naked, you step onto the set and begin the shoot immediately.'
@@ -702,7 +684,7 @@ end
 if $ARGS[0] = 'nude':
 	*clr & cla
 	minut += 120
-	modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
+	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	if modelfoto_nude = 0: modelpayfin * 2 & foto_persuade = 0
 	modelfoto_nude += 1
@@ -712,9 +694,7 @@ if $ARGS[0] = 'nude':
 	mdlng_exp += rand(9,10)
 	gs 'fame', 'city', 'modelling', rand(10,20)
 	gs 'fame', 'pav', 'modelling', rand(10,15)
-	if city_modelling > 200: 
-		gs 'fame', 'city', 'modelling', rand(5,10)
-	end
+	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(5,10)
 	inhib_exp += rand(1,3)
 	if pcs_pubes <= 20:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude/<<rand(1,17)>>.jpg"></center>'

+ 12 - 31
locations/gadbana.qsrc

@@ -46,11 +46,8 @@ if mira_guest = 0:
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			if gadbana_stripping ! daystart:
-				gadbana_stripping = daystart
-				inhib_exp += 2
-				grandmaQW['nudity_trouble'] += 1
-			end
+			inhib_exp += rand(0,2)
+			grandmaQW['nudity_trouble'] += rand(0,2)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
@@ -64,11 +61,8 @@ if mira_guest = 0:
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			if gadbana_stripping ! daystart:
-				gadbana_stripping = daystart
-				inhib_exp += 1
-				grandmaQW['nudity_trouble'] += rand(0,1)
-			end
+			inhib_exp += rand(0,1)
+			grandmaQW['nudity_trouble'] += rand(0,1)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
@@ -268,11 +262,8 @@ else
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			if gadbana_stripping ! daystart:
-				gadbana_stripping = daystart
-				inhib_exp += 2
-				grandmaQW['nudity_trouble'] += 1
-			end
+			inhib_exp += rand(0,2)
+			grandmaQW['nudity_trouble'] += rand(0,2)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
 			gs 'arousal', 'flash', 10, 'exhibitionism'
@@ -285,11 +276,8 @@ else
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			if gadbana_stripping ! daystart:
-				gadbana_stripping = daystart
-				inhib_exp += 1
-				grandmaQW['nudity_trouble'] += rand(0,1)
-			end
+			inhib_exp += rand(0,1)
+			grandmaQW['nudity_trouble'] += rand(0,1)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
 			gs 'arousal', 'flashlite', 10, 'exhibitionism'
@@ -357,11 +345,8 @@ else
 						*clr & cla
 						menu_off = 1
 						minut += 1
-						if gadbana_stripping ! daystart:
-							gadbana_stripping = daystart
-							inhib_exp += 2
-							grandmaQW['nudity_trouble'] += 1
-						end
+						inhib_exp += rand(0,2)
+						grandmaQW['nudity_trouble'] += rand(0,2)
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone but Mira saw you go outside naked, there''s a thrill in potentially getting caught.'
 						!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
 						gs 'arousal', 'flash', 10, 'exhibitionism'
@@ -374,11 +359,8 @@ else
 						*clr & cla
 						menu_off = 1
 						minut += 1
-						if gadbana_stripping ! daystart:
-							gadbana_stripping = daystart
-							inhib_exp += 1
-							grandmaQW['nudity_trouble'] += rand(0,1)
-						end
+						inhib_exp += rand(0,1)
+						grandmaQW['nudity_trouble'] += rand(0,1)
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone but Mira saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
 						!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
 						gs 'arousal', 'flashlite', 10, 'exhibitionism'
@@ -390,7 +372,6 @@ else
 			end
 		end
 	end
-	!125ed
 end
 
 

+ 0 - 12
locations/gaddvor.qsrc

@@ -12,18 +12,6 @@ if $ARGS[0]='':
 	gs 'stat'
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
-	if hour >= 6 and hour < 22:
-		if grandmaQW['nudity_trouble'] = 10:
-			*clr & cla
-			menu_off = 1
-			grandmaQW['nudity_trouble'] = 0
-			'<center><h4>Your grandparents'' yard</h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma_trouble.jpg"></center>'
-			'Suddenly your grandmother approaches you with disappointed look on her face. "I had higher expectations of you young lady! You should be ashamed of yourself running around outdoors without clothes. You have embarrassed me AND your grandfather! Unlike you, we have to live in this village, and with the people in it. If you keep this up, I''ll be cutting your time here short and sending you back to your mother, and she can deal with your sinful behaviour. Go and get dressed immediately!" She then walks off. You are too ashamed to say anything.'
-			act 'Continue': gt 'gaddvor'
-			exit
-		end
-	end
 
 	if StoryLine = 1:
 		'<center><h4>Your grandparents'' yard</h4></center>'

+ 794 - 516
locations/gadforest.qsrc

@@ -1,381 +1,377 @@
 # 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':
+if $ARGS[0] = 'forest_edge':
 	*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)
 
-	! edge of forest
+	! force Mira to stay here if Sveta brought Mira here by choice - temporarily overrides Miras schedule to not annoy the player
+	Mira_Stay = iif($loc ! 'Miroslava', 1 , 0)
+
+	clothesAtLocation = FUNC('lost_clothes_here','forest_edge')
+
 	$loc = 'gadforest'
-	$metka = '1'
+	$metka = 'forest_edge'
 	$location_type = 'secluded'
 
 	$menu_loc = 'gadforest'
-	$menu_arg = '1'
+	$menu_arg = 'forest_edge'
 	menu_off = 0
 
-	clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
-	gs 'gadukino_event', 'sound'
-	gs'stat'
-
-	*clr & cla
+	$forest_args1 = 'forest_edge'
 
-	! Add to knowledge of forest
-	if goforest < 20:goforest += rand(0,1)
-	! chance to get lost
-	lost = 1
-	lostrand = rand(1,20)
-	! Determine where Sveta got lost in the forest
-	foresteventrand = rand(1,20)
-	new_boletus = 0
-	new_bilberry = 0
+	CLOSE ALL
+	gs 'gadukino_event', 'sound'
+	gs 'stat'
 
 	'<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>'
+			*nl
 			'You 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>'
+			*nl
 			'You are at the edge of the forest. Night in the woods is scary and uncomfortable.'
 		end
 	else
-		if hour >= 8 and hour < 18:
+		if hour >= 8 and hour < 20:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter1.jpg"></center>'
-			'You are at the edge of the forest. The forest in winter is very beautiful.'
+			*nl
+			'You are at the edge of the forest. The forest during wintertime is very beautiful.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter_night1.jpg"></center>'
+			*nl
 			'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:'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'
-		if foresteventrand = 3 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1 and week > 5 and forestpicnic = 0: forestpicnic = 1 & gt 'gadforest_event', 'picnic'
-		if foresteventrand = 4 and month >= 6 and month <= 9: gt 'gadforest_event', 'mushroom_pickers2'
-		if foresteventrand = 5 and hour >= 8 and hour <= 15 and month >= 4 and month <= 10 and gadboyday ! daystart and week <= 5: gt 'gadforest_event', 'gopforest_mitka'
-		if foresteventrand = 6 and hour >= 8 and hour <= 18 and month >= 4 and month <= 10 and gadboyday ! daystart and week <= 5: gt 'gadforest_event', 'gopforest_kolyamba'
-		if foresteventrand = 7 and hour >= 8 and hour <= 18 and month >= 4 and month <= 10 and gadboyday ! daystart and week <= 5: gt 'gadforest_event', 'gopforest_vasyan'
-		if foresteventrand = 8 and hour >= 8 and hour <= 15 and month >= 4 and month <= 10 and gadboyday ! daystart and week > 5: gt 'gadforest_event', 'gopforest_2boys'
-		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'
+	gs 'gadforest','bushcraft','forest_edge'
+	*nl
+	if pcs_bushcraft < 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.'
+	else
+		'You are comfortable navigating this part of the forest, and can adventure deeper into the woods if you want.'
+	end
+
+	if clothesAtLocation = 1:*nl & 'Your clothes are nearby on the ground.'
+	if forestpicnic = 1:
+		if hour < 10 or hour > 14:
+			forestpicnic = 0
+		else
+			*nl
+			'On the edge of the forest you see people. Apparently they are having a family <a href="exec:gt ''gadforest_event'',''picnic''">picnic</a>.'
+		end
+	end
+	if hour < 8 or hour > 16 and mushroom_pickers ! 0:
+		mushroom_pickers = 0
+		*nl
+		'You don''t see or hear any other people picking mushrooms or berries in the forest right now.'
+	else
+		*nl
+		if mushroom_pickers = 0:
+			'You don''t see or hear any other people picking mushrooms or berries in the forest right now.'
+		elseif mushroom_pickers = 1:
+			'You can see other people picking mushrooms and berries here at the forests edge.'
+		elseif mushroom_pickers = 2:
+			'You can hear people picking mushrooms and berries deeper in the forest.'
+		end
 	end
+	if MiraLoc = 3:'<a href="exec: gt ''Miroslava'' ">Mira</a> is here with you.'
+
+	foresteventrand = rand(1,20)
+	! Events with Mira
+	if MiraLoc = 3:
+		if hour >= 11 and Mira_Stay = 0:
+			*clr & cla
+
+			gs 'miroslava','miraclothes'
+			*nl
+			'"<<$pcs_nickname>>, I''m going to head home now, but we can hang out again more later." Mira said to you as she began to walk out of the forest.'
+
+			! Allow the player to override Mira schedule to get events done with her, also so Mira cannot appear and disappear before the player can interact with her
+			act 'Convince her to stay with you':
+				Mira_Stay = 1
+				gt 'gadforest', 'forest_edge'
+			end
+			! Allow the player to let Mira continue on her schedule if they want to get events done on their own
+			act 'Say goodbye':
+				MiraLoc = 0
+				gt 'gadforest', 'forest_edge'
+			end
+		end
+		if mirapickingtalk = 0 and miratalkday ! daystart: gt 'gadforest_event', 'mira_picking_talk'
+		if miranudetalk = 0 and miratalkday ! daystart: gt 'gadforest_event', 'mira_nude_talk'
+		! stripping requires there to be no picnic going on, to have clothes on, for there to be no clothes already abandoned at the forest_edge, between april and october and already talked to Mira about being naked in the forest
+		if forestpicnic = 0 and $clothingworntype ! 'nude' and clothesAtLocation = 0 and month >= 4 and month <= 10 and hour >= 8 and hour <= 20 and miranudetalk = 1 and miratalkday ! daystart: gt 'gadforest_event', 'mira_nude_event'
+	! Events without Mira
+	else
+		if metmira = 1 and MiraLoc ! 3 and hour >= 8 and hour <= 10:
+			mirarand = rand(1,10)
+			if mirarand >= 6:
+				*clr & cla
+
+				gs 'Miroslava','miraclothes'
+				*nl
+				'As you walk through the forest, you hear a familiar voice call out to you, "Hey <<$pcs_nickname>>, wait up!" You turn around and see Mira excitedly bounding up behind you.'
+				'"Want to join me on my walk?" she asks. "I love walking through the forest in the morning."'
+
+				act 'Say hi':
+					MiraLoc = 3
+					gt 'gadforest', 'forest_edge'
+				end
+			end
+		end
+		if foresteventrand <= 2 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 1 & gt 'gadforest_event', 'mushroom_pickers1'
+		if foresteventrand <= 4 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers2'
+		if foresteventrand = 5 and month >= 6 and month <= 9 and hour >= 10 and hour <= 14 and temper >= 10 and sunWeather = 1 and week > 5 and forestpicnic = 0: forestpicnic = 1 & gt 'gadforest_event', 'picnic'
+	end
+	! Events with or without Mira
+	if foresteventrand <= 8 and hour >= 8 and hour <= 20 and month >= 4 and month <= 10 and gadboyday ! daystart:
+		if mitkaday ! daystart:
+			gt 'gadforest_event', 'mitka_temporary_event'
+		!	gt 'mitka_forest_1', 'mitka'
+		!elseif kolyambaday ! daystart:
+		!	gt 'mitka_forest_1', 'kolyamba'
+		!elseif vasyanday ! daystart:
+		!	gt 'mitka_forest_1', 'vasyan'
+		end
+	end
+	!if foresteventrand = 9 and hour >= 8 and hour <= 20 and month >= 4 and month <= 10 and gadboyday ! daystart:
+	!	if mitkaday ! daystart and kolyambaday ! daystart:
+	!		gt 'mitka_forest_2', '1'
+	!	elseif mitkaday ! daystart and vasyanday ! daystart:
+	!		gt 'mitka_forest_2', '2'
+	!	elseif kolyambaday ! daystart and vasyanday ! daystart:
+	!		gt 'mitka_forest_2', '3'
+	!	elseif mitkaday ! daystart:
+	!		gt 'mitka_forest_1', 'mitka'
+	!	elseif kolyambaday ! daystart:
+	!		gt 'mitka_forest_1', 'kolyamba'
+	!	elseif vasyanday ! daystart:
+	!		gt 'mitka_forest_1', 'vasyan'
+	!	end
+	!end
+	!if forest_eventrand = 10 and hour >= 8 and hour <= 20 and month >= 4 and month <= 10 and gadboyday ! daystart:
+	!	if mitkaday ! daystart and kolyambaday ! daystart and vasyanday ! daystart:
+	!		gt 'mitka_forest_3'
+	!	elseif mitkaday ! daystart and kolyambaday ! daystart:
+	!		gt 'mitka_forest_2', '1'
+	!	elseif mitkaday ! daystart and vasyanday ! daystart:
+	!		gt 'mitka_forest_2', '2'
+	!	elseif kolyambaday ! daystart and vasyanday ! daystart:
+	!		gt 'mitka_forest_2', '3'
+	!	elseif mitkaday ! daystart:
+	!		gt 'mitka_forest_1', 'mitka'
+	!	elseif kolyambaday ! daystart:
+	!		gt 'mitka_forest_1', 'kolyamba'
+	!	elseif vasyanday ! daystart:
+	!		gt 'mitka_forest_1', 'vasyan'
+	!	end
+	!end
 
 	act 'Leave the woods':
+		! Allow Mira to continue on her schedule as normal if the player was keeping her here for events
+		if MiraLoc = 3:
+			Mira_Stay = 0
+			MiraLoc = 0
+		end
+		! Naked event when leaving forest
 		if $clothingworntype = 'nude':
 			*clr & cla
-			inhib_exp += rand(0,2)
+			menu_off = 1
+
 			if hour >= 6 and hour < 22:
-				if rand(0,100) > 50:
+				if rand(0,10) > 5:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_nude.jpg"></center>'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_back.jpg"></center>'
 				end
 			else
-				if rand(0,100) > 50:
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_nude.jpg"></center>'
+				if rand(0,10) > 5:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_nude_night.jpg"></center>'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_back_night.jpg"></center>'
 				end
 			end
-			if clothesAtLocation = 0:
-				inhib_exp += rand(0,2)
-				'You seem to have misplaced your clothes! You have little choice but to sneak out the woods, hiding your naked body in shadow and moving toward your grandparents house. You wonder where you might have left your clothes.'
+			*nl
+			! clothes ripped apart in the woods or swamp
+			if gadforest_clothestorn = 1:
+				gadforest_clothestorn = 0
+				'Your clothes were torn to shreds in the woods, leaving you with no choice but to head back home naked.'
+				'You try your best to stay in the shadows as you move towards '+iif(StoryLine=1,'your grandparents house ','the village ')+'as stealthily as possible.'
+			! clothes are here
 			elseif clothesAtLocation = 1:
-				'You decide to stash your belongings and sneak out the woods completely naked, purely for the thrill of it, hiding your naked body in shadow and moving toward your grandparents house, avoiding any well lit areas.'
+				'You decide to leave your clothes behind and sneak home naked, purely for the thrill of it.'
+				'You try your best to stay in the shadows as you move towards '+iif(StoryLine=1,'your grandparents house ','the village ')+'as stealthily as possible.'
+			! no clothes here
+			elseif clothesAtLocation = 0:
+				'You seem to have misplaced your clothes, leaving you with no choice but to head back home naked. You wonder where you might have left your clothes.'
+				'You try your best to stay in the shadows as you move towards '+iif(StoryLine=1,'your grandparents house ','the village ')+'as stealthily as possible.'
 			end
-			act 'Run back home naked':
-				minut += 30
-				gt'gadforest', 'caught'
+			! Allow schoolgirl player to leave naked but go straight back home
+			! Non-schoolgirls will just find a random sweatshirt to put on - it is the same everytime but walking around naked in the village is not implemented yet
+			act 'Go back to Gadukino naked':
+				*clr & cla
+				inhib_exp += rand(1,3)
+				gs 'exhibitionism', 3
+				gs 'stat'
+
+				if StoryLine = 1 and grandaQW['block'] = 0:
+					if hour >= 10 and hour < 16 and month >= 4 and month <= 10:
+						forestcaughtrand = rand(4,10)
+					elseif hour >= 6 and hour < 20 and month >= 4 and month <= 10:
+						forestcaughtrand = rand(2,8)
+					else
+						forestcaughtrand = rand(0,6)
+					end
+					if forestcaughtrand >= 9:
+						grandmaQW['nudity_trouble'] += rand(7,10)
+
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_woman.jpg"></center>'
+						*nl
+						'You''ve been spotted walking home naked by all the women of the village. They scold you as you walk by. Your grandparents are definitely going to find out about this.'
+					elseif forestcaughtrand >= 7:
+						grandmaQW['nudity_trouble'] += rand(4,6)
+
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_woman'+rand(1,5)+'.jpg"></center>'
+						*nl
+						'You''ve been spotted walking home naked by a woman from the village. You hope she doesn''t tell your grandmother.'
+					elseif forestcaughtrand >= 5:
+						grandmaQW['nudity_trouble'] += rand(1,3)
+
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_man'+rand(1,5)+'.jpg"></center>'
+						*nl
+						'You''ve been spotted walking home naked by a man from the village. You hope he doesn''t tell your grandfather.'
+					else
+						grandmaQW['nudity_trouble'] += rand(0,1)
+
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
+						*nl
+						'No one saw you outside naked, but there''s a thrill in almost getting caught.'
+					end
+
+					act 'Continue home to your grandparents':
+						minut += 30
+						gs 'stat'
+
+						gt'gaddvor'
+					end
+				else
+					average[520] = 1
+					averageS[520] = 0
+					averageH[520] = 100
+					averageB[520] = pcs_hips
+					gs 'clothing', 'wear', 'average', 520
+
+					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>'
+					*nl
+					'You begin to panic a little. You have no where to go and no one to help you can you are stuck naked in the woods.'
+					'As you look around frantically, you spot a sweatshirt someone must have lost. You quickly put it on, thinking about how lucky you are.'
+
+					act 'Leave':
+						minut += 15
+						gs 'stat'
+
+						gt 'gadroad'
+					end
+				end
 			end
-		elseif $clothingworntype = 'cheap' and clothingwornnumber = 414:
+			! last chance for player to choose to get dressed
 			if clothesAtLocation = 1:
-				'You should pickup your clothes and get dressed before you leave'
+				act 'Get dressed instead':
+					*clr & cla
+					minut += 5
+					gs 'clothing', 'swamp_clothes', 0
+					gs 'underwear', 'wear'
+					gs 'clothing', 'recover_lost_clothes', 'forest_edge', 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>'
+					*nl
+					'You decide to change back into your clothes rather than try to get home through the village naked.'
+
+					act 'Leave':
+						minut += 15
+						gs 'stat'
+
+						gt 'gadroad'
+					end
+				end
 			end
+		! hessian sack from hunters is not allowed to leave the woods it is only supposed to be a temporary item
+		elseif swamp_clothes = 1:
+			*nl
+			'You cannot leave the woods wearing your current clothing. You should pickup your clothes and get dressed before you leave or just risk leaving naked.'
 		else
-			minut += 30
+			minut += 15
 			gs 'stat'
+
 			gt 'gadroad'
 		end
 	end
 
-	gs 'treeCircEntry', 'GadForest'
-
-	! 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:
-				cla
-				*clr
-				menu_off = 1
-				if pcs_inhib < 50:inhib_exp += rand(1,3)
-				minut += 5
-				if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
-				if PCloSkirt > 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'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 nearby and decide not to undress right now.'
-
-				act'Continue':gt'gadforest','1'
-			end
-		end
+	! Sveta cannot travel further into the forest if Mira is here at the forest with Sveta
+	if MiraLoc ! 3:
+		act 'Go further into the forest': minut += 15 & gt 'gadforest','forest_outskirts'
 	end
 
-	if clothesAtLocation = 1 and $clothingworntype = 'nude':
-		act 'Get dressed':
-			cla
-			*clr
-			menu_off = 1
-			minut += 5
-			gs 'clothing', 'swamp_clothes', 0
-			gs 'underwear', 'wear'
-			gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
-			gs 'stat'
-			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
-			if PCloSkirt > 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
+	gs 'bicycle', 'gadforest'
 
-	! if Sveta left the forest without retrieving her clothes
-	if clothesAtLocation = 1 and $clothingworntype ! 'nude':
-		if $clothingworntype = 'cheap' and clothingwornnumber = 414:
-			act 'Pick up your abandoned clothing':
-				cla
-				menu_off = 1
-				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
-				menu_off = 1
-				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
+	! Sveta can go to the Meadow if she has discovered it and bring Mira too if she is allowed
+	if (meadow > 0 and MiraLoc ! 3):
+		act 'Go to the meadow': minut += 20 & gt 'meadow'
+	elseif ((meadow = 3 or (meadow = 6 and npc_QW['A60'] >= 3)) and MiraLoc = 3):
+		act 'Go to the meadow with Mira': minut += 20 & MiraLoc = 2 & gt 'meadow'
 	end
 
-	if hour >= 6 and hour <= 20 and sunWeather = 1:
-		act 'Go for a walk in the woods':
-			cla
-			*clr
-			menu_off = 1
-			minut += 60
-			pcs_mood += 20
-			if $clothingworntype = 'nude':
-				pcs_health += healthmax/5 & pcs_horny += 5
-				inhib_exp += rand(1,5)
-			end
-			gs 'stat'
-
-			if month >= 4 and month <= 10:
-				if MiraLoc ! 3:
-					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
-					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and PCloSkirt > 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 PCloSkirt > 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 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>'
-					'You walk with Mira through the woods, enjoying the sounds of the forest and the fresh air.'
-				end
+	! Can travel directly to the hunters cabin if Sveta has been there before, knows the hunters, and Mira is not here at the forest with Sveta
+	if hunterscabin = 1 and huntersKnow = 1 and MiraLoc ! 3:
+		act 'Go to the hunters cabin':
+			! daytime chance to get stuck in swamp - use bike to get there 100% of the time
+			if hour >= 6 and hour <= 22:
+				gt 'swamp', 'stuck'
+			! nighttime chased by wolves - Sveta probably should not be roaming the forest at this time
 			else
-				if MiraLoc ! 3:
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforestwinter0.'+rand(1,2)+'.jpg"></center>'
-					'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 snowy woods, enjoying the sounds of the forest and the fresh air.'
-				end
+				gt 'gadforestlost','wolves','forest_edge'
 			end
-
-			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
-			*clr
-			menu_off = 1
-			minut += 30
-			temp_gf = rand(1,2)
-			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)
-				new_bilberry += 1
-				boletus += new_boletus
-				bilberry += new_bilberry
-				pcs_mood += 5
-				gs 'stat'
+	! tree circle teleportation for magic users - only found at the edge of the forest
+	gs 'treeCircEntry', 'GadForest'
 
-				gs 'gadforest', 'clothes1'
-				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)
-				bilberry += new_bilberry
-				gs 'stat'
+	! the generic actions for the different parts of the forest are so similar that they are all stored in their own gosubs so the code is not duplicated
+	gs 'gadforest', 'stripping'
 
-				if new_bilberry > 0: gs 'gadforest', 'clothes1'
-				if new_bilberry = 0: gs 'gadforest', 'clothes2'
-				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
-				pcs_mood -= 5
-				gs 'stat'
+	gs 'gadforest', 'dressing'
 
-				gs 'gadforest', 'clothes2'
-				'After searching for mushrooms and berries for half an hour you found nothing.'
-			end
-			act 'Continue':gt 'gadforest','1'
-		end
- 	end
+	gs 'gadforest', 'walking'
 
-	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 joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $metka
-
-	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
-				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
-	gs 'stat'
+	gs 'gadforest', 'picking'
 end
 
-if $ARGS[0] = 'caught':
+if $ARGS[0] = 'forest_outskirts':
 	*clr & cla
-	menu_off = 1
-	caught_rand = rand(0, 100)
-	if caught_rand > 90:
-		inhib_exp += rand(0,3)
-		grandmaQW['nudity_trouble'] += rand(7,10)
-		gs 'arousal', 'flash', 10, 'exhibitionism'
-		gs 'arousal', 'end'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_woman.jpg"></center>'
-		'You''ve been spotted walking home naked by all the women of the village. They are all sitting there scolding you. Your grandparents are definitely going to find out about this.'
-	elseif caught_rand > 70:
-		inhib_exp += rand(0,4)
-		grandmaQW['nudity_trouble'] += rand(1,3)
-		gs 'arousal', 'flash', 10, 'exhibitionism'
-		gs 'arousal', 'end'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_woman'+rand(1,5)+'.jpg"></center>'
-		'You''ve been spotted walking home naked by a woman from the village. You want to hope she doesn''t tell your grandparents.'
-	elseif caught_rand > 50:
-		inhib_exp += rand(0,3)
-		grandmaQW['nudity_trouble'] += rand(1,3)
-		gs 'arousal', 'flash', 10, 'exhibitionism'
-		gs 'arousal', 'end'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_man'+rand(1,5)+'.jpg"></center>'
-		'You''ve been spotted walking home naked by a man from the village. You want to hope he doesn''t tell your grandparents.'
-	else
-		grandmaQW['nudity_trouble'] += rand(0,1)
-		gs 'arousal', 'flash', 10, 'exhibitionism'
-		gs 'arousal', 'end'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
-		'Luckily no one saw you outside naked, but there''s a thrill in almost getting caught.'
-	end
-	act 'Continue': gt'gaddvor'
-end
 
-if $ARGS[0] = '2':
-	*clr & cla
-	! slightly inside forest
+	clothesAtLocation = FUNC('lost_clothes_here','forest_outskirts')
+
 	$loc = 'gadforest'
-	$metka = '2'
+	$metka = 'forest_outskirts'
 	$location_type = 'secluded'
 
 	$menu_loc = 'gadforest'
-	$menu_arg = '2'
+	$menu_arg = 'forest_outskirts'
 	menu_off = 0
 
+	$forest_args1 = 'forest_outskirts'
+
+	CLOSE ALL
 	gs 'gadukino_event', 'sound'
-	gs'stat'
-
-	! Add to knowledge of forest
-	if goforest < 40:goforest += rand(0,1)
-	! Determine where Sveta got lost in the forest
-	lost = 2
-	! chance to get lost
-	lostrand = rand(1,60)
-	foresteventrand = rand(1,10)
-	new_boletus = 0
-	new_bilberry = 0
-
-	'<center><H4>Forest</H4></center>'
+	gs 'stat'
+
+	'<center><H4>Forest Outskirts</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>'
@@ -385,7 +381,7 @@ if $ARGS[0] = '2':
 			'You are in the forest. Night in the woods is scary and uncomfortable.'
 		end
 	else
-		if hour >= 8 and hour < 18:
+		if hour >= 8 and hour < 20:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter2.jpg"></center>'
 			'You are in the forest. The forest in the winter is very beautiful, the fresh air makes you happy.'
 		else
@@ -393,97 +389,67 @@ if $ARGS[0] = '2':
 			'You are in the forest. Night in the forest during wintertime is very scary and uncomfortable.'
 		end
 	end
-	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_hunters'
-	if foresteventrand > 7 and month >= 6 and month <= 9 and foresteventday ! daystart:mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers3'
+	gs 'gadforest','bushcraft','forest_outskirts'
+	*nl
+	if pcs_bushcraft < 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.'
+	else
+		'You are comfortable navigating this part of the forest, and can adventure deeper into the woods if you want.'
+	end
+	if clothesAtLocation = 1:*nl & 'Your clothes are nearby on the ground.'
+	if hour < 8 or hour > 16:
+		mushroom_pickers = 0
+		*nl
+		'You don''t see or hear any other people picking mushrooms or berries in the forest right now.'
+	else
+		*nl
+		if mushroom_pickers = 0:
+			'You don''t see or hear any other people picking mushrooms or berries in the forest right now.'
+		elseif mushroom_pickers = 1:
+			'You can hear other people picking mushrooms and berries at the forests edge.'
+		elseif mushroom_pickers = 2:
+			'You can see people picking mushrooms and berries here on the outskirts of the forest.'
+		end
+	end
 
+	foresteventrand = rand(1,20)
+	if foresteventrand <= 2 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart:mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers1'
+	if foresteventrand <= 4 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers3'
+	if foresteventrand = 5 and month >= 4 and month <= 10 and ((hour >= 6 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforest_event', 'forest_hunters', 'forest_outskirts'
 
-	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'
-	end
-	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and forestday ! daystart:
-		act 'Look for mushrooms and berries':
-			cla
-			*clr
-			menu_off = 1
-			minut += 30
-			temp_gf = rand(1,2)
-			forestday = daystart
-			if goforest < 40:goforest += rand(0,1)
-			gs 'stat'
+	act 'Head back out of the forest': minut += 15 & gt 'gadforest', 'forest_edge'
 
-			! mushroom_pickers either not seen today or still at the edge of the forest
-			if mushroom_pickers < 2:
-				cla
-				new_boletus += 1
-				new_bilberry += rand(1,2)
-				boletus += new_boletus
-				bilberry += new_bilberry
-				pcs_mood += 5
-				gs 'stat'
+	act 'Go further into the forest': minut += 15 & gt 'gadforest','forest_center'
 
-				gs 'gadforest', 'clothes1'
-				'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
-				new_boletus += rand(0,1)
-				new_bilberry += 1
-				boletus += new_boletus
-				bilberry += new_bilberry
-				gs 'stat'
+	! the generic actions for the different parts of the forest are so similar that they are all stored in their own gosubs so the code is not duplicated
+	gs 'gadforest', 'stripping'
 
-				if new_boletus > 0 or new_bilberry > 0: gs 'gadforest', 'clothes1'
-				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
-				pcs_mood -= 5
-				gs 'stat'
+	gs 'gadforest', 'dressing'
 
-				gs 'gadforest', 'clothes2'
-				'After searching for mushrooms and berries for half an hour you found nothing.'
-			end
-			act 'Continue':gt 'gadforest','2'
-		end
-	end
+	gs 'gadforest', 'walking'
 
-	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'
-			if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
-	 	end
-	end
+	gs 'gadforest', 'picking'
 end
 
-if $ARGS[0] = '3':
+if $ARGS[0] = 'forest_center':
 	*clr & cla
-	! deep inside forest
+
+	clothesAtLocation = FUNC('lost_clothes_here','forest_center')
+
 	$loc = 'gadforest'
-	$metka = '3'
+	$metka = 'forest_center'
 	$location_type = 'secluded'
 
 	$menu_loc = 'gadforest'
-	$menu_arg = '3'
+	$menu_arg = 'forest_center'
 	menu_off = 0
 
+	$forest_args1 = 'forest_center'
+
+	CLOSE ALL
 	gs 'gadukino_event', 'sound'
-	gs'stat'
-
-	! Add to knowledge of forest
-	if goforest < 60:goforest += rand(0,1)
-	lost = 3
-	! Determine where Sveta got lost in the forest
-	lostrand = rand(1,100)
-	! chance to get lost
-	foresteventrand = rand(1,10)
-	new_boletus = 0
-	new_bilberry = 0
+	gs 'stat'
 
 	'<center><H4>Deep Forest</H4></center>'
 	if month >= 4 and month <= 10:
@@ -495,7 +461,7 @@ if $ARGS[0] = '3':
 			'You are deep in the forest. Night in the woods is scary and uncomfortable.'
 		end
 	else
-		if hour >= 8 and hour < 18:
+		if hour >= 8 and hour < 20:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter3.jpg"></center>'
 			'You are deep in the forest. The forest in the winter is very beautiful, the fresh air makes you happy.'
 		else
@@ -503,184 +469,496 @@ if $ARGS[0] = '3':
 			'You are deep in the forest. Night in the forest during wintertime is very scary and uncomfortable.'
 		end
 	end
-	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_hunters'
-
-	act 'Go back to the forest':
-		lostrand = rand(1,60)
-		if goforest >= lostrand:minut += 30 & gt 'gadforest','2'
-		if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
+	gs 'gadforest','bushcraft','forest_center'
+	*nl
+	if pcs_bushcraft < 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.'
+	else
+		'You are comfortable navigating this part of the forest, and can adventure deeper into the woods if you want.'
+	end
+	if clothesAtLocation = 1:*nl & 'Your clothes are nearby on the ground.'
+	if hour < 8 or hour > 16:
+		mushroom_pickers = 0
+		*nl
+		'You don''t see or hear any other people picking mushrooms or berries in the forest right now.'
+	else
+		*nl
+		if mushroom_pickers = 0:
+			'You don''t see or hear any other people picking mushrooms or berries in the forest right now.'
+		elseif mushroom_pickers = 1:
+			'You can hear people picking mushrooms and berries at the forests edge.'
+		elseif mushroom_pickers = 2:
+			'You can hear people picking mushrooms and berries at the outskirts of the forest.'
+		end
 	end
 
-	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and thicketday ! daystart:
+	foresteventrand = rand(1,20)
+	if foresteventrand <= 2 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'basket'
+	if foresteventrand <= 3 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'bilberry'
+	if foresteventrand <= 4 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'mushroom'
+	if foresteventrand = 5 and month >= 4 and month <= 10 and ((hour >= 6 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforest_event', 'forest_hunters', 'forest_center'
 
-	act 'Look for mushrooms and berries':
-			*clr & cla
-			menu_off = 1
-			minut += 30
-			thicketday = daystart
-			if goforest < 60:goforest += rand(0,1)
-			new_boletus += rand(1,2)
-			new_bilberry += rand(1,2)
-			boletus += new_boletus
-			bilberry += new_bilberry
-			pcs_mood += 5
-			gs 'stat'
-			gs 'gadforest', 'clothes1'
-			'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+	act 'Head back out of the forest': minut += 15 & gt 'gadforest', 'forest_outskirts'
 
-			act 'Continue':gt 'gadforest','3'
-		end
-	end
+	act 'Go further into the swamp': minut += 15 & gt 'swamp', 'start'
 
-	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9:
+	! the generic actions for the different parts of the forest are so similar that they are all stored in their own gosubs so the code is not duplicated
+	gs 'gadforest', 'stripping'
 
-		act 'Go further into the forest':
-			if goforest >= lostrand:minut += 30 & gt 'gadforest','4'
-			if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
-	 	end
-	end
-end
+	gs 'gadforest', 'dressing'
 
-if $ARGS[0] = '4':
-	*clr & cla
-	! forest near swamp
-	$loc = 'gadforest'
-	$metka = '4'
-	$location_type = 'secluded'
+	gs 'gadforest', 'walking'
 
-	$menu_loc = 'gadforest'
-	$menu_arg = '4'
-	menu_off = 0
+	gs 'gadforest', 'picking'
+end
 
-	gs 'gadukino_event', 'sound'
-	gs'stat'
-
-	! Add to knowledge of forest
-	if goforest < 80:goforest += rand(0,1)
-	lost = 4
-	! Determine where Sveta got lost in the forest
-	lostrand = rand(1,120)
-	! chance to get lost
-	foresteventrand = rand(1,10)
-	dirty = 0
-	new_boletus = 0
-	new_bilberry = 0
-
-	'<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>'
-			'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.'
+
+! this gs handles the bushcraft increases, clothing degradation, and getting lost in the forest
+! $ARGS[1] - location of forest where this is called from
+! Example: gs 'gadforest', 'bushcraft', 'forest_edge'
+if $ARGS[0] = 'bushcraft':
+	! bushcraft_rand - the max amount of bushcraft exp that can be gained from an action in an area of the forest
+	! bushcraft_limit - the max amount bushcraft can be naturally raised to by visiting an area of the forest
+	! bushcraft_lost - bushcraft needed to no longer get lost when visiting an area of the forest
+	! torncloth_high_bushcraft - chance of tearing clothes with high bushcraft when visiting an area of the forest
+	! torncloth_low_bushcraft - chance of tearing clothes with low bushcraft when visiting an area of the forest
+	! Make sure Sveta always has at least 1 pcs_bushcraft
+	if pcs_bushcraft = 0:pcs_bushcraft = 1
+	if $ARGS[1] = 'forest_edge':
+		bushcraft_rand = 1
+		bushcraft_limit = 10
+		! Sveta cannot get lost at the forest_edge part of the forest anymore
+		bushcraft_lost = 1
+		torncloth_high_bushcraft = 10
+		torncloth_low_bushcraft = 9
+	elseif $ARGS[1] = 'forest_outskirts':
+		bushcraft_rand = 2
+		bushcraft_limit = 20
+		bushcraft_lost = 20
+		torncloth_high_bushcraft = 9
+		torncloth_low_bushcraft = 7
+	elseif $ARGS[1] = 'forest_center':
+		bushcraft_rand = 3
+		bushcraft_limit = 30
+		bushcraft_lost = 30
+		torncloth_high_bushcraft = 8
+		torncloth_low_bushcraft = 5
+	elseif $ARGS[1] = 'swamp_woods':
+		bushcraft_rand = 4
+		bushcraft_limit = 40
+		! Sveta cannot get lost at the swamp_woods part of the forest either
+		bushcraft_lost = 1
+		torncloth_high_bushcraft = 7
+		torncloth_low_bushcraft = 3
+	end
+	! most annoying part of the old forest code was how difficult it was to do anything without getting lost and having your clothes destroyed quickly
+	! the new pcs_bushcraft stat will now help Sveta keep her clothes intact longer and it is much less grindy than the old goforest variable for navigating the forest
+	! also if Sveta meets the hunters they can help her raise this stat as well but it will go up naturally too from just visiting the forest every day
+	! if Sveta raises bushcraft with the hunters then she will get to a point where she no longer get lost in the forest since there is no cap on bushcraft when learning from them
+	ripclothesrand = rand(1,10)
+	if pcs_bushcraft < bushcraft_limit:
+		! use the higher chance of ripping clothes when Sveta has lower bushcraft
+		if ripclothesrand >= torncloth_low_bushcraft: gs 'gadforest', 'torncloth'
+
+		! bushcraft exp gained is random to keep it from increasing too fast
+		if rand(0,1) = 0:
+			bushcraft_exp += rand(0,bushcraft_rand)
 		end
 	else
-		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter4.jpg"></center>'
-			'You are in the forest near the swamp. The forest in the winter is very beautiful, the fresh air makes you happy.'
+		! use the lower chance of ripping clothes when Sveta has higher bushcraft
+		if ripclothesrand >= torncloth_high_bushcraft: gs 'gadforest', 'torncloth'
+	end
+
+	! decide if Sveta is now lost as Sveta raises her bushcraft her chances of getting lost decreases
+	if pcs_bushcraft < bushcraft_lost:
+		lostrand = rand(1,bushcraft_lost)
+		if pcs_bushcraft < lostrand: lost_girl = 1 & forest_lostday = daystart & gt 'gadforestlost', $ARGS[1]
+	end
+end
+
+! this gs handles the actual degradation and removal of clothes from Sveta in the forest
+! this should only be called from inside of gs 'gadforest', 'bushcraft'
+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 tear slightly.'
+			dynamic $clothingworntype + 'H[<<clothingwornnumber>>] -= 1'
+			!add remove clothes if worn out
+			if dyneval('RESULT = <<$clothingworntype>>H[<<clothingwornnumber>>]') <= 0:
+				'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'
+				gs 'stat'
+			end
+		end
+	end
+end
+
+! this gs handles stripping for Sveta in the various locations of the forest
+! $forest_args1 - location of forest where this is called from
+! Example: gs 'gadforest', 'stripping'
+if $ARGS[0] = 'stripping':
+	! stripping requires there to be no picnic going on, to have clothes on, for there to be no clothes already abandoned at the current location, between april and october and lowered inhibitions or higher exhibitionism
+	if $clothingworntype ! 'nude' and clothesAtLocation = 0 and month >= 4 and month <= 10 and hour >= 6 and hour < 22 and (pcs_inhib >= 25 or exhibitionist_lvl > 1):
+		! Mira only goes to the forest edge
+		if MiraLoc = 3 and $forest_args1 = 'forest_edge':
+			! stripping with Mira requires completing talking to her about it already and doing their nude event in the forest already
+			if miranudetalk = 2:
+				act 'Strip Naked with Mira':
+					*clr & cla
+					menu_off = 1
+					minut += 5
+					if pcs_inhib < 50:inhib_exp += rand(1,3)
+					gs 'underwear', 'remove'
+					if swamp_clothes = 0:
+						gs 'clothing', 'strip', $forest_args1
+					elseif swamp_clothes = 1:
+						gs 'clothing', 'strip', 'gadforest'
+						gs 'clothing', 'swamp_clothes', 0
+					end
+					gs 'exhibitionism', 3
+					gs 'stat'
+
+					'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest6.jpg"></center>'
+
+					'You and Mira quickly get undressed, leaving your clothes in a neat pile on the ground.'
+
+					act 'Continue': gt 'gadforest', $forest_args1
+				end
+			end
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter_night4.jpg"></center>'
-			'You are in the forest near the swamp. Night in the forest during wintertime is very scary and uncomfortable.'
+			! picnic blocks being naked at the forest edge but not other parts of the forest
+			if (forestpicnic = 0 and $forest_args1 = 'forest_edge') or $forest_args1 ! 'forest_edge':
+				act 'Strip Naked':
+					*clr & cla
+					menu_off = 1
+					minut += 5
+					if pcs_inhib < 50:inhib_exp += rand(1,3)
+					gs 'underwear', 'remove'
+					if swamp_clothes = 0:
+						gs 'clothing', 'strip', $forest_args1
+					elseif swamp_clothes = 1:
+						gs 'clothing', 'strip', 'gadforest'
+						gs 'clothing', 'swamp_clothes', 0
+					end
+					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 quickly get undressed, leaving your clothes in a neat pile on the ground.'
+
+					if $forest_args1 = 'swamp_woods':
+						act 'Continue': gt 'swamp_woods', 'start'
+					else
+						act 'Continue': gt 'gadforest', $forest_args1
+					end
+				end
+			end
 		end
 	end
-	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.'
+end
 
-	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_hunters'
+! this gs handles dressing for Sveta in the various locations of the forest
+! $forest_args1 - location of forest where this is called from
+! Example: gs 'gadforest', 'dressing'
+if $ARGS[0] = 'dressing':
+	! code for different variations of getting dressed or dealing with clothes left in the forest
+	if clothesAtLocation = 1:
+		if $clothingworntype = 'nude':
+			act 'Get dressed':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				gs 'clothing', 'swamp_clothes', 0
+				gs 'underwear', 'wear'
+				gs 'clothing', 'recover_lost_clothes', $forest_args1, 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>'
+				*nl
+				'You change back into your clothes.'
 
-	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'
+				if $forest_args1 = 'swamp_woods':
+					act 'Continue': gt 'swamp_woods', 'start'
+				else
+					act 'Continue': gt 'gadforest', $forest_args1
+				end
+			end
+		elseif $clothingworntype ! 'nude':
+			! hessian sack from hunters is not allowed to leave the woods it is only supposed to be a temporary item
+			if $clothingworntype = 'cheap' and clothingwornnumber = 414:
+				act 'Wear your abandoned clothing':
+					*clr & cla
+					menu_off = 1
+					minut += 5
+					gs 'clothing', 'swamp_clothes', 0
+					gs 'underwear', 'wear'
+					gs 'clothing', 'recover_lost_clothes', $forest_args1, 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>'
+					*nl
+					'You wear your abandoned clothing and get rid of the hessian sack the hunters gave you.'
+
+					if $forest_args1 = 'swamp_woods':
+						act 'Continue': gt 'swamp_woods', 'start'
+					else
+						act 'Continue': gt 'gadforest', $forest_args1
+					end
+				end
+			else
+				act 'Pick up your abandoned clothing':
+					cla
+					menu_off = 1
+					minut += 5
+					gs 'clothing', 'swamp_clothes', 0
+					gs 'underwear', 'wear'
+					gs 'clothing', 'recover_lost_clothes', $forest_args1
+					gs 'stat'
+
+					*nl
+					'You pick up your abandoned clothing.'
+
+					if $forest_args1 = 'swamp_woods':
+						act 'Continue': gt 'swamp_woods', 'start'
+					else
+						act 'Continue': gt 'gadforest', $forest_args1
+					end
+				end
+			end
+		end
 	end
-	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and swampforest ! daystart:
-		act 'Look for mushrooms and berries':
-			cla
-			*clr
-			menu_off = 1
-			minut += 30
-			swampforest = daystart
-			if goforest < 80:goforest += rand(0,1)
-			new_boletus += rand(1,2)
-			new_bilberry += rand(2,3)
-			boletus += new_boletus
-			bilberry += new_bilberry
-			pcs_mood += 5
-			gs 'stat'
+end
+
+! this gs handles walking for Sveta in the various locations of the forest
+! $forest_args1 - location of forest where this is called from
+! Example: gs 'gadforest', 'walking'
+if $ARGS[0] = 'walking':
+	if hour >= 6 and hour <= 22:
+		! Mira only goes to the forest edge
+		if MiraLoc = 3 and $forest_args1 = 'forest_edge':
+			act 'Go for a walk in the woods with Mira (1:00)':
+				*clr & cla
+				menu_off = 1
+				minut += 60
+				pcs_mood += 20
+				pcs_health += healthmax/5
+				gs 'gadforest', 'bushcraft', $forest_args1
+				if $clothingworntype = 'nude':
+					if pcs_inhib < 50:inhib_exp += rand(1,5)
+					gs 'exhibitionism', 3
+				end
+				gs 'stat'
 
-			gs 'gadforest', 'clothes1'
-			'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+				if month >= 4 and month <= 10:
+					! 10% chance of finding meadow (needed to advance Miras quest)
+					if rand(0,9) = 0 and meadow = 0 and $forest_args1 = 'forest_edge':
+						gt 'gadforest_event', 'find_meadow'
+					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>'
+						*nl
+						'You spend an hour walking with Mira through the woods, chatting and enjoying the sounds of the forest and the fresh air.'
+					end
+				else
+					'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforestwinter.jpg"></center>'
+					*nl
+					'You spend an hour walking with Mira through the snowy woods, chatting and enjoying the sounds of the forest and the fresh air.'
+				end
+
+				act 'Continue':gt 'gadforest', $forest_args1
+			end
+		else
+			act 'Go for a walk in the woods (1:00)':
+				*clr & cla
+				menu_off = 1
+				minut += 60
+				pcs_mood += 20
+				pcs_health += healthmax/5
+				gs 'gadforest', 'bushcraft', $forest_args1
+				if $clothingworntype = 'nude' and pcs_inhib < 50:inhib_exp += rand(1,5)
+				gs 'stat'
 
-			act 'Continue':gt 'gadforest','4'
+				! 10% chance of finding meadow (needed to advance Miras quest)
+				if rand(0,9) = 0 and meadow = 0 and $forest_args1 = 'forest_edge':
+					gt 'gadforest_event', 'find_meadow'
+				else
+					if month >= 4 and month <= 10:
+						if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
+						if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest1.'+rand(1,3)+'.jpg"></center>'
+						if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga0.'+rand(1,2)+'.jpg"></center>'
+						if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_nude0.'+rand(1,4)+'.jpg"></center>'
+						*nl
+						'You spend an hour walking through the woods, enjoying the sounds of the forest and the fresh air.'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforestwinter0.'+rand(1,6)+'.jpg"></center>'
+						*nl
+						'You spend an hour walking through the snowy woods, enjoying the sounds of the forest and the fresh air.'
+					end
+
+					if $forest_args1 = 'swamp_woods':
+						act 'Continue': gt 'swamp_woods', 'start'
+					else
+						act 'Continue': gt 'gadforest', $forest_args1
+					end
+				end
+			end
 		end
 	end
+end
 
-	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'
+! this gs handles mushroom and berry picking for Sveta in the various locations of the forest
+! $forest_args1 - location of forest where this is called from
+! Example: gs 'gadforest', 'picking'
+if $ARGS[0] = 'picking':
+	if StoryLine = 1 or (StoryLine = 0 and mirapickingtalk = 1):
+		if hour >= 6 and hour <= 22 and month >= 6 and month <= 9 and boletus + boletus_cooked + bilberry < 5:
+			if ($forest_args1 = 'forest_edge' and edge_pickingday ! daystart) or ($forest_args1 = 'forest_outskirts' and outskirts_pickingday ! daystart) or ($forest_args1 = 'forest_center' and center_pickingday ! daystart) or ($forest_args1 = 'swamp_woods' and swamp_pickingday ! daystart):
+				act 'Look for mushrooms and berries'+iif(MiraLoc = 3 and $forest_args1 = 'forest_edge', ' with Mira (0:30)',' (0:30)'):
+					*clr & cla
+					menu_off = 1
+
+					if $forest_args1 = 'forest_edge':
+						edge_pickingday = daystart
+						mushroom_pickers_check = 1
+						max_boletus = 1
+						max_bilberry = 1
+					elseif $forest_args1 = 'forest_outskirts':
+						outskirts_pickingday = daystart
+						mushroom_pickers_check = 2
+						max_boletus = 2
+						max_bilberry = 2
+					elseif $forest_args1 = 'forest_center':
+						center_pickingday = daystart
+						mushroom_pickers_check = 3
+						max_boletus = 3
+						max_bilberry = 3
+					elseif $forest_args1 = 'swamp_woods':
+						swamp_pickingday = daystart
+						mushroom_pickers_check = 4
+						max_boletus = 4
+						max_bilberry = 4
+					end
+
+					minut += 30
+					new_boletus = 0
+					new_bilberry = 0
+					gs 'gadforest', 'bushcraft', $forest_args1
+					if $clothingworntype = 'nude':
+						if pcs_inhib < 50:inhib_exp += rand(1,5)
+						if MiraLoc = 3 and $forest_args1 = 'forest_edge': gs 'exhibitionism', 3
+					end
+					gs 'stat'
+
+					! mushroom_pickers are not at the location of the forest Sveta is in
+					if mushroom_pickers ! mushroom_pickers_check:
+						new_boletus += max_boletus
+						new_bilberry += max_bilberry
+						boletus += new_boletus
+						bilberry += new_bilberry
+						pcs_mood += 10
+						gs 'stat'
+
+						gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+						*nl
+						'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+					! mushroom pickers are at the location of the forest Sveta is in
+					elseif mushroom_pickers = mushroom_pickers_check:
+						new_boletus += rand(0,max_boletus)
+						new_bilberry += rand(0,max_bilberry)
+						boletus += new_boletus
+						bilberry += new_bilberry
+						gs 'stat'
+
+						if new_boletus > 0 and new_bilberry > 0:
+							pcs_mood += 10
+							gs 'stat'
+
+							gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+							*nl
+							'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+						elseif new_boletus = 0 and new_bilberry > 0:
+							pcs_mood += 5
+							gs 'stat'
+
+							gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+							*nl
+							'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
+						elseif new_boletus > 0 and new_bilberry = 0:
+							pcs_mood += 5
+							gs 'stat'
+
+							gs 'gadforest', 'picking_clothes', $forest_args1, 'mushroom'
+							*nl
+							'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms'
+						elseif new_boletus = 0 and new_bilberry = 0:
+							pcs_mood -= 5
+							gs 'stat'
+
+							gs 'gadforest', 'picking_clothes_empty', $forest_args1
+							*nl
+							'After searching for mushrooms and berries for half an hour you found nothing.'
+						end
+					end
+
+					if $forest_args1 = 'swamp_woods':
+						act 'Continue': gt 'swamp_woods', 'start'
+					else
+						act 'Continue': gt 'gadforest', $forest_args1
+					end
+				end
+			end
+		end
 	end
 end
 
-!dynamics to ARGS by illume
-if $ARGS[0] = 'clothes1':
-	if MiraLoc ! 3:
-		if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
-		if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
-		if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
-		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom4.'+rand(1,3)+'.jpg"></center>'
-
-	else
-		if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom'+rand(1,2)+'.jpg"></center>'
-		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom_nude'+rand(1,2)+'.jpg"></center>'
+! this gs handles images for mushroom and berry picking for Sveta in the various locations of the forest when she finds at least 1 kg of berries or mushrooms
+! $ARGS[1] - location of forest where this is called from
+! $ARGS[2] - whether you want images for mushrooms or berries
+! Example: gs 'gadforest', 'picking_clothes', 'forest_edge', 'mushroom'
+if $ARGS[0] = 'picking_clothes':
+	if $ARGS[2] = 'mushroom':
+		if MiraLoc = 3 and $ARGS[1] = 'forest_edge':
+			if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom'+rand(1,2)+'.jpg"></center>'
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom_nude'+rand(1,2)+'.jpg"></center>'
+		else
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom4.'+rand(1,3)+'.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
+			if $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
+			if $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
+		end
+	elseif $ARGS[2] = 'berry':
+		if MiraLoc = 3 and $ARGS[1] = 'forest_edge':
+			if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom'+rand(1,2)+'.jpg"></center>'
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom_nude'+rand(1,2)+'.jpg"></center>'
+		else
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom4.'+rand(1,3)+'.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/blueberry_picking_'+rand(3,6)+'.jpg"></center>'
+			if $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/blueberry_picking_2.jpg"></center>'
+			if $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/blueberry_picking_1.jpg"></center>'
+		end
 	end
 end
 
-if $ARGS[0] = 'clothes2':
-	if MiraLoc ! 3:
+! this gs handles images for mushroom and berry picking for Sveta in the various locations of the forest when she finds 0 kg of berries or mushrooms
+! $ARGS[1] - location of forest where this is called from
+! Example: gs 'gadforest', 'picking_clothes_empty', 'forest_edge'
+if $ARGS[0] = 'picking_clothes_empty':
+	if MiraLoc = 3 and $ARGS[1] = 'forest_edge':
+		if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom3.jpg"></center>'
+		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom_nude3.jpg"></center>'
+	else
 		if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest2.jpg"></center>'
 		if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest3.jpg"></center>'
 		if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga1.'+rand(1,2)+'.jpg"></center>'
 		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_nude1.'+rand(1,4)+'.jpg"></center>'
-	else
-		if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom3.jpg"></center>'
-		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom_nude3.jpg"></center>'
 	end
 end
 
-if $ARGS[0] = 'gadforestloststart':
-	cla
-	*clr
-	menu_off = 1
-	gs 'stat'
-
-	'<center><H4>Somewhere in the woods</H4></center>'
-	if month >= 5 and month <= 9:
-		if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadfear1.jpg"></center>'
-		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadfear2.jpg"></center>'
-	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 are lost!.'
-
-	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 rescue in forest by illume
-	forest_lost = 1
-	if StoryLine = 1: forest_lostday = daystart + rand(1,3)
-end
-
 --- gadforest ---------------------------------
 

File diff suppressed because it is too large
+ 266 - 2198
locations/gadforest_event.qsrc


+ 713 - 288
locations/gadforestlost.qsrc

@@ -1,387 +1,812 @@
 # gadforestlost
 
-!make this trigger after 2 days in swamp house, minus a countdown per hour
-if $ARGS[0] = 'forestrescue':
-	cls
+! this file holds all the current code and events for player when lost
+! it is structured like the normal gadforest file with similar actions and arguments but with unique events
+if $ARGS[0] = 'forest_outskirts':
+	*clr & cla
+
 	$loc = 'gadforestlost'
-	$metka = 'forestrescue'
+	$metka = 'forest_outskirts'
 	$location_type = 'secluded'
 
 	$menu_loc = 'gadforestlost'
-	$menu_arg = 'forestrescue'
+	$menu_arg = 'forest_outskirts'
 	menu_off = 0
 
-	gs 'gadukino_event', 'sound'
-	gs'stat'
+	$forest_args1 = 'forest_outskirts'
 
-	minut += 150
-	lost_girl = 0
-	forest_lostday = 0
-	hunters_here = 0
-	gs 'clothing', 'swamp_clothes', 0
+	CLOSE ALL
+	gs 'gadukino_event', 'sound'
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/forester.jpg"></center>'
+	gs 'gadforestlost', 'gadforestlost_picture'
 
-	'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."'
+	! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
+	foresteventrand = rand(1,40)
+	if foresteventrand <= (2+(bonfire*2)) and daystart > forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', 'forest_outskirts'
+	if foresteventrand <= (4+(bonfire*2)) and daystart > forest_lostday+1 and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', 'forest_outskirts'
+	if foresteventrand <= (6+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday+2 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', 'forest_outskirts'
+	if foresteventrand <= (8-(bonfire*2)) and (hour < 6 or hour > 22) and foresteventday ! daystart: gt 'gadforestlost', 'wolves', 'forest_outskirts'
 
-	!rescued during rest 
-	!is this possible? isn''t $loc = 'gadforestlost' ??? (julzor)
-	if $loc = 'gadforestrelax':
-		!have fire
-		if bonfire = 1:
-			'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 follow the forest ranger out of the woods.'
-
-	if $clothingworntype ! 'nude' or swamp_clothes = 0:
-		'You can''t wait to get back to your grandparents house and have a bath and a nice hot meal.'
+	gs 'gadforestlost', 'wander'
 
-		act 'To your grandparents house':gt 'gadhouse', 'start'
-	elseif $clothingworntype = 'nude' or swamp_clothes = 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 'Relax here for a bit': gt 'gadforestlost', 'relax'
 
-		act 'To the edge of the woods':gt'gadforest', '1'
-	end
+	gs 'gadforestlost', 'picking'
 end
 
-if $ARGS[0] = '1':
+if $ARGS[0] = 'forest_center':
 	*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'
+	$metka = 'forest_center'
 	$location_type = 'secluded'
 
 	$menu_loc = 'gadforestlost'
-	$menu_arg = '1'
+	$menu_arg = 'forest_center'
 	menu_off = 0
 
-	gs 'gadukino_event', 'sound'
-	gs'stat'
+	$forest_args1 = 'forest_center'
 
-	riprand = rand(1,10)
-	rescuerand = rand(1,10)
-	wolfrand = rand(1,10)
-	huntrand = rand(1,10)
+	CLOSE ALL
+	gs 'gadukino_event', 'sound'
+	gs 'stat'
 
+	gs 'gadforestlost', 'gadforestlost_picture'
 
-	gs 'gadforestlost', 'gadforestlost'
+	! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
+	foresteventrand = rand(1,40)
+	if foresteventrand <= (1+(bonfire*1)) and daystart > forest_lostday+1 and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', 'forest_center'
+	if foresteventrand <= (3+(bonfire*1)) and StoryLine = 1 and daystart > forest_lostday+2 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', 'forest_center'
+	if foresteventrand <= (8-(bonfire*1)) and (hour < 6 or hour > 22) and foresteventday ! daystart: gt 'gadforestlost', 'wolves', 'forest_center'
 
-	if wolfrand = 1 and (hour = 23 or hour >= 0 and hour < 6):gt 'gadforest_event', 'lost'
+	gs 'gadforestlost', 'wander'
 
-	act 'Look for a way out':
-		cla
-		*clr
-		menu_off = 1
-		minut += 60
-		pcs_mood -= 5
-		goforest += rand(0,1)
-		lostrand = rand(1,40)
-		gs 'stat'
+	act 'Relax here for a bit': gt 'gadforestlost', 'relax'
 
-		gs 'gadforestlost', 'lostclothes'
-		if goforest > lostrand:
-			act 'Look for a way out':gs 'gadforestlost', 'gadforestlostfinish1'
-		else
-			act 'Look for a way out':gt 'gadforestlost','1'
-		end
-		act 'Take a break':gt 'gadforestrelax'
-	end
-	if rand(1,10)> 8: gs 'gadforest', 'torncloth'
-	gs 'gadforestlost', 'searchfood'
+	gs 'gadforestlost', 'picking'
 end
 
-if $ARGS[0] = '2':
-	*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'
-
-	$menu_loc = 'gadforestlost'
-	$menu_arg = '2'
-	menu_off = 0
-
-	gs 'gadukino_event', 'sound'
-	gs'stat'
-	wolfrand = rand(1,10)
-	huntrand = rand(1,10)
-	gs'stat'
-
-	gs 'gadforestlost', 'gadforestlost'
-
-	if wolfrand <= 2 and (hour = 23 or hour >= 0 and hour < 6):gt 'gadforest_event', 'lost'
-	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
+! this gs handles the bushcraft increases, clothing degradation, while lost in the forest
+! $ARGS[1] - location of forest where this is called from
+! Example: gs 'gadforestlost', 'bushcraft', 'forest_outskirts'
+if $ARGS[0] = 'bushcraft':
+	! Make sure Sveta always has at least 1 pcs_bushcraft
+	if pcs_bushcraft = 0:pcs_bushcraft = 1
+	if $ARGS[1] = 'forest_outskirts':
+		bushcraft_rand = 2
+		bushcraft_lost = 30
+		torncloth_high_bushcraft = 9
+		torncloth_low_bushcraft = 7
+	elseif $ARGS[1] = 'forest_center':
+		bushcraft_rand = 3
+		bushcraft_lost = 50
+		torncloth_high_bushcraft = 8
+		torncloth_low_bushcraft = 5
+	end
+	! No limit on earning bushcraft while lost but still random
+	bushcraft_exp += rand(0,bushcraft_rand)
 
-	act 'Look for the road':
-		*clr & cla
-		menu_off = 1
-		minut += 60
-		pcs_mood -= 5
-		goforest += rand(0,1)
-		lostrand = rand(1,120)
-		gs 'stat'
+	ripclothesrand = rand(1,10)
+	if pcs_bushcraft < bushcraft_limit:
+		if ripclothesrand >= torncloth_low_bushcraft: gs 'gadforest', 'torncloth'
+	else
+		if ripclothesrand >= torncloth_high_bushcraft: gs 'gadforest', 'torncloth'
+	end
+	gs 'stat'
+end
 
-		gs 'gadforestlost', 'lostclothes'
-		if goforest > lostrand:
-			act 'Look for a way out':gs 'gadforestlost', 'gadforestlostfinish2'
-		else
-			act 'Look for a way out':gt 'gadforestlost','2'
+! this gs handles Sveta trying to find her way in the forest when lost
+! $forest_args1 - location of forest where this is called from
+! Example: gs 'gadforestlost', 'wander'
+if $ARGS[0] = 'wander':
+	if hour >= 6 and hour < 22:
+		act 'Wander trying to get your bearings (0:30)':
+			*clr & cla
+			menu_off = 1
+			minut += 30
+			gs 'stat'
+
+			gs 'gadforestlost', 'bushcraft', $forest_args1
+
+			'<center><H4>Somewhere in the forest</H4></center>'
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_nude0.'+rand(1,4)+'.jpg"></center>'
+			if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch0.'+rand(1,4)+'.jpg"></center>'
+			if $clothingworntype ! 'nude' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_ski0.'+rand(1,4)+'.jpg"></center>'
+			*nl
+
+			if pcs_bushcraft < bushcraft_lost:
+				lostrand = rand(1,bushcraft_lost)
+				if pcs_bushcraft > lostrand:
+					gt 'gadforestlost','finish', $forest_args1
+				else
+					'After half an hour wandering around, you feel like all you''ve accomplished is walking in circles.'
+					act 'Continue':gt 'gadforestlost', $forest_args1
+				end
+			end
 		end
-		act 'Take a break':gt 'gadforestrelax'
 	end
-	if rand(1,10)> 7: gs 'gadforest', 'torncloth'
-	gs 'gadforestlost', 'searchfood'
 end
 
-if $ARGS[0] = '3':
+! $forest_args1 - location of forest where this is called from
+! Example: gt 'gadforestlost', 'relax'
+if $ARGS[0] = 'relax':
 	*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'
+	$metka = 'relax'
 	$location_type = 'secluded'
 
 	$menu_loc = 'gadforestlost'
-	$menu_arg = '3'
+	$menu_arg = 'relax'
 	menu_off = 0
 
+	CLOSE ALL
 	gs 'gadukino_event', 'sound'
-	gs'stat'
-
-	wolfrand = rand(1,10)
-	huntrand = rand(1,10)
-	gs'stat'
-
-	gs 'gadforestlost', 'gadforestlost'
-	if wolfrand <= 3 and (hour = 23 or hour >= 0 and hour < 6):gt 'gadforest_event', 'lost'
-	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
-
-	act 'Look for the road':
-		*clr & cla
-		menu_off = 1
-		minut += 60
-		pcs_mood -= 5
-		goforest += rand(0,1)
-		lostrand = rand(1,180)
-		gs 'stat'
+	gs 'stat'
 
-		gs 'gadforestlost', 'lostclothes'
-		if goforest > lostrand:
-			act 'Look for a way out':gs 'gadforestlost', 'gadforestlostfinish3'
-		else
-			act 'Look for a way out':gt 'gadforestlost','3'
-		end
-		act 'Take a break':gt 'gadforestrelax'
+	if $forest_args1 = 'forest_outskirts':
+		! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
+		foresteventrand = rand(1,40)
+		if foresteventrand <= (2+(bonfire*2)) and daystart > forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', $forest_args1
+		if foresteventrand <= (4+(bonfire*2)) and daystart > forest_lostday+1 and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
+		if foresteventrand <= (6+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday+2 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
+	elseif $forest_args1 = 'forest_center':
+		! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
+		foresteventrand = rand(1,40)
+		if foresteventrand <= (1+(bonfire*1)) and daystart > forest_lostday+1 and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
+		if foresteventrand <= (3+(bonfire*1)) and StoryLine = 1 and daystart > forest_lostday+2 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
 	end
-	if rand(1,10)> 6: gs 'gadforest', 'torncloth'
-	gs 'gadforestlost', 'searchfood'
-end
 
-if $ARGS[0] = '4':
-	*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'
+	'<center><H4>Somewhere in the forest</H4></center>'
+	if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_nude'+ rand(1,3) +'.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt = 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax1.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt = 0 and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax2.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt > 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski1.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt > 0 and $pantyworntype ! 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski2.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt > 0 and $pantyworntype = 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski3.jpg"></center>'
+	*nl
+	'You decide this is as good of place as any to stop and take a break.'
 
-	$menu_loc = 'gadforestlost'
-	$menu_arg = '4'
-	menu_off = 0
+	act 'Explore the forest': gt 'gadforestlost', $forest_args1
 
-	gs 'gadukino_event', 'sound'
-	gs'stat'
+	if bonfire = 0:
+		act 'Build a fire (0:15)':
+			*clr & cla
+			menu_off = 1
+			minut += 15
+			bonfire = 1
+			gs 'stat'
 
-	*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_bonfire1.jpg"></center>'
+			*nl
+			'After a few minutes, you are able to get a nice sized fire started.'
 
-	wolfrand = rand(1,10)
-	huntrand = rand(1,10)
-	gs'stat'
+			act 'Continue':gt 'gadforestlost', 'relax'
+		end
+		act 'Sit and relax (0:30)':
+			*clr & cla
+			menu_off = 1
+			minut += 30
+			pcs_sleep += 5
+			pcs_health += 10
+			pcs_mood += 10
+			gs 'stat'
+
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_nude'+rand(1,2)+'.jpg"></center>'
+			if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax3.jpg"></center>'
+			if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski4.jpg"></center>'
+			if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski5.jpg"></center>'
+			*nl
+			'You spend half an hour relaxing, trying to pretend this is just like any other walk in the woods you''ve done.'
+
+			act 'Continue':gt 'gadforestlost', 'relax'
+		end
+		if pcs_sleep < 40:
+			act 'Nap on the ground (2:00)':
+				*clr & cla
+				menu_off = 1
+				minut += 120
+				pcs_sleep += 20
+				pcs_health += 5
+				pcs_mood += 10
+				gs'stat'
+
+				if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepnude1.'+rand(1,2)+'.jpg"></center>'
+				if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleep.jpg"></center>'
+				if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski.jpg"></center>'
+				if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski1.jpg"></center>'
+				*nl
+				'You are able to make youself fall asleep for about 2 hours, but that is it. If you want to get a full nights sleep you will have to find a way out of the forest.'
+				'Even though you had to sleep on the ground, you do wake up feeling a bit more hopeful and rested.'
+
+				act 'Continue':gt 'gadforestlost', 'relax'
+			end
+		end
+	elseif bonfire = 1:
+		if pcs_sleep < 95:
+			act 'Warm up by the fire (0:30)':
+				*clr & cla
+				menu_off = 1
+				minut += 30
+				pcs_sleep += 5
+				pcs_health += 10
+				pcs_mood += 10
+				frost = 0
+				gs 'stat'
 
-	gs 'gadforestlost', 'gadforestlost'
+				if hour >= 6 and hour < 21:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_bonfire2.jpg"></center>'
+				else
+				   '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_bonfire3.jpg"></center>'
+				end
+				*nl
+				'You spend half an hour huddled by the flames until you no longer feel cold anymore.'
 
-	if wolfrand <= 4 and (hour = 23 or hour >= 0 and hour < 6):gt 'gadforest_event', 'lost'
-	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
+				act 'Continue':gt 'gadforestlost', 'relax'
+			end
+		end
+		if pcs_sleep < 40:
+			act 'Nap by the fire (2:00)':
+				*clr & cla
+				menu_off = 1
+				minut += 120
+				pcs_sleep += 20
+				pcs_health += 10
+				pcs_mood += 20
+				frost = 0
+				gs 'stat'
 
-	act 'Look for the road':
-		*clr & cla
-		menu_off = 1
-		minut += 60
-		pcs_mood -= 5
-		goforest += rand(0,1)
-		lostrand = rand(1,300)
-		temp = rand(1,10)
-		gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_bonfiresleep.jpg"></center>'
+				*nl
+				'You are able to make youself fall asleep for about 2 hours, but that is it. If you want to get a full nights sleep you will have to find a way out of the forest.'
+				'Even though you had to sleep on the ground, you do wake up feeling a bit more hopeful and rested.'
 
-		gs 'gadforestlost', 'lostclothes'
-		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'
+				act 'Continue':gt 'gadforestlost', 'relax'
+			end
+		end
+		if boletus > 0:
+			act 'Cook some mushrooms in the fire (0:15)':
+				*clr & cla
+				menu_off = 1
+				minut += 15
+				boletus_cooked += 1
+				boletus -= 1
+				frost = 0
+				gs'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/boletushot.jpg"></center>'
+				*nl
+				'You spend 15 minutes grilling some mushrooms in the fire.'
+
+				act 'Continue':gt 'gadforestlost', 'relax'
+			end
 		end
-		act 'Take a break':gt 'gadforestrelax'
 	end
-	if rand(1,10)> 7: gs 'gadforest', 'torncloth'
-	gs 'gadforestlost', 'searchfood'
-end
-
-if $ARGS[0] = 'gadforestlost':
-	'<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/gadforestlost0.'+rand(1,6)+'.jpg"></center>'
-			'You get lost in the woods. All around, you see unfamiliar places, you are too stressed to appreciate the beauty of nature right now.'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_night0.'+rand(1,4)+'.jpg"></center>'
-			'You get lost in the woods. The situation becomes even worse, because it''s now night time.'
+	if boletus_cooked > 0:
+		act 'Eat cooked mushrooms (0:15)':
+			*clr & cla
+			menu_off = 1
+			minut += 15
+			boletus_cooked -= 1
+			pcs_health += 10
+			pcs_mood += 10
+			fat += 1
+			pcs_energy += 20
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/boletuscook.jpg"></center>'
+			*nl
+			'You eat some cooked mushrooms. They are pretty tasty considering your circumstances.'
+
+			act 'Continue':gt 'gadforestlost', 'relax'
 		end
-	else
-		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_winter0.'+rand(1,5)+'.jpg"></center>'
-			'You get lost in the winter woods. All around, you see unfamiliar places, you are too stressed to appreciate the beauty of nature right now.'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_winter_night0.'+rand(1,4)+'.jpg"></center>'
-			'You get lost in the winter woods. The situation becomes even worse, because it''s now night time.'
+	end
+	if bilberry > 0:
+		act 'Eat berries (0:15)':
+			*clr & cla
+			menu_off = 1
+			minut += 15
+			bilberry -= 1
+			pcs_health += 10
+			pcs_mood += 10
+			fat += 1
+			pcs_energy += 10
+			pcs_hydra += 10
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/bilberry.jpg"></center>'
+			*nl
+			'You eat some berries. These would be great to eat even if you weren''t lost.'
+
+			act 'Continue':gt 'gadforestlost', 'relax'
 		end
 	end
 end
 
-if $ARGS[0] = 'lostclothes':
-	if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch0.'+rand(1,4)+'.jpg"></center>'
-	if $clothingworntype ! 'nude' and PCloSkirt > 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>'
-	'After wandering through the woods for an hour you decide to....'
-end
+! this gs handles mushroom and berry picking for Sveta in the various locations of the forest when she is lost
+! $forest_args1 - location of forest where this is called from
+! Example: gs 'gadforestlost', 'picking'
+if $ARGS[0] = 'picking':
+	if hour >= 6 and hour < 22 and month >= 6 and month <= 9 and boletus + boletus_cooked + bilberry < 5:
+		act 'Look for mushrooms and berries (0:30)':
+			*clr & cla
+			menu_off = 1
 
-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 distant houses, glad to get out of this alive you rush forward.'
+			if $forest_args1 = 'forest_outskirts':
+				outskirts_pickingday = daystart
+				mushroom_pickers_check = 2
+				max_boletus = 2
+				max_bilberry = 2
+			elseif $forest_args1 = 'forest_center':
+				center_pickingday = daystart
+				mushroom_pickers_check = 3
+				max_boletus = 3
+				max_bilberry = 3
+			end
 
-	!clear lost flags by illume
-	lost_girl = 0
-	forest_lostday = 0
-	hunters_here = 0
-	menu_off = 1
-	gs 'clothing', 'swamp_clothes', 0
-	gs 'stat'
-	if $clothingworntype = 'nude':
-		act 'Leave the woods':
-			menu_off = 1
-			minut += 25
-			'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'
+			minut += 30
+			new_boletus = 0
+			new_bilberry = 0
+			gs 'gadforestlost', 'bushcraft', $forest_args1
+			if $clothingworntype = 'nude' and pcs_inhib < 50:inhib_exp += rand(1,5)
+			gs 'stat'
+
+			if mushroom_pickers ! mushroom_pickers_check:
+				new_boletus += max_boletus
+				new_bilberry += max_bilberry
+				boletus += new_boletus
+				bilberry += new_bilberry
+				pcs_mood += 10
+				gs 'stat'
+
+				gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+				*nl
+				'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+			elseif mushroom_pickers = mushroom_pickers_check
+				new_boletus += rand(0,max_boletus)
+				new_bilberry += rand(0,max_bilberry)
+				boletus += new_boletus
+				bilberry += new_bilberry
+				gs 'stat'
+
+				if new_boletus > 0 and new_bilberry > 0:
+					pcs_mood += 10
+					gs 'stat'
+
+					gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+					*nl
+					'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+				elseif new_boletus = 0 and new_bilberry > 0:
+					pcs_mood += 5
+					gs 'stat'
+
+					gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+					*nl
+					'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
+				elseif new_boletus > 0 and new_bilberry = 0:
+					pcs_mood += 5
+					gs 'stat'
+
+					gs 'gadforest', 'picking_clothes', $forest_args1, 'mushroom'
+					*nl
+					'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms'
+				elseif new_boletus = 0 and new_bilberry = 0:
+					pcs_mood -= 5
+					gs 'stat'
+
+					gs 'gadforest', 'picking_clothes_empty', $forest_args1
+					*nl
+					'After searching for mushrooms and berries for half an hour you found nothing.'
+				end
+			end
+			act 'Continue':gt 'gadforestlost', $forest_args1
 		end
-		!disable further actions from being added
-		temp=0
 	end
 end
 
-if $ARGS[0] = 'gadforestlostfinish1':
+! $ARGS[1] - location of forest where this is called from
+if $ARGS[0] = 'finish':
 	*clr & cla
 	menu_off = 1
-	temp = RAND(1,3)
-	lost = 0
+	bonfire = 0
 	pcs_mood += 20
+	bushcraft_exp += rand(1,5)
+	gs 'clothing', 'swamp_clothes', 0
 	gs 'stat'
 
-	gs 'gadforestlost', 'gadforestlostfinish'
+	'<center><H4>Somewhere in the forest</H4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadjoy.jpg"></center>'
+	*nl
+	'After half an hour wandering around, you finally see some familiar sights.'
 
-	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 $clothingworntype = 'nude':
+		if $ARGS[1] = 'forest_outskirts':
+			act 'Continue':
+				if meadow > 0:
+					foresteventrand = rand(1,3)
+				else
+					foresteventrand = rand(1,2)
+				end
+				if foresteventrand = 1: minut += 15 & gt 'gadforest','forest_edge'
+				if foresteventrand = 2: gt 'gadforest','forest_outskirts'
+				if foresteventrand = 3: minut += 35 & gt 'meadow', 'start'
+			end
+		elseif $ARGS[1] = 'forest_center':
+			act 'Continue':
+				if hunterscabin = 1 and meadow > 0:
+					foresteventrand = rand(1,5)
+				elseif meadow > 0:
+					foresteventrand = rand(1,4)
+				else
+					foresteventrand = rand(1,3)
+				end
+				if foresteventrand = 1: minut += 30 & gt 'gadforest','forest_edge'
+				if foresteventrand = 2: minut += 15 & gt 'gadforest','forest_outskirts'
+				if foresteventrand = 3: gt 'gadforest','forest_center'
+				if foresteventrand = 4: minut += 50 & gt 'meadow', 'start'
+				if foresteventrand = 5: minut += 30 & gt 'swamp_yard', 'start'
+			end
+		end
+	else
+		if $ARGS[1] = 'forest_outskirts':
+			act 'Continue':
+				if meadow > 0:
+					foresteventrand = rand(1,6)
+				else
+					foresteventrand = rand(1,5)
+				end
+				if foresteventrand = 1: minut += 15 & gt 'gadforest','forest_edge'
+				if foresteventrand = 2: gt 'gadforest','forest_outskirts'
+				if foresteventrand = 3: minut += 40 & gt 'gadfield','field'
+				if foresteventrand = 4: minut += 30 & gt 'gadroad'
+				if foresteventrand = 5: minut += 40 & gt 'gadriver','start'
+				if foresteventrand = 6: minut += 35 & gt 'meadow', 'start'
+			end
+		elseif $ARGS[1] = 'forest_center':
+			act 'Continue':
+				if hunterscabin = 1 and meadow > 0:
+					foresteventrand = rand(1,8)
+				elseif meadow > 0:
+					foresteventrand = rand(1,7)
+				else
+					foresteventrand = rand(1,6)
+				end
+				if foresteventrand = 1: minut += 30 & gt 'gadforest','forest_edge'
+				if foresteventrand = 2: minut += 15 & gt 'gadforest','forest_outskirts'
+				if foresteventrand = 3: gt 'gadforest','forest_center'
+				if foresteventrand = 4: minut += 55 & gt 'gadfield','field'
+				if foresteventrand = 5: minut += 45 & gt 'gadroad'
+				if foresteventrand = 6: minut += 55 & gt 'gadriver','start'
+				if foresteventrand = 7: minut += 50 & gt 'meadow', 'start'
+				if foresteventrand = 8: minut += 30 & gt 'swamp_yard', 'start'
+			end
+		end
+	end
 end
 
-if $ARGS[0] = 'gadforestlostfinish2':
+! $ARGS[1] - who is rescuing player
+! $ARGS[2] - location of forest where this is called from
+if $ARGS[0] = 'rescue':
 	*clr & cla
 	menu_off = 1
-	temp = RAND(1,5)
-	lost = 0
+	bonfire = 0
 	pcs_mood += 20
+	bushcraft_exp += rand(1,5)
+	if StoryLine = 0: lost_girl = 0
+	if swamp_clothes = 1:
+		'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear'+iif(StoryLine=1,' at your grandparents house.','.')
+		gs 'clothing', 'strip', 'gadforest'
+		gs 'clothing', 'swamp_clothes', 0
+	end
 	gs 'stat'
 
-	gs 'gadforestlost', 'gadforestlostfinish'
-
-	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 $ARGS[1] = 'pickers':
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers2.jpg"></center>'
+		*nl
+		'Suddenly you hear the sounds of people approaching. A group of pickers from the village appear out of the bushes.'
+		if bonfire = 1:'They notice your fire and praise you, "When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others."'
+		if StoryLine = 1 and grandmaQW['block'] = 0:
+			'They walk up to you and say, "Your grandparents are very worried about you. They asked us to keep an eye out for you. Follow us, we will lead you back '+iif($clothingworntype ! 'nude','to their house."','to the edge of the forest."')
+			if $clothingworntype ! 'nude':
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 45 & gt 'gadhouse', 'start'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 60 & gt 'gadhouse', 'start'
+				end
+			else
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+				end
+			end
+		else
+			'They walk up to you and say, "We heard there may have been a missing girl in the forest. Follow us, we will lead you back '+iif($clothingworntype ! 'nude','out of the forest."','to the edge of the forest."')
+			if $clothingworntype ! 'nude':
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 30 & gt 'gadroad'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 45 & gt 'gadroad'
+				end
+			else
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+				end
+			end
+		end
+	elseif $ARGS[1] = 'hunters':
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
+		*nl
+		'Suddenly you hear the sounds of people approaching. '+iif(huntersKnow=1,'The hunters from the swamp ','A group of hunters ')+'appear out of the bushes.'
+		if bonfire = 1:'They notice your fire and praise you, "When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others."'
+		if StoryLine = 1 and grandmaQW['block'] = 0:
+			'They walk up to you and say, "Your grandparents are very worried about you. They asked us to keep an eye out for you. Follow us, we will lead you back '+iif($clothingworntype ! 'nude','to the edge of the forest."','to the swamp with us."')
+			if $clothingworntype ! 'nude':
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+				end
+			else
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 45 & gt 'swamp_yard', 'start'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'swamp_yard', 'start'
+				end
+			end
+		else
+			'They walk up to you and say, "We heard there may have been a missing girl in the forest. Follow us, we will lead you back '+iif($clothingworntype ! 'nude','to the edge of the forest."','to the swamp with us."')
+			if $clothingworntype ! 'nude':
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+				end
+			else
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 45 & gt 'swamp_yard', 'start'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'swamp_yard', 'start'
+				end
+			end
+		end
+	elseif $ARGS[1] = 'ranger':
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/forester.jpg"></center>'
+		*nl
+		'Suddenly you hear the sound of a person approaching. A man you vaguely recognize from the village appears out of the bushes.'
+		if bonfire = 1:'They notice your fire and praise you, "When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others."'
+		if StoryLine = 1 and grandmaQW['block'] = 0:
+			'He walks up to you and says, "Your grandparents are very worried about you. They asked me to keep an eye out for you. Follow me, I will lead you back '+iif($clothingworntype ! 'nude','to their house."','to the edge of the forest."')
+			if $clothingworntype ! 'nude':
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 45 & gt 'gadhouse', 'start'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 60 & gt 'gadhouse', 'start'
+				elseif $ARGS[2] = 'swamp_yard':
+					act 'Continue': minut += 90 & gt 'gadhouse', 'start'
+				end
+			else
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'swamp_yard':
+					act 'Continue': minut += 60 & gt 'gadforest', 'forest_edge'
+				end
+			end
+		else
+			'He walks up to you and says, "I heard there may have been a missing girl in the forest. Follow me, I will lead you back '+iif($clothingworntype ! 'nude','out of the forest."','to the edge of the forest."')
+			if $clothingworntype ! 'nude':
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 30 & gt 'gadroad'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 45 & gt 'gadroad'
+				elseif $ARGS[2] = 'swamp_yard':
+					act 'Continue': minut += 75 & gt 'gadroad'
+				end
+			else
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'swamp_yard':
+					act 'Continue': minut += 60 & gt 'gadforest', 'forest_edge'
+				end
+			end
+		end
+	end
 end
 
-if $ARGS[0] = 'gadforestlostfinish3':
+! $ARGS[1] - location of forest where this is called from
+if $ARGS[0] = 'wolves':
 	*clr & cla
 	menu_off = 1
-	temp = RAND(1,7)
-	lost = 0
-	pcs_mood += 20
-	gs 'stat'
-
-	gs 'gadforestlost', 'gadforestlostfinish'
 
-	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
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/howl.jpg"></center>'
+	*nl
+	'Suddenly your hear a terrifying howl nearby.'
 
-if $ARGS[0] = 'gadforestlostfinish4':
-	*clr & cla
-	menu_off = 1
-	temp = RAND(1,9)
-	lost = 0
-	pcs_mood += 20
-	gs 'stat'
+	act 'Run away':
+		*clr & cla
+		gs 'exercise', 'tier4', 1, 'run_exp'
+		gs 'stat'
 
-	gs 'gadforestlost', 'gadforestlostfinish'
-
-	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
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run.jpg"></center>'
+		*nl
+		'Instincts take over and you begin running without a second thought.'
 
-if $ARGS[0] = 'searchfood':
-	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10:
-		act 'Look for mushrooms and berries':
-			*clr & cla
-			menu_off = 1
-			minut += 30
-			new_boletus += rand(1,2)
-			new_bilberry += rand(1,2)
-			if new_boletus + new_bilberry > 0:
-				boletus += new_boletus
-				bilberry += new_bilberry
-				pcs_mood += 5
+		if $ARGS[1] = 'forest_edge':
+			if pcs_bushcraft < 70 and pcs_agil < 70 and pcs_stren < 70 and Enable_nogameover = 0:
+				foresteventrand = rand(1,7)
+			else
+				foresteventrand = rand(1,6)
+			end
+			if foresteventrand <= 3:
+				bushcraft_exp += rand(1,3)
 				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.'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, but unfortunately are still in the forest.'
+			elseif foresteventrand <= 6:
+				bushcraft_exp += rand(1,5)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, and also are no longer in the forest.'
+			elseif foresteventrand <= 7:
+				bushcraft_exp += rand(1,2)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
+				*nl
+				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
+			end
+			act 'Continue':
+				if foresteventrand <= 3: gt 'gadforest','forest_edge'
+				if foresteventrand <= 4: gt 'gadfield','field'
+				if foresteventrand <= 5: gt 'gadroad'
+				if foresteventrand <= 6: gt 'gadriver','start'
+				if foresteventrand <= 7:over = 11 & gt 'gameover'
+			end
+		elseif $ARGS[1] = 'forest_outskirts':
+			if pcs_bushcraft < 70 and pcs_agil < 70 and pcs_stren < 70 and Enable_nogameover = 0:
+				foresteventrand = rand(1,10)
 			else
-				pcs_mood -= 5
+				foresteventrand = rand(1,9)
+			end
+			if foresteventrand <= 5:
+				bushcraft_exp += rand(1,3)
 				gs 'stat'
-
-				gs 'gadforest', 'clothes2'
-				'After half an hour of wandering through the woods in search of mushrooms or berries, you found nothing.'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, but unfortunately are still lost in the forest.'
+			elseif foresteventrand <= 9:
+				bushcraft_exp += rand(1,5)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, and also are no longer lost as you recognize your surroundings.'
+			elseif foresteventrand <= 10:
+				bushcraft_exp += rand(1,2)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
+				*nl
+				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
+			end
+			act 'Continue':
+				if foresteventrand <= 3: gt 'gadforestlost', 'forest_outskirts'
+				if foresteventrand <= 5: gt 'gadforest','forest_edge'
+				if foresteventrand <= 6: gt 'gadforest','forest_outskirts'
+				if foresteventrand <= 7: gt 'gadfield','field'
+				if foresteventrand <= 8: gt 'gadroad'
+				if foresteventrand <= 9: gt 'gadriver','start'
+				if foresteventrand <= 10:over = 11 & gt 'gameover'
 			end
+		elseif $ARGS[1] = 'forest_center':
+			if pcs_bushcraft < 70 and pcs_agil < 70 and pcs_stren < 70 and Enable_nogameover = 0:
+				foresteventrand = rand(1,13)
+			else
+				foresteventrand = rand(1,2)
+			end
+			if foresteventrand <= 6:
+				bushcraft_exp += rand(1,3)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, but unfortunately are still lost in the forest.'
+			elseif foresteventrand <= 12:
+				bushcraft_exp += rand(1,5)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, and also are no longer lost as you recognize your surroundings.'
+			elseif foresteventrand <= 13:
+				bushcraft_exp += rand(1,2)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
+				*nl
+				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
+			end
+			act 'Continue':
+				if foresteventrand <= 2: gt 'gadforestlost', 'forest_outskirts'
+				if foresteventrand <= 6: gt 'gadforestlost', 'forest_center'
+				if foresteventrand <= 7: gt 'gadforest','forest_edge'
+				if foresteventrand <= 8: gt 'gadforest','forest_outskirts'
+				if foresteventrand <= 9: gt 'gadforest','forest_center'
+				if foresteventrand <= 10: gt 'gadfield','field'
+				if foresteventrand <= 11: gt 'gadroad'
+				if foresteventrand <= 12: gt 'gadriver','start'
+				if foresteventrand <= 13:over = 11 & gt 'gameover'
+			end
+		elseif $ARGS[1] = 'swamp':
+			if pcs_bushcraft < 70 and pcs_agil < 70 and pcs_stren < 70 and Enable_nogameover = 0:
+				foresteventrand = rand(1,14)
+			else
+				foresteventrand = rand(1,13)
+			end
+			if foresteventrand <= 8:
+				bushcraft_exp += rand(1,3)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, but unfortunately are still lost in the forest.'
+			elseif foresteventrand <= 13:
+				bushcraft_exp += rand(1,5)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, and also are no longer in the forest.'
+			elseif foresteventrand <= 14:
+				bushcraft_exp += rand(1,2)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
+				*nl
+				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
+			end
+			act 'Continue':
+				if foresteventrand <= 4: gt 'gadforest','forest_edge'
+				if foresteventrand <= 6: gt 'gadforest','forest_outskirts'
+				if foresteventrand <= 8: gt 'gadforest','forest_center'
+				if foresteventrand <= 9: gt 'gadfield','field'
+				if foresteventrand <= 10: gt 'gadroad'
+				if foresteventrand <= 11: gt 'gadriver','start'
+				if foresteventrand <= 12: gt 'swamp_yard','start'
+				if foresteventrand <= 13: gt 'swamp_woods','start'
+				if foresteventrand <= 14:over = 11 & gt 'gameover'
+			end
+		end
+	end
+end
 
-			act 'Continue':gt $loc, $metka
+! this gs handles images for generic forest locations while lost
+! Example: gs 'gadforestlost', 'gadforestlost_picture'
+if $ARGS[0] = 'gadforestlost_picture':
+	'<center><H4>Somewhere in 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/gadforestlost0.'+rand(1,6)+'.jpg"></center>'
+			*nl
+			'You are lost in the woods. You don''t recognize any of your surroundings and there aren''t any good landmarks to help pinpoint where you are.'
+			'You would normally consider the woods a relaxing and scenic place, but are too stressed to appreciate the beauty of nature right now.'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_night0.'+rand(1,4)+'.jpg"></center>'
+			*nl
+			'You are lost in the woods. You don''t recognize any of your surroundings and there aren''t any good landmarks to help pinpoint where you are.'
+			'With nightfall, your chances of finding your way are practically nothing. You should stop and rest until daylight.'
+		end
+	else
+		if hour >= 8 and hour < 20:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_winter0.'+rand(1,5)+'.jpg"></center>'
+			*nl
+			'You are lost in the woods. You don''t recognize any of your surroundings and there aren''t any good landmarks to help pinpoint where you are.'
+			'You would normally consider the woods a relaxing and scenic place, but are too stressed to appreciate the beauty of nature right now.'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_winter_night0.'+rand(1,4)+'.jpg"></center>'
+			*nl
+			'You are lost in the woods. You don''t recognize any of your surroundings and there aren''t any good landmarks to help pinpoint where you are.'
+			'With nightfall, your chances of finding your way are practically nothing. You should stop and rest until daylight.'
 		end
 	end
 end

+ 0 - 203
locations/gadforestrelax.qsrc

@@ -1,203 +0,0 @@
-# gadforestrelax
-
-$location_type = 'secluded'
-$metka = ''
-$loc = 'gadforestrelax'
-$menu_loc = 'gadforestrelax'
-$menu_arg = ''
-menu_off = 0
-if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10) + bonfire > 8: gt 'gadforestlost', 'forestrescue' & !add rescue by illume
-gs 'gadukino_event', 'sound'
-wolfrand = rand(1,10)
-gs'stat'
-
-'<center><H4>Forest</H4></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax1.jpg"></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0 and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax2.jpg"></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski1.jpg"></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0 and $pantyworntype ! 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski2.jpg"></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0 and $pantyworntype = 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski3.jpg"></center>'
-if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_nude'+ rand(1,3) +'.jpg"></center>'
-if $clothingworntype = 'nude':inhib_exp += rand(1,3)
-'You are tired and decided to rest a little.'
-if wolfrand <= 3 and bonfire = 0 and hour = 23 or hour >= 0 and hour < 6 and bonfire = 0 and wolfrand <= 3:gt 'gadforest_event', 'relax'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and bonfire = 0:
-    act 'Kindle fire':
-        cla
-   	    *clr
-		menu_off = 1
-   	    minut += 10
-   	    bonfire = 1
-   	    gs 'stat'
-   	    
-   	    '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_bonfire1.jpg"></center>'
-   	    'You have a match and decide to light a fire...'
-   	    
-   	    act 'Further':gt 'gadforestrelax'
-   	end    
-end   	
-    
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and bonfire = 1:
-	if edahot = 1:
-	    act 'Eat fried mushrooms':
-	        cla
-	        *clr
-			menu_off = 1
-	        minut += 15
-	        edahot = 0
-	        pcs_health += 10
-	        pcs_mood += 20
-	        gs'stat'
-	        '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/boletuscook.jpg"></center>'
-	        if pcs_energy >= 100:
-		        fat += 5
-		        'You can''t eat anymore.'
-	        elseif pcs_energy >= 70:
-		        fat += 3
-		        pcs_energy += 10
-		        'You force yourself to eat more food.'
-	        else
-		        pcs_energy += 20
-		        'You love to eat fried mushrooms.'
-	        end
-            act 'Further':gt 'gadforestrelax'
-        end
-    end       	     
-   	act 'Get warm by the fire':
-        cla
-   	    *clr
-		menu_off = 1
-        minut += 60
-        pcs_sleep += 9
-        pcs_health += 10
-        frost = 0
-        pcs_mood += 10
-		gs 'stat'
-        
-	    if hour >= 6 and hour < 21:
-		    '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_bonfire2.jpg"></center>'
-	    else
-           '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_bonfire3.jpg"></center>'
-	    end  	    
-   	   
-   	    'You sit in silence for hours looking at the fire. You feel warm and rested, perhaps it''s time to move on.'
-   	    
-   	    act 'Further':gt 'gadforestrelax' 
-   	end
-	act 'Nap by the campfire':
-        cla
-   	    *clr
-		menu_off = 1
-	    if pcs_sleep < 40:
-		    pcs_sleep += 30
-		    pcs_health += 20
-		    minut += 180 
-		    frost = 0
-		    pcs_mood += 50
-		    gs'stat'
-		
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_bonfiresleep.jpg"></center>'
-	        'You doze off for about 3 hours, you wake up feeling more cheerful and rested.'
-	        act 'Wake up':gt 'gadforestrelax'
-	    else
-            cla
-   	        *clr 
-		    minut += 5
-		    frost = 0
-		    gs'stat'
-		    '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_bonfiresleep.jpg"></center>'
-		    'You''re trying to sleep, but can''t.'
-		    act 'Further':gt 'gadforestrelax'	
-		end
-	end
-	if boletus > 0:
-	    act 'Grill the mushrooms in the fire':
-	        cla
-	        *clr
-			menu_off = 1
-	        minut += 30
-	        edahot = 1
-	        boletus -= 1
-	        frost = 0
-	        gs'stat'
-	        '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/boletushot.jpg"></center>'
-	        'You grilled some mushrooms in the fire.'
-            act 'Further':gt 'gadforestrelax'
-        end
-    end 
-end
-
-if $clothingworntype ! 'nude' and bonfire = 0:
-   	act 'Sit on the grass':
-        cla
-   	    *clr
-		menu_off = 1
-   	    if temper < 12:pcs_health -= healthmax/20
-        minut += 60
-        pcs_sleep += 6
-        pcs_mood += 10
-        
-	    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax3.jpg"></center>'    
-	    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski4.jpg"></center>'   
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski5.jpg"></center>' 
-        if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_nude'+rand(1,2)+'.jpg"></center>'    	    
-   	    
-   	    'You sit in silence for hours looking at the fire. You feel warm and rested, perhaps it''s time to move on.'
-   	    
-   	    act 'Further':gt 'gadforestrelax' 
-   	end
-	act 'Nap on the ground':
-        cla
-   	    *clr
-		menu_off = 1
-	    if pcs_sleep < 40:
-		    pcs_sleep += 30
-		    if temper < 12:pcs_health -= healthmax/10
-		    minut += 180 
-		    pcs_mood += 20
-		    gs'stat'
-		    
-	        if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleep.jpg"></center>'   
-	        if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski.jpg"></center>'    
-		    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski1.jpg"></center>' 
-            if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepnude1.'+rand(1,2)+'.jpg"></center>'    
-		  	
-	        'You doze off for about 3 hours, you wake up feeling more cheerful and rested.'
-	        act 'Wake up':gt 'gadforestrelax'
-	    else
-		    minut += 5
-		    gs'stat'
-		    '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_nosleep.jpg"></center>'
-		    'You''re trying to sleep, but can''t.'
-		    act 'Further':gt 'gadforestrelax'	
-		end
-	end
-end
-
-if bilberry > 0:
-	act 'Eat berries':
-	    cla
-	    *clr
-		menu_off = 1
-	    minut += 30
-	    pcs_energy += 15
-	    pcs_hydra += 40
-	    bilberry -= 1
-	    pcs_health += 5
-	    pcs_mood += 10
-	    gs'stat'
-	    '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/bilberry.jpg"></center>'
-	    'You ate a few berries.'
-        act 'Further':gt 'gadforestrelax'
-    end
-end
-
-act 'Look for the road':
-    if lost = 1:bonfire = 0 & minut += 15 & gt 'gadforestlost','1'
-    if lost = 2:bonfire = 0 & minut += 15 & gt 'gadforestlost','2'
-    if lost = 3:bonfire = 0 & minut += 15 & gt 'gadforestlost','3'
-    if lost = 4:bonfire = 0 & minut += 15 & gt 'gadforestlost','4'
-end
-
---- gadforestrelax ---------------------------------
-

+ 0 - 210
locations/gadforestswamp.qsrc

@@ -1,210 +0,0 @@
-# gadforestswamp
-
-$location_type = 'secluded'
-if $ARGS[0] = '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:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp_night.jpg"></center>'
-		end
-	else
-		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp_winter.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp_winter_night.jpg"></center>'
-		end
-	end
-	'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 through the mire':
-		*clr & cla
-		menu_off = 1
-		minut += 10
-		swamprand = pcs_stren + pcs_agil
-		gs 'sweat', 'add', 15
-		gs 'stat'
-
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp.jpg"></center>'
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski.jpg"></center>'
-		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 'Give it another try':
-			if swamprand > temp_gads:gt 'swamp_yard', 'start'
-			if Enable_nogameover = 0:
-				if swamprand < temp_gads and temp_gads >= 90:over = 10 & gt 'gameover'
-				if swamprand < temp_gads and temp_gads < 90:pcs_bushcraft += 5 & gt 'gadforestswamp', '2'
-			else
-				pcs_bushcraft += 5
-				gt 'gadforestswamp', '2'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = '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
-	! if dirty = 0 and ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):dirty = 1 & dynamic $clothingworntype + 'H[<<clothingwornnumber>>] -= 10'
-	!!add remove clothes if worn out
-	! if dyneval('RESULT = <<$clothingworntype>>H[<<clothingwornnumber>>]') <= 0:
-		! '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>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/panicswamp.jpg"></center>'
-	'You are stuck in the quagmire."I''m stuck!", you think in panic "What do I do?". '
-
-	act 'Call for help':
-		*clr & cla
-		menu_off = 1
-		minut += 10
-		if pcs_sweat < 10: gs 'sweat', 'add', 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...'
-
-
-		act 'Wait':
-			if temp_gads = 1:
-				*clr & cla
-				minut += 10
-				hunters_here = 1
-				hunterhelp = 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/handshelp.jpg"></center>'
-				'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 'Wake up':gt 'swamp_yard', 'start'
-			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 'Contemplate your life':gt 'gadforestswamp','2'
-			end
-		end
-	end
-
-	act 'Try to get back to the woods':
-		*clr & cla
-		menu_off = 1
-		minut += 10
-		swamprand = pcs_stren + pcs_agil
-		stren_exp += rand(0,1)
-		agil_exp += rand(0,1)
-		gs 'sweat', 'add', 30
-		temp_gads = RAND(1,100)
-		gs 'stat'
-
-		dynamic $swampclothes
-
-		'You decide it''s wisest to try and turn back...'
-		act 'Give it another try':
-			if swamprand > temp_gads:gt 'gadforestswamp','1'
-			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':
-		cla
-		*clr
-		menu_off = 1
-		minut += 10
-		swamprand = pcs_stren + pcs_agil
-		stren_exp += rand(0,1)
-		agil_exp += rand(0,1)
-		gs 'sweat', 'add', 30
-		temp_gads = RAND(1,100)
-		gs 'stat'
-
-		dynamic $swampclothes
-
-		'You decide you might as well keep going forward at this point...'
-		act 'Give it another try':
-			if swamprand > temp_gads:gt 'swamp_yard', 'start'
-			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 hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and swamp_day ! daystart:
-	act 'Look for mushrooms and berries (0:30)':
-		cla
-		*clr
-		menu_off = 1
-		minut += 30
-		temp = RAND(1,2)
-		swamp_day = daystart
-		if goforest < 20:goforest += rand(0,1)
-		new_boletus += rand(4,5)
-		boletus += new_boletus
-		new_bilberry += rand(4,5)
-		bilberry += new_bilberry
-		pcs_mood += 5
-		gs 'stat'
-
-		gs 'gadforest', 'clothes1'
-
-		'You spend half an hour wandering through the woods in search of mushrooms and berries and manage to find <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
-
-		act 'Continue': gt'swamp'
-	end
-end
-$swampclothes = {
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp1.jpg"></center>'
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski1.jpg"></center>'
-	if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
-}
-
---- gadforestswamp ---------------------------------
-

+ 333 - 143
locations/gadhouse.qsrc

@@ -1,7 +1,7 @@
 # gadhouse
 
 !! VARIABLE LIST FOR GRANDPARENTS AND THEIR CHORES - START
-!! 
+!!
 !! Quest Variables - Grandma
 !! -------------------------
 !! grandmaQW['chore_type']						Variable for storage of the rand() that picks which chore to assign.
@@ -38,16 +38,20 @@
 !! grandmaQW['last_day_talked']					The most recent day Sveta chatted with Grandma.
 !! grandmaQW['last_hour_talked']				The most recent hour Sveta chatted with Grandma. Checked against hour, allows for several chats through the day.
 !! grandmaQW['last_month_paid']					The most recent month Grandma paid Sveta for her help (i.e. was it the current month?)
-!! grandmaQW['nudity_trouble']					Semi-abstract representation of how annoyed Grandma is by Svetas exhibitionism. At 10 she reprimands Sveta (no effect).
+!! grandmaQW['nudity_trouble']					Semi-abstract representation of how annoyed Grandma is by Svetas exhibitionism. grandmaQW['nudity_trouble'] is subtracted from grandmaQW['help_amount'] and then reset to 0
+!! grandmaQW['nudity_trouble_limit']			Limit based on fame/reputation before Grandma reprimands Sveta about her behavior
+!! grandmaQW['nudity_trouble_base']				Base based on how many times Sveta has been reprimanded by Grandma about her behavior. Starts at 10. Goes up by 1 each time grandmaQW['nudity_trouble'] hits grandmaQW['nudity_trouble_limit']
+!! grandmaQW['block']							0/1 - has Sveta been caught sinning so much Grandma kicks her out
 !! grandmaQW['talked_about_gadukino']			0/1 - has Sveta asked Grandma about Gadukino? Makes the "Ask about Gadukino" option a one-time thing.
 !! grandmaQW['disappointment']					0/1 - marks if you failed a chore and Grandma is disappointed in you. Causes a lecture and -1 to help_amount
+!! grandmaQW['first_visit']						0/1 - triggers first converstion and gift from Grandma. Only get free money from Grandma once. Monthly payments are now only based on grandmaQW['help_amount']
+!!
+!! ------------------------------------------------------------------------
 !!
-!! ------------------------------------------------------------------------ 
-!! 
 !! Quest Variables - Grandpa
 !! -------------------------
 !! grandpaQW['chore_type']						Variable for storage of the rand() that picks which chore to assign.
-!! 
+!!
 !! grandpaQW['chore_bale_hay']					0/1 - is the "bale hay in the field" quest active?
 !! grandpaQW['chore_bathe_horse']				0/1 - is the "bathe the horse in the river" quest active?
 !! grandpaQW['chore_bathe_horse_prog']			0/1/2 - progress of "bathe the horse in the river" quest
@@ -61,14 +65,14 @@
 !! grandpaQW['chore_herd_cattle_experience']	Has Sveta ever done the "herd cows in the field" quest before? (Practically useless, barely changes a couple of action descriptions.)
 !! grandpaQW['chore_lead_cow_to_field']			0/1 - is the "just take the cow to the field and drop it off there" quest active?
 !! grandpaQW['chore_lead_horse_to_field']		0/1 - is the "take the horse to the field" quest active?
-!! 
+!!
 !! grandpaQW['chore_gather_mushrooms']			0/1 - is the "gather mushrooms" quest active?
 !! grandpaQW['chore_gather_berries']			0/1 - is the "gather berries" quest active?
 !! grandpaQW['chore_gather_both']				0/1 - is the "gather mushrooms and berries" quest active?
 !! grandpaQW['chore_mushroom_quantity']			How many kg of mushrooms does Grandpa want?
 !! grandpaQW['chore_berry_quantity']			How many kg of berries does Grandpa want?
-!! 
-!! 
+!!
+!!
 !! Other Variables - Grandpa
 !! -------------------------
 !! grandpaQW['last_day_helped']					The most recent day Sveta asked Grandpa if she could help him with anything.
@@ -80,66 +84,209 @@
 !! VARIABLE LIST FOR GRANDPARENTS AND THEIR CHORES - END
 
 if $ARGS[0] = 'start':
+	*clr & cla
 	CLOSE ALL
 	$location_type = 'indoors'
 	$metka = 'start'
 	$loc = 'gadhouse'
 	$menu_loc = 'gadhouse'
 	$menu_arg = ''
-	menu_off = 0
+	menu_off = 1
 	$locclass = 'singleroom'
 	curr_home = 2
 	display_bb = 1
-	*clr & cla
 	frost = 0
-	mira_temp = rand(1,5)
+	mira_temp = rand(1,10)
 
-	if grandmaQW['last_month_paid'] ! month and hour >= 6 and hour < 22:
-		grandmaQW['last_month_paid'] = month
-		if grandmaQW['help_amount'] > 0: money += grandmaQW['help_amount'] * 50
-		money += 2000
-		minut += 10
+	gs 'gadhouse', 'nudity_trouble_limit'
 
+	!! Grandma sends Sveta back to Pavlovsk for school to start
+	if gadstay = 1 and (kanikuli = 4 or kanikuli = 5) and month = 8 and day >= 27 and hour >= 6 and hour < 20:
+		*clr & cla
+		minut += 5
+		money += 75
 		gs 'stat'
 
+		'<center><b><font color="maroon">Your grandmother</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
-		if gadstay = 0:
-			'Upon entering the house, you let out a screech as you catch sight of your grandmother, throwing yourself at her, wrapping your arms around her neck. She embraces you tightly. She starts by saying "Dear <<$pcs_nickname>>, you''re only skin and bones, but don''t worry, a few months here and you''ll be looking your usual self again ."'
-			'"But look at you, you sure have grown up. A young woman." she says proudly. She continues "Grandpa and I keep getting older and older and need some help around the house. What do you say youngling? You will not have to do much. Here''s the deal, you lend us a helping hand on the farm as much as possible, and we will pay you for each chore you do. It will be a great life lesson, you will learn about hard work. What do you say?"'
-			'"Of course I''ll help out, Grandma." you answer.'
-			'"I''m glad to hear that <<$pcs_nickname>>, here is little something upfront so you know we are serious," Grandma says and hands over <<2000 + grandmaQW[''help_amount''] * 50>>  rubels.'
-			'"Thanks Babushka!" you kiss her on the cheek before you head on out.'
-		else
-			'When you got out of bed, your grandmother called you over to her.'
-			'"I imagine you''ve spent all your allowance on sweets so lets see what we can do to give you some more pocket money, hmmmm?" she says as she opens her purse.'
-			if grandmaQW['help_amount'] > 0:
-				'"You were quite helpful over the last few weeks, so here''s <<2000 + grandmaQW[''help_amount''] * 50>> rubles." She starts to hand you the money, then lifts it away with a stern look, "But you can always do more work, young lady!" she scolds gently then smiles as she gives you the money.'
-			else
-				'"We really could have used your help last month," she says mournfully as she counts out some bills. "Maybe this month you''ll do more to help us?" She looks at you sternly as she hands you 2000 rubles.'
-			end
+		*nl
+		'"<<$pcs_firstname>>, your mother called, school is starting soon, and you have to head back to Pavlovsk to get ready."'
+		'"As much as we loved having you around and getting to see you more, this is it for now."'
+		'"You are always welcome to come and visit on weekends or breaks from school."'
+		'"And if you want to, you can always stay with us again next summer."'
+
+		if grandmaQW['help_amount'] > 0:
+			money += grandmaQW['help_amount']*25
 			gs 'stat'
+
+			'Before leaving your grandma hugs you and gives you <<grandmaQW[''help_amount'']*25>> rubles for your help with chores.'
+			grandmaQW['help_amount'] = 0
+		else
+			'Before leaving your grandma gives you a big hug goodbye.'
 		end
+
+		'As you turn to leave, she stops you, "One last thing, here are some rubles for the train ticket to get you back to Pavlovsk."'
+
+		act 'Leave': gadstay = 0 & gt 'gaddvor'
+	!! Returning home after being lost; no penalty for not doing chores or disappointing either grandparent
+	elseif lost_girl = 1 and hour >= 6 and hour < 20:
+		*clr & cla
+		lost_girl = 0
+		grandmaQW['disappointment'] = 0
+		grandpaQW['disappointment'] = 0
+		grandmaQW['last_day_helped'] = daystart
+		grandpaQW['last_day_helped'] = daystart
+		minut += 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/babushka.jpg"></center>'
+		*nl
+		'"<<$pcs_firstname>>, your grandfather and I were so worried when you didn''t come back home from the forest."'
+		'"We are so glad you are back safe and sound. Go have a hot meal and shower and relax."'
+		'"Also, don''t worry about any chores today or tomorrow, just focus on recovering."'
+
+		act 'Continue':gt 'gadhouse', 'main'
+	!!Grandma kicks Sveta out for being a whore
+	elseif grandmaQW['nudity_trouble_limit'] = 50 and hour >= 6 and hour < 20:
+		*clr & cla
 		grandmaQW['help_amount'] = 0
-		act 'Continue': gt 'gadhouse', 'start'
+		grandmaQW['block'] = 1
+		minut += 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+		*nl
+		'Your grandmother looks at you coldly from across the room. She is speaking softly but somehow that is more unnerving than normal, "I''ve been more than fair to you, <<$pcs_firstname>>, and given you more chances than maybe even your mother."'
+		'"If you won''t at least try to act like a decent lady around here, you are no longer welcome. Take your things and leave. Come back when you''ve learned at least some basic decency."'
+
+		act 'Leave': gadstay = 0 & gt 'gadukino'
+	!! Grandma scolding for being spotted nude around the village
+	elseif grandmaQW['nudity_trouble'] = grandmaQW['nudity_trouble_limit'] and hour >= 6 and hour < 20:
+		*clr & cla
+		if grandmaQW['nudity_trouble'] > grandmaQW['help_amount']:
+			grandmaQW['help_amount'] = 0
+		else
+			grandmaQW['help_amount'] = grandmaQW['help_amount'] - grandmaQW['nudity_trouble']
+		end
+		grandmaQW['nudity_trouble'] = 0
+		grandmaQW['nudity_trouble_base'] += 1
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/babushka.jpg"></center>'
+		*nl
+		'Suddenly your grandmother approaches you with disappointed look on her face. "I had higher expectations of you young lady! You should be ashamed of yourself running around outdoors without clothes. You have embarrassed me and your grandfather! Our friends have seen you around naked as have your grandfather and I, so don''t even try to hide it."'
+		'"This will be reflected in your allowance for your chores as well so don''t act all surprised at the beginning of the month either."'
+		'"Unlike you, we have to live in this village, and get along with the people in it. If you keep this up, I''ll be cutting your time here short and sending you back to your mother, and she can deal with your sinful behaviour. We better not hear anymore about this!" She then walks off before you can even respond.'
+
+		act 'Continue': gt 'gadhouse', 'main'
+	!!Grandpa is disappointed in you for failing to do a chore you promised
+	elseif grandpaQW['disappointment'] = 1 and hour >= 6 and hour < 20:
+		*clr & cla
+		grandpaQW['disappointment'] = 0
+		grandmaQW['help_amount'] -= 1
+		minut += 5
+		pcs_mood -= 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa.jpg"></center>'
+		*nl
+		'Your grandfather scowls at you as you walk by.'
+		'<br>"<<$pcs_firstname>>. I am disappointed in you," he says flatly.'
+		'"What? Why?" you ask, taken aback a bit by his demeanor.'
+		'"Yesterday I asked you to help me, and you agreed. And here we are, today, and I find that you did not."'
+		'"Oh n-no, Grandpa," you stutter, "I forgot all about it! I''m sorry!"'
+		'"Quiet, child. I wasn''t done speaking. You promised to help and did not, which means you lied."'
+		'<br>You stare at him, crestfallen.'
+		'<br>"And I don''t want your apologies. A <<$pcs_lastname>> keeps their word, or their word is worth nothing."'
+		'Your eyes tear up a bit as your grandfather berates you. "Yes, sir," you mumble quietly.'
+		'"I would rather you tell me flat-out if you do not want to help, <<$pcs_firstname>>. At least that makes you honest, even if lazy."'
+		'"Grandpa, I honestly just forg-" you begin, but he cuts you off.'
+		'"Hush, child. I don''t care for excuses. Now go on, some of us have work to do."'
+		'<br>You silently turn and walk away, feeling guilty.'
 
-	elseif mira_temp = 1 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 0 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or miragopQW >= 10 or mirasex > 1):
+		act 'Continue':gt 'gadhouse', 'main'
+	!!Grandma is disappointed in you for failing to do a chore you promised
+	elseif grandmaQW['disappointment'] = 1 and hour >= 6 and hour < 20:
+		*clr & cla
+		grandmaQW['disappointment'] = 0
+		grandmaQW['help_amount'] -= 1
+		minut += 5
+		pcs_mood -= 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+		*nl
+		'Grandma frowns at you as you walk by. "<<$pcs_nickname>>, you said you would help me yesterday, and you did not."'
+		'You cringe a little as you remember what you told her you would do. "I''m sorry Grandma, I forgot all about it..."'
+		'"I am an old woman, child. It is difficult for me to do many of the things I once could. But I can still do them if I know I have to."'
+		'You look at the ground, feeling guilty, as she continues: "But it is even harder for me if I expected help and did not receive it."'
+		'"Sorry, Grandma," you mumble again.'
+		'She softens a little, finally. "It''s okay child," she says. "But it makes it harder for me to give you your allowance for sweets if you cannot follow through on your promises."'
+		'"Yes, ma''am," you nod.'
+		'"All right child," she says, patting your shoulder softly. "Go on now, I am sure you have things to do."'
+
+		act 'Continue':gt 'gadhouse', 'main'
+	elseif grandmaQW['first_visit'] = 0 and hour >= 6 and hour < 20:
+		*clr & cla
+		grandmaQW['first_visit'] = 1
+		money += 3000
+		minut += 5
+		pcs_mood += 10
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
+		*nl
+		'Upon entering the house, you let out a screech as you catch sight of your grandmother, throwing yourself at her, wrapping your arms around her neck. She embraces you tightly. She starts by saying "Dear <<$pcs_nickname>>, you''re only skin and bones, but don''t worry, a few months here and you''ll be looking your usual self again ."'
+		'"But look at you, you sure have grown up. A young woman." she says proudly. She continues "Grandpa and I keep getting older and older and need some help around the house. What do you say youngling? You will not have to do much. Here''s the deal, you lend us a helping hand on the farm as much as possible, and we will pay you for each chore you do. It will be a great life lesson, you will learn about hard work. What do you say?"'
+		'"Of course I''ll help out, Grandma." you answer.'
+		'"I''m glad to hear that <<$pcs_nickname>>, here is little something anyways just for visiting," Grandma says and gives you 3000 rubles.'
+		'"Thanks Babushka!" you kiss her on the cheek before you head on out.'
+
+		if (kanikuli = 4 or kanikuli = 5) and ((month = 6 or month = 7) or (month = 8 and day <= 25)):
+			'"Will you be staying with us during the summer or will you be traveling back and forth with your parents?" she asks.'
+
+			act 'Stay with your grandaparents':gadstay = 1 & gt 'gadhouse', 'main'
+			act 'Stay in Pavlovsk':gadstay = 0 & gt 'gadhouse', 'main'
+		else
+			act 'Continue':gt 'gadhouse', 'main'
+		end
+	elseif grandmaQW['last_month_paid'] ! month and hour >= 6 and hour < 20:
+		*clr & cla
+		grandmaQW['last_month_paid'] = month
+		if grandmaQW['help_amount'] > 0: money += (grandmaQW['help_amount'] * 25)
+		minut += 5
+		pcs_mood += 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
+		*nl
+		'Your grandmother calls you over to her, "I imagine you''ve spent all your allowance so lets see what we can do to give you some more pocket money, hmmmm?" she says as she opens her purse.'
+		if grandmaQW['help_amount'] > 0:
+			'"You were quite helpful over the last few weeks, so here''s <<grandmaQW[''help_amount''] * 25>> rubles." She starts to hand you the money, then lifts it away with a stern look, "But you can always do more work, young lady!" she scolds gently then smiles as she gives you the money.'
+			grandmaQW['help_amount'] = 0
+		else
+			'"We really could have used your help last month," she says mournfully as she counts out some bills. "Maybe this month you''ll do more to help us?" She looks at you sternly as she puts her purse away.'
+		end
+
+		act 'Continue': gt 'gadhouse', 'main'
+	elseif mira_temp = 1 and MiraLoc = 0 and hour >= 8 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 0 and mira_guestday ! daystart and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1):
 		*clr & cla
 		mira_guestday = daystart
 		minut += 5
 		mira_guest = 1
+		MiraLoc = 6
 		gs 'stat'
 
 		gs 'miroslava', 'miraclothes'
+		*nl
 		'You notice Mira coming towards your grandparents home.'
 		'You step out on the porch and greet Mira. She replies "Hi <<$pcs_nickname>>, I was really bored being all alone at home. Do you want to do something?"'
 
-		act 'Continue':gt 'gadhouse', 'start'
-
+		act 'Continue':gt 'gadhouse', 'main'
 	else
 		gt 'gadhouse', 'main'
 	end
 end
-	!125e
+
 if $ARGS[0] = 'main':
 	$metkaM = 'main'
 	$locM = 'gadhouse'
@@ -151,6 +298,7 @@ if $ARGS[0] = 'main':
 	gs 'stat'
 	'<center><H4>Your Grandparents'' Cottage</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
+	*nl
 	'A fairly simple cottage in the village of Gadukino which your grandparents call home. In the main room there is a huge <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gad = 1 & gt ''bed'', ''start''">bed</a> where you can rest. The bed is more comfortable than it looks.'
 	'There is an old <a href="exec:gt ''TV'',''gad''">television</a> in the living room. It''s positioned next to a body length <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
 	'You can check your weight on your grandma''s old mechanical <a href="exec:msg ''<center>Your weight is <<pcs_weight>> kg<br>Your body mass index (BMI) is <<bmi_calc>>.<br><<$bmi_desc>></center>''">scales</a>.'
@@ -180,7 +328,6 @@ if $ARGS[0] = 'main':
 		if temp = 1:'In a box filled with scraps of cloth, <a href="exec: gt ''gadhouse'',''villagecat''">Boniface</a> is curled up sleeping peacefully.'
 	end
 
-
 	if hour >= 6 and hour < 8:
 		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> is puttering around in the kitchen, making breakfast.'
 		'Your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> is sitting at the kitchen table, drinking a black cup of coffee.'
@@ -222,16 +369,11 @@ if $ARGS[0] = 'main':
 	gs 'zz_family', 'father_sheduler'
 	if $father['location'] = $curloc and home_owned[2] = 1:
 		'Your parents room.'
-		gs 'gadukino_event', 'go_home'
+		gs 'gadhouse', 'go_home'
 	end
 	}
-	if week = 6 and hour > 12 and family_trip_month ! month: indorf = 1
-
-	if indorf = 1:
-		'Your parents are relaxing inside.'
 
-		if staygad ! daystart and home_owned[2] = 1: gs 'gadukino_event', 'go_home'
-	end
+	gs 'gadhouse', 'family_trip'
 
 	if $clothingworntype ! 'nude':
 		act 'Go outside':minut += 1 & gt 'gaddvor'
@@ -241,7 +383,7 @@ if $ARGS[0] = 'main':
 			menu_off = 1
 			minut += 1
 			inhib_exp += rand(0,2)
-			grandmaQW['nudity_trouble'] += rand(1,3)
+			grandmaQW['nudity_trouble'] += rand(0,2)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the house like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
 			gs 'arousal', 'flash', 10, 'exhibitionism'
@@ -254,8 +396,8 @@ if $ARGS[0] = 'main':
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			inhib_exp += rand(0,2)
-			grandmaQW['nudity_trouble'] += rand(1,3)
+			inhib_exp += rand(0,1)
+			grandmaQW['nudity_trouble'] += rand(0,1)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in almost getting caught'
 			gs 'arousal', 'flashlite', 10, 'exhibitionism'
 			gs 'arousal', 'end'
@@ -273,7 +415,7 @@ if $ARGS[0] = 'main':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
 			'You grab a bucket and a rag, and get down on your knees and begin scrubbing the floor. Within the hour the floor shines and you are satisfied with the work you''ve done. You put the cleaning supplies into a corner and continue on with your day.'
-			
+
 			act 'Continue':gt 'gadhouse', 'start'
 		end
 	end
@@ -287,7 +429,7 @@ if $ARGS[0] = 'main':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
 			'You pick up your grandfather''s dirty clothes and take them with you outside, where you soak them in the metal basin for an hour.'
-			
+
 			act 'Hang the laundry':
 				*clr & cla
 				minut += 10
@@ -296,10 +438,10 @@ if $ARGS[0] = 'main':
 				'Once you are done with the washing, you walk over to the clothesline where you carefully hang the clothes to dry.'
 
 				act 'Continue':gt'gaddvor'
-			end    
+			end
 		end
 	end
-	
+
 	if (hour >= 6 and hour < 10) or (hour >= 12 and hour < 20): act 'Talk to Grandma':gt 'gadhouse','grandma'
 	if (hour >= 6 and hour < 13) or (hour >= 15 and hour < 20): act 'Talk to Grandpa':gt 'gadhouse','grandpa'
 	act 'Prepare a full meal (0:30)':gs 'food', 'm_meal'
@@ -365,30 +507,6 @@ if $ARGS[0] = 'main':
 end
 
 if $ARGS[0] = 'grandma':
-	!!Grandma is disappointed in you for failing to do a chore you promised
-	if grandmaQW['disappointment'] = 1:
-		*clr & cla
-		menu_off = 1
-		minut += 5
-		gs 'stat'
-		grandmaQW['disappointment'] = 0
-		grandmaQW['help_amount'] -= 1
-		pcs_mood -= 5
-		
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
-		'Grandma frowns at you as you approach her. "<<$pcs_nickname>>, you said you would help me yesterday, and you did not."'
-		'You cringe a little as you remember what you told her you would do. "I''m sorry Grandma, I forgot all about it..."'
-		'"I am an old woman, child. It is difficult for me to do many of the things I once could. But I can still do them if I know I have to."'
-		'You look at the ground, feeling guilty, as she continues: "But it is even harder for me if I expected help and did not receive it."'
-		'"Sorry, Grandma," you mumble again.'
-		'She softens a little, finally. "It''s okay child," she says. "But it makes it harder for me to give you your allowance for sweets if you cannot follow through on your promises."'
-		'"Yes, ma''am," you nod.'
-		'"All right child," she says, patting your shoulder softly. "Go on now, I am sure you have things to do."'
-		
-		act 'Continue':gt 'gadhouse', 'start'
-		exit
-	end
-	
 	*clr & cla
 	menu_off = 1
 	minut += 2
@@ -426,7 +544,7 @@ if $ARGS[0] = 'grandma':
 						*clr & cla
 						minut += 15
 						gs'stat'
-						
+
 						grandmaQW['chore_can_mushrooms'] = 0
 						grandmaQW['help_amount'] += 2
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_mushrooms.jpg"></center>'
@@ -469,7 +587,7 @@ if $ARGS[0] = 'grandma':
 				end
 			end
 		end
-		
+
 		if grandmaQW['chore_can_veggies'] = 1:
 			act 'Help Grandma can veggies (3:00)':
 				*clr & cla
@@ -503,7 +621,7 @@ if $ARGS[0] = 'grandma':
 			end
 		end
 
-		
+
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to her about the flowers': gt 'grigory', 'flower4'
 
 	!! ask for chore from Grandma
@@ -518,16 +636,16 @@ if $ARGS[0] = 'grandma':
 				minut += 2
 				grandmaQW['chore_clean_floor'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'"Grandma, the floors are all clean!" you say proudly.'
 				'"Thank you child," your grandmother says, "You have saved my hands and knees a great deal of aching."'
 				'You give her a warm smile and continue on with your day.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_wash_clothes'] = 2:
 			act 'Tell her you washed the clothes':
 				*clr & cla
@@ -540,11 +658,11 @@ if $ARGS[0] = 'grandma':
 				'"Grandma, I finished washing Grandpa''s dirty clothes," you tell her.'
 				'"Thank you <<$pcs_nickname>>. I have no idea how that man gets so dirty!"'
 				'You and your grandmother share a laugh, and you give her a hug before moving on.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_milk_cow'] = 2:
 			act 'Tell her you milked the cow':
 				*clr & cla
@@ -558,11 +676,11 @@ if $ARGS[0] = 'grandma':
 				'"Thank you <<$pcs_nickname>>. She''s such a sweet thing, isn''t she?" your grandmother asks fondly.'
 				'"Um, yes, she is very nice for a cow," you say, smiling. "She''s the nicest cow I know."'
 				'Grandma nods sagely at that, and you grin and continue on with your day.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_groceries'] = 2:
 			act 'Give her the groceries':
 				*clr & cla
@@ -579,11 +697,11 @@ if $ARGS[0] = 'grandma':
 				'You lug the bags into the kitchen and heft them up on the table, before coming back to Grandma.'
 				'"Anything else you need, Grandma?" you ask.'
 				'"No, that is all, <<$pcs_nickname>>," she says, and gives you a gentle pat on the back.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_feed_chickens'] = 2:
 			act 'Tell her you fed the chickens':
 				*clr & cla
@@ -597,11 +715,11 @@ if $ARGS[0] = 'grandma':
 				'"Good, thank you, <<$pcs_nickname>>," she says. "A fat chicken is a happy chicken, and happy chickens lay the best eggs."'
 				'She nods to herself as if she had said something very wise.'
 				'"Um, well, I''m happy to help, Grandma," you say, and give her a quick hug.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_work_in_garden'] = 2:
 			act 'Tell her you worked in the garden':
 				*clr & cla
@@ -628,11 +746,11 @@ if $ARGS[0] = 'grandma':
 				'You grin to yourself, thinking of how <<$npc_nickname[''A29'']>> must have been at your age.'
 				'"Anyway," she continues, "thank you for doing that for me, <<$pcs_nickname>>. My old bones complain when I do it."'
 				'She gives you a peck on the cheek and sends you on your way.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_water_garden'] = 2:
 			act 'Tell her you watered the garden':
 				*clr & cla
@@ -646,11 +764,11 @@ if $ARGS[0] = 'grandma':
 				'"Thank you, <<$pcs_nickname>>," she says. "A healthy plant is always thirsty. You should have some water too, if you want to be a healthy girl."'
 				'"Maybe I will. Is there anything else you need?"'
 				'"No, sweet child. That is enough for today," she says, and gives you a gentle pat on the arm.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_collect_strawberries'] = 2:
 			act 'Give her the strawberries you picked':
 				*clr & cla
@@ -666,11 +784,11 @@ if $ARGS[0] = 'grandma':
 				'You smile and say, "They taste pretty good too!"'
 				'Your grandmother gives you a rueful look and says, "I don''t remember asking you to eat the strawberries, child."'
 				'She cannot hold the charade, though, and breaks into a smile. "I never could resist eating a few fresh off the plant either."'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_collect_fruit'] = 2:
 			act 'Give her the fruit you collected':
 				*clr & cla
@@ -684,11 +802,11 @@ if $ARGS[0] = 'grandma':
 				'"I gathered all the fruits I could reach," you say.'
 				'"Thank you, <<$pcs_nickname>>," she says. "I cannot reach or bend like I used to, so you have done me a great favor."'
 				'You smile and hug your grandmother, and go on about your day.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_harvest_garden'] = 2:
 			act 'Give her the vegetables from the garden':
 				*clr & cla
@@ -706,11 +824,11 @@ if $ARGS[0] = 'grandma':
 				'"Oh don''t worry yourself, little <<$pcs_nickname>>," she says, cupping your cheek with her hand. "Forgive an old woman of her wistful ways. We are lucky to have such a kind granddaughter to help us bring in the harvest."'
 				'You place your youthful hand over her wizened old one and smile at her. "I am happy to help, Grandma. Is there anything else you need?"'
 				'"No, child, you have done more than your fair share today. Soon we will have to preserve these vegetables to keep them from spoiling, but for now you can rest."'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_gather_mushrooms'] = 2 and boletus >= grandmaQW['chore_mushroom_quantity'] and hour >= 6 and hour < 20:
 			act 'Give Grandma the mushrooms she asked for':
 				*clr & cla
@@ -729,11 +847,11 @@ if $ARGS[0] = 'grandma':
 				'"I can get more, if you want me to."'
 				'"No need for that, little one," she clucks. "You''ve done enough for one day."'
 				'You give her a quick hug in response, and carry on.'
-				
+
 				act 'Continue': grandmaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_gather_berries'] = 2 and bilberry >= grandmaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
 			act 'Give Grandma the berries she asked for':
 				*clr & cla
@@ -808,7 +926,7 @@ if $ARGS[0] = 'grandma':
 				act 'Continue':gt 'gadhouse', 'grandma'
 			end
 		end
-		!125e
+
 		if hour >= grandmaQW['last_hour_talked'] + 3:
 			act 'Chat with your grandmother (0:10)':
 				*clr & cla
@@ -895,35 +1013,6 @@ if $ARGS[0] = 'grandma':
 end
 
 if $ARGS[0]='grandpa':
-
-	!!Grandpa is disappointed in you for failing to do a chore you promised
-	if grandpaQW['disappointment'] = 1:
-		*clr & cla
-		menu_off = 1
-		minut += 5
-		gs 'stat'
-		grandpaQW['disappointment'] = 0
-		grandmaQW['help_amount'] -= 1
-		pcs_mood -= 5
-		
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa.jpg"></center>'
-		'Your grandfather scowls at you as you approach him.'
-		'<br>"<<$pcs_firstname>>. I am disappointed in you," he says flatly.'
-		'"What? Why?" you ask, taken aback a bit by his demeanor.'
-		'"Yesterday I asked you to help me, and you agreed. And here we are, today, and I find that you did not."'
-		'"Oh n-no, Grandpa," you stutter, "I forgot all about it! I''m sorry!"'
-		'"Quiet, child. I wasn''t done speaking. You promised to help and did not, which means you lied."'
-		'<br>You stare at him, crestfallen.'
-		'<br>"And I don''t want your apologies. A <<$pcs_lastname>> keeps their word, or their word is worth nothing."'
-		'Your eyes tear up a bit as your grandfather berates you. "Yes, sir," you mumble quietly.'
-		'"I would rather you tell me flat-out if you do not want to help, <<$pcs_firstname>>. At least that makes you honest, even if lazy."'
-		'"Grandpa, I honestly just forg-" you begin, but he cuts you off.'
-		'"Hush, child. I don''t care for excuses. Now go on, some of us have work to do."'
-		'<br>You silently turn and walk away, feeling guilty.'
-		
-		act 'Continue':gt 'gadhouse', 'start'
-		exit
-	end
 	*clr & cla
 	menu_off = 1
 	minut += 2
@@ -939,7 +1028,7 @@ if $ARGS[0]='grandpa':
 		act 'Maybe you should get dressed before talking to him':gt 'gadhouse', 'start'
 	else
 		act 'Leave him alone':gt 'gadhouse', 'start'
-		
+
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to him about the flowers': gt 'grigory', 'flower3'
 
 		if grandpaQW['chore_gather_mushrooms'] = 1:
@@ -962,7 +1051,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_fetch_firewood'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"I''ve brought in some firewood, Grandpa," you say to your grandfather.'
 				'"Thank you very much, <<$pcs_nickname>>," he replies with a smile. "Just set down it over there."'
@@ -980,7 +1069,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_feed_horse'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"I fed the horse, Grandpa."'
 				'"Thank you <<$pcs_nickname>>," he says. "It is very important to make sure a horse is well fed. They are hard workers and deserve their meals."'
@@ -999,7 +1088,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_feed_cow'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'You tell your grandfather, "I fed Dawn her hay, Grandpa."'
 				'"Very good, <<$pcs_nickname>>," he says. "I presume she acted like we were starving her to death?"'
@@ -1017,7 +1106,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_clean_yard'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"I finished cleaning the yard, Grandpa," you say as you stretch your sore arms.'
 				'"Very good," he says. "It is more work than it seems, isn''t it?"'
@@ -1035,7 +1124,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_brush_horse'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"I brushed the horse, Grandpa," you tell your grandfather.'
 				'"You scrubbed him down with the curry brush?" he asks.'
@@ -1061,7 +1150,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_feed_boar'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'You walk up to your grandfather and tell him, "I fed the pig, Grandpa."'
 				'"Thank you <<$pcs_nickname>>," he says.'
@@ -1079,7 +1168,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_lead_horse_to_field'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"Hey Grandpa, I took Desperado out to the field."'
 				'"Good, good," he says. "Horses need freedom to run."'
@@ -1097,7 +1186,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_lead_cow_to_field'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"Hi Grandpa!" you say. "I took Dawn out to the field."'
 				'"Were the others there?" he asks.'
@@ -1119,7 +1208,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_bathe_horse'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'You walk up to your grandfather and tell him, "I gave Desperado a bath in the river, Grandpa."'
 				'"Thank you <<$pcs_nickname>>," he says. "Grooming him is all well and good, but sometimes it''s not enough."'
@@ -1150,7 +1239,7 @@ if $ARGS[0]='grandpa':
 				act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
 			end
 		end
-		
+
 		if grandpaQW['chore_gather_berries'] = 2 and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
 			act 'Give him the berries he asked for':
 				*clr & cla
@@ -1193,7 +1282,7 @@ if $ARGS[0]='grandpa':
 				act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
 			end
 		end
-		
+
 		if grandpaQW['chore_bale_hay'] = 2:
 			act 'Tell him you helped the townspeople bale hay':
 				*clr & cla
@@ -1201,7 +1290,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_bale_hay'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"I spent all day helping with the hay, Grandpa," you tell him, stretching your sore muscles.'
 				'He smiles proudly at you and says, "Yes, I was there too, <<$pcs_nickname>>. I saw you working hard."'
@@ -1309,6 +1398,107 @@ if $ARGS[0]='villagecat':
 	end
 end
 
+if $ARGS[0] = 'nudity_trouble_limit':
+	if grandmaQW['nudity_trouble_base'] = 0 or grandmaQW['nudity_trouble_limit'] = 0:
+		grandmaQW['nudity_trouble_base'] = 10
+		grandmaQW['nudity_trouble_limit'] = grandmaQW['nudity_trouble_base']
+	else
+		grandmaQW['nudity_trouble_limit'] = grandmaQW['nudity_trouble_base']
+	end
+
+	if SchoolBlock = 1: grandmaQW['nudity_trouble_limit'] += 5
+	if momKnowsKolka = 1: grandmaQW['nudity_trouble_limit'] += 10
+	if momKnowsVladimir = 1: grandmaQW['nudity_trouble_limit'] += 10
+	if momslut < 2:
+		if motherKnowWhore > 0: grandmaQW['nudity_trouble_limit'] += 3
+		if motherKnowSpravka > 0: grandmaQW['nudity_trouble_limit'] += 2
+	end
+	if brotherSex < 6:
+		if brotherknowslut > 1: grandmaQW['nudity_trouble_limit'] += 3
+		if brotherknowslut > 0: grandmaQW['nudity_trouble_limit'] += 2
+	end
+	if sisterQW['roma3block'] = 1:
+		if sisterknowslut > 1 and sisboypartyQW > 1: grandmaQW['nudity_trouble_limit'] += 3
+		if sisterknowslut > 0: grandmaQW['nudity_trouble_limit'] += 2
+	end
+	if gadriver_gang = 2:
+		grandmaQW['nudity_trouble_limit'] += 5
+	else
+		if npc_QW['A63'] >= 11: grandmaQW['nudity_trouble_limit'] += 3
+		if npc_QW['A60'] >= 15: grandmaQW['nudity_trouble_limit'] += 2
+	end
+end
+
+if $ARGS[0] = 'family_trip':
+	! family comes to visit first weekend of each month from Saturday at 1200 to Sunday at 2100
+	if week = 6 and hour > 12 and family_trip_month ! month: indorf = 1
+
+	if indorf = 1:
+		'Your parents are relaxing inside.'
+
+		if gadstay_day ! daystart and home_owned[2] = 1:
+			if week = 7:
+				if hour = 20:
+					family_trip_month = month
+					if (kanikuli = 4 or kanikuli = 5) and ((month = 6 or month = 7) or (month = 8 and day <= 25)):
+						*clr & cla
+						menu_off = 1
+						'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+						*nl
+						'<<$npc_nickname[''A29'']>> asks you "Well, <<$pcs_nickname>>, are you coming home with us or are you going to stay in the village with your grandparents?"'
+
+						act 'Stay with your grandaparents':gadstay_day = daystart & gadstay = 1 & indorf = 0 & gt 'gadhouse', 'main'
+						act 'Go home to Pavlovsk': gt 'gadhouse', 'to_pavlovsk'
+					else
+						act 'Go home to Pavlovsk': gt 'gadhouse', 'to_pavlovsk'
+					end
+				elseif hour > 20:
+					family_trip_month = month
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'to_pavlovsk':
+	menu_off = 1
+	*clr & cla
+	gadstay = 0
+	indorf = 0
+	minut += rand(15,25)
+	gs 'stat'
+
+	'<center><b><font color="maroon">Your grandmother</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
+	*nl
+	if grandmaQW['help_amount'] > 0:
+		money += grandmaQW['help_amount']*25
+		gs 'stat'
+
+		'Before leaving your grandma hugs you and gives you <<grandmaQW[''help_amount'']*25>> rubles for your help with chores.'
+		grandmaQW['help_amount'] = 0
+	else
+		'Before leaving your grandma gives you a big hug goodbye.'
+	end
+
+	'You get into the Lada with the rest of your family and before you know it, you''ve arrived back in Pavlovsk.'
+
+	act 'Go to your room': gt 'bedrPar'
+end
+
+if $ARGS[0] = 'to_gadukino':
+	menu_off = 1
+	*clr & cla
+	indorf = 1
+	minut += rand(15,25)
+	gs 'stat'
+
+	'You get into the Lada with the rest of your family and before you know it, you''ve arrived in Gadukino.'
+
+	act 'Go to your grandparents house': gt 'gadhouse', 'start'
+end
+
 if $ARGS[0] = 'intro':
 	cla & *clr
 	$metka = ''

+ 47 - 47
locations/gadprostitutes.qsrc

@@ -12,19 +12,19 @@ if $ARGS[0] = 'start':
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
 	gs'stat'
-	
+
 	*clr & cla
-	
+
 	'<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
-	
+
 	if MiraLoc ! 8 and npc_QW['A60'] > 15 and hour >= 16 and hour <= 19: MiraLoc = 8
 	if MiraLoc ! 8 and npc_QW['A60'] > 15: 'You look around for Mira but don''t see her here. She must be doing something else right now.'
-	!if gadriver_gang = 2:
+	!if gadriver_gang = 2 and (mirapimp = 0 or mirapimp = 2):
 	!	if PCloStyle <> 4:
 	!		'You are not wearing the right clothes to prostitute yourself.'
 	!	elseif pcs_sleep <= 0:
@@ -35,13 +35,13 @@ if $ARGS[0] = 'start':
 		! event to remove Sveta from being miras pimp if she becomes the boys slut, the village whore
 		if MiraLoc = 8 and mirapimp = 1 and (npc_QW['A63'] >= 10 or gadriver_gang = 2):
 			*clr & cla
-			
-			mirapimp = 0
+
+			mirapimp = 2
 			minut += 5
 			gs 'stat'
-			
+
 			gs 'miroslava', 'miraclothes'
-			
+
 			'Mira spots you and confidently walks up to you. You''re not sure what has gotten into her but from the look on her face you probably won''t like it.'
 			'As soon as you are face to face with Mira she winds up and smacks you across the face as hard as she can. You are stunned a bit by and stagger to the ground. You feel warm tears begin to run down your face.'
 			'Mira commands you, "Stand up bitch!"'
@@ -53,7 +53,7 @@ if $ARGS[0] = 'start':
 			end
 			'After Mira is done with her preaching, you try to think of something witty to say or raise your hand to slap her back, but you just can''t bring yourself to do it.'
 			'Mira sees the defeated look in your eyes and knows that she has won. She pulls you into an embrace and whispers, "It''s alright <<$pcs_nickname>>. We can just be friends again. And if you want to, maybe you can come work with me instead?"'
-			
+
 			act 'Continue':gt 'gadprostitutes','start'
 		else
 			act 'Walk back to the highway': nroad = 10 & gt 'road'
@@ -65,15 +65,15 @@ if $ARGS[0] = 'start':
 					if will_cost <= pcs_willpwr:
 						act 'Make Mira your prostitute (<<will_cost>> Willpower)':
 							*clr & cla
-							
+
 							mirapimp = 1
 							minut += 5
 							gs 'willpower', 'misc', 'force', 'hard'
 							gs 'willpower', 'pay', 'force'
 							gs 'stat'
-							
+
 							gs 'miroslava', 'miraclothes'
-							
+
 							'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 angrily. "A better question, my lovely whore, is ''Are you having a good night''?  I want 500 <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?"'
@@ -81,7 +81,7 @@ if $ARGS[0] = 'start':
 							'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 a new chapter of her life as your prostitute.'
-							
+
 							act 'Finish':gt'gadprostitutes','start'
 						end
 					else
@@ -91,12 +91,12 @@ if $ARGS[0] = 'start':
 				! events to prostitute just Mira
 				act 'Watch Mira prostitute herself': gt 'gadprostitutes', 'just_mira'
 				! can do prostitution with Mira if Sveta is the village whore - this can be achieved by doing Mitka''s questline
-				!if gadriver_gang = 2 and mirapimp = 0 and PCloStyle = 4 and pcs_sleep > 0:
+				!if gadriver_gang = 2 and (mirapimp = 0 or mirapimp = 2) and PCloStyle = 4 and pcs_sleep > 0:
 					! act 'Prostitute yourself with Mira':gt 'gadprostitutes', 'with_mira'
 				!end
 			end
 			! can do prostitution without Mira if Sveta is the village whore - this can be achieved by doing Mitka''s questline
-			!if gadriver_gang = 2 and PCloStyle = 4 and pcs_sleep > 0:
+			!if gadriver_gang = 2 and (mirapimp = 0 or mirapimp = 2) and PCloStyle = 4 and pcs_sleep > 0:
 			!	act 'Prostitute yourself':gt 'gadprostitutes', 'without_mira'
 			!end
 		end
@@ -109,61 +109,61 @@ end
 ! Prostitution events for just Mira - SM
 if $ARGS[0] = 'just_mira':
 	gs 'miroslava', 'miraclothes'
-	
-	if hour >= 16 and hour <= 23:		
+
+	if hour >= 16 and hour <= 23:
 		act 'Leave Mira to her work': gt 'gadprostitutes', 'start'
 		act 'Wait for Mira to attract a customer':
 			*clr & cla
 			minut += 30
 			gs 'stat'
-			
+
 			temp_gadpro = rand(1,10)
 			if temp_gadpro > 5:
 				miraprost += 1
-				if npc_QW['A60'] < 20: npc_QW['A60'] += 1 
-				
+				if npc_QW['A60'] < 20: npc_QW['A60'] += 1
+
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/miraprost.jpg"></center>'
-				
+
 				'It isn''t long before a customer pulls up in a nice vehicle. Mira approaches the vehicle and starts talking to the driver.'
 				'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.'
-				
+
 				act 'Watch Mira and the customer':
-					
+
 					temp_gadpro = rand(0,1)
 					if temp_gadpro = 0:
 						*clr & cla
 						gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 						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 customer. Her head is bobbing up and down on his cock.'
-						
+
 						act 'Hide':
 							*clr & cla
 							gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 							gs 'stat'
-							
+
 							'<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.'
-							
+
 							act 'Keep watching':
 								*clr & cla
 								gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 								gs 'stat'
-								
+
 								'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_2.mp4"></video></center>'
 								'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.'
 								gs 'stat'
-								
+
 								act 'Finish':
 									*clr & cla
-									if mirapimp = 1: money += 500
+									if mirapimp = 1: money += 200
 									gs 'arousal', 'end'
 									gs 'stat'
-									
+
 									gt 'gadprostitutes', 'just_mira'
 								end
 							end
@@ -172,35 +172,35 @@ if $ARGS[0] = 'just_mira':
 						*clr & cla
 						gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 						gs 'stat'
-						
+
 						'<center><video autoplay loop src="images/characters/village/mira/miraprost2.mp4"></video></center>'
 						'You walk up and look into the van. You see Mira showing her customer her tits and rubbing her pussy. You see a hungry gleam in the guy''s eyes, which Mira returns right back.'
-						
+
 						act 'Keep watching':
 							*clr & cla
 							gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 							gs 'stat'
-							
+
 							'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_1.mp4"></video></center>'
-							
+
 							'Mira and the guy jump into the back of the van and you watch as he starts fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy pounds his 20cm cock deep into her pussy. From Mira''s grunts of partial ecstasy, partial pain, you know the guy is hitting or entering her cervix.'
-							
+
 							act 'Hide':
 								*clr & cla
 								gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 								gs 'stat'
-								
+
 								'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_2.mp4"></video></center>'
-								
+
 								'You have to duck behind some bushes as they move outside the van. The guy continues to pound into Mira''s pussy until he cums...and cums...and cums. '
 								'After the wild sex, Mira and the guy sit in the van and talk for a bit. He gives her a nice wad of cash and she starts walking back towards the road. She smiles at you and shows you the money as you join her.'
-								
+
 								act 'Finish':
 									*clr & cla
-									if mirapimp = 1: money += 500
+									if mirapimp = 1: money += 200
 									gs 'arousal', 'end'
 									gs 'stat'
-									
+
 									gt 'gadprostitutes', 'just_mira'
 								end
 							end
@@ -209,9 +209,9 @@ if $ARGS[0] = 'just_mira':
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2_1.jpg"></center>'
-				
+
 				'Mira walks along the road showing off her body to passing car and trucks, but no one stops to pick her up.'
-				
+
 				act 'Continue' :gt 'gadprostitutes', 'just_mira'
 			end
 		end
@@ -226,7 +226,7 @@ end
 !	if pcs_sleep <= 0: 'You are too tired to prostitute yourself.'
 !	if pcs_sleep > 0:
 !		act 'Try to attract a customer with Mira':
-!	
+!
 !		end
 !	end
 !	act 'Stop looking for customers with Mira': gt 'gadprostitutes', 'start'
@@ -237,7 +237,7 @@ end
 !	if pcs_sleep <= 0: 'You are too tired to prostitute yourself.'
 !	if pcs_sleep > 0:
 !		act 'Try to attract a customer':
-!			
+!
 !		end
 !	end
 !

+ 34 - 32
locations/gadriver.qsrc

@@ -204,9 +204,9 @@ if $ARGS[0] = 'gadbitch':
 			gt 'gadriver', 'start'
 		end
 	end
-	
+
 	if ARRSIZE('swimwear') > 0: act 'Get changed':gt 'changingroom', 'view_swim_list'
-	
+
 	if $clothingworntype = 'nude':
 		act 'Get dressed':
 			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
@@ -217,7 +217,7 @@ if $ARGS[0] = 'gadbitch':
 				act 'Continue': gt 'gadriver', 'gadbitch'
 		end
 	end
-	
+
 	if temper >= 15 and month >= 5 and month <= 9:
 		temp_gr = rand(0,9)
 		if $clothingworntype ! 'nude' and (pcs_inhib >= 25 or exhibitionist_lvl > 1):
@@ -501,14 +501,14 @@ if $ARGS[0] = 'gadbitch':
 		if grandpaQW['chore_bathe_horse_prog'] = 1:
 			act 'Look at Desperado':
 				*clr & cla
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/horse_river.jpg"></center>'
 				'You see Desperado happily walking around in the river.'
-				
+
 				if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 					act 'Wash Desperado':
 						*clr & cla
-						
+
 						cumspclnt = 4
 						gs 'cum_cleanup'
 						minut += 30
@@ -518,7 +518,7 @@ if $ARGS[0] = 'gadbitch':
 						hndiwrk_exp += rand(1,3)
 						grandpaQW['chore_bathe_horse_prog'] = 2
 						gs 'stat'
-						
+
 						if $clothingworntype = 'nude':
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/wash_horse_nude.jpg"></center>'
 						elseif $clothingworntype = 'swimwear':
@@ -527,7 +527,7 @@ if $ARGS[0] = 'gadbitch':
 						'You jump in the river and swim over to Desperado. You take your time, washing his beautiful chestnut coat.'
 						'After half an hour, you are satisfied with your work and Desperado is ready to be taken back home.'
 						if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-						
+
 						act 'Get out of the water':
 							minut += 5
 							gt'gadriver', 'gadbitch'
@@ -536,7 +536,7 @@ if $ARGS[0] = 'gadbitch':
 					if Mira_Loc = 1 and npc_rel['A60'] > 0:
 						act 'Wash Desperado with Mira':
 							*clr & cla
-							
+
 							cumspclnt = 4
 							gs 'cum_cleanup'
 							minut += 30
@@ -547,7 +547,7 @@ if $ARGS[0] = 'gadbitch':
 							hndiwrk_exp += rand(1,3)
 							grandpaQW['chore_bathe_horse_prog'] = 2
 							gs 'stat'
-							
+
 							if $clothingworntype = 'nude':
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/wash_horse_mira_nude.jpg"></center>'
 							elseif $clothingworntype = 'swimwear':
@@ -557,14 +557,14 @@ if $ARGS[0] = 'gadbitch':
 							'Both of you swim over to Desperado and begin to splash water on him. You chat with Mira and sometimes splash her instead.'
 							'After half an hour, you think Desperado looks cleaner than before and is ready to be taken back home.'
 							if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-							
+
 							act 'Get out of the water':
 								minut += 5
 								gt'gadriver', 'gadbitch'
 							end
 						end
 					end
-					
+
 				else
 					'You cannot wear regular clothes to wash Desperado.'
 					act 'Return': gt'gadriver', 'gadbitch'
@@ -587,7 +587,7 @@ if $ARGS[0] = 'gadbitch':
 					grandpaQW['chore_bathe_horse'] = 2
 					grandpaQW['chore_bathe_horse_prog'] = 0
 					gs 'stat'
-					
+
 					gt'gadsarai'
 				end
 			end
@@ -1225,28 +1225,30 @@ if $ARGS[0] = 'fishing':
 
 				act 'Leave':gt $loc, $metka
 			end
-			act 'Bring a fish to Boniface':
-				cla
-				*clr
-				minut += 5
-				fish -= 1
-				pcs_mood += rand(15,40)
-				gs 'stat'
+			if StoryLine = 1 and grandmaQW['block'] = 0:
+				act 'Bring a fish to Boniface':
+					cla
+					*clr
+					minut += 5
+					fish -= 1
+					pcs_mood += rand(15,40)
+					gs 'stat'
 
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat2.jpg"></center>'
-				'As soon as you enter the house, Boniface immediately jumps down to the floor and twines around your feet. The furry beast starts yowling very loudly and pawing at your legs. He has obviously detected the smell of fresh fish. You treat Boniface to a small fish and within a few minutes all that remains is a pile of fish bones.'
-				if fish >0: fish = 0 & 'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and point at your grandfather. He sighs heavily then takes the fish outside to clean them.'
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat2.jpg"></center>'
+					'As soon as you enter the house, Boniface immediately jumps down to the floor and twines around your feet. The furry beast starts yowling very loudly and pawing at your legs. He has obviously detected the smell of fresh fish. You treat Boniface to a small fish and within a few minutes all that remains is a pile of fish bones.'
+					if fish >0: fish = 0 & 'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and point at your grandfather. He sighs heavily then takes the fish outside to clean them.'
 
-				act 'Finish': gt 'gadhouse', 'start'
-			end
-			act 'Give the fish to your grandmother':
-				cla
-				*clr
-				minut += 5
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/givefish.jpg"></center>'
-				'You try to give the fish to your grandmother, but she takes one look at the intact fish and point at your grandfather. He sighs heavily then takes the fish outside to clean them.'
+					act 'Finish': gt 'gadhouse', 'start'
+				end
+				act 'Give the fish to your grandmother':
+					cla
+					*clr
+					minut += 5
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/givefish.jpg"></center>'
+					'You try to give the fish to your grandmother, but she takes one look at the intact fish and point at your grandfather. He sighs heavily then takes the fish outside to clean them.'
 
-				act 'Finish': gt 'gadhouse', 'start'
+					act 'Finish': gt 'gadhouse', 'start'
+				end
 			end
 		else
 			act 'Leave':gt $loc, $metka

+ 11 - 11
locations/gadroad.qsrc

@@ -44,7 +44,7 @@ if $ARGS[0] = '':
 		! if Sveta did not bring Mira with her and Mira has met the boys already then there is a 50% chance she will show up too
 		if MiraLoc ! 5 and npc_QW['A60'] >= 1:
 			mirarand = rand(1,10)
-			if mirarand >= 6: 
+			if mirarand >= 6:
 				MiraLoc = 5
 				'You can go drink with Mira, Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh'',''partywithMira''">trailer</a> hidden in the woods.'
 			else
@@ -55,9 +55,9 @@ if $ARGS[0] = '':
 		end
 	end
 
-	act 'Go back to Gadukino':minut += 20 & gt'gadukino'
-	act 'Go into the woods':minut += 30 & gt'gadforest','1'
-	if meadow > 0: act 'Go to the meadow':minut += 20 & gt 'meadow'
+	act 'Go back to Gadukino':minut += 10 & gt'gadukino'
+	act 'Walk down to the river':minut += 10 & gt 'gadriver', 'start'
+	act 'Go into the woods':minut += 15 & gt'gadforest','forest_edge'
 	act 'Go to the fields':minut += 10 & gt'gadfield','field'
 	if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour >= 6 and hour < 22 and gadrunday ! daystart:
 		act 'Go for a run (1:00)':
@@ -75,11 +75,11 @@ if $ARGS[0] = '':
 			elseif month=9 or month=10 or month=4 or month=5:
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg3.jpg"></center>'
 			else
-				if musle >= salo: 
+				if musle >= salo:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg1.jpg"></center>'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg2.jpg"></center>'
-				end    
+				end
 			end
 			'You run for an hour enjoying the scenery.'
 
@@ -98,10 +98,10 @@ if $ARGS[0] = 'drinking_invite':
 	$menu_loc = 'gadroad'
 	$menu_arg = 'drinking_invite'
 	menu_off = 1
-	
+
 	minut += 5
 	gs 'stat'
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drunk.jpg"></center>'
 	'You quickly catch up to the boys who have already started drinking.'
 	!School girl Sveta
@@ -128,7 +128,7 @@ if $ARGS[0] = 'drinking_invite':
 		end
 	end
 	'Mitka asks, "Are you ready to go?"'
-	
+
 	! if Sveta came here to kick off Miras quest then she cannot leave otherwise Sveta is free to decline the offer
 	if npc_QW['A60'] > 0 or (MiraLoc ! 5 and npc_QW['A60'] = 0):
 		gs 'willpower', 'drink', 'resist'
@@ -137,7 +137,7 @@ if $ARGS[0] = 'drinking_invite':
 				gs 'willpower', 'drink', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				
+
 				gt 'gadroad'
 			end
 		else
@@ -152,7 +152,7 @@ if $ARGS[0] = 'drinking_invite':
 		'Just as the words leave Mitka''s mouth, Mira comes bounding around the corner.'
 		'"Hey guys, thanks for the invite! <<$pcs_nickname>> is here too, awesome! Let''s go!"'
 	end
-	
+
 	! Mira is here and both her and Sveta are the town whores
 	! mitkabuh_group has the drinking events for group sex for 2 girls and 3 boys
 	if MiraLoc = 5 and npc_QW['A60'] >= 16 and gadriver_gang = 2:

+ 13 - 20
locations/gadsarai.qsrc

@@ -8,7 +8,6 @@ if $ARGS[0] = '':
 	menu_off = 0
 	$location_type = 'secluded'
 
-
 	'<center><h4>Old Barn</h4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
@@ -41,13 +40,13 @@ if $ARGS[0] = '':
 		'On your left is a <a href="exec: gt ''gadsarai'',''horse'' ">horse</a> stable.'
 	end
 	'There''s a <a href="exec: gt ''gadsarai'',''boar'' ">boar</a> living in a separate stable.'
-	if findvel = 1:'You see an old <a href="exec:gt ''bicycle'',''sarai''">bike</a> in the corner.'
 
+	gs 'bicycle', 'gadsarai'
 	clr
 	gs 'stat'
 
 	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
-	
+
 	if grandpaQW['chore_fetch_firewood'] = 1:
 		act 'Gather firewood for Grandpa (0:10)':
 			*clr & cla
@@ -65,32 +64,32 @@ if $ARGS[0] = '':
 			act 'Continue':gt 'gadsarai'
 		end
 	end
-	
+
 	act 'Poke around in the barn':
 		if npc_qw['A221'] > 0 and grigory_barn ! daystart and hour > 8 and hour < 12: gt 'grigory', 'barn'
 		*clr & cla
 		minut += 15
 		gs 'stat'
-		if vcard = 0 and vcard_trash = 0:
+		if BikeLoc = 0:
 			*clr & cla
-			if rand(0,5) >= 4:
+			if rand(0,8) >= 7:
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vcards.jpg"></center>'
-				'"Hmm, what''s this?" You''ve found an unopened deck of vintage adult playing cards, still in its original cellophone wrapper.'
-				vcard = 1
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findbike.jpg"></center>'
+				'In the far corner of the barn you manage to find an old bicycle. It''s in surprisingly good condition. You pull it out of the barn and clean it up.'
+				BikeLoc = 1
 				observ_exp += 3
 			else
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
 				'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
 			end
 			act 'Leave and get some fresh air':gt 'gadsarai'
-		elseif findvel = 0:
+		elseif vcard = 0 and vcard_trash = 0:
 			*clr & cla
-			if rand(0,8) >= 7:
+			if rand(0,5) >= 4:
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findbike.jpg"></center>'
-				'In the far corner of the barn you manage to find an old bicycle. It''s in surprisingly good condition. You pull it out of the barn and clean it up.'
-				findvel = 1
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vcards.jpg"></center>'
+				'"Hmm, what''s this?" You''ve found an unopened deck of vintage adult playing cards, still in its original cellophone wrapper.'
+				vcard = 1
 				observ_exp += 3
 			else
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
@@ -165,12 +164,6 @@ if $ARGS[0] = '':
 !!	if findneck = 1:
 !!		act 'You hear a scrapping noice above you.':gt 'serpent'
 !!	end
-
-!!	if sunWeather = 1:
-!!		if findvel = 1 and velday ! daystart:
-!!			'You decide to spend awhile riding the <a href="exec: gt ''events'', ''cycling''">bicycle</a> around.'
-!!		end
-!!	end
 end
 
 if $ARGS[0] = 'boar':

+ 53 - 105
locations/gadukino.qsrc

@@ -77,9 +77,9 @@ if $ARGS[0] = '':
 				! Sveta is the boys slut and Mira is not and they have already had sex together
 				if npc_QW['A63'] >= 11 and mirasex = 1 and npc_QW['A60'] < 11 and miraday ! daystart: gt 'meadow','mira_lesb_talk4'
 			end
-		end		
+		end
 		gs 'stat'
-		
+
 		'<center><h2>Gadukino</h2></center>'
 		if month >= 4 and month <= 10:
 			if hour >= 6 and hour < 22:
@@ -94,18 +94,22 @@ if $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/street_winter_night.jpg"></center>'
 			end
 		end
-		'A small village with many rickety wooden houses and even more ruins of houses. This village has seen better times.'
+		*nl
+		'A small village with many old wooden houses and even more in various states of disrepair. It has certainly seen better times.'
 		if car > 0 and cardrive = 23: '<a href="exec:GS ''carF'',''start''">Your <<$car>></a> is close by.'
-		if StoryLine = 1:
+		if StoryLine = 1 and grandmaQW['block'] = 0:
 			'Several small farms are scattered around the outskirts of the village, one of which belongs to <a href="exec:minut += 5 & gt ''gaddvor''">your grandparents</a>.'
 			act 'Go to your grandparent''s house': minut += 5 & gt 'gaddvor'
 		end
-		if npc_rel['A60'] > 0 and metmira = 1: 'Just down the road '+iif(StoryLine=1,'from your grandparents house ','')+'is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s house</a>.'
+		if npc_rel['A60'] > 0 and metmira = 1:
+			'Just down the road '+iif(StoryLine=1,'from your grandparents house ','')+'is <a href="exec:minut += 5 & gt ''miroslavahome'', ''start''">Mira''s house</a>.'
+			act 'Go to Mira''s house': minut += 5 & gt 'miroslavahome', 'start'
+		end
 		*nl
 
 		if month >= 6 and month <= 9:
 			if hour >= 9 and hour <= 11:
-				'An old farm truck is parked halfway off one of the roads nearby. The farmer who drives it will buy <a href="exec: gt ''gadukino'',''collection_point''">mushrooms and berries</a> from the locals to sell back in the city. He usually hangs around town until about noon.'
+				'An old farm truck is parked halfway off one of the roads nearby. The farmer who drives it will buy <a href="exec: gt ''gadukino'',''collection_point''">mushrooms and berries</a> from the locals to sell back in the city. He usually hangs around town until from nine until noon.'
 			else
 				'This time of year, a truck usually comes by in the mornings between 9AM and noon to purchase mushrooms and berries from the locals.'
 			end
@@ -129,14 +133,10 @@ if $ARGS[0] = '':
 				minut += 15
 				menu_off = 1
 				gs 'stat'
-				
+
 				temp = rand(1,100)
-				
-				! 10% chance of finding meadow (needed to advance Miras quest)
-				if temp > 90 and meadow = 0:
-					gt 'gadukino', 'find_meadow'
 				! 50% chance of mira events if you already found the meadow and are still friends with mira
-				elseif temp > 50 and Mira_no = 0 and MiraLoc = 0:
+				if temp >= 50 and Mira_no = 0 and MiraLoc = 0:
 					gt 'gadukino', 'mira_events'
 				! 50% chance of other random 1 picture flavour events
 				else
@@ -145,8 +145,7 @@ if $ARGS[0] = '':
 			end
 		end
 
-		act 'Walk down to the river':minut += 20 & gt 'gadriver', 'start'
-		act 'Walk to the old forest road':minut += 20 & gt 'gadroad'
+		act 'Walk to the forest road':minut += 10 & gt 'gadroad'
 		!!Succubus active hunting, can only hunt successfully once a day, but can try until success
 		if (hour <= 7 or hour >= 21) and succubusQW = 5 and suchuntday ! daystart:
 			act 'Go Hunting (this can take a lot of time)': suchunt = 1 & gt 'gadukino', 'succubus_hunt'
@@ -242,59 +241,6 @@ if $ARGS[0] = 'succubus_hunt':
 	end
 end
 
-if $ARGS[0] = 'find_meadow':
-	$menu_loc = 'gadukino'
-	$menu_arg = 'find_meadow'
-	menu_off = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/trail_meadow.jpg"></center>'
-	'As you walk through the village, you notice a small path that leads between some houses. The path leads away from the village and into a dense thicket...'
-
-	act 'Ignore it and keep walking':gt 'gadukino'
-	act 'Follow the path to see where it goes':
-		*clr & cla
-		meadow = 1
-		minut += 10
-		menu_off = 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_thicket.jpg"></center>'
-		'You follow the path to see where it goes, but about ten minutes later the path becomes indistinguishable from the bushes and trees around you.'
-
-		act 'Look around for the path':
-			*clr & cla
-			minut += 10
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_trail.jpg"></center>'
-			'You''re about to return to the village, but you spot a small break in the thicket, from the looks of it it''s an animal trail.'
-
-			act 'Follow the trail':
-				*clr & cla
-				minut += 10
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_fruit_<<rand(0,1)>>.jpg"></center>'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_nearby_ruins.jpg"></center>'
-				'You carefully walk down the trail through the thicket until you emerge into a small grove of fruit trees standing next the ruins of a long-abandoned house.'
-
-				act 'Take an apple and keep walking':
-					*clr & cla
-					minut += 10
-					gs 'stat'
-					'<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 else uses it.'
-
-					act 'Claim the meadow as your own':
-						*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. To your surpise, your discover a quick shortcut that leads from the meadow back to the forest road.'
-						act 'Return to the forest road': minut += 5 & gt 'gadroad'
-					end
-				end
-			end
-		end
-	end
-end
-
 if $ARGS[0] = 'mira_events':
 	! never met mira before
 	if npc_rel['A60'] = 0 and npc_QW['A60'] = 0:
@@ -326,7 +272,7 @@ if $ARGS[0] = 'mira_events':
 		if npc_QW['A60'] = 15 and temper >= 10 and sunWeather = 1 and miraprost = 0:
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/miraqw7.jpg"></center>'
 			'Walking through the village, you notice Mira, digging in her vegetable garden. She stands with her ass high in the air, and to your amazement, she isn''t wearing panties. You get a good look at her pussy lips...'
-			
+
 			act 'Walk away': gt 'gadukino'
 			gs 'willpower', 'prostitution', 'force'
 			if will_cost <= pcs_willpwr:
@@ -339,21 +285,21 @@ if $ARGS[0] = 'mira_events':
 
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira0,<<rand(0,5)>>.jpg"></center>'
 					'You quietly sneak up to her, but she notices your approach and turns around, her hands pull her skirt back into place, blushing. You stare at her for a few seconds silently, and then ask, "Why don''t you have any panties on?" Mira, her eyes darting about, shifting her weight from foot to foot, explaining hesitantly, "Well what happened is, well it''s very hot and I thought it would feel better without panties." You interrupt her with an upraised hand as you get an idea for your second wish... You remind her she still owes you two wishes and you''re ready to collect your second wish. You tell Mira to sit down and she reluctantly agrees. When she is finally sitting, you order her to show you her pussy. Mira grumbles and glares at you, but eventually sighs and slowly lifts up her skirt, giving you a good look at her crotch.'
-					
+
 					act 'Watch':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2.jpg"></center>'
 						'You enjoy the view, then snap your fingers as an amazing idea comes to mind for your second wish. Mira says she thought her second wish was over, but you wouldn''t make it that easy. You ask if she is thinking about backing out of granting your wishes, but Mira says no, she will go through with them. You smile and tell her to follow you.'
-						
+
 						act 'Lead her to the road':
 							*clr & cla
 							minut += 45
 							gs 'arousal', 'voyeur', 2, 'exhibitionism', 'lesbian', 'dom'
 							gs 'stat'
-							
+
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2_1.jpg"></center>'
 							'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...'
-							
+
 
 							act 'Wait for a car...':
 								*clr & cla
@@ -425,10 +371,10 @@ if $ARGS[0] = 'mira_events':
 												act 'Walk back to the village together':
 													*clr & cla
 													minut += 10
-													miraloc = 0 
+													miraloc = 0
 													gs 'arousal', 'end'
 													gs 'stat'
-													
+
 													gt 'gadukino'
 												end
 											end
@@ -442,7 +388,7 @@ if $ARGS[0] = 'mira_events':
 			else
 				act 'Approach Mira (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-			
+
 		! mira slut events
 		elseif npc_QW['A60'] >= 11 and temper >= 10 and sunWeather = 1 and miraday ! daystart:
 			miraday = daystart
@@ -451,12 +397,12 @@ if $ARGS[0] = 'mira_events':
 				gs 'miroslava', 'miraclothes'
 				*nl
 				'You meet Mira, who is heading to the river to get some water, seeing you she decides to stop and chat with you for a few minutes.'
-				
+
 				act 'Walk away': gt 'gadukino'
 				gs 'willpower', 'exhib', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'You''re feeling naughty (<<will_cost>> Willpower)':
-						*clr & cla						
+						*clr & cla
 						if mirasextimes < 50:
 							temp = rand(0,3)
 							if temp = 0:
@@ -470,7 +416,7 @@ if $ARGS[0] = 'mira_events':
 							elseif temp = 2:
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp2.jpg"></center>'
 								*nl
-								'You ask Mira to show you her pussy. She smiles casually, sits down on the fence and, looking at you with a gleam in her eyes and a mischievous smile, she pulls aside panties showing off her wet pussy...'	
+								'You ask Mira to show you her pussy. She smiles casually, sits down on the fence and, looking at you with a gleam in her eyes and a mischievous smile, she pulls aside panties showing off her wet pussy...'
 							elseif temp = 3:
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp5.jpg"></center>'
 								*nl
@@ -510,10 +456,10 @@ if $ARGS[0] = 'mira_events':
 				else
 					act 'You''re feeling naughty (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				
+
 			else
 				*clr & cla
-				
+
 				temp = rand(0,7)
 				if temp = 0:
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad5.jpg"></center>'
@@ -539,7 +485,7 @@ if $ARGS[0] = 'mira_events':
 				elseif temp = 7:
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasexgad11.jpg"></center>'
 					'Walking through the village, you meet Mira. You notice she is not wearing panties and the white thread of a tampon is sticking out of her pussy...'
-				end		
+				end
 				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -556,7 +502,7 @@ if $ARGS[0] = 'mira_events':
 				'Walking through the village, you happen to notice Mira fucking Mitka. Mitka slowly grinds his cock deep into Mira''s pussy. You see Mira shudder under him as she climaxed. She moaned and raked his back with her fingernails as she squirted and continued to cum. Mitka increased his pace and started to roughly hammer his cock into her dripping pussy. With his left hand he reached for Mira''s right tit and started to squeeze it without mercy. Mira just squeals and laughs.'
 				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 				gs 'stat'
-				
+
 				act 'Walk away': gt 'gadukino'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
@@ -565,7 +511,7 @@ if $ARGS[0] = 'mira_events':
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad3.jpg"></center>'
 						if rand(0,1) = 0:
 							'They are so absorbed in fucking each other senseless that they ignoring everything else, so you decide to quietly continue to watch. Within a few minutes you see Mitka begin to pick up the pace and he started to drive his cock faster and faster into Mira''s pussy until he grunts like a pig and dumps a huge load of cum into Mira''s pussy which is again squirting. After a few minutes of them just laying together holding each other and gasping for breath, they slowly begin to kiss and laugh as they freshen up. You smile and rub your own dripping snatch before moving away.'
-						else	
+						else
 							'They are so absorbed in fucking each other senseless that they ignoring everything else, so you decide to quietly continue to watch. You see Mitka pull his cock out of Mira''s dripping pussy and he drives it deep into her ass, barebacked. Mira let''s out a short scream of protest as Mitka continues to drive his cock into her asshole until his pubes rub up against her ass. Mira writhes under his brutal onslaught. After only a few minutes, Mitka starts to slap her ass leaving bright red marks. Mitka begins to shudder from his thrusts into her ass. Finally, Mitka leans back with his dick still embedded balls deep in Mira''s asshole and lets out a bestial growl as he begins to cum...'
 						end
 						gs 'willpower', 'voyeur', 'self'
@@ -573,13 +519,13 @@ if $ARGS[0] = 'mira_events':
 						gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 						gs 'arousal', 'end'
 						gs 'stat'
-						
+
 						act 'Finish your walk': gt 'gadukino'
 					end
 				else
 					act 'Continue watching (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				
+
 			! mira first wish not done
 			elseif npc_QW['A60'] >= 4:
 				*clr & cla
@@ -587,7 +533,7 @@ if $ARGS[0] = 'mira_events':
 				'Walking through the village, you happen to notice Mira, sucking Mitka''s cock in the backyard. She wraps her lips around it, almost completely taking the dick into her mouth. Sometimes she glances to the side...'
 				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 				gs 'stat'
-				
+
 				act 'Walk away': gt 'gadukino'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
@@ -604,13 +550,13 @@ if $ARGS[0] = 'mira_events':
 						gs 'arousal', 'voyeur_sex', 5, 'exhibitionism'
 						gs 'arousal', 'end'
 						gs 'stat'
-						
+
 						act 'Finish your walk': gt 'gadukino'
 					end
 				else
 					act 'Continue watching (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				
+
 			end
 		! quest not far along enough yet so just talking to mira or already watched mira have sex today
 		else
@@ -635,7 +581,7 @@ if $ARGS[0] = 'mira_events':
 					gs 'miroslava','miraclothes'
 				end
 				'You meet Mira, who is heading to the river to get some water, seeing you she decides to stop and chat with you for a few minutes.'
-				
+
 				act 'Finish your walk': gt 'gadukino'
 			end
 		end
@@ -695,47 +641,49 @@ end
 if $ARGS[0] = 'collection_point':
 	*clr & cla
 	menu_off = 1
-	minut += 5
+	minut += 1
 	gs 'stat'
+
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
+	*nl
 	'Parked halfway off the road is an old, unmarked truck. The back doors are open and inside is a farmer looking to buy any mushrooms or berries the locals find while out in the nearby woods.'
 	'Some find it odd that they''re operating out of a truck, but you imagine it''s cheaper to maintain than a shop and it lets them get around to other villages like this one to buy their mushrooms and berries, too.'
 	'There is a small sign hanging off of one of the back doors, which says:'
-	'"Buying: mushrooms 150<b>₽</b>/kg, berries 75<b>₽</b>/kg"'
+	'"Buying: mushrooms 25<b>₽</b>/kg, berries 25<b>₽</b>/kg"'
 
-	act 'Go back to the village center':gt 'gadukino'
+	act 'Go back to the village center':minut += 1 & gt 'gadukino'
 	if boletus > 0 and bilberry > 0:
-		act 'Sell your mushrooms and berries':
+		act 'Sell all your mushrooms and berries':
 			*clr & cla
-			minut += 30
-			money += boletus*150+bilberry*75
-			
+			minut += 10
+			money += boletus*25+bilberry*25
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You decide to sell your mushrooms and berries for <<boletus*150+bilberry*75>> <b>₽</b>.'
+			'You decide to sell your mushrooms and berries for <<boletus*25+bilberry*25>> <b>₽</b>.'
 			gs 'stat'
 
 			act'Continue':boletus = 0 &  bilberry = 0 & gt 'gadukino','collection_point'
 		end
 	end
 	if boletus > 0:
-		act 'Sell your mushrooms':
+		act 'Sell all your mushrooms':
 			*clr & cla
-			minut += 30
-			money += boletus*150
+			minut += 10
+			money += boletus*25
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You decide to sell your mushrooms for <<boletus*150>> <b>₽</b>.'
+			'You decide to sell your mushrooms for <<boletus*25>> <b>₽</b>.'
 			gs 'stat'
 
 			act'Continue':boletus = 0 & gt 'gadukino','collection_point'
 		end
 	end
 	if bilberry > 0:
-		act 'Sell your berries':
+		act 'Sell all your berries':
 			*clr & cla
-			minut += 30
-			money += bilberry*75
+			minut += 10
+			money += bilberry*25
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You decide to sell your berries for <<bilberry*75>> <b>₽</b>.'
+			'You decide to sell your berries for <<bilberry*25>> <b>₽</b>.'
 			gs 'stat'
 
 			act'Continue':bilberry = 0 & gt 'gadukino','collection_point'

+ 21 - 79
locations/gadukino_event.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'mira_apologise':
 		'"So what now?," you asked, looking at her.'
 		'"Well, if you want, I can make it up to you?" she answered a bit embarrassed.'
 		'While you pondered what to answer, Mira stares at you, biting her lip impatiently.'
-		
+
 		act 'Agree':
 			*clr & cla
 			minut += 5
@@ -227,7 +227,7 @@ if $ARGS[0] = 'gadriver_gang':
 				'The men continue lining up, one after another. Some of the men are so impatient they shoved two cocks at you at once. You sucked each one of them off, embracing their penis with your <<$liptalk>> lips, deepthroating them all.'
 				gs 'arousal', 'bj', 5, 'sub', 'gangbang', 'deepthroat'
 				gs 'stat'
-				
+
 				act 'Make the first trio cum':
 					*clr & cla
 					minut += 5
@@ -239,7 +239,7 @@ if $ARGS[0] = 'gadriver_gang':
 					'It doesn''t take long before the first men finish, cumming in your mouth, and on your face and chest. You continue sucking more men off, however...'
 					gs 'arousal', 'bj', 5, 'sub', 'gangbang', 'deepthroat'
 					gs 'stat'
-					
+
 					act 'Get penetrated':
 						*clr & cla
 						gs 'npcgeneratec', 0, 'some country man', rand(19,45)
@@ -688,10 +688,10 @@ if $ARGS[0] = 'gadukino_mitka':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You tell him to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -718,10 +718,10 @@ if $ARGS[0] = 'gadukino_kolyamba':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You tell him to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -748,10 +748,10 @@ if $ARGS[0] = 'gadukino_vasyan':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You tell him to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -800,10 +800,10 @@ if $ARGS[0] = 'gadukino_2boys':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You tell them to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -831,10 +831,10 @@ if $ARGS[0] = 'mira_mitka':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You take Mira by the hand and tell him to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -861,10 +861,10 @@ if $ARGS[0] = 'mira_kolyamba':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You take Mira by the hand and tell him to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -890,10 +890,10 @@ if $ARGS[0] = 'mira_vasyan':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You take Mira by the hand and tell him to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -942,10 +942,10 @@ if $ARGS[0] = 'mira_2boys':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You take Mira by the hand and tell them to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -980,10 +980,10 @@ if $ARGS[0] = 'mira_3boys':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You take Mira by the hand and tell them to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -992,60 +992,6 @@ if $ARGS[0] = 'mira_3boys':
 	act 'Go with them': gt 'mitkasex', 'forest3'
 end
 
-if $ARGS[0] = 'go_home':
-	menu_off = 1
-	if week = 7:
-		if hour = 20 or hour = 21:
-			family_trip_month = month
-			if month >= 6 or month <= 8:
-				*clr & cla
-				'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-				'<<$npc_nickname[''A29'']>> asks you "Well, <<$pcs_nickname>>, are you coming home with us or are you going to stay in the village with your grandparents?"'
-				act 'Stay':
-					staygad = daystart
-					gadstay = 1 & !Flag to monthly pay scene
-					indorf = 0
-					gt 'gadhouse', 'start'
-				end
-				act 'Go home': gs 'gadukino_event','go_home_ender'
-			else
-				gs 'gadukino_event','go_home_ender'
-			end
-		elseif hour > 21:
-			family_trip_month = month
-		end
-	end
-end
-
-
-if $ARGS[0] = 'go_home_ender':
-	menu_off = 1
-	*clr & cla
-	minut += rand(15,25)
-	if grandmaQW['help_amount'] > 0:
-		'<center><b><font color="maroon">Your grandmother</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
-		'Before leaving grandma gives you <<grandmaQW[''help_amount'']*50>> rubles.'
-		money += grandmaQW['help_amount'] * 50
-		grandmaQW['help_amount'] = 0
-	end
-	gadstay = 0
-	gs 'stat'
-	'You get into the Lada with the rest of your family and before you know it, you''ve arrived back in Pavlovosk.'
-	act 'Go to your room': gt 'bedrPar'
-end
-
-if $ARGS[0] = 'to_gadukino':
-	menu_off = 1
-	*clr & cla
-	!family_trip_month = 1
-	minut += rand(15,25)
-	gs 'stat'
-	'You get into the Lada with the rest of your family and before you know, you''ve arrived in Gadukino. Your grandparents have lived here for forty years.'
-	act 'Go into the house': gt 'gadhouse', 'start'
-end
-
 !from 1.2.5, [zz_func]
 if $ARGS[0] = 'sound':
 	if sound = 0:
@@ -1059,9 +1005,5 @@ if $ARGS[0] = 'sound':
 	end
 end
 
-if $ARGS[0] = 'cleanup':
-	!remove dynamics set in village, use this while leaving by illume
-end
-
 --- gadukino_event ---------------------------------
 

+ 2 - 0
locations/gdksport.qsrc

@@ -18,6 +18,8 @@ if $ARGS[0] = 'start':
 	'The community center sports club offers lessons in <a href="exec: gt ''gdksport'',''racing1''">Racing</a>, <a href="exec: gt ''gdksport'',''dance1''">Dance</a> and <a href="exec: gt ''gdksport'',''vball1''">Volleyball</a>. All lessons start before 18:00'
 	*nl
 	'In the locker room is a <a href="exec: gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec: gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	if kotovLoveQW > 0 and hour = 16:
 		'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> with a large sports bag entering the sports club.'

+ 26 - 26
locations/grandmahelp.qsrc

@@ -12,13 +12,13 @@ frost = 0
 if $ARGS[0] = 'start':
 	if month <= 4 or month >= 10:
 		grandmaQW['chore_type'] = rand(0,6)
-	elseif month = 5 or month = 6:
+	elseif month = 5:
 		grandmaQW['chore_type'] = rand(0,9)
-	else
-		grandmaQW['chore_type'] = rand(0,13)
+	elseif month >= 6 and month <= 9:
+		grandmaQW['chore_type'] = rand(0,14)
 	end
 
-	if grandmaQW['chore_type'] = 0: 
+	if grandmaQW['chore_type'] = 0:
 		gt 'grandmahelp', 'cleanfloor'
 	elseif grandmaQW['chore_type'] = 1:
 		gt 'grandmahelp', 'washclothes'
@@ -66,14 +66,14 @@ if $ARGS[0] = 'cleanfloor':
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
 		'You grab a bucket and a rag, and get down on your knees and begin scrubbing the floor. Within the hour the floor shines and you are satisfied with the work you''ve done. You put the cleaning supplies into a corner and continue on with your day.'
-		
+
 		act 'Continue':gt 'gadhouse', 'start'
 	end
 end
 
 if $ARGS[0] = 'washclothes':
 	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes?"'
-	
+
 	grandmaQW['chore_wash_clothes'] = 1
 	act 'Tell her you will wash them in a little bit':gt 'gadhouse', 'grandma'
 	act 'Agree and start washing (1:00)':
@@ -85,7 +85,7 @@ if $ARGS[0] = 'washclothes':
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
 		'You pick up grandfather''s dirty clothes and take them with you outside, where you soak them in the metal basin for an hour.'
-		
+
 		act 'Hang the Laundry':
 		    *clr & cla
 		    minut += 10
@@ -94,7 +94,7 @@ if $ARGS[0] = 'washclothes':
 		    'Once you are done with the washing, you walk over to the clothesline where you carefully hang the clothes to dry.'
 
 		    act 'Continue':gt'gaddvor'
-		end    
+		end
 	end
 end
 
@@ -112,12 +112,12 @@ if $ARGS[0] = 'milkcows':
 		'You walk over to the barn where the cows are kept.'
 
 		act 'Continue':gt'gadsarai','cow'
-	end	
+	end
 end
 
 if $ARGS[0] = 'groceries':
 	'"Oh yes, <<$pcs_nickname>>. I was going to go down to the store today to buy some groceries, but my knees are aching. Do you think you could go down there and get them for me? I have a list of what we need and the grocer will come by later to collect the money."'
-	
+
 	grandmaQW['chore_groceries'] = 1
 	act 'Tell her you will go to the store later':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the store (0:15)':
@@ -133,7 +133,7 @@ end
 
 if $ARGS[0] = 'can_mushrooms':
 	'"I need to get some of these mushrooms canned, <<$pcs_nickname>>, so we can store them. Can you please help me prepare them?"'
-	
+
 	grandmaQW['chore_can_mushrooms'] = 1
 	act 'Tell her you will help her in a little while':gt 'gadhouse', 'grandma'
 	act 'Agree to help her right now (2:00)':
@@ -168,7 +168,7 @@ end
 
 if $ARGS[0] = 'can_berries':
 	'"It is time to can these berries, <<$pcs_nickname>>. Can you please help me? My fingers aren''t as spry as they used to be."'
-	
+
 	grandmaQW['chore_can_berries'] = 1
 	act 'Tell her you will help her in a little while':gt 'gadhouse', 'grandma'
 	act 'Agree to help her right now (2:00)':
@@ -204,7 +204,7 @@ end
 
 if $ARGS[0] = 'can_veggies':
 	'"We have had good luck with the garden this year, <<$pcs_nickname>>. But now we need to can these vegetables before they spoil. Can you help me please?"'
-	
+
 	grandmaQW['chore_can_veggies'] = 1
 	act 'Tell her you will help her in a little while':gt 'gadhouse', 'grandma'
 	act 'Agree to help her right now (3:00)':
@@ -241,7 +241,7 @@ end
 
 if $ARGS[0] = 'feedchickens':
 	'"Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
-	
+
 	grandmaQW['chore_feed_chickens'] = 1
 	act 'Tell her you will do it in a little while':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the yard (0:10)':
@@ -293,7 +293,7 @@ end
 if $ARGS[0] = 'harvest':
 	if month = 7:
 		'"<<$pcs_nickname>> dear, the strawberries are ripe to pick. Could you go over to the plot and pick them today?"'
-		
+
 		grandmaQW['chore_collect_strawberries'] = 1
 		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
 		act 'Agree and go to the strawberry plot (0:10)':
@@ -341,7 +341,7 @@ end
 
 if $ARGS[0] = 'pickforest_mushrooms':
 	grandmaQW['chore_gather_mushrooms'] = 1
-	grandmaQW['chore_mushroom_quantity'] = rand(3,5)
+	grandmaQW['chore_mushroom_quantity'] = rand(1,2)
 	'"<<$pcs_nickname>>, it''s mushroom season. Would you mind going into the forest to pick some for us?"'
 	'"How much do we need, Grandma?", you ask.'
 	'"Oh, I would say you should be able to find at least <<grandmaQW[''chore_mushroom_quantity'']>> kilos," Grandma replies.'
@@ -356,17 +356,17 @@ if $ARGS[0] = 'pickforest_mushrooms':
 		end
 		'You decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', '1'
-	end	
+		act 'Continue': gt 'gadforest', 'forest_edge'
+	end
 end
 
 if $ARGS[0] = 'pickforest_berries':
 	grandmaQW['chore_gather_berries'] = 1
-	grandmaQW['chore_berry_quantity'] = rand(3,5)
+	grandmaQW['chore_berry_quantity'] = rand(1,2)
 	'"<<$pcs_nickname>>, the wild berries are ripe for picking. We should gather them now while we can."'
 	'"How much do you want, Grandma?" you ask.'
 	'"<<grandmaQW[''chore_berry_quantity'']>> kilos will be a good start," Grandma replies.'
-	
+
 	act 'Tell her you will go get some soon':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
@@ -377,18 +377,18 @@ if $ARGS[0] = 'pickforest_berries':
 		end
 		'You decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', '1'
-	end		
+		act 'Continue': gt 'gadforest', 'forest_edge'
+	end
 end
 
 if $ARGS[0] = 'pickforest_both':
 	grandmaQW['chore_gather_both'] = 1
 	grandmaQW['chore_mushroom_quantity'] = rand(1,2)
-	grandmaQW['chore_berry_quantity'] = rand(2,3)
+	grandmaQW['chore_berry_quantity'] = rand(1,2)
 	'"This is the time of year that the forest provides us its gifts, <<$pcs_nickname>>. Can you go and harvest some mushrooms and berries for us?"'
 	'"How much of each should I get?" you ask.'
 	'"If you could, try to find <<grandmaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandmaQW[''chore_berry_quantity'']>> kilos of berries," Grandma replies. "It is important to stock up while we can."'
-	
+
 	act 'Tell her you will go get some soon':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
@@ -399,8 +399,8 @@ if $ARGS[0] = 'pickforest_both':
 		end
 		'You decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', '1'
-	end	
+		act 'Continue': gt 'gadforest', 'forest_edge'
+	end
 end
 
 

+ 10 - 13
locations/grandpahelp.qsrc

@@ -7,15 +7,12 @@ menu_off = 1
 gs'stat'
 
 if $ARGS[0] = 'start':
-
 	if month <= 4 or month >= 10:
 		grandpaQW['chore_type'] = rand(0,5)
 	elseif month = 5:
 		grandpaQW['chore_type'] = rand(3,8)
-	elseif month = 6 or month = 9:
-		grandpaQW['chore_type'] = rand(3,12)
-	else
-		grandpaQW['chore_type'] = rand(3,13)
+	elseif month >= 6 and month <= 9:
+		grandpaQW['chore_type'] = rand(3,14)
 	end
 
 	if grandpaQW['chore_type'] = 0:
@@ -240,7 +237,7 @@ if $ARGS[0] = 'grazehorse':
 end
 
 if $ARGS[0] = 'grazecows':
-	if grandpaQW['chore_herd_cattle_experience'] = 0: 
+	if grandpaQW['chore_herd_cattle_experience'] = 0:
 		'"<<$pcs_nickname>>, we need to let the cows graze on the field today. Grab something to eat and lead the herd to the field. I''ll meet you there."'
 	else
 		'"<<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring them back home."'
@@ -286,11 +283,11 @@ end
 
 if $ARGS[0] = 'pickforest_mushrooms':
 	grandpaQW['chore_gather_mushrooms'] = 1
-	grandpaQW['chore_mushroom_quantity'] = rand(2,3)
+	grandpaQW['chore_mushroom_quantity'] = rand(1,2)
 	'"<<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
 	'"How much should I pick, grandpa?", you ask.'
 	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos will be enough," grandfather replies. "Be careful so you don''t get lost."'
-	
+
 	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
@@ -301,13 +298,13 @@ if $ARGS[0] = 'pickforest_mushrooms':
 		end
 		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', '1'
+		act 'Continue': gt 'gadforest', 'forest_edge'
 	end
 end
 
 if $ARGS[0] = 'pickforest_berries':
 	grandpaQW['chore_gather_berries'] = 1
-	grandpaQW['chore_berry_quantity'] = rand(3,5)
+	grandpaQW['chore_berry_quantity'] = rand(1,2)
 	'"<<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
 	'"How much should I pick, grandpa?" you ask.'
 	'"<<grandpaQW[''chore_berry_quantity'']>> kilos will be enough," grandfather replies. "Just be careful so you don''t get lost."'
@@ -322,14 +319,14 @@ if $ARGS[0] = 'pickforest_berries':
 		end
 		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', '1'
+		act 'Continue': gt 'gadforest', 'forest_edge'
 	end
 end
 
 if $ARGS[0] = 'pickforest_both':
 	grandpaQW['chore_gather_both'] = 1
 	grandpaQW['chore_mushroom_quantity'] = rand(1,2)
-	grandpaQW['chore_berry_quantity'] = rand(2,3)
+	grandpaQW['chore_berry_quantity'] = rand(1,2)
 	'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and I have a craving for some fresh berries."'
 	'"How much should I pick, grandpa?"'
 	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kilos of berries will be enough," grandfather replies. "Just don''t get lost."'
@@ -344,7 +341,7 @@ if $ARGS[0] = 'pickforest_both':
 		end
 		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', '1'
+		act 'Continue': gt 'gadforest', 'forest_edge'
 	end
 end
 

+ 12 - 10
locations/grigory.qsrc

@@ -1045,16 +1045,18 @@ if $ARGS[0] = 'romantic_event':
 		act 'Lets go':
 			'"Where were you thinking?" You ask.'
 			'"I can walk you back to your Grandparent''s home, or you could come back to mine," He looks you in the eye, a hopeful look on his face.'
-
-			act 'Grandparents Home':
-				'"I should probably get back to my Grandparent''s place," You say.'
-				'You see a rueful smile cross Grigory''s face, "Ok," Standing, he gives you a little hug, your feet dangling off the ground, before he lowers you to stand on your own two feet again.'
-				'Slipping his arm around you, you lean against him as the two of you make the walk back to your Grandparent''s home.'
-				'Once there, the two of you say your goodbyes, him leaning down to kiss your lips lightly. He slowly straightens, his eyes on yours, "Until next time Kiska."'
-				'You''re unable to hide a little smile, "Until next time Grigory."'
-				'Turning on his heel, he starts to wander back towards the town''s center.'
-
-				act 'Continue':gt 'gadhouse', 'start'
+			
+			if StoryLine = 1 and grandmaQW['block'] = 0:
+				act 'Grandparents Home':
+					'"I should probably get back to my Grandparent''s place," You say.'
+					'You see a rueful smile cross Grigory''s face, "Ok," Standing, he gives you a little hug, your feet dangling off the ground, before he lowers you to stand on your own two feet again.'
+					'Slipping his arm around you, you lean against him as the two of you make the walk back to your Grandparent''s home.'
+					'Once there, the two of you say your goodbyes, him leaning down to kiss your lips lightly. He slowly straightens, his eyes on yours, "Until next time Kiska."'
+					'You''re unable to hide a little smile, "Until next time Grigory."'
+					'Turning on his heel, he starts to wander back towards the town''s center.'
+
+					act 'Continue':gt 'gadhouse', 'start'
+				end
 			end
 
 			act 'Grigory''s Home':

+ 5 - 3
locations/gschool_grounds.qsrc

@@ -12,10 +12,10 @@ if $ARGS[0] = 'main':
 	*clr & cla
 	gs 'stat'
 	'<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>'
-	else
+	if month >= 11 or month <= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/schoolwinter.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool.jpg"></center>'
 	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.'
 
@@ -712,6 +712,8 @@ if $ARGS[0] = 'change_room':
 	end
 	*nl
 	'The locker room is accessed through the school gym, and is left unlocked until 18:30 each day, to be utilised by students using the sports ground for training and events outside school hours. The room is cold, damp and filled with lockers, benches, and not much else. You can <a href="exec: gt ''wardrobe'', ''start''">change your outfit</a> by the lockers here'+iif(pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0, ', and <a href="exec:dynamic $pirManage">manage your piercings</a>', '.')+''
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	if (hour = 18 and minut >= 30) or hour > 18:
 		'The school is closing for the night and you have to leave so you don''t get stuck here all night.'

+ 3 - 0
locations/gschool_lessons4.qsrc

@@ -1842,6 +1842,9 @@ if $ARGS[0] = 'post_dress':
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
+	*nl
+	'You can access your <a href="exec:postphys_event = daystart & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+
 	act 'Leave school':
 		if $clothingworntype = 'nude':
 			msg'<b><font color = red>You need to get dressed before you leave the changing rooms.</font></b>'

+ 1 - 1
locations/gschool_lessonsev3.qsrc

@@ -1297,7 +1297,7 @@ if $ARGS[0] = 'art':
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
-		elseif scooltiperand = 8:
+		elseif scooltiperand = 8 and bag = 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
 			'You get an alert on your phone. You pull it out of your purse and put it in your lap. You glance down and see someone has sent you an image. Opening the image you see a picture of someone''s dick. You hear some snickering and look up to see who it was, but you can''t tell where it came from. Unsure what to do, you don''t want to be caught looking at it, so you delete the image.'
 			gs 'arousal', 'voyeur', 5

+ 2 - 2
locations/hunters.qsrc

@@ -716,7 +716,7 @@ if $ARGS[0] = 'start':
 		! for a break between the sex, is taken away -1 every hour
 		gs 'underwear', 'remove'
 		if forest_gopsex = 1:
-			gs 'clothing', 'strip', 'gadforest'
+			gs 'clothing', 'strip', 'forest_edge'
 		elseif slutgosex = 1 or forest_huntersex = 1 :
 			gs 'clothing', 'strip', 'backwater'
 		else
@@ -2550,7 +2550,7 @@ if $ARGS[0]='hunterslutEND':
 
 		if slutgosex = 1:act 'Go to the river':slutgosex = 0 & gt 'backwater'
 		if forest_huntersex = 1:act 'Go to the hut':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
-		if forest_gopsex = 1:act 'Go to forest':forest_gopsex = 0 & gt 'gadforest','1'
+		if forest_gopsex = 1:act 'Go to forest':forest_gopsex = 0 & gt 'gadforest','forest_edge'
 	end
 end
 

+ 2 - 2
locations/journal.qsrc

@@ -2,12 +2,12 @@
 
 if $ARGS[0] = 'records':
 	*clr & cla
-	act 'Put your notebook down': gt $menu_loc, $menu_arg
+	act 'Put your journal down': gt $menu_loc, $menu_arg
 	gs 'housing', 'rent'
 
 	$NoteBookLine = { $result = "<br><<$ARGS[0]>>" }
 
-	$tab_text = '<center><h1>Notebook</h1></center>'
+	$tab_text = '<center><h1>Journal</h1></center>'
 	if MagikDostup = 0:
 		$tab_text += '<center><h2>Spells to Cast</h2></center><br>'
 		$tab_text += func('spellBook','cast','$nonComSpells')

+ 171 - 170
locations/kompMFC.qsrc

@@ -9,30 +9,30 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 		act 'Lose your virginity in front of  <<camclients>> people':
 			cls
 			mfcclients = 0
-			webpopular += 10
+			webpopular += 10 + hotcat
 			if webpopular < 15:
-				tokens += RAND(100,300)
+				tokens += rand(100,300)
 			elseif webpopular >= 15 and webpopular < 35:
-				tokens += RAND(200,500)
+				tokens += rand(200,500)
 			elseif webpopular >= 35 and webpopular < 75:
-				tokens += RAND(500,1500)
+				tokens += rand(500,1500)
 			elseif webpopular >= 75:
-				tokens += RAND(1000,5000)
+				tokens += rand(1000,5000)
 			end
 			vgape = 3
 			minut += 5
 			pcs_horny = 0
 			pcs_vag = 1
 			if camclients > 1000:
-				tokens += RAND(1000,5000)
+				tokens += rand(1000,5000)
 			elseif camclients > 500:
-				tokens += RAND(500,3000)
+				tokens += rand(500,3000)
 			elseif camclients > 250:
-				tokens += RAND(500,1500)
+				tokens += rand(500,1500)
 			elseif camclients > 100:
-				tokens += RAND(100,1000)
+				tokens += rand(100,1000)
 			elseif camclients < 100:
-				tokens += RAND(50,500)
+				tokens += rand(50,500)
 			end
 			gs 'stat'
 
@@ -44,7 +44,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 			'"Wish that was me!"'
 			'You wince a little, and immediately stop stimulating yourself. That hurt! A lot!'
 			'You lie on your back and pull out the toy, showing your no-longer-virgin pussy and the blood to prove it to your audience.'
-			act'Continue':gt'Komp','waitclients'
+			act'Continue':gt 'komp','waitclients'
 		end
 		act 'Stick it in your ass instead':
 			cls
@@ -59,23 +59,23 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 					act 'Use your vibrator':
 						cls
 						mfcclients = 0
-						webpopular += 1
+						webpopular += rand(hotcat/2 -2,hotcat/2)
 						if webpopular < 15:
-							tokens += RAND(25,50)
+							tokens += rand(25,50)
 						elseif webpopular >= 15 and webpopular < 35:
-							tokens += RAND(50,100)
+							tokens += rand(50,100)
 						elseif webpopular >= 35 and webpopular < 75:
-							tokens += RAND(50,150)
+							tokens += rand(50,150)
 						elseif webpopular >= 75:
-							tokens += RAND(100,200)
+							tokens += rand(100,200)
 						end
 						minut += 5
 						dildohand = 10
 						if pcs_ass > 10:
-							pcs_horny += RAND(10,20)
+							pcs_horny += rand(10,20)
 						else
 							pcs_ass += 1
-							pcs_horny += RAND(10,20)
+							pcs_horny += rand(10,20)
 						end
 						gs 'stat'
 
@@ -95,29 +95,29 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 							'You spit on the vibrator a few times and bring it to your anus, before turning it on. You gently stick it up your ass and ride it for a while, enjoying the stimulation it gives you.'
 							'When you put the vibrator aside after a few minutes of fun, you notice you received several donations during your little show.'
 						end
-						act'Continue':gt'Komp','waitclients'
+						act'Continue':gt 'komp','waitclients'
 					end
 				end
 				if dildo = 1:
 					act 'Use your small dildo':
 						cls
 						mfcclients = 0
-						webpopular += 1
+						webpopular += rand(hotcat/2 -2,hotcat/2)
 						if webpopular < 15:
-							tokens += RAND(20,30)
+							tokens += rand(20,30)
 						elseif webpopular >= 15 and webpopular < 35:
-							tokens += RAND(30,50)
+							tokens += rand(30,50)
 						elseif webpopular >= 35 and webpopular < 75:
-							tokens += RAND(30,100)
+							tokens += rand(30,100)
 						elseif webpopular >= 75:
-							tokens += RAND(50,100)
+							tokens += rand(50,100)
 						end
 						minut += 5
 						dildohand = 10
 						if pcs_ass > 10:
-							pcs_horny += RAND(5,15)
+							pcs_horny += rand(5,15)
 						else
-							pcs_horny -= RAND(5,15)
+							pcs_horny -= rand(5,15)
 							pcs_ass += 1
 						end
 						gs 'stat'
@@ -137,7 +137,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 							'You take the 10cm long dildo, and slip it inside your ass with one firm motion. It''s not very big, but is still fairly big for you. Ouch!'
 							'When you put the dildo aside after a few minutes, you notice you received several donations during your little show.'
 						end
-						act'Continue':gt'Komp','waitclients'
+						act'Continue':gt 'komp','waitclients'
 					end
 				end
 				if middildo = 1:
@@ -145,22 +145,22 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						act 'Use your medium dildo':
 							cls
 							mfcclients = 0
-							webpopular += 1
+							webpopular += rand(hotcat/2 -2,hotcat/2)
 							if webpopular < 15:
-								tokens += RAND(25,35)
+								tokens += rand(25,35)
 							elseif webpopular >= 15 and webpopular < 35:
-								tokens += RAND(25,100)
+								tokens += rand(25,100)
 							elseif webpopular >= 35 and webpopular < 75:
-								tokens += RAND(25,150)
+								tokens += rand(25,150)
 							elseif webpopular >= 75:
-								tokens += RAND(100,150)
+								tokens += rand(100,150)
 							end
 							minut += 5
 							dildohand = 15
 							if pcs_ass > 15:
-								pcs_horny += RAND(5,15)
+								pcs_horny += rand(5,15)
 							else
-								pcs_horny -= RAND(5,15)
+								pcs_horny -= rand(5,15)
 								pcs_ass += 1
 							end
 							gs 'stat'
@@ -180,7 +180,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 								'You take the 15cm long dildo, and put it on the floor so you can ride it. After you slip it inside your ass you hump it carefully, making a nice show of it stretching your anus in the process. It kinda hurts.'
 								'When you put the dildo aside after a few minutes, you notice you received several donations during your little show.'
 							end
-							act'Further':gt'Komp','waitclients'
+							act'Further':gt 'komp','waitclients'
 						end
 					end
 				end
@@ -189,22 +189,22 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						act 'Use your large dildo':
 							cls
 							mfcclients = 0
-							webpopular += 1
+							webpopular += rand(hotcat/2 -2,hotcat/2)
 							if webpopular < 15:
-								tokens += RAND(40,55)
+								tokens += rand(40,55)
 							elseif webpopular >= 15 and webpopular < 35:
-								tokens += RAND(40,100)
+								tokens += rand(40,100)
 							elseif webpopular >= 35 and webpopular < 75:
-								tokens += RAND(100,150)
+								tokens += rand(100,150)
 							elseif webpopular >= 75:
-								tokens += RAND(100,200)
+								tokens += rand(100,200)
 							end
 							minut += 5
 							dildohand = 20
 							if pcs_ass > 20:
-								pcs_horny += RAND(5,15)
+								pcs_horny += rand(5,15)
 							else
-								pcs_horny -= RAND(5,15)
+								pcs_horny -= rand(5,15)
 								pcs_ass += 1
 								agape = 1
 							end
@@ -225,7 +225,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 								'You take the 20cm long dildo, and put it on the floor so you can ride it. After you slip it inside your ass carefully, you begin to hump it. It''s too big to really be enjoyable, but the visitors demand a show and you do your best to show how it stretches your anus in the process.'
 								'When you put the dildo aside after a few minutes of fun, you notice you received several donations during your little show.'
 							end
-							act'Continue':gt'Komp','waitclients'
+							act'Continue':gt 'komp','waitclients'
 						end
 					end
 				end
@@ -234,22 +234,22 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						act 'Use your very large dildo':
 							cls
 							mfcclients = 0
-							webpopular += 1
+							webpopular += rand(hotcat/2 -2,hotcat/2)
 							if webpopular < 15:
-								tokens += RAND(50,60)
+								tokens += rand(50,60)
 							elseif webpopular >= 15 and webpopular < 35:
-								tokens += RAND(50,100)
+								tokens += rand(50,100)
 							elseif webpopular >= 35 and webpopular < 75:
-								tokens += RAND(100,200)
+								tokens += rand(100,200)
 							elseif webpopular >= 75:
-								tokens += RAND(100,300)
+								tokens += rand(100,300)
 							end
 							minut += 5
 							dildohand = 25
 							if pcs_ass > 25:
-								pcs_horny += RAND(10,20)
+								pcs_horny += rand(10,20)
 							else
-								pcs_horny -= RAND(10,20)
+								pcs_horny -= rand(10,20)
 								pcs_ass += 1
 								agape = 1
 							end
@@ -270,7 +270,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 								'You relax on your bed and lift your pelvis for easier access. After coating the dildo liberally with your saliva and rubbing some onto your anus too, you carefully shove the dildo inside you one bit at a time.'
 								'Once its whole length is inside you, you take a break and catch your breath. Damn, that thing is big! You wiggle your ass a little and carefully move the dildo a bit inside your rectum, but then decide you fulfilled the client''s request and quickly let it slide out again. Ow...'
 							end
-							act'Continue':gt'Komp','waitclients'
+							act'Continue':gt 'komp','waitclients'
 						end
 					end
 				end
@@ -279,22 +279,22 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						act 'Use your 30cm dildo':
 							cls
 							mfcclients = 0
-							webpopular += 1
+							webpopular += rand(hotcat/2 -2,hotcat/2)
 							if webpopular < 15:
-								tokens += RAND(50,75)
+								tokens += rand(50,75)
 							elseif webpopular >= 15 and webpopular < 35:
-								tokens += RAND(50,150)
+								tokens += rand(50,150)
 							elseif webpopular >= 35 and webpopular < 75:
-								tokens += RAND(100,300)
+								tokens += rand(100,300)
 							elseif webpopular >= 75:
-								tokens += RAND(300,500)
+								tokens += rand(300,500)
 							end
 							minut += 5
 							dildohand = 30
 							if pcs_ass > 30:
-								pcs_horny += RAND(15,20)
+								pcs_horny += rand(15,20)
 							else
-								pcs_horny -= RAND(15,20)
+								pcs_horny -= rand(15,20)
 								pcs_ass += 1
 								agape = 1
 							end
@@ -315,7 +315,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 								'You lie down on your back and throw your legs behind your head. You realize your ass isn''t quite used to taking anything this large in it and go slowly, carefully thrusting the dildo up your ass.'
 								'Even with lubrication it hurts, and a few minutes in you have to stop. Your client enjoyed your show regardless, and donated some tokens as promised.'
 							end
-							act'Continue':gt'Komp','waitclients'
+							act'Continue':gt 'komp','waitclients'
 						end
 					end
 				end
@@ -324,22 +324,22 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						act 'Use your humongous 35cm dildo':
 							cls
 							mfcclients = 0
-							webpopular += 1
+							webpopular += rand(hotcat/2 -2,hotcat/2)
 							if webpopular < 15:
-								tokens += RAND(75,100)
+								tokens += rand(75,100)
 							elseif webpopular >= 15 and webpopular < 35:
-								tokens += RAND(100,300)
+								tokens += rand(100,300)
 							elseif webpopular >= 35 and webpopular < 75:
-								tokens += RAND(100,500)
+								tokens += rand(100,500)
 							elseif webpopular >= 75:
-								tokens += RAND(300,500)
+								tokens += rand(300,500)
 							end
 							minut += 5
 							dildohand = 35
 							if pcs_ass > 35:
-								pcs_horny += RAND(20,25)
+								pcs_horny += rand(20,25)
 							else
-								pcs_horny -= RAND(20,25)
+								pcs_horny -= rand(20,25)
 								pcs_ass += 1
 								agape = 1
 							end
@@ -360,7 +360,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 								'You roll to your side, looking at the enormous dildo for a second before you decide to shove it inside you. It''s too big, and even with a liberal coat of lubrication you barely manage to shove the head inside you.'
 								'It hurt a lot, but the client appreciated your struggle anyway and gives you some tokens.'
 							end
-							act'Continue':gt'Komp','waitclients'
+							act'Continue':gt 'komp','waitclients'
 						end
 					end
 				end
@@ -369,22 +369,22 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						act 'Use your enormous 40cm dildo':
 							cls
 							mfcclients = 0
-							webpopular += 1
+							webpopular += rand(hotcat/2 -2,hotcat/2)
 							if webpopular < 15:
-								tokens += RAND(100,150)
+								tokens += rand(100,150)
 							elseif webpopular >= 15 and webpopular < 35:
-							tokens += RAND(100,300)
+							tokens += rand(100,300)
 							elseif webpopular >= 35 and webpopular < 75:
-								tokens += RAND(300,500)
+								tokens += rand(300,500)
 							elseif webpopular >= 75:
-								tokens += RAND(500,750)
+								tokens += rand(500,750)
 							end
 							minut += 5
 							dildohand = 40
 							if pcs_ass > 35:
-								pcs_horny += RAND(25,30)
+								pcs_horny += rand(25,30)
 							else
-								pcs_horny -= RAND(25,30)
+								pcs_horny -= rand(25,30)
 								pcs_ass += 1
 								agape = 1
 							end
@@ -407,14 +407,14 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 								'When you rub the head against your sphincter, you''re even more doubtful. This is not going to be a pleasant experience. Nevertheless, the customers demand it, so...'
 								'Despite your best efforts, you don''t manage to get much more than the head in. A few tears roll down your cheek while you desperately try to ignore the pain. When you give up, you see you got a fair few donations... apparently your viewers enjoy watching you suffer!'
 							end
-							act'Continue':gt'Komp','waitclients'
+							act'Continue':gt 'komp','waitclients'
 						end
 					end
 				end
 				act 'Can''t find suitable toy or you changed your mind':
 					cls
 					webpopular -= 1
-					gt'Komp','waitclients'
+					gt 'komp','waitclients'
 				end
 			end
 			gs 'willpower', 'exhib', 'resist', 'hard'
@@ -424,7 +424,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 					webpopular -= 1
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
-					gt 'Komp','waitclients'
+					gt 'komp','waitclients'
 				end
 			else
 				act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -435,22 +435,22 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 			act 'Use your vibrator':
 				cls
 				mfcclients = 0
-				webpopular += 1
+				webpopular += rand(hotcat/2 -2,hotcat/2)
 				if webpopular < 15:
-					tokens += RAND(25,50)
+					tokens += rand(25,50)
 				elseif webpopular >= 15 and webpopular < 35:
-					tokens += RAND(50,100)
+					tokens += rand(50,100)
 				elseif webpopular >= 35 and webpopular < 75:
-					tokens += RAND(50,150)
+					tokens += rand(50,150)
 				elseif webpopular >= 75:
-					tokens += RAND(100,200)
+					tokens += rand(100,200)
 				end
 				minut += 5
 				dildohand = 10
 				if pcs_vag > 10:
-					pcs_horny += RAND(10,20)
+					pcs_horny += rand(10,20)
 				else
-					pcs_horny += RAND(10,15)
+					pcs_horny += rand(10,15)
 					pcs_vag += 1
 				end
 				gs 'stat'
@@ -469,30 +469,30 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 				else
 					'When you put the vibrator aside after a few minutes of fun, you notice you received several donations during your little show.'
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt 'komp','waitclients'
 			end
 		end
 		if dildo = 1:
 			act 'Use your small dildo':
 				cls
 				mfcclients = 0
-				webpopular += 1
+				webpopular += rand(hotcat/2 -2,hotcat/2)
 				if webpopular < 15:
-					tokens += RAND(20,30)
+					tokens += rand(20,30)
 				elseif webpopular >= 15 and webpopular < 35:
-					tokens += RAND(20,50)
+					tokens += rand(20,50)
 				elseif webpopular >= 35 and webpopular < 75:
-					tokens += RAND(20,100)
+					tokens += rand(20,100)
 				elseif webpopular >= 75:
-					tokens += RAND(50,100)
+					tokens += rand(50,100)
 				end
 				minut += 5
 				dildohand = 10
 				if pcs_vag < 10:
-					pcs_horny += RAND(10,15)
+					pcs_horny += rand(10,15)
 					pcs_vag += 1
 				else
-					pcs_horny += RAND(5,10)
+					pcs_horny += rand(5,10)
 				end
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore36.jpg"></center>'
@@ -510,31 +510,31 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 				else
 					'When you put the dildo aside after a few minutes of fun, you notice you received several donations during your little show.'
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt 'komp','waitclients'
 			end
 		end
 		if middildo = 1:
 			act 'Use your medium dildo':
 				cls
 				mfcclients = 0
-				webpopular += 1
+				webpopular += rand(hotcat/2 -2,hotcat/2)
 				if webpopular < 15:
-					tokens += RAND(25,35)
+					tokens += rand(25,35)
 				elseif webpopular >= 15 and webpopular < 35:
-					tokens += RAND(35,50)
+					tokens += rand(35,50)
 				elseif webpopular >= 35 and webpopular < 75:
-					tokens += RAND(50,75)
+					tokens += rand(50,75)
 				elseif webpopular >= 75:
-					tokens += RAND(50,100)
+					tokens += rand(50,100)
 				end
 				minut += 5
 				dildohand = 15
 				if pcs_vag < 15:
-					pcs_horny += RAND(10,15)
+					pcs_horny += rand(10,15)
 					pcs_vag += 1
 					vgape = 1
 				else
-					pcs_horny += RAND(5,10)
+					pcs_horny += rand(5,10)
 				end
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore37.jpg"></center>'
@@ -552,31 +552,31 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 				else
 					'When you put the dildo aside after a few minutes of fun, you notice you received several donations during your little show.'
 				end
-				act'Further':gt'Komp','waitclients'
+				act'Further':gt 'komp','waitclients'
 			end
 		end
 		if largedildo = 1:
 			act 'Use your large dildo':
 				cls
 				mfcclients = 0
-				webpopular += 1
+				webpopular += rand(hotcat/2 -2,hotcat/2)
 				if webpopular < 15:
-					tokens += RAND(40,55)
+					tokens += rand(40,55)
 				elseif webpopular >= 15 and webpopular < 35:
-					tokens += RAND(50,100)
+					tokens += rand(50,100)
 				elseif webpopular >= 35 and webpopular < 75:
-					tokens += RAND(50,150)
+					tokens += rand(50,150)
 				elseif webpopular >= 75:
-					tokens += RAND(50,200)
+					tokens += rand(50,200)
 				end
 				minut += 5
 				dildohand = 20
 				if pcs_vag < 20:
-					pcs_horny += RAND(5,15)
+					pcs_horny += rand(5,15)
 					pcs_vag += 1
 					vgape = 2
 				else
-					pcs_horny += RAND(5,10)
+					pcs_horny += rand(5,10)
 				end
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore38.jpg"></center>'
@@ -604,31 +604,31 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						'Luckily the viewers can''t see your face, and you quickly wipe a tear away while you gently move inside you for a moment, until you realize you''ve done enough to meet the client''s request and quickly take it out of you.'
 					end
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt 'komp','waitclients'
 			end
 		end
 		if bigdildo = 1:
 			act 'Use your very large dildo':
 				cls
 				mfcclients = 0
-				webpopular += 1
+				webpopular += rand(hotcat/2 -2,hotcat/2)
 				if webpopular < 15:
-					tokens += RAND(50,60)
+					tokens += rand(50,60)
 				elseif webpopular >= 15 and webpopular < 35:
-					tokens += RAND(50,150)
+					tokens += rand(50,150)
 				elseif webpopular >= 35 and webpopular < 75:
-					tokens += RAND(100,250)
+					tokens += rand(100,250)
 				elseif webpopular >= 75:
-					tokens += RAND(250,400)
+					tokens += rand(250,400)
 				end
 				minut += 5
 				dildohand = 25
 				if pcs_vag < 25:
-					pcs_horny += RAND(10,20)
+					pcs_horny += rand(10,20)
 					pcs_vag += 1
 					vgape = 3
 				else
-					pcs_horny += RAND(5,10)
+					pcs_horny += rand(5,10)
 				end
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore39.jpg"></center>'
@@ -657,7 +657,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						'After a few minutes you have to stop; your poor pussy aches too much to continue! You try to give your viewers a sweet smile, but several of them point out the grimace on your face. You received some tips during your show regardless.'
 					end
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt 'komp','waitclients'
 			end
 		end
 		if extradildo = 1:
@@ -665,24 +665,24 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 				act 'Use your 30cm dildo':
 					cls
 					mfcclients = 0
-					webpopular += 1
+					webpopular += rand(hotcat/2 -2,hotcat/2)
 					if webpopular < 15:
-						tokens += RAND(50,75)
+						tokens += rand(50,75)
 					elseif webpopular >= 15 and webpopular < 35:
-						tokens += RAND(75,100)
+						tokens += rand(75,100)
 					elseif webpopular >= 35 and webpopular < 75:
-						tokens += RAND(100,250)
+						tokens += rand(100,250)
 					elseif webpopular >= 75:
-						tokens += RAND(250,500)
+						tokens += rand(250,500)
 					end
 					minut += 5
 					dildohand = 30
 					if pcs_vag < 30:
-						pcs_horny += RAND(15,20)
+						pcs_horny += rand(15,20)
 						pcs_vag += 1
 						vgape = 1
 					else
-						pcs_horny += RAND(5,15)
+						pcs_horny += rand(5,15)
 					end
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore40.jpg"></center>'
@@ -711,7 +711,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 							'After a few minutes you have to stop; your poor pussy aches too much to continue! You try to give your viewers a sweet smile, but several of them point out the grimace on your face. You received some tips during your show regardless.'
 						end
 					end
-					act'Continue':gt'Komp','waitclients'
+					act'Continue':gt 'komp','waitclients'
 				end
 			end
 		end
@@ -720,24 +720,24 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 				act 'Use your humongous 35cm dildo':
 					cls
 					mfcclients = 0
-					webpopular += 1
+					webpopular += rand(hotcat/2 -2,hotcat/2)
 					if webpopular < 15:
-						tokens += RAND(75,100)
+						tokens += rand(75,100)
 					elseif webpopular >= 15 and webpopular < 35:
-						tokens += RAND(100,250)
+						tokens += rand(100,250)
 					elseif webpopular >= 35 and webpopular < 75:
-						tokens += RAND(200,450)
+						tokens += rand(200,450)
 					elseif webpopular >= 75:
-						tokens += RAND(350,750)
+						tokens += rand(350,750)
 					end
 					minut += 5
 					dildohand = 35
 					if pcs_vag < 30:
-						pcs_horny += RAND(20,25)
+						pcs_horny += rand(20,25)
 						pcs_vag += 1
 						vgape = 1
 					else
-						pcs_horny += RAND(10,15)
+						pcs_horny += rand(10,15)
 					end
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore41.jpg"></center>'
@@ -767,7 +767,7 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 							'You decide to give it all you have and ride the dildo carefully, but stop after a few minutes when the friction of the dildo against your vaginal walls becomes too much to bear. Damn, that''s going to feel sore for a while...'
 						end
 					end
-					act'Continue':gt'Komp','waitclients'
+					act'Continue':gt 'komp','waitclients'
 				end
 			end
 		end
@@ -778,22 +778,22 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 					mfcclients = 0
 					webpopular += 2
 					if webpopular < 15:
-						tokens += RAND(100,150)
+						tokens += rand(100,150)
 					elseif webpopular >= 15 and webpopular < 35:
-						tokens += RAND(150,450)
+						tokens += rand(150,450)
 					elseif webpopular >= 35 and webpopular < 75:
-						tokens += RAND(350,750)
+						tokens += rand(350,750)
 					elseif webpopular >= 75:
-						tokens += RAND(500,750)
+						tokens += rand(500,750)
 					end
 					minut += 5
 					dildohand = 40
 					if pcs_vag < 35:
-						pcs_horny += RAND(25,30)
+						pcs_horny += rand(25,30)
 						pcs_vag += 1
 						vgape = 2
 					else
-						pcs_horny += RAND(15,20)
+						pcs_horny += rand(15,20)
 					end
 					gs 'stat'
 					if pcs_vag > 35:
@@ -826,14 +826,14 @@ if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 o
 						end
 
 					end
-					act'Continue':gt'Komp','waitclients'
+					act'Continue':gt 'komp','waitclients'
 				end
 			end
 		end
 		act 'Can''t find suitable toy or you changed your mind':
 			cls
 			webpopular -= 1
-			gt'Komp','waitclients'
+			gt 'komp','waitclients'
 		end
 	end
 else
@@ -846,17 +846,17 @@ else
 		act 'Do as he asks':
 			cls
 			mfcclients = 0
-			webpopular += 1
+			webpopular += rand(hotcat/2 -2,hotcat/2)
 			minut += 5
-			pcs_horny += RAND(10,15)
+			pcs_horny += rand(10,15)
 			if webpopular < 15:
-				tokens += RAND(25,50)
+				tokens += rand(25,50)
 			elseif webpopular >= 15 and webpopular < 35:
-				tokens += RAND(25,75)
+				tokens += rand(25,75)
 			elseif webpopular >= 35 and webpopular < 75:
-				tokens += RAND(50,100)
+				tokens += rand(50,100)
 			elseif webpopular >= 75:
-				tokens += RAND(100,150)
+				tokens += rand(100,150)
 			end
 			pcs_ass += 1
 			gs 'stat'
@@ -927,22 +927,22 @@ else
 					'Your viewers are absolutely ecstatic, and are extremely impressed with the ease at which you take large objects (such as your hand) in your ass. A few of them donate some tokens, hoping you''ll use their money to buy the biggest dildo you can find.'
 				end
 			end
-			act'Continue':gt'Komp','waitclients'
+			act'Continue':gt 'komp','waitclients'
 		end
 		act 'Improvise':
 			cls
 			mfcclients = 0
-			webpopular += 1
+			webpopular += rand(hotcat/2 -2,hotcat/2)
 			minut += 5
-			pcs_horny += RAND(10,15)
+			pcs_horny += rand(10,15)
 			if webpopular < 15:
-				tokens += RAND(25,50)
+				tokens += rand(25,50)
 			elseif webpopular >= 15 and webpopular < 35:
-				tokens += RAND(25,75)
+				tokens += rand(25,75)
 			elseif webpopular >= 35 and webpopular < 75:
-				tokens += RAND(50,100)
+				tokens += rand(50,100)
 			elseif webpopular >= 75:
-				tokens += RAND(100,150)
+				tokens += rand(100,150)
 			end
 			pcs_ass += 1
 			gs 'stat'
@@ -959,7 +959,7 @@ else
 				else
 					'Fucking yourself with the brush feels nice, but you knew from the start you weren''t going to orgasm like this. After a while, when you feel you earned all the donations you''re going to get out of this, you put the hair brush away with a smile and get back to chatting with your viewers.'
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt 'komp','waitclients'
 			elseif pcs_ass >= 10 and pcs_ass < 15:
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore50.jpg"></center>'
 				'You quickly look around you, trying to find something you can stick up your ass to make the viewer happy. How about those sharpies?'
@@ -975,7 +975,7 @@ else
 				else
 					'The sharpies stretch your anus nicely, but you''re not horny enough to orgasm from this. You make an effort of trying to add a fourth in front of the camera, but take them out and return to your seat once you think you won''t get any more donations.'
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt 'komp','waitclients'
 			elseif pcs_ass >= 15 and pcs_ass < 25:
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore51.jpg"></center>'
 				'You quickly look around you, trying to find something you can stick up your ass to make the viewer happy. How about that remote?'
@@ -989,7 +989,7 @@ else
 				else
 					'The remote stretches your anus nicely, but you''re not horny enough to orgasm from this. You make an effort of fucking yourself with it in front of the camera, but take it out and return to your seat once you think you won''t get any more donations.'
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt 'komp','waitclients'
 			elseif pcs_ass >= 25 and pcs_ass < 35:
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore52.jpg"></center>'
 				'You quickly look around you, trying to find something you can stick up your ass to make the viewer happy. Then you ponder: "How about the phone in the hallway?"'
@@ -1003,7 +1003,7 @@ else
 				else
 					'The phone stretches your anus nicely, but you''re not horny enough to orgasm from this. You make an effort of fucking yourself with it in front of the camera, but take it out and return to your seat once you think you won''t get any more donations. You smile to yourself, hoping you''ll remember to clean it before you make a phone call...'
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt 'komp','waitclients'
 			elseif pcs_ass >= 35:
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore53.jpg"></center>'
 				'You quickly look around you, trying to find something you can stick up your ass to make the viewer happy. What would your fans want to see inside your ass today... how about that spray can of hairspray?'
@@ -1018,7 +1018,7 @@ else
 				else
 					'You masturbate furiously while you slowly fuck yourself with the canister, much to the enthusiasm of your chat. They''re all encouraging you by now, and cheer amongst themselves when they see you fake an orgasm on their screens. Several of them donate some tokens to you. You didn''t actually orgasm, but you know what your viewers want to see!'
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt 'komp','waitclients'
 			end
 		end
 		gs 'willpower', 'exhib', 'resist', 'hard'
@@ -1028,7 +1028,7 @@ else
 				webpopular -= 1
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'Komp','waitclients'
+				gt 'komp','waitclients'
 			end
 		else
 			act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1037,17 +1037,17 @@ else
 		act 'Do as he asks':
 			cls
 			mfcclients = 0
-			webpopular += 1
+			webpopular += rand(hotcat/2 -2,hotcat/2)
 			minut += 5
-			pcs_horny += RAND(15,30)
+			pcs_horny += rand(15,30)
 			if webpopular < 15:
-				tokens += RAND(25,50)
+				tokens += rand(25,50)
 			elseif webpopular >= 15 and webpopular < 35:
-				tokens += RAND(25,75)
+				tokens += rand(25,75)
 			elseif webpopular >= 35 and webpopular < 75:
-				tokens += RAND(50,100)
+				tokens += rand(50,100)
 			elseif webpopular >= 75:
-				tokens += RAND(100,150)
+				tokens += rand(100,150)
 			end
 			if pcs_vag >= 15:
 				pcs_vag += 1
@@ -1066,7 +1066,7 @@ else
 				else
 					'After you please yourself for a while, you realize you could probably get more tokens out of your viewers by not cumming just yet. You carefully remove your hand with an apologetic smile, hoping some of them will get the hint and donate more.'
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt 'komp','waitclients'
 			elseif pcs_vag >= 25 and pcs_ass >= 25:
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore44.jpg"></center>'
 				'"I''d rather be riding your dick right now, but since you''re not here..." you tell the viewer, guiding your hand to your snatch while you wink at the camera.'
@@ -1080,7 +1080,7 @@ else
 				else
 					'After you please yourself for a while, you realize you could probably get more tokens out of your viewers by not cumming just yet. You carefully remove your hands with an apologetic smile, hoping some of them will get the hint and donate more.'
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt 'komp','waitclients'
 			elseif pcs_vag > 15 and pcs_vag < 25:
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore34.jpg"></center>'
 				'"I''d rather be riding your dick right now, but since you''re not here..." you tell the viewer, guiding your hand to your snatch while you wink at the camera.'
@@ -1094,7 +1094,7 @@ else
 				else
 					'You stimulate yourself for a few minutes, nearly forgetting about the camera pointed at you. While you gain your breath you blow a kiss at the camera, and let the person who posted the request know that was just for him. He readily donates some extra tokens, appreciating the personal touch.'
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt 'komp','waitclients'
 			elseif pcs_vag <= 15:
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore35.jpg"></center>'
 				'"I''d rather be riding your dick right now, but since you''re not here..." you tell the viewer, guiding your hand to your snatch while you wink at the camera.'
@@ -1108,11 +1108,12 @@ else
 				else
 					'You stimulate yourself for a few minutes, nearly forgetting about the camera pointed at you. While you gain your breath you blow a kiss at the camera, and let the person who posted the request know that was just for him. He readily donates some extra tokens, appreciating the personal touch.'
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt 'komp','waitclients'
 			end
 		end
 	end
 end
 
+
 --- kompMFC ---------------------------------
 

+ 543 - 0
locations/kompMFCanal.qsrc

@@ -0,0 +1,543 @@
+# kompMFCanal
+
+*clr & cla
+gs 'stat'
+'One of the visitors asks: "Do you have a vibrator or dildo? I want to see your ass stuffed..."'
+if vibrator = 1 or dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 or extradildo = 1 or superdildo = 1 or maddildo = 1:
+	act 'Play with a toy':
+		*clr & cla
+		gs 'stat'
+		if vibrator = 1:
+			act 'Use your vibrator':
+				*clr & cla
+				mfcclients = 0
+				webpopular += rand(hotcat/2 -2,hotcat/2)
+				if webpopular < 15:
+					tokens += rand(25,50)
+				elseif webpopular >= 15 and webpopular < 35:
+					tokens += rand(50,100)
+				elseif webpopular >= 35 and webpopular < 75:
+					tokens += rand(50,150)
+				elseif webpopular >= 75:
+					tokens += rand(100,200)
+				end
+				minut += 5
+				dildohand = 10
+				if pcs_ass > 10:
+					pcs_horny += rand(10,20)
+				else
+					pcs_ass += 1
+					pcs_horny += rand(10,20)
+				end
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore23.jpg"></center>'
+				if pcs_ass > 10:
+					'You turn on the vibrator and make a show of fucking your ass with it, hoping to please the customer despite it not being what he initially asked for.'
+					if pcs_horny >= 100:
+						orgasm += 1
+						mfccum += 1
+						pcs_horny = 0
+						pcs_mood = 100
+						'The vibration is so powerful, you orgasm without even touching your vagina! Your chat loves it...'
+					else
+						'When you put the vibrator aside after a few minutes of fun, you notice you received several donations during your little show.'
+					end
+				else
+					'You spit on the vibrator a few times and bring it to your anus, before turning it on. You gently stick it up your ass and ride it for a while, enjoying the stimulation it gives you.'
+					'When you put the vibrator aside after a few minutes of fun, you notice you received several donations during your little show.'
+				end
+				act'Continue':gt 'komp','waitclients'
+			end
+		end
+		if dildo = 1:
+			act 'Use your small dildo':
+				*clr & cla
+				mfcclients = 0
+				webpopular += rand(hotcat/2 -2,hotcat/2)
+				if webpopular < 15:
+					tokens += rand(20,30)
+				elseif webpopular >= 15 and webpopular < 35:
+					tokens += rand(30,50)
+				elseif webpopular >= 35 and webpopular < 75:
+					tokens += rand(30,100)
+				elseif webpopular >= 75:
+					tokens += rand(50,100)
+				end
+				minut += 5
+				dildohand = 10
+				if pcs_ass > 10:
+					pcs_horny += rand(5,15)
+				else
+					pcs_horny -= rand(5,15)
+					pcs_ass += 1
+				end
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore24.jpg"></center>'
+				if pcs_ass > 10:
+					'You take the 10cm long dildo, and slip it inside your ass with one firm motion. It''s not very big, and feels quite enjoyable inside your ass.'
+					if pcs_horny >= 100:
+						orgasm += 1
+						mfccum += 1
+						pcs_horny = 0
+						pcs_mood = 100
+						'The dildo feels so good, you can''t help but masturbate and orgasm when you rub your clit with one hand while you thrust the dildo inside your ass with the other. Your chat loves it, making all sorts of comments about how slutty you are...'
+					else
+						'When you put the dildo aside after a few minutes of fun, you notice you received several donations during your little show.'
+					end
+				else
+					'You take the 10cm long dildo, and slip it inside your ass with one firm motion. It''s not very big, but is still fairly big for you. Ouch!'
+					'When you put the dildo aside after a few minutes, you notice you received several donations during your little show.'
+				end
+				act'Continue':gt 'komp','waitclients'
+			end
+		end
+		if middildo = 1 and pcs_ass >= 10:
+			act 'Use your medium dildo':
+				*clr & cla
+				mfcclients = 0
+				webpopular += rand(hotcat/2 -2,hotcat/2)
+				if webpopular < 15:
+					tokens += rand(25,35)
+				elseif webpopular >= 15 and webpopular < 35:
+					tokens += rand(25,100)
+				elseif webpopular >= 35 and webpopular < 75:
+					tokens += rand(25,150)
+				elseif webpopular >= 75:
+					tokens += rand(100,150)
+				end
+				minut += 5
+				dildohand = 15
+				if pcs_ass > 15:
+					pcs_horny += rand(5,15)
+				else
+					pcs_horny -= rand(5,15)
+					pcs_ass += 1
+				end
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore25.jpg"></center>'
+				if pcs_ass > 15:
+					'You take the 15cm long dildo, and put it on the floor so you can ride it. After you slip it inside your ass with one firm motion, you hump it enthusiastically, making a nice show of it stretching your anus in the process.'
+					if pcs_horny >= 100:
+						orgasm += 1
+						mfccum += 1
+						pcs_horny = 0
+						pcs_mood = 100
+						'The dildo feels so good, you can''t help but masturbate and orgasm when you rub your clit with one hand while you ride the dildo. Your chat loves it, making all sorts of comments about how slutty you are...'
+					else
+						'When you put the dildo aside after a few minutes of fun, you notice you received everal donations during your little show.'
+					end
+				else
+					'You take the 15cm long dildo, and put it on the floor so you can ride it. After you slip it inside your ass you hump it carefully, making a nice show of it stretching your anus in the process. It kinda hurts.'
+					'When you put the dildo aside after a few minutes, you notice you received several donations during your little show.'
+				end
+				act'Further':gt 'komp','waitclients'
+			end
+		end
+		if largedildo = 1 and pcs_ass >= 15:
+			act 'Use your large dildo':
+				*clr & cla
+				mfcclients = 0
+				webpopular += rand(hotcat/2 -2,hotcat/2)
+				if webpopular < 15:
+					tokens += rand(40,55)
+				elseif webpopular >= 15 and webpopular < 35:
+					tokens += rand(40,100)
+				elseif webpopular >= 35 and webpopular < 75:
+					tokens += rand(100,150)
+				elseif webpopular >= 75:
+					tokens += rand(100,200)
+				end
+				minut += 5
+				dildohand = 20
+				if pcs_ass > 20:
+					pcs_horny += rand(5,15)
+				else
+					pcs_horny -= rand(5,15)
+					pcs_ass += 1
+					agape = 1
+				end
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore26.jpg"></center>'
+				if pcs_ass > 20:
+					'You take the 20cm long dildo, and put it on the floor so you can ride it. After you slip it inside your ass with one firm motion, you hump it enthusiastically. You''re used to this size and make a nice show of it stretching your anus in the process.'
+					if pcs_horny >= 100:
+						orgasm += 1
+						mfccum += 1
+						pcs_horny = 0
+						pcs_mood = 100
+						'The dildo feels so good, you can''t help but masturbate and orgasm when you rub your clit with one hand while you ride the dildo. Your chat loves it, making all sorts of comments about how slutty you are...'
+					else
+						'When you put the dildo aside after a few minutes of fun, you notice you received several donations during your little show.'
+					end
+				else
+					'You take the 20cm long dildo, and put it on the floor so you can ride it. After you slip it inside your ass carefully, you begin to hump it. It''s too big to really be enjoyable, but the visitors demand a show and you do your best to show how it stretches your anus in the process.'
+					'When you put the dildo aside after a few minutes of fun, you notice you received several donations during your little show.'
+				end
+				act'Continue':gt 'komp','waitclients'
+			end
+		end
+		if bigdildo = 1 and pcs_ass >= 20:
+			act 'Use your very large dildo':
+				*clr & cla
+				mfcclients = 0
+				webpopular += rand(hotcat/2 -2,hotcat/2)
+				if webpopular < 15:
+					tokens += rand(50,60)
+				elseif webpopular >= 15 and webpopular < 35:
+					tokens += rand(50,100)
+				elseif webpopular >= 35 and webpopular < 75:
+					tokens += rand(100,200)
+				elseif webpopular >= 75:
+					tokens += rand(100,300)
+				end
+				minut += 5
+				dildohand = 25
+				if pcs_ass > 25:
+					pcs_horny += rand(10,20)
+				else
+					pcs_horny -= rand(10,20)
+					pcs_ass += 1
+					agape = 1
+				end
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore27.jpg"></center>'
+				if pcs_ass > 25:
+					'You relax on your bed and lift your pelvis for easier access. You don''t bother to lubricate the dildo first and just guide it to your anus, knowing you''re loose enough back there to be okay without. Your viewers seem very impressed by this, and compliment your sluttiness while they watch the dildo slowly being swallowed by your hungry anus.'
+					if pcs_horny >= 100:
+						orgasm += 1
+						mfccum += 1
+						pcs_horny = 0
+						pcs_mood = 100
+						'The sensation of fullness you''re getting from the dildo is too much! You frantically rub your pussy while you squeeze your sphincter tightly around the large dildo in your ass, and reach an orgasm in no time.'
+					else
+						'When you put the dildo aside after a few minutes of fun, you notice you received several donations during your little show.'
+					end
+				else
+					'You relax on your bed and lift your pelvis for easier access. After coating the dildo liberally with your saliva and rubbing some onto your anus too, you carefully shove the dildo inside you one bit at a time.'
+					'Once its whole length is inside you, you take a break and catch your breath. Damn, that thing is big! You wiggle your ass a little and carefully move the dildo a bit inside your rectum, but then decide you fulfilled the client''s request and quickly let it slide out again. Ow...'
+				end
+				act'Continue':gt 'komp','waitclients'
+			end
+		end
+		if extradildo = 1 and pcs_ass >= 25:
+			act 'Use your 30cm dildo':
+				*clr & cla
+				mfcclients = 0
+				webpopular += rand(hotcat/2 -2,hotcat/2)
+				if webpopular < 15:
+					tokens += rand(50,75)
+				elseif webpopular >= 15 and webpopular < 35:
+					tokens += rand(50,150)
+				elseif webpopular >= 35 and webpopular < 75:
+					tokens += rand(100,300)
+				elseif webpopular >= 75:
+					tokens += rand(300,500)
+				end
+				minut += 5
+				dildohand = 30
+				if pcs_ass > 30:
+					pcs_horny += rand(15,20)
+				else
+					pcs_horny -= rand(15,20)
+					pcs_ass += 1
+					agape = 1
+				end
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore28.jpg"></center>'
+				if pcs_ass > 30:
+					'You lie down on your back and throw your legs behind your head. Knowing you can take its size comfortably, you skewer yourself with the dildo. You moan eagerly while you fuck your ass with it for a while, giving your clients a nice show.'
+					if pcs_horny >= 100:
+						orgasm += 1
+						mfccum += 1
+						pcs_horny = 0
+						pcs_mood = 100
+						'The frictions so close to your pussy make it so your free hand is immediately drawn to your clitoris, and you can''t stop from rubbing yourself to a thunderous orgasm. Your sphincter contracted lewdly around the dildo while you were cumming, which your audience enjoys greatly.'
+					else
+						'A few minutes later your muscles begin to ache and you decide to stop. You give the camera a weak smile, hoping you fulfilled your visitor''s request.'
+					end
+				else
+					'You lie down on your back and throw your legs behind your head. You realize your ass isn''t quite used to taking anything this large in it and go slowly, carefully thrusting the dildo up your ass.'
+					'Even with lubrication it hurts, and a few minutes in you have to stop. Your client enjoyed your show regardless, and donated some tokens as promised.'
+				end
+				act'Continue':gt 'komp','waitclients'
+			end
+		end
+		if superdildo = 1 and pcs_ass >= 30:
+			act 'Use your humongous 35cm dildo':
+				*clr & cla
+				mfcclients = 0
+				webpopular += rand(hotcat/2 -2,hotcat/2)
+				if webpopular < 15:
+					tokens += rand(75,100)
+				elseif webpopular >= 15 and webpopular < 35:
+					tokens += rand(100,300)
+				elseif webpopular >= 35 and webpopular < 75:
+					tokens += rand(100,500)
+				elseif webpopular >= 75:
+					tokens += rand(300,500)
+				end
+				minut += 5
+				dildohand = 35
+				if pcs_ass > 35:
+					pcs_horny += rand(20,25)
+				else
+					pcs_horny -= rand(20,25)
+					pcs_ass += 1
+					agape = 1
+				end
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore29.jpg"></center>'
+				if pcs_ass > 35:
+					'You roll to your side, looking at the enormous dildo for a second before you decide to shove it inside you. You''re used to taking things this large up your ass, and moan softly while you thrust the dildo in and out of you.'
+					if pcs_horny >= 100:
+						orgasm += 1
+						mfccum += 1
+						pcs_horny = 0
+						pcs_mood = 100
+						'In the process you cum violently.'
+					else
+						'Even though it feels nice, you are not quite horny enough to reach orgasm this way.'
+					end
+				else
+					'You roll to your side, looking at the enormous dildo for a second before you decide to shove it inside you. It''s too big, and even with a liberal coat of lubrication you barely manage to shove the head inside you.'
+					'It hurt a lot, but the client appreciated your struggle anyway and gives you some tokens.'
+				end
+				act'Continue':gt 'komp','waitclients'
+			end
+		end
+		if maddildo = 1 and pcs_ass >= 35:
+			act 'Use your enormous 40cm dildo':
+				*clr & cla
+				mfcclients = 0
+				webpopular += rand(hotcat/2 -2,hotcat/2)
+				if webpopular < 15:
+					tokens += rand(100,150)
+				elseif webpopular >= 15 and webpopular < 35:
+					tokens += rand(100,300)
+				elseif webpopular >= 35 and webpopular < 75:
+					tokens += rand(300,500)
+				elseif webpopular >= 75:
+					tokens += rand(500,750)
+				end
+				minut += 5
+				dildohand = 40
+				if pcs_ass > 40:
+					pcs_horny += rand(25,30)
+				else
+					pcs_horny -= rand(25,30)
+					pcs_ass += 1
+					agape = 1
+				end
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore30.jpg"></center>'
+				if pcs_ass > 40:
+					'You take your largest dildo and put it on the floor, and then spit on your fingers a few times and rub it across your sphincter habitually. Taking things up the ass is nothing new to you, and you slowly let yourself sink down on the humongous dildo with a satisfied sigh. Your chat loves it, calling you their anal queen.'
+					if pcs_horny >= 100:
+						orgasm += 1
+						mfccum += 1
+						pcs_horny = 0
+						pcs_mood = 100
+						'You''re so excited that you can''t stop yourself from masturbating, and quickly rub an orgasm out.'
+					else
+						'The rubber phallus stretches your anal ring nicely, and makes your vagina poke out lewdly with every thrust. The knowledge that you''re still a virgin makes your customers all the hornier, knowing that a sweet virgin girl such as yourself is taking such a huge dildo up her ass at the same time...'
+					end
+				else
+					'You take out your biggest dildo and put it on the floor, giving it a doubtful look. Is that really going to fit inside you?'
+					'You spit on your fingers several times, apologizing to the camera while you try to produce some more lubrication for yourself.'
+					'When you rub the head against your sphincter, you''re even more doubtful. This is not going to be a pleasant experience. Nevertheless, the customers demand it, so...'
+					'Despite your best efforts, you don''t manage to get much more than the head in. A few tears roll down your cheek while you desperately try to ignore the pain. When you give up, you see you got a fair few donations... apparently your viewers enjoy watching you suffer!'
+				end
+				act'Continue':gt 'komp','waitclients'
+			end
+		end
+	end
+end
+
+act 'Decide to improvise':
+	*clr & cla
+	mfcclients = 0
+	webpopular += rand(hotcat/2 -2,hotcat/2)
+	minut += 5
+	pcs_horny += rand(10,15)
+	if webpopular < 15:
+		tokens += rand(25,50)
+	elseif webpopular >= 15 and webpopular < 35:
+		tokens += rand(25,75)
+	elseif webpopular >= 35 and webpopular < 75:
+		tokens += rand(50,100)
+	elseif webpopular >= 75:
+		tokens += rand(100,150)
+	end
+	pcs_ass += 1
+	gs 'stat'
+	if pcs_ass < 10:
+		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore49.jpg"></center>'
+		'You quickly look around you, trying to find something you can stick up your ass to make the viewer happy. Ah, your hair brush!'
+		'Even though the handle doesn''t look particularly big, you''re still careful as you spit on the handle a few times before guiding it to your ass, slowly pushing it inside you.'
+		if pcs_horny >= 100:
+			orgasm += 1
+			mfccum += 1
+			pcs_horny = 0
+			pcs_mood = 100
+			'To your shame you have to admit, this feels great! If you keep this up, you might not be able to ever look at your hair brush again without getting aroused...'
+			'Mere seconds later, you''re unable to resist the urge any longer and eagerly rub your clit while you fuck yourself with your brush, moaning loudly into the microphone when you orgasm. Who knew using a hair brush could be so much fun!?'
+		else
+			'Fucking yourself with the brush feels nice, but you knew from the start you weren''t going to orgasm like this. After a while, when you feel you earned all the donations you''re going to get out of this, you put the hair brush away with a smile and get back to chatting with your viewers.'
+		end
+		act'Continue':gt 'komp','waitclients'
+	elseif pcs_ass >= 10 and pcs_ass < 15:
+		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore50.jpg"></center>'
+		'You quickly look around you, trying to find something you can stick up your ass to make the viewer happy. How about those sharpies?'
+		'"How many do you think I can take, guys?" you smile at the camera, while you show a fistful of sharpies to the camera. "Bonus points to who gets it right!"'
+		'You''re not that experienced with taking things up your ass yet, but can''t help but laugh at the visitors typing: "ALL OF THEM!!!11"'
+		'Even though you give it your best shot, you have to yield at 3. For now... this could be fun as a recurring challenge!'
+		if pcs_horny >= 100:
+			orgasm += 1
+			mfccum += 1
+			pcs_horny = 0
+			pcs_mood = 100
+			'You were already quite horny, and the extra sensation of your anus being stretched by those sharpies puts you over the edge. You rub your clit without even really realizing it, and gasp in surprise when an orgasm suddenly hits you!'
+			'Your ass squeezes out the sharpies one by one from the spasms, while the chat is singing your praises. They all love a girl that can orgasm from anal sex...'
+		else
+			'The sharpies stretch your anus nicely, but you''re not horny enough to orgasm from this. You make an effort of trying to add a fourth in front of the camera, but take them out and return to your seat once you think you won''t get any more donations.'
+		end
+		act'Continue':gt 'komp','waitclients'
+	elseif pcs_ass >= 15 and pcs_ass < 25:
+		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore51.jpg"></center>'
+		'You quickly look around you, trying to find something you can stick up your ass to make the viewer happy. How about that remote?'
+		'The remote feels a bit uncomfortable, with its angular shape and sharp edges, but you still manage to get nearly half of it inside your ass.'
+		if pcs_horny >= 100:
+			orgasm += 1
+			mfccum += 1
+			pcs_horny = 0
+			pcs_mood = 100
+			'You were already quite horny, and the extra sensation of your anus being stretched by the remote puts you over the edge. You rub your clit without even really realizing it, and gasp in surprise when an orgasm suddenly hits you!'
+			'Your ass clasps tightly around the emote, while the chat is singing your praises. They all love a girl that can orgasm from anal sex...'
+		else
+			'The remote stretches your anus nicely, but you''re not horny enough to orgasm from this. You make an effort of fucking yourself with it in front of the camera, but take it out and return to your seat once you think you won''t get any more donations.'
+		end
+		act'Continue':gt 'komp','waitclients'
+	elseif pcs_ass >= 25 and pcs_ass < 35:
+		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore52.jpg"></center>'
+		'You quickly look around you, trying to find something you can stick up your ass to make the viewer happy. Then you ponder: "How about the phone in the hallway?"'
+		'The horn doesn''t go in very easily, with the earpiece being the widest part of the whole thing! However, you eventually manage to work it past your sphincter and let out a happy sigh. Is there anything you won''t do for your viewers?'
+		if pcs_horny >= 100:
+			orgasm += 1
+			mfccum += 1
+			pcs_horny = 0
+			pcs_mood = 100
+			'Just when the bulbous part of the horn penetrates you, your body suddenly trembles intensely and you orgasm without even touching your clit! Wow, that was intense...'
+		else
+			'The phone stretches your anus nicely, but you''re not horny enough to orgasm from this. You make an effort of fucking yourself with it in front of the camera, but take it out and return to your seat once you think you won''t get any more donations. You smile to yourself, hoping you''ll remember to clean it before you make a phone call...'
+		end
+		act'Continue':gt 'komp','waitclients'
+	elseif pcs_ass >= 35:
+		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore53.jpg"></center>'
+		'You quickly look around you, trying to find something you can stick up your ass to make the viewer happy. What would your fans want to see inside your ass today... how about that spray can of hairspray?'
+		'With a lewd smile on your face you pretend to stroke the can for a moment, while you tell your viewers: "Pretend that this is your cock, right now..."'
+		'Then you guide it to your anus and penetrate yourself with it, moaning lewdly while you thrust it in deeper and deeper.'
+		if pcs_horny >= 100:
+			orgasm += 1
+			mfccum += 1
+			pcs_horny = 0
+			pcs_mood = 100
+			'You masturbate furiously while you slowly fuck yourself with the canister, much to the enthusiasm of your chat. They''re all encouraging you by now, and cheer amongst themselves when they see you orgasm on their screens. Several of them donate some tokens to you.'
+		else
+			'You masturbate furiously while you slowly fuck yourself with the canister, much to the enthusiasm of your chat. They''re all encouraging you by now, and cheer amongst themselves when they see you fake an orgasm on their screens. Several of them donate some tokens to you. You didn''t actually orgasm, but you know what your viewers want to see!'
+		end
+		act'Continue':gt 'komp','waitclients'
+	end
+end
+
+act 'Use your fingers instead':
+	'You frown at the camera and apologize: "I''m sorry, but no. I don''t have anything like that..."'
+	'The visitor replies: ":( :( :(. OK, maybe you use hand or fingers then yes?"'
+	*clr & cla
+	mfcclients = 0
+	webpopular += rand(hotcat/2 -2,hotcat/2)
+	minut += 5
+	pcs_horny += rand(10,15)
+	if webpopular < 15:
+		tokens += rand(25,50)
+	elseif webpopular >= 15 and webpopular < 35:
+		tokens += rand(25,75)
+	elseif webpopular >= 35 and webpopular < 75:
+		tokens += rand(50,100)
+	elseif webpopular >= 75:
+		tokens += rand(100,150)
+	end
+	pcs_ass += 1
+	gs 'stat'
+	if pcs_ass < 10:
+		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore32.jpg"></center>'
+		'Without saying a word you turn your ass to the camera, and lick your finger before slowly working it past your tight sphincter. When your entire finger is inside you, you slowly begin to fuck your ass with it.'
+		if pcs_horny >= 100:
+			orgasm += 1
+			mfccum += 1
+			pcs_horny = 0
+			pcs_mood = 100
+			'You''re carried away so much by the sudden sensations, you''re almost forgetting there''s a camera pointed at you! Your free hand quickly finds its way to your clit and rubs it eagerly, making your orgasm in front of your <<camclients>> viewers.'
+		else
+			'Your client can tell you''re not very experienced having things up your ass, and enjoys you fingering yourself. He quickly donates some tokens as promised, and you thrust your finger in a few more times before returning to your chair.'
+		end
+	elseif pcs_ass >= 10 and pcs_ass < 15:
+		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore45.jpg"></center>'
+		'Without saying a word you turn your ass to the camera, and lick your fingers before slowly working one in past your tight sphincter. Then you add a second! With the two fingers inside you, you slowly begin to move your hand back and forth, slowly fucking your ass with them.'
+		if pcs_horny >= 100:
+			orgasm += 1
+			mfccum += 1
+			pcs_horny = 0
+			pcs_mood = 100
+			'You''re carried away so much by the sudden sensations, you''re almost forgetting there''s a camera pointed at you! Your free hand quickly finds its way to your clit and rubs it eagerly, making your orgasm in front of your <<camclients>> viewers.'
+		else
+			'Your client can tell you''re not very experienced having things up your ass yet, and enjoys you fingering yourself. He quickly donates some tokens as promised, and you thrust your fingers in a few more times before returning to your chair with a tinge of regret. That actually felt nice, but there''s money to be made...'
+		end
+	elseif pcs_ass >= 15 and pcs_ass < 25:
+		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore46.jpg"></center>'
+		'Without saying a word you turn your ass to the camera, and lick your fingers before slowly working one in past your tight sphincter. Then you add a second! And a third! With the three fingers firmly inside you, you slowly begin to move your hand back and forth, slowly fucking your ass with them.'
+		if pcs_horny >= 100:
+			orgasm += 1
+			mfccum += 1
+			pcs_horny = 0
+			pcs_mood = 100
+			'You''re carried away so much by the sudden sensations, you''re almost forgetting there''s a camera pointed at you! Your free hand quickly finds its way to your clit and rubs it eagerly, making your orgasm in front of your <<camclients>> viewers.'
+		else
+			'Your client enjoys you fingering yourself, eager to have finally found a girl that isn''t too squeamish to take some fingers in her ass without crying about it. He quickly donates some tokens as promised, and you thrust your fingers in a few more times before returning to your chair with a tinge of regret. That actually felt nice, but there''s money to be made...'
+		end
+	elseif pcs_ass >= 25 and pcs_ass < 35:
+		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore47.jpg"></center>'
+		'Without saying a word you turn your ass to the camera, and lick your fingers before slowly working one in past your tight sphincter. Then you add a second! And a third! And even a fourth!'
+		'With four fingers firmly inside you, you slowly begin to move your hand back and forth, slowly fucking your ass with them. It''s only a matter of time before your whole hand will fit in now, they''re going to love that!'
+		if pcs_horny >= 100:
+			orgasm += 1
+			mfccum += 1
+			pcs_horny = 0
+			pcs_mood = 100
+			'You''re carried away so much by the sudden sensations, you''re almost forgetting there''s a camera pointed at you! Your free hand quickly finds its way to your clit and rubs it eagerly, making your orgasm in front of your <<camclients>> viewers.'
+		else
+			'Your client enjoys you fingering yourself, eager to have finally found a girl that isn''t too squeamish to take some fingers in her ass without crying about it. He quickly donates some tokens as promised, and you thrust your fingers in a few more times before returning to your chair with a tinge of regret. That actually felt nice, but there''s money to be made...'
+		end
+	elseif pcs_ass >= 35:
+		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore48.jpg"></center>'
+		'Without saying a word you turn your ass to the camera, and lick your fingers before slowly working one in past your tight sphincter. Then you add a second! And a third! And even a fourth! The chat explodes when you work your thumb in too, and even manage to go in a bit further. That''s right... you''re practically fisting yourself, in front of an audience!'
+		if pcs_horny >= 100:
+			orgasm += 1
+			mfccum += 1
+			pcs_horny = 0
+			pcs_mood = 100
+			'You''re carried away so much by the sudden sensations, you''re almost forgetting there''s a camera pointed at you! Your free hand quickly finds its way to your clit and rubs it eagerly, making your orgasm in front of your <<camclients>> viewers.'
+		else
+			'Your viewers are absolutely ecstatic, and are extremely impressed with the ease at which you take large objects (such as your hand) in your ass. A few of them donate some tokens, hoping you''ll use their money to buy the biggest dildo you can find.'
+		end
+	end
+	act'Continue':gt 'komp','waitclients'
+end
+act 'Refuse':
+	*clr & cla
+	webpopular -= 1
+	gt 'komp','waitclients'
+end
+
+--- kompMFCanal ---------------------------------
+

+ 223 - 0
locations/kompMFCoral.qsrc

@@ -0,0 +1,223 @@
+# kompMFCoral
+
+cls
+gs 'stat'
+'One of the visitors asks: "Do you have a dildo or something? I''d love to see your throat skills..."'
+if dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 or extradildo = 1 or superdildo = 1 or maddildo = 1:
+		act 'Suck':
+		cls
+		gs 'stat'
+		if dildo = 1:
+			act 'Use your small dildo':
+				cls
+				mfcclients = 0
+				webpopular += rand(hotcat/2 -2,hotcat/2)
+				if webpopular < 15:
+					tokens += rand(20,30)
+				elseif webpopular >= 15 and webpopular < 35:
+					tokens += rand(30,50)
+				elseif webpopular >= 35 and webpopular < 75:
+					tokens += rand(30,100)
+				elseif webpopular >= 75:
+					tokens += rand(50,100)
+				end
+				minut += 5
+				gs 'stat'
+				'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/throat'+rand(1,3)+'.mp4" ></video></center>'
+				if pcs_throat < 15:
+					pcs_throat += 1
+					'You are terribly inexperienced at giving blowjobs.  Hesitantly you take your small dildo into your mouth and do your best to put on an entertaining show.'
+					'Some of your clients critize your clear lack of experience but the majority seem to at least appreciate the effort offering words of support and donations.'
+				end
+				if pcs_throat >= 15 and pcs_throat < 25:
+					'You are fairly inexperienced at giving blowjobs but good enough that you feel you can handle a dildo of small size.'
+					'Pushing the dildo in your mouth a few times you get a little too ambitious and gag on it as it hits the back of your throat but the crowd seems appreciative of your effort.'
+				end
+				if pcs_throat >= 25:
+					'You easily handle deepthroating the small sized dildo.  A few of your clients notice this and offer you something a little larger to work on.'
+					'You laugh but realize that perhaps you may draw better donations if you push your limits a little more next time.'
+				end
+				act'Continue':gt'komp','waitclients'
+			end
+		end
+		if middildo = 1:
+			act 'Use your medium dildo':
+				cls
+				if pcs_throat < 15:
+					pcs_throat += 1
+					mfcclients = 0
+					webpopular += rand(hotcat/2 -2,hotcat/2)
+					if webpopular < 15:
+						tokens += rand(20,30)
+					elseif webpopular >= 15 and webpopular < 35:
+						tokens += rand(30,50)
+					elseif webpopular >= 35 and webpopular < 75:
+						tokens += rand(30,100)
+					elseif webpopular >= 75:
+						tokens += rand(50,100)
+					end
+					minut += 5
+					gs 'stat'
+						
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/throat'+rand(1,3)+'.mp4" ></video></center>'
+					'You are terribly inexperienced at giving blowjobs.  Hesitantly you take your medium dildo into your mouth and do your best to put on an entertaining show.'
+					'You realize that with your inexperience you can''t really do much with this dildo that you couldn''t do with a smaller one.  Nonetheless your clients seem to appreciate the effort and your ambition and you get a few donations.'
+				end
+				if pcs_throat => 15 and pcs_throat < 25:
+					pcs_throat += 1
+					mfcclients = 0
+					webpopular += rand(hotcat/2 -2,hotcat/2)
+					if webpopular < 15:
+						tokens += rand(25,35)
+					elseif webpopular >= 15 and webpopular < 35:
+						tokens += rand(25,100)
+					elseif webpopular >= 35 and webpopular < 75:
+						tokens += rand(25,150)
+					elseif webpopular >= 75:
+						tokens += rand(100,150)
+					end
+					minut += 5
+					gs 'stat'
+
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/midthroat'+rand(1,3)+'.mp4" ></video></center>'
+					'Sucking on the the head of the dildo seductively you push it into you mouth giving the toy a sensual blowjob.'
+				end
+				if pcs_throat >= 25:
+					mfcclients = 0
+					webpopular += rand(hotcat/2 -2,hotcat/2)
+					if webpopular < 15:
+						tokens += rand(25,35)
+					elseif webpopular >= 15 and webpopular < 35:
+						tokens += rand(25,100)
+					elseif webpopular >= 35 and webpopular < 75:
+						tokens += rand(25,150)
+					elseif webpopular >= 75:
+						tokens += rand(100,150)
+					end
+					minut += 5
+					gs 'stat'
+
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/midthroat'+rand(1,3)+'.mp4" ></video></center>'
+					'You expertly suck on the dildo.  Knowing that a toy of this size poses little challenge for someone of your experience you deepthroat the full length a few times to get a rise out the crowd.'
+				end
+				act'Continue':gt'komp','waitclients'
+			end
+		end
+		if largedildo = 1 or bigdildo = 1 or extradildo = 1:
+			act 'Use a bigger dildo':
+				cls
+				if pcs_throat < 25:
+					pcs_throat += 1
+					mfcclients = 0
+					webpopular += rand(hotcat/2 -2,hotcat/2)
+					if webpopular < 15:
+						tokens += rand(20,30)
+					elseif webpopular >= 15 and webpopular < 35:
+						tokens += rand(30,50)
+					elseif webpopular >= 35 and webpopular < 75:
+						tokens += rand(30,100)
+					elseif webpopular >= 75:
+						tokens += rand(50,100)
+					end
+					minut += 5
+					gs 'stat'
+						
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/throat'+rand(1,3)+'.mp4" ></video></center>'
+					'You are not necessarily inexperienced at giving blowjobs but taking the large dildo into your mouth you quickly realize it is well beyond your skill level.'
+					'Nonetheless your clients seem to appreciate the effort and your ambition and you get a few donations.'
+				end
+				if pcs_throat >= 25 and pcs_throat < 35:
+					pcs_throat += 1
+					mfcclients = 0
+					webpopular += rand(hotcat/2 -2,hotcat/2)
+					if webpopular < 15:
+						tokens += rand(40,55)
+					elseif webpopular >= 15 and webpopular < 35:
+						tokens += rand(40,100)
+					elseif webpopular >= 35 and webpopular < 75:
+						tokens += rand(100,150)
+					elseif webpopular >= 75:
+						tokens += rand(100,200)
+					end
+					minut += 5
+					gs 'stat'
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/bigthroat'+rand(1,3)+'.mp4" ></video></center>'
+					'The large dildo slides easily down your throat as you begin to pump it back and forth to entertain the crowd.'
+					'Your clients seem geniunely impressed by the show and promptly begin to donate.'
+				end
+				if pcs_throat >= 35:
+					mfcclients = 0
+					webpopular += rand(hotcat/2 -2,hotcat/2)
+					if webpopular < 15:
+						tokens += rand(40,55)
+					elseif webpopular >= 15 and webpopular < 35:
+						tokens += rand(40,100)
+					elseif webpopular >= 35 and webpopular < 75:
+						tokens += rand(100,150)
+					elseif webpopular >= 75:
+						tokens += rand(100,200)
+					end
+					minut += 5
+					gs 'stat'
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/bigthroat'+rand(1,3)+'.mp4" ></video></center>'
+					'The large dildo slides easily down your throat as you begin to pump it back and forth to entertain the crowd.'
+					'Your clients seem geniunely impressed by the show and promptly begin to donate.'
+				end
+				act'Continue':gt'komp','waitclients'
+			end
+		end
+		if superdildo = 1 or maddildo = 1:
+			act 'Use the biggest dildo you have':
+			cls
+				if pcs_throat < 35:
+					pcs_throat += 1
+					mfcclients = 0
+					webpopular += rand(hotcat/2 -2,hotcat/2)
+					if webpopular < 15:
+						tokens += rand(20,30)
+					elseif webpopular >= 15 and webpopular < 35:
+						tokens += rand(30,50)
+					elseif webpopular >= 35 and webpopular < 75:
+						tokens += rand(30,100)
+					elseif webpopular >= 75:
+						tokens += rand(50,100)
+					end
+					minut += 5
+					gs 'stat'
+						
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/throat'+rand(1,3)+'.mp4" ></video></center>'
+					'You are not necessarily inexperienced at giving blowjobs but taking the huge dildo into your mouth you quickly realize it is well beyond your skill level.'
+					'Nonetheless your clients seem to appreciate the effort and your ambition and you get a few donations.'
+				end
+				if pcs_throat >= 35:
+					pcs_throat += 1
+					mfcclients = 0
+					webpopular += rand(hotcat/2 -2,hotcat/2)
+					if webpopular < 15:
+						tokens += rand(100,150)
+					elseif webpopular >= 15 and webpopular < 35:
+						tokens += rand(100,300)
+					elseif webpopular >= 35 and webpopular < 75:
+						tokens += rand(300,500)
+					elseif webpopular >= 75:
+						tokens += rand(500,750)
+					end
+					minut += 5
+					gs 'stat'
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/extrthroat'+rand(1,2)+'.mp4" ></video></center>'
+					'Wanting to truly showcase your throat skills you take the huge dildo and start to roughly jam it down your throat.'
+					'Your clients seem to be amazed at the demonstration of skill donating generously while praising your unparalleled oral ability at the same time.'
+				end
+				act'Continue':gt'komp','waitclients'
+			end
+		end
+	end
+end
+act 'Refuse':
+	cls
+	webpopular -= 1
+	gt'komp','waitclients'
+end
+
+--- kompMFCoral ---------------------------------
+

+ 111 - 109
locations/kompMFCtwo.qsrc

@@ -1,5 +1,6 @@
 # kompMFCtwo
 
+
 if webpopular >= 15 and pcs_ass >= 15 and clientask = 89:
 	cls
 	gs 'stat'
@@ -7,21 +8,21 @@ if webpopular >= 15 and pcs_ass >= 15 and clientask = 89:
 	act 'Show him your anus':
 		cls
 		mfcclients = 0
-		webpopular += 1
+		webpopular += rand(hotcat/2 -2,hotcat/2)
 		minut += 2
 		if pcs_apprnc > 100:
-			tokens += RAND(5,15)
+			tokens += rand(5,15)
 		else
-			tokens += RAND(5,10)
+			tokens += rand(5,10)
 		end
 		if webpopular < 15:
-			tokens += RAND(5,10)
+			tokens += rand(5,10)
 		elseif webpopular >= 15 and webpopular < 35:
-			tokens += RAND(10,15)
+			tokens += rand(10,15)
 		elseif webpopular >= 35 and webpopular < 75:
-			tokens += RAND(15,20)
+			tokens += rand(15,20)
 		elseif webpopular >= 75:
-			tokens += RAND(20,30)
+			tokens += rand(20,30)
 		end
 		gs 'stat'
 		if pcs_ass < 25 and backmfc = 0:
@@ -41,7 +42,7 @@ if webpopular >= 15 and pcs_ass >= 15 and clientask = 89:
 			'"I don''t know if it could handle your cock just yet", you tell the viewer. "What do you think?"'
 			'You turn your back to the camera and pull your butt cheeks aside, giving him (and everyone else in the channel) a good look at your sphincter. Unsurprisingly he''s very confident that he could make you feel good, but he donates some tokens as promised.'
 		end
-		act'Continue':gt'Komp','waitclients'
+		act'Continue':gt'komp','waitclients'
 	end
 	gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -50,7 +51,7 @@ if webpopular >= 15 and pcs_ass >= 15 and clientask = 89:
 				webpopular -= 1
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'Komp','waitclients'
+				gt 'komp','waitclients'
 			end
 		else
 			act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -64,18 +65,18 @@ if webpopular < 50 and clientask = 88:
 	act 'Do as he asks':
 		cls
 		mfcclients = 0
-		webpopular += 1
+		webpopular += rand(hotcat/2 -2,hotcat/2)
 		minut += 2
-		pcs_horny -= RAND(5,10)
+		pcs_horny -= rand(5,10)
 		if pcs_apprnc > 100:
-			tokens += RAND(5,10)
+			tokens += rand(5,10)
 		else
-			tokens += RAND(0,5)
+			tokens += rand(0,5)
 		end
 		if webpopular < 25:
-			tokens += RAND(5,10)
+			tokens += rand(5,10)
 		else
-			tokens += RAND(10,15)
+			tokens += rand(10,15)
 		end
 		gs 'stat'
 		if backmfc = 1:
@@ -86,7 +87,7 @@ if webpopular < 50 and clientask = 88:
 			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore58.jpg"></center>'
 			'You smile at the camera and find the panties that you had already taken off somewhere nearby, stuffing them in your mouth dutifully. You try to say something to the chat but only manage to produce some muffled sounds, much to the enjoyment of your viewers. "Haha, what a slut! That''s the way she should be!" everyone laughs, belittling you with their degrading comments.'
 		end
-		act'Continue':gt'Komp','waitclients'
+		act'Continue':gt'komp','waitclients'
 	end
 	gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -95,7 +96,7 @@ if webpopular < 50 and clientask = 88:
 				webpopular -= 1
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'Komp','waitclients'
+				gt 'komp','waitclients'
 			end
 		else
 			act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -109,25 +110,25 @@ if webpopular >= 50 and pcs_vag >= 35 and clientask = 87:
 	act 'Find something to put inside you':
 		cls
 		mfcclients = 0
-		webpopular += 1
+		webpopular += rand(hotcat/2 -2,hotcat/2)
 		minut += 2
-		pcs_horny += RAND(5,10)
+		pcs_horny += rand(5,10)
 		if pcs_apprnc > 100:
-			tokens += RAND(50,100)
+			tokens += rand(50,100)
 		else
-			tokens += RAND(0,50)
+			tokens += rand(0,50)
 		end
 		if webpopular < 75:
-			tokens += RAND(50,100)
+			tokens += rand(50,100)
 		else
-			tokens += RAND(100,200)
+			tokens += rand(100,200)
 		end
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore59.jpg"></center>'
 		'"Erm... okay, hold on just one moment!" you smile at the camera and quickly go through your house, trying to find something that would impress him.'
 		'You return to your computer holding two objects: a remote control and a small bottle. Just when the people in the chat were about to suggest their preference, you silence them by sticking the bottle inside you first and then adding the remote too. That''s right, you do both!'
 		'The chat is very impressed with your eagerness to please, and makes several lewd comments on what a good slut you are. You wiggle your hips at them for a moment before retrieving the objects and setting them aside.'
-		act'Continue':gt'Komp','waitclients'
+		act'Continue':gt'komp','waitclients'
 	end
 	gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -136,7 +137,7 @@ if webpopular >= 50 and pcs_vag >= 35 and clientask = 87:
 				webpopular -= 1
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'Komp','waitclients'
+				gt 'komp','waitclients'
 			end
 		else
 			act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -152,15 +153,15 @@ if webpopular >= 35 and pcs_vag >= 25 and alko >= 8 and clientask = 86:
 		cls
 		mfcclients = 0
 		pcs_vag += 1
-		webpopular += 2
+		webpopular += rand(hotcat/2,hotcat/2+2)
 		minut += 2
-		pcs_horny -= RAND(10,20)
+		pcs_horny -= rand(10,20)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore60.jpg"></center>'
 		'You rummage around in the kitchen for a moment, but don''t find any bottles other than the one still in your fridge. You settle on a cold bottle of beer, and return to the living room where you proudly put it on your desk.'
 		'You get comfortable in front of the camera and begin to shove the bottle inside you. The glass is cold and unyielding, but you''re too drunk to care and keep trying out different angles until you finally manage to penetrate yourself with the bottom. Letting out a triumphant squeal, you push the bottle inside you as far as it will go and adjust your position a bit so everyone watching has a great view of your cunt being stretched out.'
 		'After a while reality kicks in, and that reality is that the cold bottle really doesn''t feel comfortable inside your snatch! Nevertheless, your viewers loved it and sing your praises when you slowly let the bottle slide out of your stretched pussy and crack the bottle open.'
-		act'Further':gt'Komp','waitclients'
+		act'Further':gt'komp','waitclients'
 	end
 end
 
@@ -179,14 +180,14 @@ if webpopular >= 50 and pcs_vag > 0 and pcs_ass > 0 and alko >= 8 and sub > 50 a
 			mfcclients = 0
 			minut += 2
 			if pcs_apprnc > 100:
-				tokens += RAND(75,150)
+				tokens += rand(75,150)
 			else
-				tokens += RAND(50,100)
+				tokens += rand(50,100)
 			end
 			if webpopular < 75:
-				tokens += RAND(75,150)
+				tokens += rand(75,150)
 			else
-				tokens += RAND(50,100)
+				tokens += rand(50,100)
 			end
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore73.jpg"></center>'
@@ -194,25 +195,25 @@ if webpopular >= 50 and pcs_vag > 0 and pcs_ass > 0 and alko >= 8 and sub > 50 a
 			'Grabbing the camera, you guide it to your crotch and pull your pussy lips aside with your fingers.'
 			'"I erm... I have a little secret, guys", you whisper, and slowly let some sperm trickle out of your pussy.'
 			'The chat goes wild, awarding you with numerous comments on how they wish that was their load, and are a tad surprised when you even receive a few donations.'
-			act'Continue':gt'Komp','waitclients'
+			act'Continue':gt'komp','waitclients'
 		end
 	else
 		killvar 'temp'
 		act 'Play hide-the-panties':
 			cls
 			mfcclients = 0
-			webpopular += 2
+			webpopular += rand(hotcat/2 -1,hotcat/2+1)
 			minut += 5
-			pcs_horny -= RAND(10,20)
+			pcs_horny -= rand(10,20)
 			if pcs_apprnc > 100:
-				tokens += RAND(75,150)
+				tokens += rand(75,150)
 			else
-				tokens += RAND(50,100)
+				tokens += rand(50,100)
 			end
 			if webpopular < 75:
-				tokens += RAND(75,150)
+				tokens += rand(75,150)
 			else
-				tokens += RAND(50,100)
+				tokens += rand(50,100)
 			end
 			gs'stat'
 			if pcs_ass > pcs_vag:
@@ -238,29 +239,29 @@ if webpopular >= 50 and pcs_vag > 0 and pcs_ass > 0 and alko >= 8 and sub > 50 a
 				'With your back turned to the camera, you slowly begin to stuff them into your pussy. Your drunken hand-eye coordination leaves a lot to be desired, and you''re quite rough with yourself when you shove your panties inside your vagina.'
 				'"Ta-dah! All gone!" you laugh proudly, when they''re inside you completely. The chat laughs with you, and you receive a few donations while you slowly pull the panties out again.'
 			end
-			act'Continue':gt'Komp','waitclients'
+			act'Continue':gt'komp','waitclients'
 		end
 		if tits >= 1:
 			act 'Bind your breasts with whatever you can find':
 				cls
 				mfcclients = 0
-				webpopular += 2
+				webpopular += rand(hotcat/2 -2,hotcat/2)
 				if alko >= 10:
 					gs 'pain', 4, 'pinch', 'nipples'
 				else
 					gs 'pain', 2, 'pinch', 'nipples'
 				end
 				minut += 10
-				pcs_horny -= RAND(10,20)
+				pcs_horny -= rand(10,20)
 				if pcs_apprnc > 100:
-					tokens += RAND(75,150)
+					tokens += rand(75,150)
 				else
-					tokens += RAND(50,100)
+					tokens += rand(50,100)
 				end
 				if webpopular < 75:
-					tokens += RAND(75,150)
+					tokens += rand(75,150)
 				else
-					tokens += RAND(50,100)
+					tokens += rand(50,100)
 				end
 				gs'stat'
 				if topmfc = 1:
@@ -295,24 +296,24 @@ if webpopular >= 50 and pcs_vag > 0 and pcs_ass > 0 and alko >= 8 and sub > 50 a
 					'Your senses have been dulled by the excessive amount of alcohol you drank, but you''re still conscious enough to make sure you don''t bind your breasts too tightly.'
 					'A few minutes later you decide your poor boobs have had enough, and untie them again. Your chat enjoyed seeing you like that, and you receive a few donations while you carefully rub some feeling back into your tingling breasts.'
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt'komp','waitclients'
 			end
 		else
 			act 'Play with your pussy':
 				cls
 				mfcclients = 0
-				webpopular += 2
+				webpopular += rand(hotcat/2,hotcat/2+2)
 				minut += 10
-				pcs_horny -= RAND(10,20)
+				pcs_horny -= rand(10,20)
 				if pcs_apprnc > 100:
-					tokens += RAND(75,150)
+					tokens += rand(75,150)
 				else
-					tokens += RAND(50,100)
+					tokens += rand(50,100)
 				end
 				if webpopular < 75:
-					tokens += RAND(75,150)
+					tokens += rand(75,150)
 				else
-					tokens += RAND(50,100)
+					tokens += rand(50,100)
 				end
 				gs'stat'
 				if backmfc = 1:
@@ -339,13 +340,13 @@ if webpopular >= 50 and pcs_vag > 0 and pcs_ass > 0 and alko >= 8 and sub > 50 a
 					'You drunkenly mutter something into the camera and turn your back to it, as you guide the two cucumbers to your holes and shove them in unceremoniously.'
 					'You didn''t even wash them first! Their uneven surface and the lack of lubrication makes fucking yourself with them very painful, and it''s not long before you force yourself to stop. The viewers enjoyed it though, giving you a few tokens while you sit down on your chair again with a painful grimace on your face.'
 				end
-				act'Continue':gt'Komp','waitclients'
+				act'Continue':gt'komp','waitclients'
 			end
 		end
 	end
 end
 
-if backmfc = 0 and webpopular >= 25 and pcs_vag >= 30 and pcs_ass >= 30 and alko >= 8 and clientask = 84:
+if backmfc = 0 and webpopular >= 25 and (pcs_vag + pcs_ass >= 30) and alko >= 8 and clientask = 84:
 	cls
 	gs 'stat'
 	if pcs_vag >= pcs_ass:
@@ -356,9 +357,9 @@ if backmfc = 0 and webpopular >= 25 and pcs_vag >= 30 and pcs_ass >= 30 and alko
 	act 'Go find a bottle':
 		cls
 		mfcclients = 0
-		webpopular += 2
+		webpopular += rand(hotcat/2,hotcat/2+2)
 		minut += 10
-		pcs_horny -= RAND(10,20)
+		pcs_horny -= rand(10,20)
 		if pcs_vag >= pcs_ass:
 			pcs_vag += 1
 			vgape = 2
@@ -367,36 +368,38 @@ if backmfc = 0 and webpopular >= 25 and pcs_vag >= 30 and pcs_ass >= 30 and alko
 			agape = 2
 		end
 		if pcs_apprnc > 100:
-			tokens += RAND(100,150)
+			tokens += rand(100,150)
 		else
-			tokens += RAND(50,75)
+			tokens += rand(50,75)
 		end
 		if webpopular < 15:
-			tokens += RAND(25,50)
+			tokens += rand(25,50)
 		elseif webpopular >= 15 and webpopular < 35:
-			tokens += RAND(50,75)
+			tokens += rand(50,75)
 		elseif webpopular >= 35 and webpopular < 75:
-			tokens += RAND(75,150)
+			tokens += rand(75,150)
 		elseif webpopular >= 75:
-			tokens += RAND(100,300)
+			tokens += rand(100,300)
 		end
 		gs 'stat'
 		if pcs_vag >= pcs_ass:
 			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore75.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore76.jpg"></center>'
-		end
 			'"The customer is king, right?" you smile sweetly at him, and apologize for a second while you quickly go look for a bottle.'
 			'You find one in the kitchen, it''s a two liter bottle of mineral water. When you return to your computer you hesitate for a second... isn''t this too big?'
 			'The alcohol and the chat convince you otherwise, and you try to squirm yourself around the bottle, forcing it inside you. You get it in!'
 			'You push the bottle inside a bit further but have to rest your hand against the wall to support yourself, the bottle inside you is huge and it feels very uncomfortable to stand normally.'
-		if pcs_vag >= pcs_ass:
 			'You leave the bottle in for a little while and slowly bob your hips up and down until it falls out from its own weight, leaving your vagina a huge gaping hole for your viewers to enjoy.'
+			'The chat is one huge stream of comments and emoticons now, and you receive several donations in quick succession. Too bad they won''t help you sit, because that''s going to be painful for a while!'
 		else
-			'You leave the bottle in for a little while and slowly bob your hips up and down. The bottle is lodged quite firmly inside you and doesn''t weigh much, so it doesn''t come out until you pull it out very slowly, leaving your ass a huge gaping hole for your viewers to enjoy.'			
+			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore76.jpg"></center>'
+			'"The customer is king, right?" you smile sweetly at him, and apologize for a second while you quickly go look for a bottle.'
+			'You find one in the kitchen, it''s a two liter bottle of mineral water. When you return to your computer you hesitate for a second... isn''t this too big?'
+			'The alcohol and the chat convince you otherwise, and you try to squirm yourself around the bottle, forcing it inside you. You get it in!'
+			'You push the bottle inside a bit further but have to rest your hand on the couch to support yourself, the bottle inside you is huge and it feels very uncomfortable to stand normally.'
+			'You leave the bottle in for a little while and slowly bob your hips up and down. The bottle is lodged quite firmly inside you and doesn''t weigh much, so it doesn''t come out until you pull it out very slowly, leaving your ass a huge gaping hole for your viewers to enjoy.'
+			'The chat is one huge stream of comments and emoticons now, and you receive several donations in quick succession. Too bad they won''t help you sit, because that''s going to be painful for a while!'
 		end
-		'The chat is one huge stream of comments and emoticons now, and you receive several donations in quick succession. Too bad they won''t help you sit, because that''s going to be painful for a while!'
-		act'Continue':gt'Komp','waitclients'
+		act'Continue':gt'komp','waitclients'
 	end
 end
 
@@ -406,23 +409,23 @@ if backmfc = 0 and pcs_vag > 20 and clientask = 83:
 		cls
 		mfcclients = 0
 		pcs_vag += 1
-		webpopular += 1
+		webpopular += rand(hotcat/2 -2,hotcat/2)
 		minut += 5
 		vgape += 2
-		pcs_horny += RAND(10,20)
+		pcs_horny += rand(10,20)
 		if pcs_apprnc > 100:
-			tokens += RAND(50,150)
+			tokens += rand(50,150)
 		else
-			tokens += RAND(25,75)
+			tokens += rand(25,75)
 		end
 		if webpopular < 15:
-			tokens += RAND(25,50)
+			tokens += rand(25,50)
 		elseif webpopular >= 15 and webpopular < 35:
-			tokens += RAND(50,75)
+			tokens += rand(50,75)
 		elseif webpopular >= 35 and webpopular < 75:
-			tokens += RAND(75,150)
+			tokens += rand(75,150)
 		elseif webpopular >= 75:
-			tokens += RAND(150,250)
+			tokens += rand(150,250)
 		end
 		gs 'stat'
 		'You look around quickly and see the wooden knobs on your bed. Those look kinda phallic... should work!'
@@ -438,7 +441,7 @@ if backmfc = 0 and pcs_vag > 20 and clientask = 83:
 			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore77.jpg"></center>'
 			'Despite the nice feeling of fullness it provides, it''s not enough to reach an orgasm right now. You make an effort of riding the wooden knob for a little while, but have to stop when your vagina hurts too much to continue.'
 		end
-		act'Continue':gt'Komp','waitclients'
+		act'Continue':gt'komp','waitclients'
 	end
 	gs 'willpower', 'exhib', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -447,7 +450,7 @@ if backmfc = 0 and pcs_vag > 20 and clientask = 83:
 			webpopular -= 1
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'Komp','waitclients'
+			gt 'komp','waitclients'
 		end
 	else
 		act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -461,29 +464,29 @@ if webpopular > 25 and backmfc = 0 and sub > 25 and pcs_vag > 10 and prezik > 0
 	act 'Do as he asks':
 		cls
 		mfcclients = 0
-		webpopular += 2
+		webpopular += rand(hotcat/2 -2,hotcat/2)
 		minut += 10
 		vgape = 3
 		if pcs_apprnc > 100:
-			tokens += RAND(100,150)
+			tokens += rand(100,150)
 		else
-			tokens += RAND(50,100)
+			tokens += rand(50,100)
 		end
 		if webpopular < 15:
-			tokens += RAND(50,100)
+			tokens += rand(50,100)
 		elseif webpopular >= 15 and webpopular < 35:
-			tokens += RAND(100,150)
+			tokens += rand(100,150)
 		elseif webpopular >= 35 and webpopular < 75:
-			tokens += RAND(150,200)
+			tokens += rand(150,200)
 		elseif webpopular >= 75:
-			tokens += RAND(200,300)
+			tokens += rand(200,300)
 		end
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore81.jpg"></center>'
 		'Kind of a strange request, but... okay. You won''t get a following if you refuse to do what your viewers want to see. "One moment, I''ll go find something!" you let him know, and quickly run to the bathroom. You look around and see your toothbrush. The handle is not particularly thick, that should work! You''re definitely wrapping a condom around it first though... you''re brushing your teeth with that later, ew!'
 		'You return to your chair with the condom-clad toothbrush, and slowly begin to push it inside your urethra. It hurts a lot more than you thought it would, but to the delight of your audience you don''t back out and slowly carry on.'
 		'When it''s in, you slowly pretend that you''re fucking yourself with it, even though it''s more your hips and hands moving than you actually moving the toothbrush. That would hurt like hell! You carefully pull the toothbrush out again, wincing with pain the whole time. Next time someone asks you to do that, you might not be so eager to do it any more... no matter how many tokens they offer.'
-		act'Further':gt'Komp','waitclients'
+		act'Further':gt'komp','waitclients'
 	end
 	gs 'willpower', 'exhib', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -492,7 +495,7 @@ if webpopular > 25 and backmfc = 0 and sub > 25 and pcs_vag > 10 and prezik > 0
 			webpopular -= 1
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'Komp','waitclients'
+			gt 'komp','waitclients'
 		end
 	else
 		act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -506,30 +509,30 @@ if backmfc = 0 and webpopular >= 50 and pcs_ass > 25 and clientask = 81:
 	act 'Do':
 		cls
 		mfcclients = 0
-		webpopular += 2
+		webpopular += rand(hotcat/2 -2,hotcat/2)
 		minut += 5
 		pcs_ass += 1
 		agape = 2
 		if pcs_apprnc > 100:
-			tokens += RAND(100,150)
+			tokens += rand(100,150)
 		else
-			tokens += RAND(50,100)
+			tokens += rand(50,100)
 		end
 		if webpopular < 15:
-			tokens += RAND(50,100)
+			tokens += rand(50,100)
 		elseif webpopular >= 15 and webpopular < 35:
-			tokens += RAND(100,150)
+			tokens += rand(100,150)
 		elseif webpopular >= 35 and webpopular < 75:
-			tokens += RAND(150,200)
+			tokens += rand(150,200)
 		elseif webpopular >= 75:
-			tokens += RAND(200,300)
+			tokens += rand(200,300)
 		end
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore82,'+rand(0,9)+'.jpg"></center>'
 		'That request sounds simple enough! You dutifully turn your back to the computer and slip two fingers inside your well-used ass, carefully pulling your asshole open.'
 		'"More! We want to see more!" the chat encourages you, and you smile obediently while you do as they ask, pulling your sphincter wide open. The promises of donations make you go through with it, even when you feel a cool breeze in your rectum.'
 		'The pain in your ass is unbearable for a while, but the client is true to his word. He donates a decent amount of tokens and lets you know that he hopes to meet an anal queen like you one day. You''re not sure if you can carry on with your show, though... that hurt a lot more than you thought it would.'
-		act'Continue':gt'Komp','waitclients'
+		act'Continue':gt'komp','waitclients'
 	end
 	gs 'willpower', 'exhib', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -538,14 +541,14 @@ if backmfc = 0 and webpopular >= 50 and pcs_ass > 25 and clientask = 81:
 			webpopular -= 1
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'Komp','waitclients'
+			gt 'komp','waitclients'
 		end
 	else
 		act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end	
 end
 
-if backmfc = 0 and webpopular >= 50 and pcs_ass > 10 and pcs_vag > 10 and sub > 50 and alko >= 6 and clientask = 80:
+if backmfc = 0 and webpopular >= 50 and pcs_ass > 10 and pcs_vag > 10 and sub > 50 and alko >= 8 and clientask = 80:
 	cls
 	gs 'stat'
 	'When one of your loyal visitors speaks up, you feel a weird knot in your throat. He''s usually making rather insensitive comments and seems to enjoy watching you squirm, but he pays well.'
@@ -558,18 +561,18 @@ if backmfc = 0 and webpopular >= 50 and pcs_ass > 10 and pcs_vag > 10 and sub >
 		agape = 3
 		vgape = 3
 		if pcs_apprnc > 100:
-			tokens += RAND(500,1000)
+			tokens += rand(500,1000)
 		else
-			tokens += RAND(250,500)
+			tokens += rand(250,500)
 		end
 		if webpopular < 15:
-			tokens += RAND(250,500)
+			tokens += rand(250,500)
 		elseif webpopular >= 15 and webpopular < 35:
-			tokens += RAND(250,750)
+			tokens += rand(250,750)
 		elseif webpopular >= 35 and webpopular < 75:
-			tokens += RAND(500,750)
+			tokens += rand(500,750)
 		elseif webpopular >= 75:
-			tokens += RAND(500,1000)
+			tokens += rand(500,1000)
 		end
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/Accessories/computer/camwhore83.jpg"></center>'
@@ -581,7 +584,7 @@ if backmfc = 0 and webpopular >= 50 and pcs_ass > 10 and pcs_vag > 10 and sub >
 		'You push hard and in a minute you all-did manage to do it	- a bloody piece of metal comes out of your ass.'
 		'A sharp pain was replaced by a dull and aching, but when you started to get this thing back, everything has changed  - it was painful as well, as then, when you have it stuffed in.'
 		'A couple of minutes you finally pulled out of his embattled hell holes hook and crying, completely forgetting about the crowd of screaming spectators, promised myself never to repeat such...'
-		act'Further':gt'Komp','waitclients'
+		act'Further':gt'komp','waitclients'
 	end
 	gs 'willpower', 'exhib', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -590,12 +593,11 @@ if backmfc = 0 and webpopular >= 50 and pcs_ass > 10 and pcs_vag > 10 and sub >
 			webpopular -= 1
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'Komp','waitclients'
+			gt 'komp','waitclients'
 		end
 	else
 		act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end	
 end
 
---- kompMFCtwo ---------------------------------
-
+--- kompMFCtwo ---------------------------------

+ 2 - 0
locations/leonid.qsrc

@@ -844,6 +844,8 @@ if $ARGS[0] = 'toilet':
 	'<center><h4>Office toilet</h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/toilet.jpg"></center>'
 	'You are in an office toilet.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	if $clothingworntype ! 'office':
 		'<b style="color: #FF00000">You are at work, so you need to be dressed as a secretary!</b>'

+ 128 - 89
locations/ludahome.qsrc

@@ -58,7 +58,7 @@ if $ARGS[0] = 'home':
 		'You go to Aunt Luda''s apartment and ring the door bell.'
 		!! Luda is home and answers the door Monday-Thursday from 18:00 to 23:00 or 08:00 to 23:00 on the weekends 50% of the time
 		!! Olu is home and answers the door at the same times but only 33% of the time. Otherwise no one is home
-		if rand(0,1) = 1:
+		if rand(0,1) = 1 and (week < 5 and hour >= 18 and hour <= 22) or (week > 5 and hour >= 8 and hour <= 22):
 			*clr & cla
 			'<center><img src="images/pc/npc_headshots/big30.jpg"></center>'
 			'You stand outside your aunts apartment, knocking on the door. The door is answered by Luda, as soon as she sees you she smiles "<<$pcs_nickname>> come in, come in." With that she invites you in and closes the door behind you.'
@@ -68,7 +68,7 @@ if $ARGS[0] = 'home':
 				'She leads you to her living room and then sits down on the couch and pats the seat next to her. Once you sit down she says "What have you been up to?"'
 				act 'Sit down and chat': LudaLoc = 5 & gt 'ludahome', 'chat_luda'
 			end
-		elseif rand(0,2) <= 1:
+		elseif rand(0,2) <= 1 and (week < 5 and hour >= 18 and hour <= 22) or (week > 5 and hour >= 8 and hour <= 22):
 			*clr & cla
 			'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
 			if OluQW['met'] = 0:
@@ -110,7 +110,7 @@ if $ARGS[0] = 'home':
 					'He looks a little surprised and maybe a bit disappointed but then he nods and opens the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What shall we talk about?"'
 					act 'Sit down and chat':
 						*clr & cla
-						'<center><img src="images/characters/pavlovsk/resident/olu/talk.jpg"></center>'
+						'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
 						'You make a bit of small talk, asking him about his recent work and telling him about some of the stuff that happened in school recently and everything seems to be going well. Then he suddenly stands up "Can you excuse me a moment, I was just about to take a shower before you arrived. I will be right back." With that he suddenly walks out of the room and you can hear the bathroom door close. You find it rather odd but you could sit and wait for him to finish his shower or you could just leave and come back some other time.'
 						act 'Leave': gt 'pod_ezd', 'etaj_4'
 						act 'Wait for him to return': gt 'olu', 'seduction'
@@ -160,7 +160,7 @@ if $ARGS[0] = 'textanya':
 			'He looks a bit disappointed but then smiles "It''s ok, maybe some other time."'
 			act 'Sit down and chat':
 				*clr & cla
-				'<center><img src="images/characters/pavlovsk/resident/olu/talk.jpg"></center>'
+				'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
 				'You make a bit of small talk, asking him about his recent work and telling him about some of the stuff that happened in school recently and everything seems to be going well. Then he suddenly stands up "Can you excuse me a moment, I was just about to take a shower before you arrived. I will be right back." With that he suddenly walks out of the room and you can hear the bathroom door close. You find it rather odd but you could sit and wait for him to finish his shower or you could just leave and come back some other time.'
 				act 'Leave': gt 'pod_ezd', 'etaj_4'
 				act 'Wait for him to return': gt 'olu', 'seduction'
@@ -197,7 +197,7 @@ if $ARGS[0] = 'textnush':
 			'He looks a bit disappointed but then smiles "It''s ok maybe some other time."'
 			act 'Sit down and chat':
 				*clr & cla
-				'<center><img src="images/characters/pavlovsk/resident/olu/talk.jpg"></center>'
+				'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
 				'You make a bit of small talk, asking him about his recent work and telling him about some of the stuff that happened in school recently and everything seems to be going well. Then he suddenly stands up "Can you excuse me a moment, I was just about to take a shower before you arrived. I will be right back." With that he suddenly walks out of the room and you can hear the bathroom door close. You find it rather odd but you could sit and wait for him to finish his shower or you could just leave and come back some other time.'
 				act 'Leave': gt 'pod_ezd', 'etaj_4'
 				act 'Wait for him to return': gt 'olu', 'seduction'
@@ -236,7 +236,7 @@ if $ARGS[0] = 'textnatasha':
 			'He looks a bit disappointed but then smiles "It''s ok, maybe some other time."'
 			act 'Sit down and chat':
 				*clr & cla
-				'<center><img src="images/characters/pavlovsk/resident/olu/talk.jpg"></center>'
+				'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
 				'You make a bit of small talk, asking him about his recent work and telling him about some of the stuff that happened in school recently and everything seems to be going well. Then he suddenly stands up "Can you excuse me a moment, I was just about to take a shower before you arrived. I will be right back." With that he suddenly walks out of the room and you can hear the bathroom door close. You find it rather odd but you could sit and wait for him to finish his shower or you could just leave and come back some other time.'
 				act 'Leave': gt 'pod_ezd', 'etaj_4'
 				act 'Wait for him to return': gt 'olu', 'seduction'
@@ -343,6 +343,7 @@ if $ARGS[0] = 'ludaroom':
 	'<center><h4><font color="maroon">Luda''s Room</font></h4></center>'
 	'<center><img src="images/locations/pavlovsk/resident/apartment/ludahome/bedroom.jpg"></center>'
 	'The room is very clean and neat. Right next to the window is a bed, next to the door is the closet, dresser and a wardrobe, other than that the room is very empty.'
+	act 'Go back to the hallway': gt 'ludahome','hallway'
 end
 	
 if $ARGS[0] = 'livingroom':
@@ -548,6 +549,7 @@ if $ARGS[0] = 'chat_luda':
 	if LudaQW['olu_offer'] = 1 and LudaQW['olu_offer_day'] ! daystart:
 		LudaQW['olu_offer_day'] = daystart
 		minut += 10
+		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 		'"<<$pcs_nickname>>, do you remember our conversation? You know... about Olu?"'
 		'You nod your head: "Yes aunt, I do... what about it?"'
@@ -559,7 +561,7 @@ if $ARGS[0] = 'chat_luda':
 			'You nod, it sounds like it can be fun. Having a man just in your same building you can visit anytime you are feeling horning and no one else will know about it? Sounds perfect actually "Ok sure Auntie as long as you are ok with it, yeah I wouldn''t mind helping out with his sexual energy." You say with a wink.'
 			'She laughs at that "Well I will let him know, also I should warn you. He likes butts, but don''t worry I keep a large supply of lube in the apartment." Seeing your face at the thought of a man described as hung like a horse fucking your ass she quickly adds "Don''t worry, it might hurt the first time but you quickly get use to it and it even starts feeling good after awhile."'
 			'You nod to that "Ok well hopefully it doesn''t take me long to get use to it then." Then the two of you start talking about anal sex and she shares a few tips with you on how to relax and making it feel better.'
-			act 'Keep talking': gt 'ludahome', 'chat'
+			act 'Keep talking': gt 'ludahome', 'chat_luda'
 			act 'Stop talking': gt 'ludahome', 'livingroom'
 		end
 		act 'Still thinking about it':
@@ -567,7 +569,7 @@ if $ARGS[0] = 'chat_luda':
 			'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 			'"I''m sorry aunt Luda, I haven''t decided yet. I need some more time."'
 			'"Oh, okay then... take your time dear." she says and then changes the subject.'
-			act 'Keep talking': gt 'ludahome', 'chat'
+			act 'Keep talking': gt 'ludahome', 'chat_luda'
 			act 'Stop talking': gt 'ludahome', 'livingroom'
 		end
 		act 'Tell her no':
@@ -576,13 +578,14 @@ if $ARGS[0] = 'chat_luda':
 			'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 			'"I''m sorry aunt Luda, I thought about it but I can''t it is just to weird." You tell her.'
 			'"Oh, okay then... i understand and don''t give it another thought." she says and then changes the subject.'
-			act 'Keep talking': gt 'ludahome', 'chat'
+			act 'Keep talking': gt 'ludahome', 'chat_luda'
 			act 'Stop talking': gt 'ludahome', 'livingroom'
 		end
 	!!this one triggers the first time after Sveta has agreed to have sex with Olu and has done so. Only triggers once, it should trigger as soon as Sveta sits down to chat with Luda
 	elseif LudaQW['olu_offer'] = 2 and OluQW['sex'] = 1:
 		minut += 10
 		LudaQW['olu_offer'] = 3
+		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 		'Luda pats the seat and sits close to you "<<$pcs_nickname>>, So tell me all about it, Olu told me the two of you had sex, I want to know all about it."'
 		'You tell her about it, the good and the bad "I am not sure how often I can do that though, he is so big and has so much stamina, it wears me out." You tell her.'
@@ -592,54 +595,59 @@ if $ARGS[0] = 'chat_luda':
 		'You smile to her "I have a couple of friends that I think would be interested and maybe Anya. I wanted to make sure you didn''t mind first before asking them to join me."'
 		'She nods "Of course dear, of course. If they are interested bring them along, but it is up to Olu if he wants to sleep with them of course."'
 		'You nod in agreement about that and then the two of you talk about sex for awhile.'
-		act 'Keep talking': gt 'ludahome', 'chat'
+		act 'Keep talking': gt 'ludahome', 'chat_luda'
 		act 'Stop talking': gt 'ludahome', 'livingroom'
 	else
 		act 'Make small talk':
 			*clr & cla
 			minut += 10
-			npc_rel['A30'] += 1
+			gs 'npc_relationship', 'modify', 'A30', 'like'
+			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 			'You sit and talk with Luda, about various topics. You tell her about what has been going on around home and at school, she tells you about funny things that happened at work or when her and Olu went out.'
-			act 'Keep talking': gt 'ludahome', 'chat'
+			act 'Keep talking': gt 'ludahome', 'chat_luda'
 			act 'Stop talking': gt 'ludahome', 'livingroom'
 		end
 		act 'Talk about your <<$npc_nickname[''A29'']>>':
 			*clr & cla
 			minut += 2
-			npc_rel['A30'] += 1
+			gs 'npc_relationship', 'modify', 'A30', 'like'
+			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 			'You ask Luda about your <<$npc_nickname[''A29'']>> and what she was like growing up. Luda shares a few stories about their childhood and some of the stuff your mom got up to. It sounds like your mom started to get a boy crazy and while in her late teens from your Aunts stories.'
 			act 'What do you think of Vladimir':
 				*clr & cla
 				minut += 3
-				npc_rel['A30'] += 1
+				gs 'npc_relationship', 'modify', 'A30', 'like'
+				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				'"What do you think of Vlad?" You ask her.'
 				'She considers a moment "He is a good man, he works hard, he provides for you and your mother. He has always treated you and your sister like you was his own daughters."'
 				'Then she goes on to talk about a few stories about him when you was to young to really remember or was not around, but the stories it sounds like he really loves your mother and you kids.'
-				act 'Keep talking': gt 'ludahome', 'chat'
+				act 'Keep talking': gt 'ludahome', 'chat_luda'
 				act 'Stop talking': gt 'ludahome', 'livingroom'
 			end
 			if momslut >= 1:
 				act '<<$npc_nickname[''A29'']>> is a slut':
 					*clr & cla
 					minut += 3
-					npc_rel['A30'] += 1
+					gs 'npc_relationship', 'modify', 'A30', 'like'
+					gs 'stat'
 					'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 					'You look at your Aunt and then tell her "I know my <<$npc_nickname[''A29'']>> is a slut, I can''t believe she is such a hypocrite."'
 					'Luda looks a little surprised by your words "<<$pcs_nickname>> you should say that about your mother."'
 					'You laugh a little "Why? It''s true." You dare her to deny it.'
 					'She sighs a little "Maybe so but it is still not nice to say. While I havn''t always agreed with her choices, she is human and makes mistakes and while she might be hard on you girls. She does it out of love because she wants what is best for you."'
 					'You decided it is best to just change the subject.'
-					act 'Keep talking': gt 'ludahome', 'chat'
+					act 'Keep talking': gt 'ludahome', 'chat_luda'
 					act 'Stop talking': gt 'ludahome', 'livingroom'
 				end
 			elseif motherrumor = 1:
 				act 'Rumors about your <<$npc_nickname[''A29'']>>':
 					*clr & cla
 					minut += 3
-					npc_rel['A30'] += 1
+					gs 'npc_relationship', 'modify', 'A30', 'like'
+					gs 'stat'
 					'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 					'You gather up your courage and decide to ask Luda about the rumors you have heard about your mother if they are true "Aunt Luda, I have heard some rumors about <<$npc_nickname[''A29'']>>, are they true?"'
 					'Luda pauses a moment "What kind of rumors?"'
@@ -650,7 +658,7 @@ if $ARGS[0] = 'chat_luda':
 						'Luda sighs, looks around a moment and then back to you "You should ask your mother about this."'
 					end
 					'You can tell she really doesn''t want to talk about this more and then she changes the subject.'
-					act 'Keep talking': gt 'ludahome', 'chat'
+					act 'Keep talking': gt 'ludahome', 'chat_luda'
 					act 'Stop talking': gt 'ludahome', 'livingroom'
 				end
 			end
@@ -658,72 +666,79 @@ if $ARGS[0] = 'chat_luda':
 		act 'Ask about your biological father':
 			*clr & cla
 			minut += 2
-			npc_rel['A30'] += 1
+			gs 'npc_relationship', 'modify', 'A30', 'like'
+			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 			'"What do you know about my biological father?" You ask her.'
 			'She shakes her head slightly "Not much honestly, I had already left by the time your mother meet him. I came back after they had split up, so what I know is mostly what I heard and what your mother told me."'
 			act 'Where is he?':
 				*clr & cla
 				minut += 3
-				npc_rel['A30'] += 1
+				gs 'npc_relationship', 'modify', 'A30', 'like'
+				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				'You nod to that "Do you know where he is?"'
 				'"I heard he is a truck driver and works out of a depot out on the highway, but I don''t know if he is still there or not."'
-				act 'Keep talking': gt 'ludahome', 'chat'
+				act 'Keep talking': gt 'ludahome', 'chat_luda'
 				act 'Stop talking': gt 'ludahome', 'livingroom'
 			end
 			act 'Why did he leave?':
 				*clr & cla
 				minut += 3
-				npc_rel['A30'] += 1
+				gs 'npc_relationship', 'modify', 'A30', 'like'
+				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				'"Do you know why he left?" You ask her.'
 				'She sighs "Not for sure, but they fought a lot about a variety of things and then he packed up one day and left. Regardless why he left he should have stayed in touch with you kids. I will never forgive him for that, regardless his reasons for leaving your mother." She sounds like she really doesn''t care for him. Not knowing what else to ask and not expecting to get a better answer you change the subject.'
-				act 'Keep talking': gt 'ludahome', 'chat'
+				act 'Keep talking': gt 'ludahome', 'chat_luda'
 				act 'Stop talking': gt 'ludahome', 'livingroom'
 			end
 		end
 		act 'Talk about Olu':
 			*clr & cla
 			minut += 2
-			npc_rel['A30'] += 1
+			gs 'npc_relationship', 'modify', 'A30', 'like'
+			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 			'"So Auntie tell me about your boyfriend, what''s he like?" You ask her curious.'
 			'She lights up at your questions "He is a fairly quiet man but wonderful, so kind and careing. Not to mention so big... and muscular. He really is the perfect man." She goes on to talk about some of the things they have done together and it really sounds like they are very much in love, certainly your Aunt is in love with him anyways. You also notice she never once mentions that he is black.'
 			act 'How do people react?':
 				*clr & cla
 				minut += 3
-				npc_rel['A30'] += 1
+				gs 'npc_relationship', 'modify', 'A30', 'like'
+				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				'"How do people treat you and him, you know with him being black?"'
 				'She frowns "Some people are ok with it, most just make comments behind our back but I know they do. Some say nasty things to our face, but I don''t care, he is a good man and I don''t care what color his skin is."'
 				'"It doesn''t bother you?" You ask'
 				'"Of course it bothers me but not as much as losing him would. If this is the price we have to pay to be together I am willing to pay it. Even if your grand parents disowned me because of it."'
 				'You nod and not sure what more to say you change the subject.'
-				act 'Keep talking': gt 'ludahome', 'chat'
+				act 'Keep talking': gt 'ludahome', 'chat_luda'
 				act 'Stop talking': gt 'ludahome', 'livingroom'
 			end
 			act 'How did you meet?':
 				*clr & cla
 				minut += 3
-				npc_rel['A30'] += 1
+				gs 'npc_relationship', 'modify', 'A30', 'like'
+				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				'"So how did the two of you meet?" You ask her.'
 				'She laughs "Well everyone thinks I meet him in my travels in Africa but that isn''t true. Actually his nephew Djibril goes to the University in Saint Petersburg and he was up visiting him. I was in the city at the time shopping after I had moved back here. We run into each other on the metro and I mean we ran into each other. He is so big he nearly knocked me down, but he caught me in his strong arms and kept me from falling. He apologized for running into him and I apologized for running into him and thanked him for keeping me from falling." Then she stops to sigh happily, this is obviously a happy memory for her.'
 				*nl
 				'Then she continues "So then it was my stop and I got off thinking nothing more of it. A few minutes later he comes strolling up beside me and gives me some flowers he had bought somewhere telling me pretty flowers for pretty lady in his bad accented Russian. I thanked him and I blushed, he was so handsome, then he asked me out to coffee and well we hit it off and started dating and not long after I asked him to move in with me."'
 				'You are glad your Aunt found someone that makes her happy.'
-				act 'Keep talking': gt 'ludahome', 'chat'
+				act 'Keep talking': gt 'ludahome', 'chat_luda'
 				act 'Stop talking': gt 'ludahome', 'livingroom'
 			end
 			act 'What does he do?':
 				*clr & cla
 				minut += 3
-				npc_rel['A30'] += 1
+				gs 'npc_relationship', 'modify', 'A30', 'like'
+				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				'"So what does he do? For a living I mean." You ask her.'
 				'"Well his visa expired so legally he can''t work, but while he could he saved up a little money and bought a van. Then he put some seats into it, cleaned it up real nice and now drives it around offering to give tourist rides to take them to all the different sites around the area. He makes ok money, though mostly he makes his money in the summers of course when there is a lot more tourist but he gets some fares year around. He mostly sits near the train station and tries to offer people rides. But I don''t care, I make enough for both of us, but it makes him feel good to work and it gives us a little extra spending money.'
-				act 'Keep talking': gt 'ludahome', 'chat'
+				act 'Keep talking': gt 'ludahome', 'chat_luda'
 				act 'Stop talking': gt 'ludahome', 'livingroom'
 			end
 		end
@@ -731,7 +746,8 @@ if $ARGS[0] = 'chat_luda':
 			act 'Talk about Olu some more':
 				*clr & cla
 				minut += 5
-				npc_rel['A30'] += 1
+				gs 'npc_relationship', 'modify', 'A30', 'like'
+				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				'"Well I meet Olu earlier, while you wasn''t home he was here and I came in and talked to him for awhile. I didn''t realize just how big he was until I was so close to him."'
 				'She laughs "Oh dear you have no clue how big he is, he is just as big all over." She say with a wink "Yes he told me you stopped by and the two of you talked. He liked you, he asked about you."'
@@ -740,7 +756,8 @@ if $ARGS[0] = 'chat_luda':
 				act 'You don''t mind?':
 					*clr & cla
 					minut += 5
-					npc_rel['A30'] += 1
+					gs 'npc_relationship', 'modify', 'A30', 'like'
+					gs 'stat'
 					'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 					'You expect her to be upset but she doesn''t seem to mind at all her boyfriend finds you cute "That doesn''t bother you?"'
 					'She shakes her head no "Why should it? I don''t mind if he finds other women attractive, Just because we are together doesn''t make us suddenly blind to how attractive others might be, besides we are in a open relationship."'
@@ -748,7 +765,8 @@ if $ARGS[0] = 'chat_luda':
 						*clr & cla
 						minut += 5
 						LudaQW['open_rel'] = 1
-						npc_rel['A30'] += 1
+						gs 'npc_relationship', 'modify', 'A30', 'like'
+						gs 'stat'
 						'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 						'You are a little shocked you didn''t know they had a open relationship "You are in a open relationship? You mean you can sleep with other people?"'
 						'She laughs at your reaction "Yes and no it doesn''t bother me and it doesn''t bother him. We know we love each other and sex is just sex."'
@@ -764,7 +782,7 @@ if $ARGS[0] = 'chat_luda':
 								'You nod, it sounds like it can be fun. Having a man just in your same building you can visit anytime you are feeling horning and no one else will know about it? Sounds perfect actually "Ok sure Auntie as long as you are ok with it, yeah I wouldn''t mind helping out with his sexual energy." You say with a wink.'
 								'She laughs at that "Well I will let him know, also I should warn you. He likes butts, but don''t worry I keep a large supply of lube in the apartment." Seeing your face at the thought of a man described as hung like a horse fucking your ass she quickly adds "Don''t worry, it might hurt the first time but you quickly get use to it and it even starts feeling good after awhile."'
 								'You nod to that "Ok well hopefully it doesn''t take me long to get use to it then." Then the two of you start talking about anal sex and she shares a few tips with you on how to relax and making it feel better.'
-								act 'Keep talking': gt 'ludahome', 'chat'
+								act 'Keep talking': gt 'ludahome', 'chat_luda'
 								act 'Stop talking': gt 'ludahome', 'livingroom'
 							end
 							act 'Decline':
@@ -776,20 +794,20 @@ if $ARGS[0] = 'chat_luda':
 								'Aunt Luda looks a little taken aback by that "I''m sorry <<$pcs_nickname>>, you''re right. I shouldn''t have asked this of you."'
 								'You feel bad for reacting like you did: "I''m not saying yes, but I''m not saying no either. I might help the two of you, I just need a while to think about it."'
 								'She smiles about that "Of course dear, I will let him know you are thinking about it, so if you change your mind when I am not around you can just let him know." You don''t know what more to say about this so you change the subject.'
-								act 'Keep talking': gt 'ludahome', 'chat'
+								act 'Keep talking': gt 'ludahome', 'chat_luda'
 								act 'Stop talking': gt 'ludahome', 'livingroom'
 							end
 						else
 							'You shake your head slightly "I am not sure if I could do that, I mean I can see the appeal but..."'
 							'She pats your leg "It is not for everyone but it works for us and we are happy and love each other." Not sure what more to say about that you left the topic drop. But you get the feeling she almost said something more but didn''t perhaps you should wait and ask her about it again some other day.'
-							act 'Keep talking': gt 'ludahome', 'chat'
+							act 'Keep talking': gt 'ludahome', 'chat_luda'
 							act 'Stop talking': gt 'ludahome', 'livingroom'
 						end
 					end
-					act 'Keep talking': gt 'ludahome', 'chat'
+					act 'Keep talking': gt 'ludahome', 'chat_luda'
 					act 'Stop talking': gt 'ludahome', 'livingroom'
 				end
-				act 'Keep talking': gt 'ludahome', 'chat'
+				act 'Keep talking': gt 'ludahome', 'chat_luda'
 				act 'Stop talking': gt 'ludahome', 'livingroom'
 			end
 		end
@@ -797,42 +815,47 @@ if $ARGS[0] = 'chat_luda':
 			*clr & cla
 			minut += 5
 			LudaQW['boytalk'] = 1
-			npc_rel['A30'] += 1
+			gs 'npc_relationship', 'modify', 'A30', 'like'
+			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 			'You talk to her about boys in general and sex with them somewhat. She gives you a bit of advice on how to deal with guys and what to expect from guys when it comes to sex and that you can always say no. Then she eventually asks you if you have a boyfriend.'
 			act 'No':
 				*clr & cla
 				minut += 2
+				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				'You shake your head "No, I don''t have a boyfriend. Just haven''t found the right guy yet." You tell her.'
 				'She smiles to you "The right guys doesn''t really exist, the right enough guy is what you are looking for. But until you put yourself out there you will never know."'
 				'You can just nod to that not sure what to say about it.'
-				act 'Keep talking': gt 'ludahome', 'chat'
+				act 'Keep talking': gt 'ludahome', 'chat_luda'
 				act 'Stop talking': gt 'ludahome', 'livingroom'
 			end
 			act 'I like girls':
 				*clr & cla
 				minut += 2
+				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				'You shake your head "No, I like girls more." You tell her.'
-				'She seems a bit surprised at first and then smiles "Well if that is what makes you happy then don''t let anyone try and tell you there is anything wrong with it. I personally was never attracted to other women, I like the hard muscles body of men to much." She says with a laugh and then the two of you discuss some of the differences between having sex with a man or another woman.'
+				'She seems a bit surprised at first and then smiles "Well if that is what makes you happy then don''t let anyone try and tell you there is anything wrong with it. I personally was never attracted to other women, I like the hard muscles body of men too much." She says with a laugh and then the two of you discuss some of the differences between having sex with a man or another woman.'
 				'You can just nod to that not sure what to say about it.'
-				act 'Keep talking': gt 'ludahome', 'chat'
+				act 'Keep talking': gt 'ludahome', 'chat_luda'
 				act 'Stop talking': gt 'ludahome', 'livingroom'
 			end
 			act 'No but I am dating':
 				*clr & cla
 				minut += 2
+				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				'You shake your head "No, I don''t have a boyfriend. At least not like that, I am dating though. I want to make sure I find the right guy before I commit." You tell her.'
 				'She nods and smiles to you "That is the best way to do it, you are young no need to rush in into anything, there is a lot of men out there and no reason not to take a few of them for a test drive before deciding on the one you want." She says with a wink and leaves no doubt in your mind by her tone just exactly what she means by test drive.'
 				'You can just nod to that not sure what to say about it.'
-				act 'Keep talking': gt 'ludahome', 'chat'
+				act 'Keep talking': gt 'ludahome', 'chat_luda'
 				act 'Stop talking': gt 'ludahome', 'livingroom'
 			end
 			act 'I have a boyfriend':
 				*clr & cla
 				minut += 2
+				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				if NikoVolkovQW >= 5:
 					'You tell her "I have a boyfriend you know."'
@@ -840,7 +863,7 @@ if $ARGS[0] = 'chat_luda':
 					'"Niko" You tell her.'
 					'She shakes her head "I don''t think I know him." With that you tell her about Niko and as you do she starts nodding and has a knowing smile on her face'
 					'"Ah yes a bad boy, I know the pull that all girls feel for bad boys, they are fun but rarely make good long term choices, but you are young and have lots of time, so enjoy your bad boy." She says with a wink.'
-					act 'Keep talking': gt 'ludahome', 'chat'
+					act 'Keep talking': gt 'ludahome', 'chat_luda'
 					act 'Stop talking': gt 'ludahome', 'livingroom'
 				elseif fedorKozlovQW >= 5:
 					'You tell her "I have a boyfriend you know."'
@@ -848,7 +871,7 @@ if $ARGS[0] = 'chat_luda':
 					'"Fedor" You tell her.'
 					'She shakes her head "I don''t think I know him." With that you tell her about Fedor and as you do she starts nodding and has a knowing smile on her face'
 					'"A jock, bet he has a really nice body and amazing stamina." She says with a wink.'
-					act 'Keep talking': gt 'ludahome', 'chat'
+					act 'Keep talking': gt 'ludahome', 'chat_luda'
 					act 'Stop talking': gt 'ludahome', 'livingroom'
 				elseif kotovLoveQW = 1:
 					'You tell her "I have a boyfriend you know."'
@@ -858,7 +881,7 @@ if $ARGS[0] = 'chat_luda':
 					'"Isn''t he one of the gopniks that hang out in the stairs sometimes?" She asks.'
 					'You nod to her "Yes sometimes he is good friends with Vasily."'
 					'She shakes her head a little "I don''t like those boys, I get the appeal trust me I ran around with my share of bad boys, but they are trouble. You be careful around them you hear?" You nod just to make her happy, but she doesn''t understand, at least she is not as bad as your <<$npc_nickname[''A29'']>>.'
-					act 'Keep talking': gt 'ludahome', 'chat'
+					act 'Keep talking': gt 'ludahome', 'chat_luda'
 					act 'Stop talking': gt 'ludahome', 'livingroom'
 				elseif artQW = 3 or artQW = 10 or artQW = 20:
 					'You tell her "I have a boyfriend you know."'
@@ -867,7 +890,7 @@ if $ARGS[0] = 'chat_luda':
 					'"Isn''t he the boy that lives on the first floor?" She asks.'
 					'You nod to her and then you tell her all about him.'
 					'She smiles and nods "He sounds like a very nice boy. I hope the two of you are very happy together, who knows you might have gotten lucky and found the right one early on. But don''t be afraid to keep fishing for another man if things don''t work out."'
-					act 'Keep talking': gt 'ludahome', 'chat'
+					act 'Keep talking': gt 'ludahome', 'chat_luda'
 					act 'Stop talking': gt 'ludahome', 'livingroom'
 				elseif Rex_Love = 1:
 					'You tell her "I have a boyfriend you know."'
@@ -876,7 +899,7 @@ if $ARGS[0] = 'chat_luda':
 					'She shakes her head "I don''t think I know him." With that you tell her about Rex and as you do she starts nodding and has a knowing smile on her face'
 					'She get a inquisitive look on her face "How did you meet him? Isn''t he a few years old?" She asks, obviously curious how you two crossed paths long enough to start dating.'
 					'You smile to her "I was invited to his party." You tell her and then add "Ok he is friends with my Anya and she invited me to his birthday party and thats when we meet." Then you talk about the night you meet him and your first date.'
-					act 'Keep talking': gt 'ludahome', 'chat'
+					act 'Keep talking': gt 'ludahome', 'chat_luda'
 					act 'Stop talking': gt 'ludahome', 'livingroom'
 				else
 					'You tell her "I have a boyfriend you know."'
@@ -884,7 +907,7 @@ if $ARGS[0] = 'chat_luda':
 					'"<<$boyfriend>>" You tell her.'
 					'She shakes her head "I don''t think I know him." With that you tell her about Niko and as you do she starts nodding and has a knowing smile on her face'
 					'"Well that is a interesting way to meet a boy but i have heard of worse ways, as long as he makes you happy that is all that matters." She says with a wink.'
-					act 'Keep talking': gt 'ludahome', 'chat'
+					act 'Keep talking': gt 'ludahome', 'chat_luda'
 					act 'Stop talking': gt 'ludahome', 'livingroom'
 				end
 			end
@@ -892,15 +915,16 @@ if $ARGS[0] = 'chat_luda':
 		act 'Talk about her travels':
 			*clr & cla
 			minut += 15
-			npc_rel['A30'] += 1
+			gs 'npc_relationship', 'modify', 'A30', 'like'
+			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 			'You ask your aunt about her travels, she exicted tells you stories about her time in Europe. She started off traveling all over Europe then drifted further south into she ended up in Africa then she traveled all over there, which is where she meet Olu. She tells you a number of funny and some sex stories about her travels.'
-			act 'Keep talking': gt 'ludahome', 'chat'
+			act 'Keep talking': gt 'ludahome', 'chat_luda'
 			act 'Stop talking': gt 'ludahome', 'livingroom'
 		end
 		act 'Stop talking': gt 'ludahome','livingroom'
 	end
-end	
+end
 
 if $ARGS[0] = 'chat_olu':
 	menu_off = 1
@@ -913,61 +937,73 @@ if $ARGS[0] = 'chat_olu':
 	act 'Make small talk':
 		*clr & cla
 		minut += 5
-		npc_rel['A55'] += 1
-		'<center><img src="images/characters/pavlovsk/resident/olu/talk.jpg"></center>'
+		gs 'npc_relationship', 'modify', 'A55', 'like'
+		gs 'stat'
+		'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
 		'The two of you chat about a variety of things, mostly school, how he and Luda has been doing, and what has been going on in Pavlovsk lately.'
-		act 'Keep talking': gt 'ludahome', 'chat'
+		act 'Keep talking': gt 'ludahome', 'chat_olu'
 		act 'Stop talking': gt 'ludahome', 'livingroom'
 	end
 	act 'Talk about Luda':
 		*clr & cla
 		minut += 5
-		npc_rel['A55'] += 1
-		'<center><img src="images/characters/pavlovsk/resident/olu/talk.jpg"></center>'
-		'"So Auntie tell me about your boyfriend, what''s he like?" You ask her curious.'
-		'She lights up at your questions "He is a fairly quiet man but wonderful, so kind and careing. Not to mention so big... and muscular. He really is the perfect man." She goes on to talk about some of the things they have done together and it really sounds like they are very much in love, certainly your Aunt is in love with him anyways. You also notice she never once mentions that he is black.'
-		act 'Keep talking': gt 'ludahome', 'chat'
-		act 'Stop talking': gt 'ludahome', 'livingroom'
+		gs 'npc_relationship', 'modify', 'A55', 'like'
+		gs 'stat'
+		'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
+		'"So you and Luda seem to get along really well, do you love her?" You ask him curious.'
+		'He lights up at your questions "Yes very much, she is a very kind and loving woman, very understanding, she is the most wonderful woman I have ever meet." He goes on to talk about some of the things they have done together and it really sounds like they are very much in love, certainly he is in love with your Aunt anyways.'
 		act 'How do people react?':
 			*clr & cla
-			minut += 5
-			'<center><img src="images/characters/pavlovsk/resident/olu/talk.jpg"></center>'
+			minut += 3
+			gs 'stat'
+			'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
 			'"How do people treat you and my aunt, with you know you being black?"'
 			'He frowns "Some people are ok with it, most just make comments behind our back but I know they do. Some say nasty things to our face, but I don''t care, though any of them that say these things to her only do so once, where I can hear it."'
 			'You can understand why someone of his size could very easily convince someone else that they might not want to say more on the topic to Luda.'
 			'You can tell he would like to change the subject so you do.'
-			act 'Keep talking': gt 'ludahome', 'chat'
+			act 'Keep talking': gt 'ludahome', 'chat_olu'
 			act 'Stop talking': gt 'ludahome', 'livingroom'
 		end
 		act 'How did you meet?':
 			*clr & cla
-			minut += 5
-			npc_rel['A55'] += 1
-			'<center><img src="images/characters/pavlovsk/resident/olu/talk.jpg"></center>'
+			minut += 3
+			gs 'npc_relationship', 'modify', 'A55', 'like'
+			gs 'stat'
+			'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
 			'"So how did the two of you meet?" You ask him.'
 			'He grins "I seen her on the metro and I wanted to talk to her. She was the most beautiful woman I had every seen, I was trying to practice my Russian so I could talk to her and I wasn''t pay attention and I walked right into her." He laughs loudly at the memory "I barely felt it, but she bounced off me and nearly fell on the ground. I quickly grabbed her to steady her and apologized, but she was so nice she said it was her fault. That is when I knew I had to get to know her better."'
 			*nl
 			'"Then she got off the metro, I didn''t even know where we was but I didn''t care. I got off quickly as well, I was trying to think what to say. Then I spotted a girl selling flowers to I bought many of them and ran up to Luda and gave them to her. I told her pretty flowers for a pretty lady. When I saw she blushed I just asked her out for coffee and she said yes." He grins broadly "It was the best day of my life, we went out for coffee and from that moment on I knew I had make her mine. In the end she felt the same way, we quickly moved in together and I have not regretted one minute since then."'
 			'You can''t help but smile at the sweet story, it is obvious he is deeply in love with your aunt.'
-			act 'Keep talking': gt 'ludahome', 'chat'
+			act 'Keep talking': gt 'ludahome', 'chat_olu'
 			act 'Stop talking': gt 'ludahome', 'livingroom'
 		end
 	end
-	act 'What does he do?':
+	act 'What do you do?':
 		*clr & cla
 		minut += 5
-		npc_rel['A55'] += 1
-		'<center><img src="images/characters/pavlovsk/resident/olu/talk.jpg"></center>'
-		'"So what does he do? For a living I mean." You ask her.'
-		'"Well his visa expired so legally he can''t work, but while he could he saved up a little money and bought a van. Then he put some seats into it, cleaned it up real nice and now drives it around offering to give tourist rides to take them to all the different sites around the area. He makes ok money, though mostly he makes his money in the summers of course when there is a lot more tourist but he gets some fares year around. He mostly sits near the train station and tries to offer people rides. But I don''t care, I make enough for both of us, but it makes him feel good to work and it gives us a little extra spending money.'
-		act 'Keep talking': gt 'ludahome', 'chat'
-		act 'Stop talking': gt 'ludahome', 'livingroom'
+		gs 'npc_relationship', 'modify', 'A55', 'like'
+		'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
+		'"So what do you do? For a living I mean." You ask him.'
+		'He seems to consider your question for a moment, at first you are not sure he is going to say. "Well I bought a van and then spent some time fixing it up. I got it painted in a deal on a trade for work. I got some old seats and others stuff out of a wrecked car. I turned the van into a taxi, mostly I wait around the train station for tourist or the near the hotel. I offer them rides and a bit of a tourist guide in exchange for money. I don''t get a lot of work in the winter, most of it I earn during the summer but there is enough of a steady stream of tourist to help out."'
+		act 'You have your own taxi service?':
+			*clr & cla
+			minut += 3
+			gs 'npc_relationship', 'modify', 'A55', 'like'
+			'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
+			'"You have your own taxi service?" You ask him.'
+			'He smiles a bit. "No, not exactly. I just turned the van into a taxi and then charge people for rides. The police mostly ignore it, as long as I give them a cut of the money, but don''t tell Luda. She would be very upset to know I pay off the local police bribes so they leave me alone."'
+			'You frown but nod at that. You understand why he doesn''t want her to know but you wish the police wasn''t so corrupt that he has to deal with it.'
+			act 'Keep talking': gt 'ludahome', 'chat_olu'
+			act 'Stop talking': gt 'ludahome', 'livingroom'
+		end
 	end
 	if LudaQW['open_rel'] = 1:
 		act 'Ask about their open relationship':
 			*clr & cla
-			npc_rel['A55'] += 1
-			minut += 5
+			minut += 3
+			gs 'npc_relationship', 'modify', 'A55', 'like'
+			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/olu/flirttalk.jpg"></center>'
 			'"Luda told me about your open relationship." you say as you place a hand on his leg flirting with him a bit.'
 			'He nods "Yes, it is her idea, I would be happy with just her. But she says I wear her out and wants me to be happy, she my needs are more than she can keep up with." He says with a blush.'
@@ -977,6 +1013,7 @@ if $ARGS[0] = 'chat_olu':
 				*clr & cla
 				minut += 3
 				pcs_mood += 5
+				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/olu/flirttalk.jpg"></center>'
 				if LudaQW['olu_offer'] = 1:
 					'"Do you think I am pretty?" You ask him.'
@@ -990,15 +1027,16 @@ if $ARGS[0] = 'chat_olu':
 					if LudaQW['olu_offer'] >= 2:
 						act 'Return the kiss': gt 'olu', 'olusex'
 					end
+					act 'Keep talking': gt 'ludahome', 'chat_olu'
 					act 'Stop talking': gt 'ludahome', 'livingroom'
-					act 'Keep talking': gt 'ludahome', 'chat'
 				end
 			end
 			if LudaQW['olu_offer'] >= 2:
 				act 'Do you want to fuck me?':
 					*clr & cla
 					minut += 1
-					npc_rel['A55'] += 1
+					gs 'npc_relationship', 'modify', 'A55', 'like'
+					gs 'stat'
 					'<center><img src="images/characters/pavlovsk/resident/olu/flirttalk.jpg"></center>'
 					'You rub his thigh with your hand and practically purr "Do you want to fuck me?"'
 					'He grins "Yes." Then he leans in and kisses you.'
@@ -1009,35 +1047,36 @@ if $ARGS[0] = 'chat_olu':
 	end
 	act 'What does he think about Russia':
 		*clr & cla
-		npc_rel['A55'] += 1
 		minut += 3
-		'<center><img src="images/characters/pavlovsk/resident/olu/talk.jpg"></center>'
+		gs 'npc_relationship', 'modify', 'A55', 'like'
+		gs 'stat'
+		'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
 		'You ask him "So what do you think about Russia?"'
 		'He seems to consider that a moment "I like it, even if some of the people are not so nice, but Luda loves it here and I don''t mind the people if it makes her happy."'
 		'You ask him about what some people have said or done and he tells you some truly awful stories not just about what he has experience but what has happened to some of the other Africans he knows living in the city. After some time he seems to want to change the subject to something nicer.'
 		act 'Do you miss your family?':
 			*clr & cla
 			minut += 3
-			'<center><img src="images/characters/pavlovsk/resident/olu/talk.jpg"></center>'
+			gs 'stat'
+			'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
 			'You ask him "Do you miss your family?"'
 			'He nods yes "Sometimes very much, but I talk to them as much as I can and I go see my nephew Djibril as much as I can and we talk on the phone almost every day, at least when he is not busy with school or girls." He says with a laugh.'
 			'You ask him about his family back home and he tells you what it was like growing up poor in Africa and how he would like to someday move his family to a nicer place, most of his stories are good even if they was dirt poor. It is obvious he cares about his family deeply but just as obvious he loves your Aunt Luda just as much as he choose her over his family.'
+			act 'Keep talking': gt 'ludahome', 'chat_olu'
 			act 'Stop talking': gt 'ludahome', 'livingroom'
-			act 'Keep talking': gt 'ludahome', 'chat'
 		end
-		act 'Stop talking': gt 'ludahome', 'livingroom'
-		act 'Keep talking': gt 'ludahome', 'chat'
 	end
 	act 'About your nephew Djibril':
 		*clr & cla
-		npc_rel['A55'] += 1
 		minut += 3
-		'<center><img src="images/characters/pavlovsk/resident/olu/talk.jpg"></center>'
+		gs 'npc_relationship', 'modify', 'A55', 'like'
+		gs 'stat'
+		'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
 		'"Tell me about your nephew Djibril." You say.'
 		'He talks about how smart his nephew Djibril is and how proud everyone is of him in the family. He tells you he goes to the University in Saint Petersburg and is getting really good grades and he has many girl friends. He goes on to talk about him in length, it is obvious he is very fond of his nephew Djibril.'
 		'"Some day you should meet him, he is almost your age." He says. You nod and consider it.'
+		act 'Keep talking': gt 'ludahome', 'chat_olu'
 		act 'Stop talking': gt 'ludahome', 'livingroom'
-		act 'Keep talking': gt 'ludahome', 'chat'
 		!!act 'Ask to meet his nephew Djibril': I will add this option later when I revamp his nephew Djibrils story, as a way to meet him.
 	end
 	act 'Stop talking': gt 'ludahome','livingroom'

+ 50 - 42
locations/meadow.qsrc

@@ -29,8 +29,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
 	*nl
 	'A quiet and deserted open field of grass and wildflowers in the forest, well hidden from civilization.'
-
-	!125s
+	'There are <a href="exec:gt ''meadow'', ''ruins''">ruins</a> of a long-abandoned house as well as some <a href="exec: gt ''meadow'', ''fruit_trees''">fruit trees</a> hinting at the areas original purpose.'
+	
 	!events trigger before everything
 	if (meadow = 3 or meadow = 6) and MiraLoc = 0 and npc_QW['A60'] = 2 and temper >= 12 and sunWeather = 1:gt 'meadow','mira_mitka'
 	if (meadow = 3 or meadow = 6) and Mira_no = 0 and MiraLoc = 0 and npc_QW['A60'] = 33 and temper >= 12 and sunWeather = 1:gt 'meadow','mira_gang'
@@ -38,7 +38,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	if npc_QW['A63'] > 13 and mirasex = 1 and npc_QW['A60'] > 11 and rand(1,5) = 1 and miraday ! daystart:gt 'meadow','mira_lesb_talk3'
 	if npc_QW['A63'] > 13 and mirasex = 1 and npc_QW['A60'] > 11:gt 'meadow','mira_lesb_talk2'
 	if mirasex = 2 and rand(1,5) > 3 and miraday ! daystart and npc_rel['A60'] >= 15:gt 'meadow','mira_lesb'
-	!125e
 
 	if MiraLoc = 2:
 		act 'Talk to Mira': gt 'meadow', 'Mira'
@@ -70,44 +69,74 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 
 	if MiraLoc = 2:
-		!act 'Go to the forest': minut += 20 & MiraLoc = 3 & gt 'gadforest', 'forest_edge'
-		act 'Leave':minut += 20 & MiraLoc = 0 & gt 'gadroad'
+		act 'Go back to the forest': minut += 20 & MiraLoc = 3 & gt 'gadforest', 'forest_edge'
 	else
-		!act 'Go to the forest': minut += 20 & gt 'gadforest', 'forest_edge'
-		act 'Leave':minut += 20 & gt 'gadroad'
+		act 'Go back to the forest': minut += 20 & gt 'gadforest', 'forest_edge'
 	end
 
 	if sunWeather = 1:
-		if pcs_stam >=15 or (pcs_stam >= 10 and bookYog + obruch > 0):
-			if $clothingworntype ! 'exercise' and pcs_inhib < 35 and Miraloc ! 2:
+		if pcs_stam >= 15 or (pcs_stam >= 10 and bookYog + obruch > 0):
+			if $clothingworntype ! 'exercise':
 				*nl
-				'You could do some exercises here if you were wearing <a href="exec: gt ''meadow'', ''workout''">exercise clothes</a>.'
-				act 'Exercise': gt 'meadow', 'workout'
+				'Your meadow is a perfect place to workout if you were wearing exercise clothes'
 			elseif pcs_inhib >= 35 and Miraloc ! 2 and temper >= 10:
 				*nl
-				'Your meadow is a perfect place to do some <a href="exec: gt ''meadow'', ''workout''">exercises</a>. There is no one around, so you could probably <a href="exec: gs ''clothing'', ''strip'', ''meadow''& gs ''underwear'', ''remove'' & gt ''meadow'', ''workout'', ''nude''">exercise nude</a>.'
+				'Your meadow is a perfect place to exercise. There is no one around, so you could probably exercise nude if you wanted.'
 				act 'Exercise': gt 'meadow', 'workout'
-				act 'Exercise nude':
-					gs 'clothing', 'strip', 'meadow'
-					gs 'underwear', 'remove'
-					gt 'meadow', 'workout', 'nude'
-				end
+				act 'Exercise nude':gt 'meadow', 'workout', 'nude'
 			elseif Miraloc = 2:
 				*nl
-				'It''s a nice day to exercise, but you don''t feel comfortable working out with an audience.'
+				'Your meadow is a perfect place to exercise. Mira is here but she wouldn''t mind if you exercised for a little bit.'
+				act 'Exercise': gt 'meadow', 'workout'
 			else
 				*nl
-				'Your meadow is a perfect place to do some <a href="exec: gt ''meadow'', ''workout''">exercises</a>.'
+				'Your meadow is a perfect place to exercise.'
 				act 'Exercise': gt 'meadow', 'workout'
 			end
 		else
-			'Your meadow is a perfect place to do some exercises, but you don''t have the energy right now.'
+			'Your meadow is a perfect place to exercise, but you don''t have the energy right now.'
 		end
 	else
-		'It''s currently raining. You could do some exercises here if the weather improves..'
+		'You can exercise in your meadow once the weather improves.'
 	end
 end
 
+if $ARGS[0] = 'workout':
+	*clr & cla
+	if $ARGS[1] = 'nude':
+		menu_off = 1
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.2.jpg"></center>'
+		*nl
+		if exhibitionist_lvl < 3:
+			'Your cheeks redden with embarrassment as you strip off your clothes. You giggle nervously at the thought of getting caught naked in the meadow.'
+		else
+			'You strip off your clothes. The thought of getting caught naked in the meadow excites you.'
+		end
+		clothesAtLocation = FUNC('lost_clothes_here','meadow')
+		gs 'clothing', 'strip', 'meadow'
+		gs 'underwear', 'remove'
+		gs 'exhibitionism', 3
+		gs 'stat'
+		act 'Continue': gt 'exercise', 'workout'
+	else
+		gt 'exercise', 'workout'
+	end
+end
+
+if $ARGS[0] = 'fruit_trees':
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_fruit_<<rand(0,1)>>.jpg"></center>'
+	*nl
+	'These fruit trees are flourishing in the undisturbed beauty of the meadow. Unfortunately all the fruit is out of your reach.'
+	act 'Continue': gt 'meadow', 'start'
+end
+
+if $ARGS[0] = 'ruins':
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_nearby_ruins.jpg"></center>'
+	*nl
+	'The ruins of this old house look intriguing. You wonder how long it has been here.'
+	act 'Continue': gt 'meadow', 'start'
+end
+
 if $ARGS[0] = 'Mira':
 	minut += 2
 	menu_off = 1
@@ -1119,26 +1148,5 @@ if $ARGS[0] = 'mirameadow':
 	end
 end
 
-if $ARGS[0] = 'workout':
-	*clr & cla
-	if $ARGS[1] = 'nude':
-		menu_off = 1
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.2.jpg"></center>'
-		*nl
-		if exhibitionist_lvl < 3:
-			'Your cheeks feel hot with embarrassment as you strip off your clothes. You giggle nervously at the thought of getting caught in the nude, the thought terrifies you but it also excites you.'
-		else
-			'You strip off your clothes. The thought of getting caught in the nude excites you.'
-		end
-		clothesAtLocation = FUNC('lost_clothes_here','meadow')
-		gs 'clothing', 'strip', $sportloc
-		gs 'exhibitionism', 3
-		gs 'stat'
-		act 'Continue': gt 'exercise', 'workout'
-	else
-		gt 'exercise', 'workout'
-	end
-end
-
 --- meadow ---------------------------------
 

+ 2 - 0
locations/mey_home.qsrc

@@ -230,6 +230,8 @@ if $ARGS[0] = '3':
 	*nl
 	'A <a href="exec:gt ''mirror'', ''start''">mirror</a> hangs on the wall near the front door.'
 	if komp = 1:'Your <a href="exec:gt ''Komp'',''start''">laptop</a> is on the desk.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	act 'Return to the hallway':
 		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):

+ 5 - 5
locations/mirasex.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'foreplay':
 		gs 'arousal', 'foreplay', 5, 'lesbian'
 		gs 'stat'
 		if npc_rel['A60'] < 30:
-			act 'Leave':MiraLoc ! 2 & minut += 20 & gt'gaddvor'
+			act 'Leave':MiraLoc = 0 & minut += 10 & gt 'gadukino'
 		else
 			act 'Lick Mira':gt 'mirasex','lickmira_start'
 		end
@@ -78,7 +78,7 @@ if $ARGS[0] = 'horny_talk':
 	if npc_rel['A60'] < 15:
 		'"Get the fuck off me you slut." Mira says, pulling away. She doesn''t sound convincing but you will have to improve you relationship is you want to take things further.'
 		'She walks home alone singing a song. You watch her for a moment before heading back to the village as well.'
-		act 'Leave':MiraLoc ! 2 & minut += 10 & gt'gaddvor'
+		act 'Leave':MiraLoc = 0 & minut += 10 & gt 'gadukino'
 	else
 		'Mira moans in enjoyment then starts to pull at your panties.'
 		'You help her pull them down and she step out of them.'
@@ -341,7 +341,7 @@ if $ARGS[0] = 'end':
 	gs 'stat'
 	MiraLoc ! 2
 	minut += 20
-	gt'gaddvor'
+	gt'gadukino'
 end
 
 !!-------------------------------------------------single act events---------------------------------------------------
@@ -384,7 +384,7 @@ if $ARGS[0] = 'miralick_stand1':
 		gs 'arousal', 'cuni', 10, 'lesbian'
 		minut -= 5
 		gs 'stat'
-		act 'Leave':MiraLoc ! 2 & minut += 20 & gt'gaddvor'
+		act 'Leave':MiraLoc = 0 & minut += 20 & gt 'gadukino'
 	end
 	killvar '$textstand'
 	killvar '$textlick'
@@ -432,7 +432,7 @@ if $ARGS[0] = 'lickmira_mis1':
 		else
 			'After Mira orgasms,you get out from between her legs and wipe her juices off your face. You clean yourself up and smile at Mira before heading back to the village with her.'
 		end
-		act 'Leave':MiraLoc ! 2 & minut += 20 & gt'gaddvor'
+		act 'Leave':MiraLoc = 0 & minut += 10 & gt 'gadukino'
 	end
 	*nl
 	killvar '$textmis'

+ 9 - 42
locations/miroslava.qsrc

@@ -429,40 +429,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 		end
 
-		if miratalkforest = 0 and npc_rel['A60'] >= 5:
-			act 'Ask about the forest':
-				menu_off = 1
-				*clr & cla
-				minut += 15
-				npc_rel['A60'] += 1
-				miratalkforest = 1
-				goforest += 1
-				gs 'stat'
-				gs 'miroslava', 'miraclothes'
-				'"Mira, can you tell me about the forest near the village?" You ask you.'
-				'"No, <<$pcs_nickname>>, I''m afraid to go there" said Mira, shaking her head.'
-				'"Why?" You said, wanting to continue the conversation.'
-				'"Oh, they say it is easy to get lost in those woods, in case you didn''t know, " she said. - "They say that there are wolf packs roaming those woods too."'
-				'"Who says?", you asked incredulously. "Real wolves?"'
-				'"Locals say this" said Mira. "They have all sorts of scary ghost stories to tell."'
-				'"Oh, they are pulling your leg." with a laugh said you. "I bet they don''t want us to go into the forest because that they don''t want to share in the picking of the mushrooms and berries. They will get more, plain and simple."'
-				'"No, no, <<$pcs_nickname>>," Mira said in a serious tone. "They told me that last summer the wolves attacked a girl from a neighboring village. She was mauled to death. She had gone into the forest looking for mushrooms too, but she never come out of the forest. In the morning they found the remains of her corpse and lots of blood. They found many wolf tracks in the blood."'
-				'"That is terrible" you shivered. "If you have simular tells, keep them to yourself. I don''t like horror stories."'
-				'"What?" Mira giggled, turning to whisper in your ear. "I also overheard a few days ago a conversation between two of the village elders. They said that if you walk naked in the woods, your health and mood improves. Something to do with the air being so fresh. Or something like that."'
-				'Mira thought for a moment, and then continued.'
-				'"I don''t know about health part, but there is definitely more to my mood and a little itch begins," Mira expressively glances between her legs.'
-				'"Wait," you interrupted her. "I thought you said that you''re afraid to walk in the woods alone."'
-				'"Oh, I did go once," she said blushing. "Just to check on the truth if what the elders said."'
-				'"Okay, okay, no more excuses," you chuckled, looking at a confused Mira. "Let''s just go together?."'
-				'"I don''t know <<$pcs_nickname>>," Mira said. "If it''s warm and the weather is nice, you can count on me to go with you."'
-				'"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 '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:
+		if sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and MiraLoc ! 3 and mirapickingtalk > 0 and npc_rel['A60'] >= 5:
 			act 'Offer to go to the forest':
 				menu_off = 1
 				*clr & cla
@@ -480,7 +447,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						gs 'miroslava', 'miraclothes'
 						'You offer her to go to the forest to look for mushrooms and berries and she willingly agrees.'
 
-						act 'Go into the woods':minut += 45 & gt'gadforest','1'
+						act 'Go into the woods':minut += 45 & gt'gadforest', 'forest_edge'
 					else
 						minut += 5
 						MiraLoc = 0
@@ -501,24 +468,24 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			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:
+		if sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and MiraLoc = 3 and miranudetalk > 1 and npc_rel['A60'] >= 5 and $clothingworntype ! 'nude' and forestpicnic = 0:
 			if pcs_inhib >= 25 or exhibitionist_lvl > 1:
 				act 'Offer to walk naked':
 					menu_off = 1
 					*clr & cla
 					minut+=5
 					gs 'underwear', 'remove'
-					gs 'clothing', 'strip', 'gadforest'
+					gs 'clothing', 'strip', 'forest_edge'
 					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'Continue':gt'gadforest','1'
+					act'Continue':gt'gadforest', 'forest_edge'
 				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 npc_rel['A60'] >= 15 and MiraLoc ! 3 and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1) and StoryLine = 1 and grandmaQW['block'] = 0:
 			if mira_guest = 0:
 				act 'Invite to your grandparent''s':
 					menu_off = 1
@@ -597,8 +564,8 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			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:
+		if npc_rel['A60'] >= 15 and Mira_no = 0 and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1):
+			if mira_guest = 0 and mira_temp >= 1 and mira_temp <= 2 and mira_go_blok = 0 and MiraLoc ! 3 and StoryLine = 1 and grandmaQW['block'] = 0:
 				menu_off = 1
 				*clr & cla
 				minut += 1
@@ -1178,7 +1145,7 @@ if $ARGS[0] = 'Leave':
 	if MiraLoc = 0:
 		gt 'MiroslavaHome','start'
 	elseif MiraLoc = 3:
-		gt 'gadforest', '1'
+		gt 'gadforest', 'forest_edge'
 	elseif MiraLoc = 6:
 		gt 'gadhouse', 'start'
 	elseif MiraLoc = 7:

+ 1 - 1
locations/miroslavahome.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'mirabrother':
 														'After a couple of minutes you feel his warm sticky cum hit the back of your throat and begin to swallow it all down. Mira''s brother stands still for a minute, his eyes closed in bliss. Finally, he takes his cock out of your mouth and zips up his pants. You put your helmets back on, get on the motorcycle once again, and he drives you back to the village...'
 
 														act 'Ask him to take you back to Mira''s house': gt 'MiroslavaHome', 'start'
-														act 'Ask him to drop you off at your grandparents house': gt 'gaddvor'
+														if StoryLine = 1  and grandaQW['block'] = 0:act 'Ask him to drop you off at your grandparents house': gt 'gaddvor'
 													end
 												end
 											end

+ 57 - 56
locations/mother.qsrc

@@ -20,19 +20,19 @@ if $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	'Your mother Natasha is still quite young and attractive. She''s only <<motherAge>> years. She works at the station cafe.'
 
-	if (motherKnowWhore > 0 or motherKnowSpravka > 0) and npc_QW['A29'] = 0:npc_QW['A29'] = 1
-	if npc_QW['A29'] = 1 and npc_rel['A29'] > 40:npc_rel['A29'] = 40
-	if npc_rel['A29'] < 20:'Your relationship with your <<$npc_nickname[''A29'']>> is terrible.'
-	if npc_rel['A29'] >= 20 and npc_rel['A29'] < 40:'Your relationship with your <<$npc_nickname[''A29'']>> is tense.'
-	if npc_rel['A29'] >= 40 and npc_rel['A29'] < 60:'You have a normal relationship with your <<$npc_nickname[''A29'']>>.'
-	if npc_rel['A29'] >= 60 and npc_rel['A29'] < 80:'You have a good relationship with your <<$npc_nickname[''A29'']>>.'
-	if npc_rel['A29'] >= 80:'You have a great relationship with your <<$npc_nickname[''A29'']>>.'
+	if (motherKnowWhore > 0 or motherKnowSpravka > 0) and npc_QW['A29'] = 0: npc_QW['A29'] = 1
+	if npc_QW['A29'] = 1 and npc_rel['A29'] > 40: npc_rel['A29'] = 40
+	if npc_rel['A29'] < 20: 'Your relationship with your <<$npc_nickname[''A29'']>> is terrible.'
+	if npc_rel['A29'] >= 20 and npc_rel['A29'] < 40: 'Your relationship with your <<$npc_nickname[''A29'']>> is tense.'
+	if npc_rel['A29'] >= 40 and npc_rel['A29'] < 60: 'You have a normal relationship with your <<$npc_nickname[''A29'']>>.'
+	if npc_rel['A29'] >= 60 and npc_rel['A29'] < 80: 'You have a good relationship with your <<$npc_nickname[''A29'']>>.'
+	if npc_rel['A29'] >= 80: 'You have a great relationship with your <<$npc_nickname[''A29'']>>.'
 
-	act 'Move away from her':gt $loc, $metka
+	act 'Move away from her': gt $loc, $metka
 
 	if motherWorry = 1 and indorf = 0:
 		motherWorry = 0
-		npc_rel['A29'] -= 1
+		gs 'npc_relationship', 'modify', 'A29', 'dislike'
 		delin_beh += 1 &!counter for getting sent to Gadukino for the summer
 		if $loc = 'gkafe':
 			'Your <<$npc_nickname[''A29'']>> looks at you from across the cafe counter, "<<$pcs_firstname>> <<$pcs_lastname>>, Where the hell have you been! I have been worried sick!" You <<$npc_nickname[''A29'']>> then looks around the small cafe and says with a frown, "We will talk about this when we get home."'
@@ -52,24 +52,24 @@ if $ARGS[0] = '':
 	end
 
 	!check hair color
-	if hcolfronce=0:
-		hcolmotherremember=pcs_haircol
-		hcolfronce=1
+	if hcolfronce = 0:
+		hcolmotherremember = pcs_haircol
+		hcolfronce = 1
 	end
 
-	if hcolmotherremember!pcs_haircol:
+	if hcolmotherremember ! pcs_haircol:
 		if pcs_haircol = nathcol:
 			$texthcol = 'Or, rather, un-dyed your hair. Good, you decided to go back to your natural color!'
-		elseif pcs_haircol=0:
+		elseif pcs_haircol = 0:
 			$texthcol='I see you decided to go with black hair?'
-		elseif pcs_haircol=1:
+		elseif pcs_haircol = 1:
 			$texthcol='I see you decided to become a brunette?'
-		elseif pcs_haircol=2:
+		elseif pcs_haircol = 2:
 			$texthcol='I see you decided to become a redhead?'
-		elseif pcs_haircol=3:
+		elseif pcs_haircol = 3:
 			$texthcol='I see you decided to go blonde?'
-		elseif pcs_haircol >=4:
-			npc_rel['A29'] -= 25
+		elseif pcs_haircol >= 4:
+			gs 'npc_relationship', 'modify', 'A29', -25
 			$texthcol='What were you thinking? Do you think you''ll get into university with hair like that!'
 		end
 		if pcs_haircol ! nathcol and pcs_haircol <= 3 and npc_rel['A29'] < 60:
@@ -83,7 +83,7 @@ if $ARGS[0] = '':
 		'Your <<$npc_nickname[''A29'']>> immediately notices you dyed your hair and says: "Wait a minute, you dyed your hair! <<$texthcol>>"'
 		'She fingers your hair and <<$texthcol2>>'
 
-		hcolmotherremember=pcs_haircol
+		hcolmotherremember = pcs_haircol
 	end
 
 	$mother_clothes[1] = {
@@ -133,11 +133,11 @@ if $ARGS[0] = '':
 	}
 
 	if $clothingworntype = 'nude' and towel = 1 and $pantyworntype = 'none':
-		npc_rel['A29'] -= 2
+		gs 'npc_relationship', 'modify', 'A29', 'dislike'
 		''
 		dynamic $mother_clothes[1]
 	elseif $clothingworntype = 'nude':
-		npc_rel['A29'] -= 2
+		gs 'npc_relationship', 'modify', 'A29', 'dislike'
 		''
 		dynamic $mother_clothes[2]
 	end
@@ -211,7 +211,7 @@ if $ARGS[0] = '':
 		act 'Ask for a tampon':
 			cla
 			sanpad += 3
-			npc_rel['A29'] -= 15
+			gs 'npc_relationship', 'modify', 'A29', -15
 			minut += 3
 			'You tell your <<$npc_nickname[''A29'']>> you''re menstruating and ran out of tampons, but really need one right now. She looks at you knowingly, gives you three sanitary pads from her own supply and sternly tells you to next time take care of this in advance.'
 
@@ -241,11 +241,11 @@ if $ARGS[0] = '':
     
     if SchoolAtestat = 1 and SAtestatGift = 0:
 		if pcs_grades >= 90:
-			npc_rel['A29']+=40
+			gs 'npc_relationship', 'modify', 'A29', 40
 			'Your <<$npc_nickname[''A29'']>> is delighted you graduated. "I''m so proud right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from school is a very important step. And you outdid all my expectations. When the Principal mentioned you being the best student of the year I could not have been happier. Your stepfather and I saved some money to reward you for your efforts. Please, take these 10000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
 			SAtestatGift = 10000
 		elseif pcs_grades >= 70:
-			npc_rel['A29']+=20
+			gs 'npc_relationship', 'modify', 'A29', 20
 			'Your <<$npc_nickname[''A29'']>> is delighted you graduated. "I''m so happy right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from school is a very important step. You did really well. Please, take these 7000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
 			SAtestatGift = 7000
 		elseif pcs_grades >= 40:
@@ -262,7 +262,7 @@ if $ARGS[0] = '':
 	if hour > 5:
 		if unintendedabort = 1 and pregTalkFamily = 1:
 			pregTalkFamily = 2
-			npc_rel['A29'] += 20
+			gs 'npc_relationship', 'modify', 'A29', 20
 			'<br>'
 			'Your <<$npc_nickname[''A29'']>> looks at you in shock." <<$pcs_nickname>>, did you get an abortion?"'
 			'You break down crying and tell your <<$npc_nickname[''A29'']>> you had a miscarriage.'
@@ -271,7 +271,7 @@ if $ARGS[0] = '':
 		end
 		if abort = 1 and pregTalkFamily = 1:
 			pregTalkFamily = 2
-			npc_rel['A29'] = 0
+			gs 'npc_relationship', 'set', 'A29', 0
 			'Your <<$npc_nickname[''A29'']>> looks at you through teary eyes, stricken with sadness. "You are such a fool, <<$pcs_nickname>>! Getting an abortion... what if you can''t have any more children? Do you think you''ll be young and healthy forever? You''re going to regret this, I just know it..."'
 		end
 
@@ -297,24 +297,24 @@ if $ARGS[0] = '':
 				act 'Chat':
 					*clr & cla
 					minut+=rand(10,15)
-					npc_rel['A29']+=1
+					gs 'npc_relationship', 'modify', 'A29', 'like'
 					gs'stat'
 					'<center><b><font color = maroon>Your <<$npc_nickname[''A29'']>>, Natasha <<$pcs_lastname>></font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 					'Your <<$npc_nickname[''A29'']>> Natasha is still quite young and attractive. She''s only <<motherAge>> years. She works at the station cafe.'
-					if npc_rel['A29']<20:'Your <<$npc_nickname[''A29'']>> can''t stand you, and she avoids you as much as she can.'
-					if npc_rel['A29']>=20 and npc_rel['A29']<40:'You and <<$npc_nickname[''A29'']>> have a tense relationship.'
-					if npc_rel['A29']>=40 and npc_rel['A29']<60:'You have a normal relationship with your <<$npc_nickname[''A29'']>>.'
-					if npc_rel['A29']>=60 and npc_rel['A29']<80:'You have a good relationship with your <<$npc_nickname[''A29'']>>.'
-					if npc_rel['A29']>=80:'You have a great relationship with your <<$npc_nickname[''A29'']>>.'
-					act 'Continue':gt 'mother'
-					if npc_rel['A29']<20:
+					if npc_rel['A29'] < 20: 'Your <<$npc_nickname[''A29'']>> can''t stand you, and she avoids you as much as she can.'
+					if npc_rel['A29'] >= 20 and npc_rel['A29'] < 40: 'You and <<$npc_nickname[''A29'']>> have a tense relationship.'
+					if npc_rel['A29'] >= 40 and npc_rel['A29'] < 60: 'You have a normal relationship with your <<$npc_nickname[''A29'']>>.'
+					if npc_rel['A29'] >= 60 and npc_rel['A29'] < 80: 'You have a good relationship with your <<$npc_nickname[''A29'']>>.'
+					if npc_rel['A29'] >= 80: 'You have a great relationship with your <<$npc_nickname[''A29'']>>.'
+					act 'Continue': gt 'mother'
+					if npc_rel['A29'] < 20:
 						dynamic $d_mother[1]
 					exit
-					elseif npc_rel['A29']>=20 and npc_rel['A29']<40:
+					elseif npc_rel['A29'] >= 20 and npc_rel['A29']<40:
 						dynamic $d_mother[2]
 					exit
-					elseif npc_rel['A29'] >=40:
+					elseif npc_rel['A29'] >= 40:
 						dynamic $d_mother[3]
 					end
 				end
@@ -345,7 +345,7 @@ if $ARGS[0] = '':
 							end
 							
 							if npc_rel['A29'] >= 40:
-								npc_rel['A29'] -= 1
+								gs 'npc_relationship', 'modify', 'A29', 'dislike'
 								motherPayDay = daystart
 
 								if pcs_grades >= 90:
@@ -472,7 +472,7 @@ if $ARGS[0] = '':
 				act 'Offer to help around the house':
 					cla
 					minut += 60
-					npc_rel['A29'] += rand(1, 5)
+					gs 'npc_relationship', 'modify', 'A29', rand(1,5)
 					pcs_mood -= 10
 					delin_beh -= 1 &!counter for getting sent to Gadukino for the summer
 					TotalMomPom += 1
@@ -505,7 +505,8 @@ if $ARGS[0] = '':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/grocery.jpg"></center>'
 						'You offer to help your <<$npc_nickname[''A29'']>> out around the house.'
-						'Your <<$npc_nickname[''A29'']>> asks you to run to the store, and buy some groceries. You head to the store and purchase the food, hauling the heavy bags home. The groceries cost you <<sdacharand>> <b>₽</b>, and she gives you the money back when you return home.'
+						'Your <<$npc_nickname[''A29'']>> asks you to run to the store, and buy some groceries. You head to the store and purchase the food, hauling the heavy bags home. The groceries cost you <<sdacharand>> <b>₽</b>, she gives you some money to cover the cost when you return home.'
+						'You have gain a few rubles for your effort.'
 					elseif MomPom = 7:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/pharmacy.jpg"></center>'
 						'You offer to help your <<$npc_nickname[''A29'']>> out around the house.'
@@ -528,13 +529,13 @@ if $ARGS[0] = '':
 						mqwtRand = rand(1, 10)
 
 						if mqwtRand <= 2:
-							npc_rel['A29'] -= rand(1, 5)
+							gs 'npc_relationship', 'modify', 'A29', -rand(1,5)
 							minut += 30
 							'You try to have a talk with your <<$npc_nickname[''A29'']>>, to hopefully patch up your horrible relationship. You''re not sure whether you said something wrong, or whether she''s just in a bad mood, but your attempt to reconcile backfired horribly; within moments the conversation turns into a screaming contest, and your <<$npc_nickname[''A29'']>> ends up disliking you even more.'
 
 							act 'Leave her be for now':gt $loc, $metka
 						elseif mqwtRand > 2 and mqwtRand <= 8:
-							npc_rel['A29'] += rand(0, 1)
+							gs 'npc_relationship', 'modify', 'A29', 'like'
 							minut += 30
 							'You try to have a talk with your <<$npc_nickname[''A29'']>>, to try and patch up your horrible relationship. Despite your best efforts, the whole half-hour conversation consists mainly of a fairly aggressive monologue from your <<$npc_nickname[''A29'']>> about morality, diseases and what awaits you in the future, if you do not change your ways. Still, there is some improvement in your relationship.'
 
@@ -552,7 +553,7 @@ if $ARGS[0] = '':
 
 	if alko >= 3  and alkomday ! daystart:
 		alkomday = daystart
-		npc_rel['A29'] -= 1
+		gs 'npc_relationship', 'modify', 'A29', 'dislike'
 		delin_beh += 1 &!counter for getting sent to Gadukino for the summer
 		'Your <<$npc_nickname[''A29'']>> can smell you have been drinking alcohol, and gives you a lecture: "<<$pcs_nickname>>, why do you smell of alcohol? You''re still too young to drink, you could get into all sorts of trouble!"'
 	end
@@ -561,7 +562,7 @@ if $ARGS[0] = '':
 		cla
 		whoremday = daystart
 		if motherKnowWhore = 0 and motherKnowSpravka = 0 and npc_QW['A29'] = 0:
-			npc_rel['A29'] = 0
+			gs 'npc_relationship', 'set', 'A29', 0
 			if motherKnowWhore = 0:motherKnowWhore = 1
 
 			if momslut < 2:
@@ -583,7 +584,7 @@ if $ARGS[0] = '':
 
 			act 'Move away':gt $loc, $metka
 		elseif (motherKnowWhore > 0 or motherKnowSpravka > 0) and npc_QW['A29'] = 1:
-			npc_rel['A29'] -= 20
+			gs 'npc_relationship', 'modify', 'A29', -20
 
 			if motherKnowWhore = 0:motherKnowWhore = 1
 
@@ -598,7 +599,7 @@ if $ARGS[0] = '':
 
 			act 'Move away':gt $loc, $metka
 		elseif npc_QW['A29'] >= 2:
-			npc_rel['A29'] -= 10
+			gs 'npc_relationship', 'modify', 'A29', -20
 
 			if motherKnowWhore = 0:motherKnowWhore = 1
 
@@ -612,13 +613,13 @@ if $ARGS[0] = '':
 
 	if ($clothingworntype = 'formal' or $clothingworntype = 'expensive') and hour > 9:'Your <<$npc_nickname[''A29'']>> looks a bit puzzled at your fancy clothes: "Well well, look at you... why are you so dressed up? Big plans today?"'
 
-	if week = 5 and dostupindorf = 1:
+	if week = 5 and dostupindorf = 1 and grandaQW['block'] = 0:
 		if hour > 9:'While your <<$npc_nickname[''A29'']>> is working on some meals in the kitchen, she remembers something and looks at you: "Oh <<$pcs_nickname>>, while you''re here... we''re going to visit your grandparents in Gadukino tomorrow. We leave at noon (12:00) tomorrow, so if you want to come along you should meet me in the kitchen before then."'
-	elseif week = 6 and dostupindorf = 1:
+	elseif week = 6 and dostupindorf = 1 and grandaQW['block'] = 0:
 		if hour > 9 and hour < 12:
 			'Your <<$npc_nickname[''A29'']>> is finishing up on some meals before leaving for Gadukino and puts down her work for a second. "<<$pcs_nickname>>, well? Do you want to come with us to Gadukino or would you rather stay home with Anya?"'
 
-			act 'Go to Gadukino':hour = 12 & minut = 0 & indorf = 1 & gt 'famdorfride'
+			act 'Go to Gadukino':gt 'gadhouse', 'to_gadukino'
 		end
 	end
 
@@ -638,7 +639,7 @@ if $ARGS[0] = 'referral':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	*nl
 	if GspravkaT = 0 and GspravkaTimes >= 3 and hour >= 6 and hour <= 21:
-		npc_rel['A29'] -= 1
+		gs 'npc_relationship', 'modify', 'A29', 'dislike'
 		if $clothingworntype ! 'nude':
 			'Your <<$npc_nickname[''A29'']>> frowns and gets her handbag: "<<$pcs_nickname>>, why haven''t you been to the gynaecologist like I asked you to? You don''t have anything to hide, do you? Come on, we''re going there right now." Your <<$npc_nickname[''A29'']>> takes you by the hand and leads you to the clinic, ushering you into the gynaecologist''s office.'
 			act 'Get a referral from the gynaecologist': gt 'gpoli', 'referral'
@@ -684,7 +685,7 @@ if $ARGS[0] = 'referral_fail':
 	end
 	*nl
 	if motherKnowWhore = 0:
-		npc_rel['A29'] = 0
+		gs 'npc_relationship', 'set', 'A29', 0
 		motherKnowSpravka = 1
 
 		if npc_QW['A29'] = 0:npc_QW['A29'] = 1
@@ -699,7 +700,7 @@ if $ARGS[0] = 'referral_fail':
 			act 'Walk home': gt 'korrPar'
 		end
 	elseif motherKnowWhore > 0 and npc_QW['A29'] < 2:
-		npc_rel['A29'] -= 10
+		gs 'npc_relationship', 'modify', 'A29', -10
 		motherKnowSpravka = 1
 		!counter for getting sent to Gadukino for the summer
 		delin_beh += 1
@@ -720,7 +721,7 @@ if $ARGS[0] = 'referral_pass':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	*nl
 	Gspassed = 0
-	npc_rel['A29'] += 10
+	gs 'npc_relationship', 'modify', 'A29', 10
 	'You hand your <<$npc_nickname[''A29'']>> the referral. She opens it, closes her eyes for a second, and breathes a sigh of relief. "I''m not even surprised, you''re a good girl <<$pcs_nickname>>, just as I raised you to be."'
 	act 'Continue': gt 'mother'
 end
@@ -748,7 +749,7 @@ if $ARGS[0] = 'pregreact':
 			act 'Tell your <<$npc_nickname[''A29'']>> you are pregnant':
 				*clr & cla
 				minut += 5
-				npc_rel['A29'] -= 20
+				gs 'npc_relationship', 'modify', 'A29', -20
 				pregTalkFamily = 1
 				npc_pregtalk['A29'] = 1
 				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
@@ -768,7 +769,7 @@ if $ARGS[0] = 'pregreact':
 			act 'Tell your <<$npc_nickname[''A29'']>> you are pregnant':
 				*clr & cla
 				minut += 5
-				npc_rel['A29'] -= 20
+				gs 'npc_relationship', 'modify', 'A29', -20
 				pregTalkFamily = 1
 				npc_pregtalk['A29'] = 1
 				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
@@ -1096,7 +1097,7 @@ end
 if $ARGS[0] = 'motherQW_2':
 	minut += 60
 	npc_QW['A29'] = 2
-	npc_rel['A29'] += rand(5,10)
+	gs 'npc_relationship', 'modify', 'A29', rand(5,10)
 	menu_off = 1
 	gs'stat'
 	'<center><b><font color = maroon><<$npc_nickname[''A29'']>></font></b></center>'

+ 1 - 1
locations/natbelapt.qsrc

@@ -745,7 +745,7 @@ if $ARGS[0] = 'study_together':
 	*clr & cla
 	menu_off = 1
 	minut += 60
-	npc_rel['A16'] += 5
+	gs 'npc_relationship', 'modify', 'A16', 'adore'
 	lernHome = 0
 	lern += rand(3, 6)
 	intel_exp += rand(1, 2)

+ 2 - 0
locations/nichBedroomServant.qsrc

@@ -41,6 +41,8 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	if bookYog > 0:'A yoga mat is rolled up in a corner next to the wardrobe. '
 
 	if mishka > 0:'On one of the shelves, you''ve placed your <<mishka>> teddy bear.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	gs 'exercise', 'start'
 

+ 3 - 0
locations/obroom.qsrc

@@ -22,6 +22,9 @@ if $ARGS[0] = 'start':
 	'There''s a <a href="exec:gt ''mirror'',''start''">mirror</a> hanging on the wall.'
 	'Your <a href="exec:gt ''bed'',''start''">bed</a> is positioned in one of the corners of the room.'
 	if komp = 1:'There''s a <a href="exec:gt ''Komp'',''start''">laptop</a> laying on your bed.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+
 	gs 'exercise', 'start'
 	''
 	if hour > 14 and hour < 20 and npc_rel['A220']>=60 and birthday = day and birthmonth = month and vikaslut = 1 and bordel = 1 and slutty > 0 and b_vika_present_Day!day:

+ 2 - 2
locations/olu.qsrc

@@ -790,7 +790,7 @@ if $ARGS[0] = 'nusholusvet':
 									if will_cost <= pcs_willpwr:
 										act 'Refuse (<<will_cost>> Willpower)':
 											*clr & cla
-											npc_rel['A144'] -= 2
+											gs 'npc_relationship', 'modify', 'A144', 'dislike'
 											gs 'willpower', 'pay', 'resist'
 											gs 'stat'
 											'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/facial.jpg"></center>'
@@ -807,7 +807,7 @@ if $ARGS[0] = 'nusholusvet':
 									act 'Go with her':
 										*clr & cla
 										minut += 2
-										npc_rel['A144'] += 3
+										gs 'npc_relationship', 'modify', 'A144', 'love'
 										gs 'stat'
 										'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/facial.jpg"></center>'
 										'You let her pull you along, she opens the door and looks out both way. Then pulls you out into the stairwell, you let the door close behind you, now you are in the stairs of your apartment building, with Anushka and both your faces covered in cum. If someone see''s they will know who you are and you think they will know that it is, but Anushka is hard to resist when she is in a playfull mood. She keeps ahold of your hand and starts up the stairs, she pauses at the top of the stairs and looks both ways down the hall, before starting up the stairs to the roof.'

+ 5 - 4
locations/pavSharedApt.qsrc

@@ -285,14 +285,15 @@ if $ARGS[0] = 'start':
 	if rentPaid = 1:
 		'A large apartment currently serves as shared living. As well as the normal living spaces, there are four bedrooms, one rented by you and three occupied by <a href="exec: gt ''pavShared_nd'', ''ndDick''"><font color=#<<$nd_font>>><<$nd_name>></font></a>, <a href="exec: gt ''pavShared_gp'', ''gpDick''"><font color=#<<$gp_font>>><<$gp_name>></font></a>, <a href="exec: gt ''pavShared_sp'', ''spDick''"><font color=#<<$sp_font>>><<$sp_name>></font></a>.'
 		'You stand in the hallway. '
-		''
+		*nl
 		'From the hallway several doors lead to <a href="exec:gt ''pavSharedApt'', ''ndRoom''"><<$nd_name>>''s</a>, <a href="exec:gt ''pavSharedApt'', ''gpRoom''"><<$gp_name>>''s</a> and <a href="exec:gt ''pavSharedApt'', ''spRoom''"><<$sp_name>>''s</a> rooms.'
 		'The last doors lead to the <a href="exec:gt ''pavSharedApt'', ''pcsRoom''">room</a> you have rented.'
-		''
+		*nl
 		!! Wardrobe is here, because Sveta''s bedroom is actually the unused living room, with no wardrobe, so she is using the hall cupboard.
 		'There are no cupboards in your livingroom cum bedroom, but there are several hall <a href="exec:gt ''wardrobe'', ''start''">closets</a>, that you can use to store your clothes</a>, with a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> attached.'
-		''
-		if servitudeLvl >= 1:'A computer printed <a href="exec:gt ''pavSharedApt'', ''list''">list</a> hangs on the exit door.'
+		*nl
+		if servitudeLvl >= 1:'A computer printed <a href="exec:gt ''pavSharedApt'', ''list''">list</a> hangs on the exit door.' & *nl
+		'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 		act 'Go to your room':gt 'pavSharedApt', 'pcsRoom'
 		act 'Go to the bathroom':gt 'pavSharedApt', 'bathroom'
 		act 'Go to the kitchen':gt 'pavSharedApt', 'kitchen'

+ 57 - 19
locations/pavtrain_market.qsrc

@@ -228,7 +228,9 @@ if $ARGS[0] = 'events':
 	'You wander around the market taking in the sounds and colours but nothing catches your eye.'
 	
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	
 	if rand(0,3) = 0: gt 'pavtrain_market', rand(1,19)
 end
@@ -245,7 +247,9 @@ if ARGS[0] = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/poproshaika2.jpg"></center>'
 		'You ignore the beggar and pretend not to hear him.'
 		act 'Stop wandering': gt 'pavtrain_market', 'start'
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		if hour >= 8 and hour <= 18:
+			act 'Wander around the market': gt 'pavtrain_market','events'
+		end
 	end
 	act 'Give some money': 
 		*clr & cla
@@ -255,7 +259,9 @@ if ARGS[0] = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/podaet.jpg"></center>'
 		'You give the beggar a few rubles which he kindly thanks you for.'
 		act 'Stop wandering': gt 'pavtrain_market', 'start'
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		if hour >= 8 and hour <= 18:
+			act 'Wander around the market': gt 'pavtrain_market','events'
+		end
 	end
 end
 
@@ -267,7 +273,9 @@ if ARGS[0] = 2:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dedgitara.jpg"></center>'
 	'You see an old man playing the guitar. He''s trying to avert as much attention as he can to himself.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 end
 
 if ARGS[0] = 3:
@@ -282,7 +290,9 @@ if ARGS[0] = 3:
 	end
 	'You find a stall selling various books, there are fantasy books, science fiction and romance novels, all of which costs only 350 <b>₽</b> each.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= 350:
 		act 'Buy a fantasy book (350 <b>₽</b>)':
 			*clr & cla
@@ -329,7 +339,9 @@ if ARGS[0] = 4:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 	'You find a small stall that has many shelves with a large variety of porn magazines, a pack of brand new porn playing cards, and you can see several sex toys just behind the counter. The salesman watches over his stall with shifty eyes.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= 699 and card < 2:
 		act 'Buy cards (699 <b>₽</b>)':
 			*clr & cla
@@ -563,7 +575,9 @@ if ARGS[0] = 5:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dedgitara.jpg"></center>'
 	'You see an old man playing the guitar. He''s trying to avert as much attention as he can to himself.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 end
 
 if ARGS[0] = 6:
@@ -605,7 +619,9 @@ if ARGS[0] = 7:
 	tovpay = 800
 	'You see some cosmetics on sale for <<tovpay>> <b>₽</b>.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= tovpay:
 		act 'Buy the cosmetics (800 <b>₽</b>)':
 			minut += 15
@@ -625,7 +641,9 @@ if ARGS[0] = 8:
 	tovpay = 105
 	'You see some vitamins on sale for <<tovpay>> <b>₽</b>.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= tovpay:
 		act 'Buy vitamins (105 <b>₽</b>)':
 			minut += 15
@@ -645,7 +663,9 @@ if ARGS[0] = 9:
 	tovpay = 80
 	'You see a booth selling condoms for <<tovpay>> <b>₽</b>.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= tovpay:
 		act 'Buy condoms (80 <b>₽</b>)':
 			minut += 15
@@ -670,7 +690,9 @@ if ARGS[0] = 10:
 	tovpay = 100
 	'There is lip balm on sale for <<tovpay>> <b>₽</b>.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= tovpay:
 		act 'Buy lip balm (100 <b>₽</b>)':
 			*clr & cla
@@ -705,7 +727,9 @@ if ARGS[0] = 12:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/cheburek.jpg"></center>'
 	'Walking through the market, you came across an old woman selling pies.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if pcs_energy <= 80:
 		act 'Buy a pie for 20 <b>₽</b>':
 			*clr & cla
@@ -773,7 +797,9 @@ if ARGS[0] = 13:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/proverka.jpg"></center>'
 			'You catch up with the woman and telling her she dropped something you hand her the purse. The woman checks her money is still there and seeing that everything is in place, she thanks you and walked away.'
 			act 'Stop wandering': gt 'pavtrain_market', 'start'
-			act 'Wander around the market': gt 'pavtrain_market','events'
+			if hour >= 8 and hour <= 18:
+				act 'Wander around the market': gt 'pavtrain_market','events'
+			end
 		end
 	end
 end
@@ -786,7 +812,9 @@ if ARGS[0] = 14:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/rebenok.jpg"></center>'
 	'You see a young mother and her crying baby.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 end
 
 if ARGS[0] = 15:
@@ -797,7 +825,9 @@ if ARGS[0] = 15:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/rezba.jpg"></center>'
 	'You find a stall with beautiful things carved out of wood and metal.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 end
 
 if ARGS[0] = 16:
@@ -808,7 +838,9 @@ if ARGS[0] = 16:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/gruzchik.jpg"></center>'
 	'Looking around, you almost collide with a man pulling a small cart.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 end
 
 if ARGS[0] = 17:
@@ -819,7 +851,9 @@ if ARGS[0] = 17:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/meatlavka.jpg"></center>'
 	'You wander past a the meet seller and see a butcher working with an axe.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 end
 
 if ARGS[0] = 18:
@@ -830,7 +864,9 @@ if ARGS[0] = 18:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dirka.jpg"></center>'
 	'As you walk past a stall you notice a small hole torn in the canvas.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	gs 'willpower', 'voyeur', 'self', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Look through the hole (<<will_cost>> Willpower)':
@@ -856,7 +892,9 @@ if ARGS[0] = 19:
 	tovpay = 1500
 	'You see a booth selling birth control pills for <<tovpay>> <b>₽</b>.'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= tovpay:
 		act 'Buy birth control pills (1500 <b>₽</b>)':
 			*clr & cla

+ 9 - 9
locations/poli.qsrc

@@ -5,10 +5,10 @@ if $ARGS[0] = 'start':
 	CLOSE all
 	$sexloc = 'poli'
 	$loc = 'poli'
-	$metka = ''
+	$metka = 'start'
 	$location_type = 'indoors'
 	$menu_loc = 'poli'
-	$menu_arg = $ARGS[0]
+	$menu_arg = 'start'
 	menu_off = 0
 	*clr & cla
 	hosprand = rand(0, 10)
@@ -1645,27 +1645,27 @@ if $ARGS[0] = 'milk_donation':
 				lact_ev['poli_totalmilkdonation_count'] += 1
 				lact_ev['poli_totalmilkdonated'] += (lact_ev['poli_temp_var']*50)
 				if lact_ev['poli_temp_var'] >= 12:
-					'She looks astonished at the at the marvelous amounts of milk you made as she stores away the <<lact_ev[''poli_temp_var'']>> bottles that contain <<lact_ev[''poli_temp_var'']*50>>ml of your breast milk.'
+					'She looks astonished at the at the marvelous amounts of milk you made as she stores away the <<lact_ev[''poli_temp_var'']>> bottles that contain 50ml of your breast milk.'
 					'Nurse: Ms. <<$pcs_lastname>>, this is so much milk, I can''t believe how much you just made!'
 					'She laughts heartily and you blush a bit.'
 				elseif lact_ev['poli_temp_var'] >= 10:
-					'She looks amazed at the at the copious amounts of milk you made as she stores away the <<lact_ev[''poli_temp_var'']>> bottles that contain <<lact_ev[''poli_temp_var'']*50>>ml of your breast milk.'
+					'She looks amazed at the at the copious amounts of milk you made as she stores away the <<lact_ev[''poli_temp_var'']>> bottles that contain 50ml of your breast milk.'
 					'Nurse: Oh my, where do you store all this milk in your breast...?'
 				elseif lact_ev['poli_temp_var'] >= 8:
-					'She looks surprised at the at the large amount of milk you made as she stores away the <<lact_ev[''poli_temp_var'']>> bottles that contain <<lact_ev[''poli_temp_var'']*50>>ml of your breast milk.'
+					'She looks surprised at the at the large amount of milk you made as she stores away the <<lact_ev[''poli_temp_var'']>> bottles that contain 50ml of your breast milk.'
 					'Nurse: Ms. <<$pcs_lastname>>, this is really much milk...'
 				elseif lact_ev['poli_temp_var'] >= 6:
-					'She looks pleasantly satisfied at you as she puts away the <<lact_ev[''poli_temp_var'']>> bottles containing <<lact_ev[''poli_temp_var'']*50>>ml of your breast milk.'
+					'She looks pleasantly satisfied at you as she puts away the <<lact_ev[''poli_temp_var'']>> bottles containing 50ml of your breast milk.'
 					'Nurse: Oh, this is pretty much milk.'
 				elseif lact_ev['poli_temp_var'] >= 4:
-					'She looks satisfied at you as she puts away the <<lact_ev[''poli_temp_var'']>> bottles containing <<lact_ev[''poli_temp_var'']*50>>ml of your breast milk.'
+					'She looks satisfied at you as she puts away the <<lact_ev[''poli_temp_var'']>> bottles containing 50ml of your breast milk.'
 					'Nurse: This is a good amount of milk.'
 				elseif lact_ev['poli_temp_var'] >= 2:
-					'She looks satisfied at you as she puts away <<lact_ev[''poli_temp_var'']>> bottles with <<lact_ev[''poli_temp_var'']*50>>ml of your breast milk inside.'
+					'She looks satisfied at you as she puts away <<lact_ev[''poli_temp_var'']>> bottles with 50ml of your breast milk inside.'
 				elseif lact_ev['poli_temp_var'] = 1:
 					'She looks satisfied at you as she puts away one bottle with 50ml of your breast milk.'
 				else
-					'She looks satisfied at you as she puts away <<lact_ev[''poli_temp_var'']>> bottles with <<lact_ev[''poli_temp_var'']*50>>ml of your breast milk inside.'
+					'She looks satisfied at you as she puts away <<lact_ev[''poli_temp_var'']>> bottles with 50ml of your breast milk inside.'
 				end
 			elseif lact_ev['poli_milkedvolume'] < 50000 and lact_ev['poli_milkedvolume'] > 0:
 				'She looks at you a bit disappointed.'

+ 1 - 0
locations/postmaster.qsrc

@@ -67,6 +67,7 @@ if $ARGS[0] = 'start':
 	elseif postjobQW = 2 and postworkday ! daystart:
 !!when you go to work on Saturday, first time
 		if week = 6 and hour = 11:
+			minut += 60 - minut
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 			'"Ah good, you''re here!" the postmaster smiles when you enter the post office. "And right on time, too. Please, follow me."'

+ 1 - 1
locations/preSYS2.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'start':
 	act 'Set purse': gt 'preSYS2','modpur'
 	act 'Set items': gt 'preSYS2','modite'
 	act 'Set money (<<money>>₽)': money = input 'Set Cash Amount' & gt'preSYS2','start'
-	act 'Return to preset character menu': gt 'preSYS', 'charselect'
+	if custom_csb ! 1: act 'Return to preset character menu': gt 'preSYS', 'charselect'
 	act 'Confirm these options':
 		if pcs_inhib < 10: pcs_inhib = 10
 		!!This line should get sveta to wear school uniform because she has no other clothing with > 50

+ 2 - 0
locations/sauna.qsrc

@@ -113,6 +113,8 @@ if $ARGS[0] = 'saunaroom':
 
 	'If you run out of personal hygeine or beauty products, you can ask for some more, but at a cost.'
 	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	*nl
 	gs 'saunawhore','debtPay'
 	if workDolg > 0:'Your debt is <<workDolg>> <b>₽</b>'
 

+ 3 - 1
locations/saveupdater.qsrc

@@ -729,6 +729,8 @@ end
 ! Switching from tracking relationship with Rex from rex to npc_rel['A57']
 if rex > 0 and rex > npc_rel['A57']: npc_rel['A57'] = rex & killvar 'rex'
 
+!!------------------------------village variable clean up/translation---------------------------------------
+if findvel > 0: BikeLoc = findvel & killvar findvel
 !!------------------------------grandparent variable clean up---for 0.8.0 release---------------------------
 !!---Grandpa
 If grandpa_bilberry > 0: grandpaQW['chore_berry_quantity'] = grandpa_bilberry & killvar 'grandpa_bilberry'
@@ -884,7 +886,7 @@ if npc_bust['A145'] = 9: npc_bust['A145'] = 31
 
 !!-----------Adding pube colours for 0.8.0-----------
 
-if pcs_pubecol[1] = 0: pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1	
+if pcs_pubecol[1] = 0: pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1 & pcs_pubecol[2] = pcs_haircol
 
 !!-----------Adding pube colours for 0.8.0-----------
 

+ 4 - 2
locations/sexshop.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	cla & *clr
-	if rand(1, 10) = 10 and hotcat >= 5 and kendrano ! 1:gt 'sexshop', 'kendra'
+	if rand(1, 10) = 10 and hotcat >= 5 and kendrano ! 1 and kendra[1] < daystart:gt 'sexshop', 'kendra'
 	if $pantyworntype = 'none' and rand(1, 10) = 10:gt 'sexshop', 'shprod'
 
 	clr
@@ -1012,6 +1012,7 @@ if $ARGS[0] = 'kendra':
 				'She smiles at that. "I think you are going to make a great little slave, we are going to have a lot of fun together. Now follow me to the basement slave so you can service me."'
 				act 'Serve Kendra':
 					*clr & cla
+					kendra = 1
 					lesbian += 1
 					kendratoy = rand(1,2)
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend1.jpg"></center>'
@@ -1238,6 +1239,7 @@ end
 
 if $ARGS[0] = 'kendrafinish':
 	$location_type = 'event'
+	kendra[1] = daystart + 6
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend16.jpg"></center>'
@@ -1245,7 +1247,7 @@ if $ARGS[0] = 'kendrafinish':
 	'You do as she says and stick out your tongue. She licks your tongue with hers and the two of you lick each others tongue for a few moments. Finally she stops and grabs your butt cheek roughly and digs her nails into your backside. Hard enough it hurts a little, then she lets go and steps away and the pain quickly fades. She starts taking off her harness, she cleans the dildo and then puts it away, before getting dressed. Once she is fully dressed she finally turns to you again. "You may not get dressed slave."'
 	*nl
 	'"Thank you Mistress." You tell her as you get dressed.'
-	'Once you are both fully dressed she says. "Give me your number, so I can summon you, when I feel the need to use my little white slave." You do as you are told and give her your number. With that done, she gives you a little shooing motion. "You may go now."'
+	'Once you are both fully dressed she says. "Visit again and if I feel the need to use my little white slave, I might even let you." She gives you a little shooing motion. "You may go now."'
 	'"Yes Mistress Kendra." You reply, with that you leave the basement and go back up to the shop above.'
 	gs 'arousal', 'foreplay', 5, 'lesbian', 'sub'
 	gs 'arousal', 'end'

+ 2 - 0
locations/shulgahall.qsrc

@@ -30,6 +30,8 @@ if $ARGS[0] = '':
 	'The hallway of Uncle Sergey''s one bedroom apartment is similar to every other apartment in the complex. There are several doors leading to the various rooms. The main bedroom is Uncle Sergey''s. There''s also the kitchen, bathroom, and finally the livingroom, which Vasily uses for a bedroom.'
 	if home_owned[2] = 0:
 		'There are several <a href="exec:gt ''wardrobe'', ''start''">closets</a> in the hall, which Sergey said you can use to store your clothes, while you''re staying here</a>, and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
+		*nl
+		'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 	else
 		'There are several closets, in the hall</a>, and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
 	end

+ 3 - 2
locations/sistersleep.qsrc

@@ -13,11 +13,12 @@ if $ARGS[0] = 'sister_sleep':
 		act 'Move away': gt 'bedrPar'
 	else
 		if sisterQW['lesbDay'] = daystart:
+			'You want to touch her again but you change your mind at the last minute. Doing this more than once a day could make her really angry. Better try again tomorrow.'
 			act 'Move away': gt 'bedrPar'
 		else
-			sisterQW['lesbDay'] = daystart
 			act 'Move away': gt 'bedrPar'
-			if sisterbfspy = 4:
+			if sisterbfspy >= 4:
+				sisterQW['lesbDay'] = daystart
 				if sisterLesb = 0:
 					gs 'willpower', 'foreplay', 'self'
 				else

+ 4 - 6
locations/spell.qsrc

@@ -398,14 +398,12 @@ if $ARGS[0] = 'cosmetica':
 			! Shave Pubes
 			if pubestyle = 1:
 				pcs_pubes = 0
-			elseif pubestyle >= 2 and pubestyle <= 7:
-				pcs_pubes = 11
-			elseif pubestyle = 8:
+			elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
 				pcs_pubes = 16
-			elseif pubestyle = 9:
-				pcs_pubes = 21
-			elseif pubestyle = 10:
+			elseif pubestyle = 10 and pcs_pubes >= 35:
 				pcs_pubes = 26
+			elseif pubestyle = 11 and pcs_pubes > 10:
+				pcs_pubes = 0
 			end
 		end
 

+ 3 - 2
locations/stat.qsrc

@@ -440,8 +440,9 @@ if minut >= 60:
 	end
 
 	if pcs_willpwr > willpowermax: pcs_willpwr = willpowermax
-	if pcs_willpwr < 20: will_degrade += 1
-	if will_degrade >= 20: willpowermax -= 1 & will_degrade = 0
+	if pcs_willpwr < 25: will_degrade += 1
+	if will_degrade >= 5: willpowermax -= 1 & will_degrade = 0
+	if pcs_willpwr >= 50 and will_degrade > 0: will_degrade -= 1
 	if pcs_stam > stammax: pcs_stam = stammax
 
 	gs 'femcyc'

+ 9 - 10
locations/stat_display.qsrc

@@ -2019,18 +2019,17 @@ if npc_QW['A113'] = 1: $stat_msg += '<br>You owe Vadim Bely <<belgangpay>> <b><b
 
 !!------------------ Gadukino chores and such -------------------
 if display_bb = 1:
-	if boletus + bilberry > 0:
-		if boletus + bilberry >= 10:
-			$stat_msg +='<br><font color = Olive>You have a full basket. </font> '
+	if boletus + boletus_cooked + bilberry > 0:
+		$stat_msg += '<br> '
+		if boletus + boletus_cooked + bilberry >= 5:
+			$stat_msg +='<br><font color = Olive>Your basket is full and you cannot carry more. </font> '
 		else
-			$stat_msg +='<br><font color = Olive>In Your basket: </font>'
+			$stat_msg +='<br><font color = Olive>Your basket is partially full. </font>'
 		end
-		if hour > 6 and (month < 6 or month > 9) and boletus + bilberry > 0:
-			boletus = 0 & bilberry = 0
-			'<br>You throw away your mushrooms and berries.'
-		end
-		if boletus > 0:$stat_msg +='Mushrooms: <b><<boletus>></b> kg. '
-		if bilberry > 0:$stat_msg +='Berries: <b><<bilberry>></b> kg. '
+		$stat_msg += '<br><font color = Olive>(Click numbers to throw away one a time) </font>'
+		if boletus > 0:$stat_msg +='<br><font color = Olive>Mushrooms: <a href="exec:boletus -= 1 & gs ''stat''"><b><<boletus>></b></a> kg. </font>'
+		if boletus_cooked > 0:$stat_msg +='<br><font color = Olive>Cooked Mushrooms: <a href="exec:boletus_cooked -= 1 & gs ''stat''"><b><<boletus_cooked>></b></a> kg. </font>'
+		if bilberry > 0:$stat_msg +='<br><font color = Olive>Berries: <a href="exec:bilberry -= 1 & gs ''stat''"><b><<bilberry>></b></a> kg. </font>'
 	end
 end
 

+ 2 - 0
locations/stwork.qsrc

@@ -23,6 +23,8 @@ if $ARGS[0] = 'start':
 	'To the side there''s a <a href="exec:stripMir = 0 & gt ''stripclub'', ''start''">steel door</a> which overlooks the back yard and the staff uses as an entrance, to save them from meeting scummy customers. Standing by this entrance, there''s always <a href="exec:gt ''stwork'', ''guard''">security</a> keeping the talent safe.'
 	'Near the exit door is a vending machine selling '+iif(money >= 100,'<a href="exec:money -= 100 & gt ''food'', ''snack''">snacks</a>','snacks')+' and a <a href="exec:gt ''beverage'', ''bev_wat''">water cooler</a>, which is heavily used by staff after coming off stage'
 	'A wooden door leads to the <a href="exec:gt ''stwork'', ''toilet''">staff bathroom</a>.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	! Tattoos increase your desireability as a stripper
 	if tatlech > 0:stripKoef1 = rand(1, 3)

+ 178 - 58
locations/swamp.qsrc

@@ -1,76 +1,196 @@
 # swamp
 
-$loc = 'swamp'
-$metka = ''
-$location_type = 'secluded'
+if $ARGS[0] = 'start':
+	*clr & cla
 
-$menu_loc = 'swamp'
-$menu_arg = ''
-menu_off = 0
+	$loc = 'swamp'
+	$metka = 'start'
+	$location_type = 'secluded'
 
-new_boletus = 0
-new_bilberry = 0
-goswamp = 1
+	$menu_loc = 'swamp'
+	$menu_arg = 'start'
+	menu_off = 0
 
-gs 'gadukino_event', 'sound'
-gs 'stat'
+	CLOSE ALL
+	gs 'gadukino_event', 'sound'
+	gs 'stat'
 
-*clr & cla
-
-'<center><H4>Swamp</H4></center>'
-
-if month >= 4 and month <= 10:
-	if hour >= 6 and hour < 22:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp.jpg"></center>'
+	'<center><H4>Swamp</H4></center>'
+	if month >= 4 and month <= 10:
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_night.jpg"></center>'
+		end
 	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_night.jpg"></center>'
+		if hour >= 8 and hour < 20:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_winter.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_winter_night.jpg"></center>'
+		end
 	end
-else
-	if hour >= 8 and hour < 18:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_winter.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_winter_night.jpg"></center>'
+	*nl
+	'You are at the swamp on the far side of the woods from the village.'
+	'It can be dangerous to hike in this area, unless physically fit or have a good knowledge of the forest.'
+
+	act 'Head back out of the swamp': minut += 15 & gt 'gadforest', 'forest_center'
+
+	if hunterscabin = 1:
+		'You can see the small path to the clearing that contains the hunters cabin.'
+		act 'Go to the hunters cabin':
+			! daytime chance to get stuck in swamp - use bike to get there 100% of the time
+			if hour >= 6 and hour <= 22:
+				swamp_stuck = 0
+				gt 'swamp', 'stuck','swamp'
+			! nighttime chased by wolves - Sveta probably should not be roaming the forest at this time
+			else
+				gt 'gadforestlost','wolves','swamp'
+			end
+		end
 	end
-end
-*nl
-'You are in the swamp area of the forest.'
-'It is considered dangerous to hike in this area, unless physically fit, and should always be avoided at night.'
-*nl
-'You can find a lot of mushrooms and berries here.'
-*nl
-'There''s a small visible path to a clearing that leads to the hut, used by the hunters.'
-*nl
-act 'Go to the hut': gt 'swamp_yard', 'start'
-
-if hour >= 6 and hour <= 21 and month >= 6 and month <= 9:
-	act 'Walk into the forest':minut += 30 & gt 'gadforest','4'
-end
-if hour >= 6 and hour < 21:
-	act 'Return to the edge of the forest':hunters_here = 0 & minut += 150 & gt 'gadforest','1'
-else
-	act 'Return to the edge of the forest':hunters_here = 0 & gt 'gadforest_event', 'forest_road'
+
 end
 
-if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and swamp_day ! daystart:
-	act 'Look for mushrooms and berries (0:30)':
-		cla
-		*clr
-		minut += 30
-		temp = RAND(1,2)
-		swamp_day = daystart
-		if goforest < 20:goforest += rand(0,1)
-		new_boletus += rand(4,5)
-		boletus += new_boletus
-		new_bilberry += rand(4,5)
-		bilberry += new_bilberry
-		pcs_mood += 5
+if $ARGS[0] = 'stuck':
+	! if player is skilled at forest or very agile or strong then don''t get stuck in swamp at all
+	if pcs_bushcraft < 70 and pcs_agil < 70 and pcs_stren < 70:
+		*clr & cla
+
+		$loc = 'swamp'
+		$metka = 'stuck'
+		$location_type = 'secluded'
+
+		$menu_loc = 'swamp'
+		$menu_arg = 'stuck'
+		menu_off = 0
+
+		CLOSE ALL
+		gs 'gadukino_event', 'sound'
 		gs 'stat'
 
-		gs 'gadforest', 'clothes1'
+		'<center><H4>Swamp</H4></center>'
+		if $clothingworntype ! 'nude' and PCloSkirt = 0:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp1.jpg"></center>'
+		elseif $clothingworntype ! 'nude' and PCloSkirt > 0:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski1.jpg"></center>'
+		elseif $clothingworntype = 'nude':
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
+		end
+		*nl
+		'As you walk through the swamp, you feel yourself begin to sink into the mud of the swamp with each step.'
+		'You know you''re so close to your destination, but you''re not sure you can make it.'
+
+		act 'Struggle':
+			*clr & cla
+			swamp_stuck += 1
+			minut += 15
+			gs 'sweat', 'add', 15
+			gs 'stat'
+			if swamp_stuck mod 3 = 0:
+				swamp_check = pcs_stren + pcs_agil + pcs_bushcraft
+				swamprand = rand(0,225)
+			elseif swamp_stuck mod 2 = 0:
+				swamp_check = pcs_stren + pcs_agil
+				swamprand = rand(0,150)
+			else
+				swamp_check = pcs_stren
+				swamprand = rand(0,75)
+			end
+			if swamp_stuck = 10 and Enable_nogameover = 0:
+				over = 10
+				gt 'gameover'
+			else
+				if swamp_check > swamprand:
+					'<center><H4>Swamp</H4></center>'
+					if $clothingworntype ! 'nude' and PCloSkirt = 0:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp.jpg"></center>'
+					elseif $clothingworntype ! 'nude' and PCloSkirt > 0:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski.jpg"></center>'
+					elseif $clothingworntype = 'nude':
+						swamprand = rand(0,3)
+						if swamprand = 0:
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0..jpg"></center>'
+						else
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+swamprand+'.jpg"></center>'
+						end
+					end
+					*nl
+					'Your efforts are not in vain as you begin to feel the muds hold loosen. With another burst of strength you free yourself and breathe a sigh of relief.'
 
-		'You spend half an hour wandering through the woods in search of mushrooms and berries and manage to find <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+					act 'Success!':gt 'swamp_yard','start'
+				else
+					'<center><H4>Swamp</H4></center>'
+					if $clothingworntype ! 'nude' and PCloSkirt = 0:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp1.jpg"></center>'
+					elseif $clothingworntype ! 'nude' and PCloSkirt > 0:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski1.jpg"></center>'
+					elseif $clothingworntype = 'nude':
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
+					end
+					*nl
+					'Your efforts are for nothing, the muds hold feels as tight as ever. In fact you feel yourself sinking even deeper.'
 
-		act 'Continue': gt'swamp'
+					act 'Failure':gt 'swamp','stuck'
+				end
+			end
+		end
+		if month >= 4 and month <= 10:
+			act 'Scream for help':
+				*clr & cla
+				minut += 15
+				if ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)):
+					swamprand = rand(1,4)
+				elseif (hour >= 7 and hour < 23):
+					swamprand = rand(1,5)
+				else
+					swamprand = rand(1,6)
+				end
+				gs 'stat'
+				'<center><H4>Swamp</H4></center>'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlosthelp.jpg"></center>'
+				*nl
+				'You don''t think you''re strong enough to break free of the mud and decide your best chance is to simply yell for help. Hopefully you''re close enough to the hunters cabin that they''ll hear you.'
+
+				if swamprand = 1:
+					act 'Success!':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/handshelp.jpg"></center>'
+						*nl
+						'You hear men speaking and begin to shout louder. The voices come closer and finally, you feel strong hands grab you and drag you out to solid ground.'
+						act 'Relax':gt 'swamp_yard','start'
+					end
+				else
+					*nl
+					'You yell out into the void, but your only response is the howling of the wind and the chirp of some crickets.'
+					act 'Failure':gt 'swamp','stuck'
+				end
+			end
+		end
+	else
+		'<center><H4>Swamp</H4></center>'
+		if month >= 4 and month <= 10:
+			if hour >= 6 and hour < 22:
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp_night.jpg"></center>'
+			end
+		else
+			if hour >= 8 and hour < 18:
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp_winter.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp_winter_night.jpg"></center>'
+			end
+		end
+		*nl
+		if $ARGS[1] = 'forest_edge':
+			minut += 60
+			'After an hour walking through the forest you finally see the hunters cabin ahead.'
+		elseif $ARGS[1] = 'swamp':
+			minut += 15
+			'After a few mintues walking through the swamp you finally see the hunters cabin ahead.'
+		end
+		gs 'stat'
+		act 'Continue':gt 'swamp_yard', 'start'
 	end
 end
 

+ 19 - 23
locations/swamp_woods.qsrc

@@ -2,19 +2,24 @@
 
 !TODO: Break into more arg blocks
 if $ARGS[0] = 'start':
+	*clr & cla
+
 	$loc = 'swamp_woods'
-	$metka = ''
+	$metka = 'start'
+	$location_type = 'secluded'
+
 	$menu_loc = 'swamp_woods'
-	$menu_arg = ''
+	$menu_arg = 'start'
 	menu_off = 0
-	$location_type = 'secluded'
 
+	$forest_args1 = 'swamp_woods'
+
+	CLOSE ALL
 	gs 'gadukino_event', 'sound'
 	gs 'stat'
 
 	gs 'hunter_ambient', 'schedule'
 
-	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods.jpg"></center>'
 	'You are in the woods near the hut. You can see it not too far in the distance.'
 	'You can also venture deeper into woods to circle around the swamp, granted you do not get lost trying.'
@@ -80,7 +85,7 @@ if $ARGS[0] = 'start':
 					'Even though you occassionally step into the swamp you manage to not get stuck'
 					'After some time walking and struggling not to get stuck you can see the hut on the opposite side'
 
-					act 'Success!': pcs_bushcraft += 5 & gt 'gadforest','4'
+					act 'Success!': pcs_bushcraft += 5 & gt 'gadforest','forest_center'
 				elseif nearby_woods_check <= 3:
 					!End up stuck in the swamp
 					if $clothingworntype ! 'nude':
@@ -93,7 +98,7 @@ if $ARGS[0] = 'start':
 
 					*nl
 					'Seems like the forest can camouflage parts of the swamp, fooling careless hikers.'
-					act 'If only you knew': pcs_bushcraft += 3 & gt 'gadforestswamp','2'
+					act 'If only you knew': pcs_bushcraft += 3 & gt 'swamp','stuck'
 				else
 					if $clothingworntype ! 'nude':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike.jpg"></center>'
@@ -101,23 +106,14 @@ if $ARGS[0] = 'start':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike_nude.jpg"></center>'
 					end
 
-					if nearby_woods_check <= 5:
-						!Circle back to where the pcs started
-						'You start going into the woods in a direction you think will take you around the swamp.'
-						'After a few hours walking you realize your surroundings are a bit familiar.'
-						'Then you look around you and can see the hut in the distance. Seems like you just walked around in circles and ended up where you started'
-
-						*nl
-						'You can see some broken branches and prints near ahead of you, marking the direction you initially started walking towards'
-						act 'That''s interesting...': pcs_bushcraft += 2 & gt 'swamp_woods', 'start'
-					else
-						!Get lost in the woods
-						'You start going into the woods in a direction you think will take you around the swamp.'
-						'After a few hours walking you realize you have no idea where you are going.'
-						'You look back to see if you can get back to the hut but nothing around seems familiar'
+					!Circle back to where the pcs started
+					'You start going into the woods in a direction you think will take you around the swamp.'
+					'After a few hours walking you realize your surroundings are a bit familiar.'
+					'Then you look around you and can see the hut in the distance. Seems like you just walked around in circles and ended up where you started'
 
-						act 'This can''t be good': gt 'gadforestlost','1'
-					end
+					*nl
+					'You can see some broken branches and prints near ahead of you, marking the direction you initially started walking towards'
+					act 'That''s interesting...': pcs_bushcraft += 2 & gt 'swamp_woods', 'start'
 				end
 			end
 		else
@@ -134,7 +130,7 @@ if $ARGS[0] = 'start':
 			'With that in mind, you go into the forest, aware of your surroundings to make sure you are not stepping too far from the edge of the swamp'
 			'After a couple hours you are on the other edge of the forest'
 
-			act 'Further': gt 'gadforest','4'
+			act 'Further': gt 'gadforest','forest_center'
 		end
 	end
 end

+ 10 - 33
locations/swamp_yard.qsrc

@@ -15,9 +15,8 @@ if $ARGS[0] = 'start':
 	!the chance of encountering hunters
 	!the chance of hitting GG, if she`s a slut
 	huntslutsexrand = rand(1,3)
-	! to remember were cowards or not
-	!if lost_girl = 0:lost_girl += rand(40,60)
-	if StoryLine = 1 and lost_girl = 0 and forest_lostday > 0: lost_girl=daystart+2
+	!if lost make this trigger after 2 days in swamp house
+	if lost_girl = 1 and daystart > forest_lostday+2 and hour >= 8 and hour < 20: gt 'gadforestlost','rescue','ranger','swamp_yard'
 	dirty = 0
 	temp_sy = rand(1,10)
 
@@ -56,10 +55,7 @@ if $ARGS[0] = 'start':
 	end
 	*nl
 	'Behind the hut there is a <a href="exec: gt ''swampspring'' ">spring</a>, if you continue a little further down there is a small <a href="exec: gt ''backwater'' ">creek</a> with relatively clean water.'
-	if findvel = 3:
-		*nl
-		'On the side of the hut is an old <a href="exec:gt ''bicycle'',''swamp''">bike</a>.'
-	end
+	gs 'bicycle', 'swamp_yard'
 	if hunters_available = 1 and hunters_outside = 1 and huntersknow = 0:
 		*nl
 		'You spot some unfamiliar <a href="exec: gt ''hunters'', ''start'' ">people</a> standing in front of the hut.'
@@ -91,9 +87,9 @@ if $ARGS[0] = 'start':
 			if hour >= 6 and hour < 23:
 				minut += 5
 				if rand(1,10)>9:
-					gt 'swamp'
+					gt 'swamp', 'start'
 				else
-					gt 'gadforestswamp','2'
+					gt 'swamp','stuck'
 				end
 			else
 				*clr & cla
@@ -105,21 +101,21 @@ if $ARGS[0] = 'start':
 				act 'Disregard his advice':
 					minut += 5
 					if rand(1,10)>8:
-						gt 'swamp'
+						gt 'swamp', 'start'
 					else
-						gt 'gadforestswamp','2'
+						gt 'swamp','stuck'
 					end
 				end
 			end
 		else
 			minut += 5
 			if (hour >= 6 and hour < 23) or rand(1,10)>7:
-				gt 'swamp'
+				gt 'swamp', 'start'
 			else
-				gt 'gadforestswamp','2'
+				gt 'swamp','stuck'
 			end
 		end
-		gt 'gadforestswamp','2'
+		gt 'swamp','stuck'
 	end
 
 	act 'Go into the house':gt 'swamphouse', 'start'
@@ -1037,25 +1033,6 @@ if $ARGS[0] = 'start':
 			act 'Further':gt 'swamp_yard', 'start'
 		end
 	end
-
-	!Forester looking for the missing GG
-	!if lost_girl < 10:
-	!make this trigger after 2 days in swamp house, minus a countdown per hour
-	if StoryLine = 1 and lost_girl > 0 and daystart > lost_girl:
-		*clr & cla
-		minut += 150
-		lost_girl = 0
-		forest_lostday = 0
-		hunters_here = 0
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/forester.jpg"></center>'
-		'You walked across the yard when noticing a man resembling a park ranger.'
-		'"There you are," he said wearily. "Your grandparents been sick and worried searching for you all over the forest. They''ve asked me to help them out. Come with me, I''ll take you home."'
-		'"Oh, this is so embarrassing..." How could I forget about my poor grandparents."'
-		'You quickly pack your stuff, letting the park ranger take you home...'
-		act 'Further':gt 'gadhouse', 'start'
-	end
 end
 
 if $ARGS[0] = 'campfire':

+ 3 - 0
locations/tanspalnya.qsrc

@@ -25,6 +25,9 @@ else
 	$komp = '.'
 end
 'A luxurious <a href="exec:gt ''divan'', ''start''">leather sofa</a> is also part of the ensemble. Mounted on the wall opposite the sofa is a huge plasma <a href="exec:gt ''TV'', ''start''">TV</a>. Under the window, you see a brand-new <a href="exec:gt ''stol'', ''start''">desk</a><<$komp>>'
+*nl
+'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+*nl
 if obruch > 0:'<br>Your hula hoop stands in a corner of the room. '
 if skak > 0:'Your jump rope is sitting on a shelf. '
 if bookYog > 0:'A yoga mat is rolled up in a corner next to the wardrobe. '

+ 1 - 1
locations/telefon.qsrc

@@ -276,7 +276,7 @@ if $ARGS[0] = 'IncomingCall':
 	PLAY 'sound/old_phone.mp3',30
 	$telefon['body'] = '
 	<font size=6><<$telefonIncC["Name"]>> calling</font><br>
-	<img src="<<$telefonIncC["Icon"]>>"><br>
+	<img src="<<$telefonIncC["Icon"]>>" width="200"><br>
 	<br>
 	<br>
 	<br>

+ 1 - 1
locations/treeCircle.qsrc

@@ -26,7 +26,7 @@ $treeCircArg['PavlovskPark'] = ''
 !Gadukino Forest Location
 $treeCircName['GadForest'] = 'Gadukino Forest'
 $treeCircLoc['GadForest'] = 'gadforest'
-$treeCircArg['GadForest'] = '1'
+$treeCircArg['GadForest'] = 'forest_edge'
 !Pushkin Park Location
 $treeCircName['PushkinPark'] = 'Pushkin Park'
 $treeCircLoc['PushkinPark'] = 'lug'

+ 9 - 1
locations/wardrobe.qsrc

@@ -144,7 +144,15 @@ if $ARGS[0] = 'default':
 	end
 	'</td></tr>'
 	'</table></center>'
-	act 'Return': gt 'wardrobe', 'start'
+	act 'Return':
+		if quick_dress = 1:
+			killvar '$wloc'
+			killvar 'quick_dress'
+			gt $loc, $metka
+		else
+			gt 'wardrobe', 'start'
+		end
+	end
 	act 'Add as a new custom set': gt 'wardrobe', 'default_entry_set', ARRSIZE('defclothingnumber')
 	'<center>Note: Selecting an outfit will show the bonus for equipped shoes, this is only applied when outside.</center>'
 end

+ 2 - 2
locations/willpower.qsrc

@@ -901,8 +901,8 @@ if $ARGS[0] = 'pay':
 	pcs_willpwr -= will_cost
 	if $ARGS[1] = 'force':
 		will_counter += 1
-		if will_counter >= 5: will_counter = 0 & willpowermax += 1
-		if will_enforced < 50: will_enforced += 1
+		if will_counter >= 2: will_counter = 0 & willpowermax += 1
+		if will_enforced < 20: will_enforced += 1
 	end
 end
 

+ 2 - 0
locations/ybedr.qsrc

@@ -23,6 +23,8 @@ if ymanrem[4] = 2:
 	'It''s a bright and beautiful room, with a large <a href="exec:gt ''bed'', ''start''">continental bed</a>.'
 	'On one side of the bed is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start'', ''start''">wardrobe</a>.'
 	'There''s a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a> placed in one of the corners.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 end
 
 act 'Leave the room':minut += 1 & gt 'ymans'

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