Ver Fonte

Merge remote-tracking branch 'keving-upstream/master'

netuttki há 1 semana atrás
pai
commit
bd154cff4f
100 ficheiros alterados com 7246 adições e 7111 exclusões
  1. 1 0
      .gitignore
  2. 22 21
      glife.qproj
  3. 45 13
      locations/BurgerTip.qsrc
  4. 4 4
      locations/Cheatmenu_din.qsrc
  5. 5 7
      locations/MagEncounterFairy.qsrc
  6. 8 8
      locations/TerminalOffice.qsrc
  7. 34 34
      locations/_attributes_school.qsrc
  8. 2 0
      locations/albina_starlets_sex.qsrc
  9. 1 0
      locations/alexandriaChat.qsrc
  10. 11 45
      locations/bedrPar.qsrc
  11. 1 0
      locations/belpicknick.qsrc
  12. 16 16
      locations/bicycle.qsrc
  13. 4 4
      locations/booty_call_sms.qsrc
  14. 2 0
      locations/bordel.qsrc
  15. 57 58
      locations/bus.qsrc
  16. 5 5
      locations/camera.qsrc
  17. 20 23
      locations/card.qsrc
  18. 6 1
      locations/cikl.qsrc
  19. 2 1
      locations/city_coffee_hole.qsrc
  20. 7 45
      locations/city_house_res_misc.qsrc
  21. 17 11
      locations/city_jorahouse.qsrc
  22. 2 2
      locations/city_kafeend.qsrc
  23. 3 3
      locations/city_library.qsrc
  24. 9 45
      locations/city_mansion_residence_2.qsrc
  25. 1 1
      locations/city_park.qsrc
  26. 2 2
      locations/clothing.qsrc
  27. 1 1
      locations/clothing_attributes.qsrc
  28. 2 2
      locations/dachain.qsrc
  29. 19 9
      locations/din_bad.qsrc
  30. 2 2
      locations/din_npc.qsrc
  31. 4 4
      locations/exercise.qsrc
  32. 21 24
      locations/gad_backwater.qsrc
  33. 872 0
      locations/gad_beach.qsrc
  34. 162 293
      locations/gad_field.qsrc
  35. 164 165
      locations/gad_forest.qsrc
  36. 74 74
      locations/gad_forest_events.qsrc
  37. 150 158
      locations/gad_forest_lost.qsrc
  38. 49 47
      locations/gad_gpbarn.qsrc
  39. 83 154
      locations/gad_gpbath.qsrc
  40. 124 155
      locations/gad_gphouse.qsrc
  41. 262 41
      locations/gad_gpyard.qsrc
  42. 8 11
      locations/gad_market.qsrc
  43. 309 302
      locations/gad_meadow.qsrc
  44. 13 17
      locations/gad_miroslava_home.qsrc
  45. 53 68
      locations/gad_prostitutes.qsrc
  46. 413 0
      locations/gad_river.qsrc
  47. 39 50
      locations/gad_road.qsrc
  48. 19 27
      locations/gad_swamp.qsrc
  49. 24 27
      locations/gad_swamp_woods.qsrc
  50. 27 30
      locations/gad_swamp_yard.qsrc
  51. 124 131
      locations/gad_swamphouse.qsrc
  52. 7 7
      locations/gad_swampspring.qsrc
  53. 0 240
      locations/gadgarden.qsrc
  54. 0 1278
      locations/gadriver.qsrc
  55. 47 50
      locations/gadukino.qsrc
  56. 31 31
      locations/gadukino_event.qsrc
  57. 14 14
      locations/gargazel.qsrc
  58. 35 35
      locations/grandmahelp.qsrc
  59. 30 30
      locations/grandpahelp.qsrc
  60. 25 25
      locations/grigory.qsrc
  61. 1 1
      locations/gschool_chats.qsrc
  62. 1 1
      locations/gschool_lessons.qsrc
  63. 18 20
      locations/homes_properties_attr.qsrc
  64. 9 6
      locations/hourly_events.qsrc
  65. 4 4
      locations/hunter_ambient.qsrc
  66. 16 16
      locations/hunter_favors.qsrc
  67. 67 67
      locations/hunter_interactions.qsrc
  68. 78 78
      locations/hunters.qsrc
  69. 147 130
      locations/huntersex.qsrc
  70. 1 1
      locations/intro_sg.qsrc
  71. 1 1
      locations/intro_sg_m.qsrc
  72. 1 1
      locations/intro_sg_tg.qsrc
  73. 11 0
      locations/item_stock_db.qsrc
  74. 2 2
      locations/journal.qsrc
  75. 35 35
      locations/journal_quests.qsrc
  76. 11 3
      locations/katja_chat.qsrc
  77. 36 36
      locations/katja_meynold_schedule.qsrc
  78. 391 153
      locations/katja_pantyquest.qsrc
  79. 2 3
      locations/kit_din.qsrc
  80. 1 1
      locations/kuhrPar.qsrc
  81. 55 35
      locations/mirafather.qsrc
  82. 44 52
      locations/mirasex.qsrc
  83. 734 661
      locations/miroslava.qsrc
  84. 411 0
      locations/miroslava_schedule.qsrc
  85. 0 173
      locations/miroslave_schedule.qsrc
  86. 29 26
      locations/mitka.qsrc
  87. 204 280
      locations/mitkabuh.qsrc
  88. 42 44
      locations/mitkabuh_group.qsrc
  89. 147 152
      locations/mitkasex.qsrc
  90. 3 3
      locations/mother.qsrc
  91. 3 3
      locations/outdoors.qsrc
  92. 3 3
      locations/pav_complex.qsrc
  93. 1 1
      locations/pav_complexb3.qsrc
  94. 265 289
      locations/pav_shared_apt.qsrc
  95. 316 317
      locations/pav_shared_nestor.qsrc
  96. 342 342
      locations/pav_shared_oleg.qsrc
  97. 308 308
      locations/pav_shared_yakov.qsrc
  98. 1 1
      locations/pav_train_hall.qsrc
  99. 3 3
      locations/pav_train_hall_events.qsrc
  100. 8 8
      locations/pav_train_market.qsrc

+ 1 - 0
.gitignore

@@ -45,3 +45,4 @@ glife.7z.tmp
 glife.7z
 
 *.test
+missing_media.txt

+ 22 - 21
glife.qproj

@@ -1135,31 +1135,32 @@
 		<Location name="pav_beach_chat"/>
 	</Folder>
 	<Folder name="Gadyukino">
-		<Location name="gadhouse"/>
+		<Location name="gad_gphouse"/>
 		<Location name="grandmahelp"/>
 		<Location name="grandpahelp"/>
-		<Location name="gaddvor"/>
-		<Location name="gadsarai"/>
-		<Location name="gadbana"/>
+		<Location name="gad_gpyard"/>
+		<Location name="gad_gpbarn"/>
+		<Location name="gad_gpbath"/>
 		<Location name="gadukino"/>
 		<Location name="gadukino_event"/>
-		<Location name="gadriver"/>
-		<Location name="meadow"/>
-		<Location name="gadprostitutes"/>
-		<Location name="gadfield"/>
-		<Location name="gadgarden"/>
-		<Location name="gadmarket"/>
-		<Location name="gadroad"/>
-		<Location name="miroslavahome"/>
-		<Location name="gadforest"/>
-		<Location name="gadforest_event"/>
-		<Location name="gadforestlost"/>
+		<Location name="gad_river"/>
+		<Location name="gad_beach"/>
+		<Location name="gad_prostitutes"/>
+		<Location name="gad_field"/>
+		<Location name="gad_market"/>
+		<Location name="gad_road"/>
+		<Location name="gad_miroslava_home"/>
+		<Location name="gad_forest"/>
+		<Location name="gad_forest_events"/>
+		<Location name="gad_forest_lost"/>
+		<Location name="gad_meadow"/>
 		<Location name="gad_church"/>
-		<Location name="swamp"/>
-		<Location name="swamp_yard"/>
-		<Location name="swamphouse"/>
-		<Location name="swampspring"/>
-		<Location name="backwater"/>
+		<Location name="gad_swamp"/>
+		<Location name="gad_swamp_yard"/>
+		<Location name="gad_swamphouse"/>
+		<Location name="gad_swampspring"/>
+		<Location name="gad_swamp_woods"/>
+		<Location name="gad_backwater"/>
 	</Folder>
 	<Folder name="Gadyukino Characters">
 		<Location name="hunters"/>
@@ -1168,7 +1169,6 @@
 		<Location name="hunter_ambient"/>
 		<Location name="hunter_favors"/>
 		<Location name="hunter_interactions"/>
-		<Location name="swamp_woods"/>
 		<Location name="andreihunter"/>
 		<Location name="igorhunter"/>
 		<Location name="sergeihunter"/>
@@ -1177,6 +1177,7 @@
 		<Location name="mitkabuh_group"/>
 		<Location name="mitkasex"/>
 		<Location name="miroslava"/>
+		<Location name="miroslava_schedule"/>
 		<Location name="mirasex"/>
 		<Location name="mirafather"/>
 		<Location name="grigory"/>

+ 45 - 13
locations/BurgerTip.qsrc

@@ -44,6 +44,7 @@ if $ARGS[0] = 'work':
 			bossrand = rand(0, 3)
 
 			if bossrand = 0:
+				killvar'bossrand'
 				'When you enter Anatoly''s office he glances up and says, "<<$pcs_nickname>>, bring me a cup of coffee."'
 				
 				act 'Fetch him a coffee':
@@ -59,6 +60,7 @@ if $ARGS[0] = 'work':
 					end
 				end
 			elseif bossrand = 1:
+				killvar'bossrand'
 				'When you enter his office, Anatoly tells you: "<<$pcs_nickname>>, I need these documents sighed by the accountant. Take them to her, and see that she signs them. When he does, return them to me."'
 
 				act 'Go to the chief accountant':
@@ -81,6 +83,7 @@ if $ARGS[0] = 'work':
 					end
 				end
 			elseif bossrand = 2:
+				killvar'bossrand'
 				'"<<$pcs_nickname>>, I need Ilyushkin working on these documents in a hurry", Anatoly says. You grab the papers, and scamper out of the office'
 
 				act 'Take the papers to Ilyushkin':
@@ -105,6 +108,7 @@ if $ARGS[0] = 'work':
 				end
 			elseif bossrand = 3:
 				*clr&cla
+				killvar'bossrand'
 				bossexrand = rand(0, 3)
 				pcs_horny += 10
 				gs 'stat'
@@ -115,6 +119,7 @@ if $ARGS[0] = 'work':
 				if bossexrand = 1:'His hand slides down your stomach, and crawls under your skirt. You moan softly when his hand begins to caress your pussy.'
 				if bossexrand = 2:'He grabs your ass, and lifting up your skirt begins to knead your ass like dough.'
 				if bossexrand = 3:'He puts his hands on your hips, and slowly raises your skirt.'
+				killvar'bossexrand' 
 				gs 'boyStat', 'A74'
 
 				act 'Kiss him':
@@ -145,6 +150,7 @@ if $ARGS[0] = 'work':
 							if bosstipsexrand >= 3:
 								act 'Moan': gt 'BurgerTip', 'sex2'
 							elseif bosstipsexrand < 3:
+								killvar'bosstipsexrand'
 								'His hand goes further finding your sphincter with one of his fingers. The probing of his finger leaves no doubt about what he wants.'
 								
 								gs 'arousal', 'anal_finger', 5, 'sub'
@@ -189,12 +195,14 @@ if $ARGS[0] = 'work':
 			bosstiprand = rand(0, 3)
 
 			if bosstiprand = 0:
+				killvar'bosstiprand'
 				BurgerQW['TerminalTask'] = 1
 				BurgerQW['TerminalTaskDay'] = daystart
 				'Anatoly comes out of the office, and asks, "<<$pcs_nickname>>, I know it''s lunch time, but I really need these documents taken to the storage terminal in the city industrial area to be signed. I''ll give you the rest of the day off if you take care of it for me," he finishes, with a smile.'
 
 				act 'Deliver the papers':gt 'city_center'
 			elseif bosstiprand = 1:
+				killvar'bosstiprand'
 				'Anatoly comes out of the office, and says: "<<$pcs_nickname>>, before lunch I need you to head down to the loading dock, and sign for a shipment of food that''s due to arrive. There''s a gold star in it for you if take care of this for me."'
 
 				act 'Go sign for the shipment':
@@ -210,6 +218,7 @@ if $ARGS[0] = 'work':
 				end
 
 			elseif bosstiprand = 2:
+				killvar'bosstiprand'
 				BurgerQW['BankTask'] = 1
 				BurgerQW['BankTaskDay'] = daystart
 				'Anatoly comes out of the office, and says, "<<$pcs_nickname>>, please run these documents to the bank for me. I''ll give you the rest of the day off if you take care of it for me," he finishes, with a smile.'
@@ -243,10 +252,12 @@ if $ARGS[0] = 'work':
 			bosstiprand = rand(0, 3)
 
 			if bosstiprand = 0:
+				killvar'bosstiprand'
 				'Anatoly comes out of the office and says, "<<$pcs_nickname>>, I have to leave early today. Here''s a few papers for you to file,"  He hands you a folder on his way out of the office.'
 				bburand = rand(0, 10)
 
 				if bburand = 0:
+					killvar'bburand'
 					'The senior manager Ilyushkin shows up in your office.'
 					
 					if $BurgerQW['IlyQWBlackmailPhoto'] = '' or BurgerQW['IlyQWBlackmail'] > 1:
@@ -265,7 +276,7 @@ if $ARGS[0] = 'work':
 					'The assistant manager Sergei shows up in your office.'
 					'Sergei looks at you with carnivorous eyes, "Is Anatoly around?"'
 					'"No, he just he just left." you tell him.'
-
+					killvar'bburand'
 					if BurgerQW['sergeyQW'] = 1:
 						'The pimply young man chuckles, and sits on the edge of your desk. "<<$pcs_nickname>>, you''re dynamite. We are very lucky to have a girl like you around," he says, leering at you.'
 					elseif BurgerQW['sergeyQW'] = 0:
@@ -327,7 +338,7 @@ if $ARGS[0] = 'work':
 					'Lena comes up to your desk and asks, "Is the boss around?"'
 					'"No, he stepped out," you reply.'
 					'She purses her lips looking at you with disapproval, before she turns to go.'
-					
+					killvar'bburand'
 					if BurgerQW['WorkShift'] = 1:
 						act 'Have your lunch': gt 'burgerWork', 'work'
 					elseif BurgerQW['WorkShift'] = 2:
@@ -335,7 +346,7 @@ if $ARGS[0] = 'work':
 					end
 				elseif bburand = 3:
 					'The personnel manager Vick comes into the office looking for the boss. When you tell her he is gone, she mutters something about personnel, and walks out'
-
+					killvar'bburand'
 					if BurgerQW['WorkShift'] = 1:
 						act 'Have your lunch': gt 'burgerWork', 'work'
 					elseif BurgerQW['WorkShift'] = 2:
@@ -351,6 +362,7 @@ if $ARGS[0] = 'work':
 					end
 				end
 			elseif bosstiprand = 1:
+				killvar'bosstiprand'
 				'Anatoly comes out of the office and says, "<<$pcs_nickname>>, let''s get out of here and go have some fun."'
 
 				act 'Go with Anatoly':
@@ -361,12 +373,13 @@ if $ARGS[0] = 'work':
 
 					if BurMestoRand = 0:
 						'You get in the car with Anatoly, and soon arrive at the sauna in the residential area. Your boss gives you a wicked little grin and says, "I made reservations to get us a private room."'
-						
+						killvar'BurMestoRand'
 						act 'Go to the sauna':
 							*clr&cla
 							gs 'stat'
-
+							
 							if SaunaWhore > 0:
+								
 								BurgerQW['SaunaWhoreKnown'] = 1
 								'When you enter the sauna and stop dead in your tracks when you see the madam."<<$pcs_nickname>>, what a surprise are you coming back to work for us."' 
 								'Anatoly says, "Whats going on here?"'
@@ -440,6 +453,7 @@ if $ARGS[0] = 'work':
 							end
 						end
 					elseif BurMestoRand = 1:
+						killvar'BurMestoRand'
 						'You get in the car, but before you can go anywhere Anatoly''s phone rings. He frowns before answering, "Yes dear, i will soon." He hangs up and says to you, "I''ve got to get home. Could you do your boss a favor, before I have to head home to the old battle axe?"'
 
 						act 'You''re great at giving favors':
@@ -461,6 +475,7 @@ if $ARGS[0] = 'work':
 
 				exit
 			elseif bosstiprand = 2:
+				killvar'bosstiprand'
 				'Anatoly comes out of the office, and says, "<<$pcs_nickname>>, call the that guy we had set up our computers. The on button of my PC seems to be broken."'
 
 				act 'Call the computer guy':
@@ -484,6 +499,7 @@ if $ARGS[0] = 'work':
 					end
 				end
 			elseif bosstiprand = 3:
+				killvar'bosstiprand'
 				'Anatoly comes out of the office, and says, "<<$pcs_nickname>>, I need you to stay late today. I have some men coming in for a meeting, and I might need an extra set of hand around.'
 
 				act 'Sure thing boss':
@@ -500,6 +516,7 @@ if $ARGS[0] = 'work':
 		exit
 	elseif burand = 2:
 		*clr & cla
+		killvar'burand'
 		if $BurgerQW['IlyQWBlackmailPhoto'] ! '' and BurgerQW['IlyQWBlackmail'] = 0:
 			gt 'BurgerTip', 'ily_work'
 		elseif $BurgerQW['IlyQWBlackmailPhoto'] = '' and BurgerQW['IlyQWBlackmail'] > 1:
@@ -524,6 +541,7 @@ if $ARGS[0] = 'work':
 
 		exit
 	elseif burand = 3:
+		killvar'burand'
 		'The assistant manager Sergei shows up in your office.'
 		'Sergei looks at you with carnivorous eyes, "Is Anatoly around?"'
 		'"No, he just he just left." you tell him.'
@@ -536,6 +554,7 @@ if $ARGS[0] = 'work':
 
 		exit
 	elseif burand = 4:
+		killvar'burand'
 		'Lena comes up to your desk and asks, "Is the boss around?"'
 		'"No, he stepped out," you reply.'
 		'She purses her lips looking at you with disapproval, before she turns to go.'
@@ -548,6 +567,7 @@ if $ARGS[0] = 'work':
 
 		exit
 	elseif burand = 5:
+		killvar'burand'
 		'The personnel manager Vic comes into the office looking for the boss. When you tell her he is gone, she mutters something about personnel, and walks out'
 
 		if BurgerQW['WorkShift'] = 1:
@@ -558,6 +578,7 @@ if $ARGS[0] = 'work':
 
 		exit
 	elseif burand = 6:
+		killvar'burand'
 		'An elegantly dressed woman shows up at the office.'
 
 		if BurgerQW['SlutReputation'] < 10:
@@ -581,6 +602,7 @@ if $ARGS[0] = 'work':
 				Pay = BurgerQW['SecretaryTimesWorked'] * 1250
 				BurgerQW['SecretaryTimesWorked'] = 0
 				money += Pay
+				killvar'Pay'
 				gs 'stat'
 				'You quickly write out something that effectively says "I quit!" with some fancy words thrown in.'
 				'Anatoly pays you the <<pay>> <b>₽</b> you are owed, and says, "It''s over <<$pcs_nickname>>, get out of here."'
@@ -630,6 +652,8 @@ if $ARGS[0] = 'bj':
 		act 'Finish him by hand': gt 'BurgerTip', 'bj_cum'
 		act 'Continue to suck': gt 'BurgerTip', 'bj2'
 	end
+	killvar'wantrand'
+	killvar'numbjrand'
 end
 
 if $ARGS[0] = 'toilet':
@@ -675,7 +699,8 @@ if $ARGS[0] = 'toilet':
 			gs 'cum_cleanup'
 
 			'You go into the bathroom, and turn the water on in the sink. <<$deytoibur>><<$deytoibur2>>'
-
+			killvar'$deytoibur'
+			killvar'$deytoibur2'
 			if BurgerQW['WorkShift'] = 1:
 				act 'Have your lunch': gt 'burgerWork', 'work'
 			elseif BurgerQW['WorkShift'] = 2:
@@ -683,6 +708,8 @@ if $ARGS[0] = 'toilet':
 			end
 		end
 	end
+	killvar'bosstoirandin'
+	killvar'bosstoirand'
 end
 
 if $ARGS[0] = 'toilet_wash':
@@ -696,7 +723,8 @@ if $ARGS[0] = 'toilet_wash':
 	gs 'cum_cleanup'
 				
 	'You go into the bathroom, and turn the water on in the sink. <<$deytoibur>><<$deytoibur2>>'
-
+	killvar'$deytoibur'
+	killvar'$deytoibur2'
 	if BurgerQW['WorkShift'] = 1:
 		act 'Have your lunch': gt 'burgerWork', 'work'
 	elseif BurgerQW['WorkShift'] = 2:
@@ -715,7 +743,8 @@ if $ARGS[0] = 'toilet_wash2':
 	gs 'cum_cleanup'
 
 	'You go into the bathroom, and turn the water on in the sink. <<$deytoibur>><<$deytoibur2>>'
-
+	killvar'$deytoibur'
+	killvar'$deytoibur2'
 	if BurgerQW['WorkShift'] = 1:
 		act 'Have your lunch': gt 'burgerWork', 'work'
 	elseif BurgerQW['WorkShift'] = 2:
@@ -780,12 +809,14 @@ if $ARGS[0] = 'bj2':
 		boburand = rand(0, 10)
 
 		if boburand > 2:
+			killvar'boburand'
 			if BurgerQW['WorkShift'] = 1:
 				act 'Have your lunch': gt 'burgerWork', 'work'
 			elseif BurgerQW['WorkShift'] = 2:
 				act 'Leave work': gs 'burgerWork', 'work2'
 			end
 		elseif boburand <= 2:
+			killvar'boburand'
 			gs 'cum_call', 'clothes', 'A74', 1
 			gs 'stat'
 			'Afterword, you notice you got some of his semen on your blouse.'
@@ -806,12 +837,14 @@ if $ARGS[0] = 'bj2':
 		boburand = rand(0, 10)
 
 		if boburand > 2:
+			killvar'boburand'
 			if BurgerQW['WorkShift'] = 1:
 				act 'Have your lunch': gt 'burgerWork', 'work'
 			elseif BurgerQW['WorkShift'] = 2:
 				act 'Leave work': gs 'burgerWork', 'work2'
 			end
 		elseif boburand <= 2:
+			killvar'boburand'
 			gs 'cum_call', 'clothes', 'A74', 1
 			gs 'stat'
 			'You notice that you didn''t get it all. A few drops of semen are staining your blouse.'
@@ -839,7 +872,6 @@ end
 
 if $ARGS[0] = 'sex':
 	*clr&cla
-	bosstipsex = rand(0, 10)
 	gs 'boyStat', 'A74'
 	pose = 1
 	gs 'stat'
@@ -854,6 +886,7 @@ if $ARGS[0] = 'sex':
 	gs 'stat'
 
 	if bosswantrand >= 3:
+		killvar'bosswantrand'
 		gs 'cum_call', 'butt', 'A74', 1
 		'<<$boydesc>> withdraws his cock, and shoots hot streams of semen all over your naked ass.'
 		
@@ -866,6 +899,7 @@ if $ARGS[0] = 'sex':
 			act 'Leave work': gs 'burgerWork', 'work2'
 		end
 	elseif bosswantrand < 3:
+		killvar'bosswantrand'
 		'Without warning, Anatoly takes his cock from pussy, and pushes it against your sphincter.'
 		act 'Give it to him': gt 'BurgerTip', 'anal'
 	end
@@ -873,7 +907,6 @@ end
 
 if $ARGS[0] = 'anal':
 	*clr&cla
-	bosstipsex = rand(0, 10)
 	gs 'boyStat', 'A74'
 	pose = 1
 	gs 'stat'
@@ -881,7 +914,6 @@ if $ARGS[0] = 'anal':
 	'<center><img <<$set_imgh>> src="images/characters/city/anatoly/sex/bossanal.jpg"></center>'
 	'You push your hips back presenting your ass for Anatoly.'
 	gs 'arousal', 'auto_lube', 'anal'
-	!!gs 'dinsex','sexcum'
 	gs 'cum_call', 'butt', 'A74', 1
 	'He finishes by giving you a little smack on the ass and a "good girl".'
 	
@@ -898,7 +930,6 @@ end
 
 if $ARGS[0] = 'sex2':
 	*clr&cla
-	bosstipsex = rand(0, 10)
 	gs 'boyStat', 'A74'
 	pose = 0
 	gs 'stat'
@@ -914,6 +945,7 @@ if $ARGS[0] = 'sex2':
 	gs 'stat'
 	
 	if bosswantrand >= 3:
+		killvar'bosswantrand'
 		gs 'cum_call', 'stomach', 'A74', 1
 		'<<$boydesc>> withdraws his cock, and shoots hot streams of semen all over your naked ass.'
 		
@@ -926,6 +958,7 @@ if $ARGS[0] = 'sex2':
 			act 'Leave work': gs 'burgerWork', 'work2'
 		end
 	elseif bosswantrand < 3:
+		killvar'bosswantrand'
 		'Without warning, Anatoly takes his cock from pussy, and pushes it against your tight little ass.'
 		act 'Take it in the ass':gt 'BurgerTip', 'anal2'
 	end
@@ -934,7 +967,6 @@ end
 if $ARGS[0] = 'anal2':
 	act 'Take it in the ass':gt 'BurgerTip', 'anal2'
 	*clr&cla
-	bosstipsex = rand(0, 10)
 	gs 'boyStat', 'A74'
 	pose = 0
 	gs 'stat'

+ 4 - 4
locations/Cheatmenu_din.qsrc

@@ -128,8 +128,8 @@ $cheatmenu['vartracker'] = {
 	'$clothingworntype: <<$clothingworntype>>'
 	'PCloQuality: <<PCloQuality>>'
 	'Mira''s Father Quest (npc_QW[''A64'']): <<npc_QW[''A64'']>>'
-	'Mira''s Quest (npc_QW[''A60'']): <<npc_QW[''A60'']>>'
-	'mirasextimes: <<mirasextimes>>'
+	'Mira''s Quest (MiraVars[''QW'']): <<MiraVars[''QW'']>>'
+	'MiraVars[''Mitka_fucks'']: <<MiraVars[''Mitka_fucks'']>>'
 	'Mira''s Relationship (npc_rel[''A60'']): <<npc_rel[''A60'']>>'
 	'Mitka''s Quest (npc_QW[''A63'']): <<npc_QW[''A63'']>>'
 	'mirabrosextime: <<mirabrosextime>>'
@@ -3476,10 +3476,10 @@ $cheatmenu['items'] = {
 		*pl 'Fabric: <a href="exec:mc_inventory[''sewing_fabric'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''sewing_fabric'']>> </b></a>'
 
 		if mc_inventory['sewing_kit'] = 0:
-			*pl 'Sewing kit: <a href="exec:sewing_kit = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
+			*pl 'Sewing kit: <a href="exec:mc_inventory[''sewing_kit''] = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
 		if mc_inventory['sewing_kit'] = 1:
-			*pl 'Sewing kit: <a href="exec:sewing_kit = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
+			*pl 'Sewing kit: <a href="exec:mc_inventory[''sewing_kit''] = 1 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
 		end
 
 		if bag = 1:

+ 5 - 7
locations/MagEncounterFairy.qsrc

@@ -247,18 +247,18 @@ if $ARGS[0] = 'teleport':
 			'The Fairy says, "It''s important to take the time to feel each Fairy Ring, that''s how you can find your way back."  She flies off.'
 			'You decide it would be wise to memorize your surroundings.'
 			spellKnown['teleport'] = 1
-			tpKnown['GadForest'] = 1
+			tpKnown['gad_forest'] = 1
 			cla
-			act 'You step out of the circle...':gt 'gadforest', 'forest_edge'
+			act 'You step out of the circle...': gt 'gad_forest', 'forest_edge'
 		end
 	else
 		!take the user to random location
 
 		'The Fairy nudges you into the nearby tree circle, and giggles as you hear her incant "inla", then flies out of the ring.'
 
-		$tpRand[0]='GadForest'
-		$tpRand[1]='PushkinPark'
-		$tpRand[2]='Village'
+		$tpRand[0] = 'gad_forest'
+		$tpRand[1] = 'PushkinPark'
+		$tpRand[2] = 'Village'
 
 		act 'See where the Fairy teleports you to': gt 'treeCircle', $tpRand[rand(0,2)]
 
@@ -266,6 +266,4 @@ if $ARGS[0] = 'teleport':
 end
 
 
-
 --- MagEncounterFairy ---------------------------------
-

+ 8 - 8
locations/TerminalOffice.qsrc

@@ -83,7 +83,7 @@ if $ARGS[0] = '11':
 		'You talk with the Manager about buying small trinkets...'
 		
 		!Get current balances
-		TovarRepository1 = tovarL
+		TovarRepository1 = mc_inventory['trinkets_home']
 		if TovarRepository1 => TovarLimitRepository1:
 			'There is no more free space at home.'
 		else
@@ -94,7 +94,7 @@ if $ARGS[0] = '11':
 		
 		if YouCanGar > 0:
 			!Get the current balances in the garage
-			TovarRepository2 = GarTorgItem
+			TovarRepository2 = mc_inventory['trinkets_garage']
 			if TovarRepository2 => TovarLimitRepository2:
 				'There is no space in the garage.'
 			else
@@ -139,18 +139,18 @@ if $ARGS[0] = '11':
 					
 					!First populate channelise 1
 					if MaxQuantityA => MaxQuantity1:
-						tovarL = TovarRepository1 + MaxQuantity1
+						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantity1
 						MaxQuantityA -= MaxQuantity1
 						if YouCanGar > 0 : *P ', in t.h. <<MaxQuantity1>> PCs. storage room, garage <<MaxQuantityA>> PCs.'
 					else
 						if YouCanGar > 0 : *P ', in t.h. <<MaxQuantityA>> PCs. storage room, garage 0 PCs.'
-						tovarL = TovarRepository1 + MaxQuantityA
+						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantityA
 						MaxQuantityA = 0
 					end
 					
 					!Now fill channelise 2
 					if MaxQuantityA > 0:
-						GarTorgItem = TovarRepository2 + MaxQuantityA
+						mc_inventory['trinkets_garage'] = TovarRepository2 + MaxQuantityA
 					end
 					
 					if YouCanGar = 0 and money > 100: 
@@ -191,18 +191,18 @@ if $ARGS[0] = '11':
 					
 					!First populate channelise 1
 					if MaxQuantityA => MaxQuantity1:
-						tovarL = TovarRepository1 + MaxQuantity1
+						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantity1
 						MaxQuantityA -= MaxQuantity1
 						if YouCanGar > 0 : *P ', in t.h. <<MaxQuantity1>> PCs. storage room, garage <<MaxQuantityA>> PCs.'
 					else
 						if YouCanGar > 0 : *P ', in t.h. <<MaxQuantityA>> PCs. storage room, garage 0 PCs.'
-						tovarL = TovarRepository1 + MaxQuantityA
+						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantityA
 						MaxQuantityA = 0
 					end
 					
 					!Now fill channelise 2
 					if MaxQuantityA > 0:
-						GarTorgItem = TovarRepository2 + MaxQuantityA
+						mc_inventory['trinkets_garage'] = TovarRepository2 + MaxQuantityA
 					end
 					
 					if YouCanGar = 0 and money > 100: 

+ 34 - 34
locations/_attributes_school.qsrc

@@ -1,5 +1,5 @@
 # $attributes_school
-!!2022/01/26
+!!2024/04/04
 !Quality range is usually 2-5.
 
 if ARGS[1] = 1:
@@ -10,14 +10,14 @@ if ARGS[1] = 1:
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 2:
-	CloQuality = 4
+	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 3:
-	CloQuality = 4
+	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 2
@@ -25,9 +25,9 @@ elseif ARGS[1] = 3:
 	
 elseif ARGS[1] = 4:
 	CloQuality = 5
-	CloThinness = 1
+	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 2
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 5:
@@ -80,7 +80,7 @@ elseif ARGS[1] = 11:
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 12:
-	CloQuality = 3
+	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
@@ -104,12 +104,12 @@ elseif ARGS[1] = 15:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 4
 	CloBimbo = 1
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 16:
-	CloQuality = 4
+	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
@@ -124,7 +124,7 @@ elseif ARGS[1] = 17:
 	
 elseif ARGS[1] = 18:
 	CloQuality = 4
-	CloThinness = 4
+	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
@@ -147,14 +147,14 @@ elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 22:
 	CloQuality = 3
-	CloThinness = 2
+	CloThinness = 1
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 5
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 23:
@@ -189,12 +189,12 @@ elseif ARGS[1] = 27:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 5
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 28:
 	CloQuality = 3
-	CloThinness = 2
+	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
@@ -208,14 +208,14 @@ elseif ARGS[1] = 29:
 	
 elseif ARGS[1] = 30:
 	CloQuality = 3
-	CloThinness = 2
+	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 31:
 	CloQuality = 3
-	CloThinness = 4
+	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
@@ -228,7 +228,7 @@ elseif ARGS[1] = 32:
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 33:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
@@ -237,8 +237,8 @@ elseif ARGS[1] = 33:
 elseif ARGS[1] = 34:
 	CloQuality = 3
 	CloThinness = 5
-	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 5
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 35:
@@ -253,7 +253,7 @@ elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 5
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 37:
@@ -267,7 +267,7 @@ elseif ARGS[1] = 38:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloSkirtShortness = 5
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 39:
@@ -280,7 +280,7 @@ elseif ARGS[1] = 39:
 	
 elseif ARGS[1] = 40:
 	CloQuality = 3
-	CloThinness = 2
+	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle2 = 4
@@ -289,7 +289,7 @@ elseif ARGS[1] = 41:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloSkirtShortness = 4
+	CloSkirtShortness = 5
 	CloStyle2 = 4
 	CloBimbo = 1
 
@@ -308,7 +308,7 @@ elseif ARGS[1] = 43:
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 44:
-	CloQuality = 3
+	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 3
@@ -317,7 +317,7 @@ elseif ARGS[1] = 44:
 elseif ARGS[1] = 45:
 	CloQuality = 4
 	CloThinness = 2
-	CloTopCut = 2
+	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
@@ -338,7 +338,7 @@ elseif ARGS[1] = 47:
 elseif ARGS[1] = 48:
 	CloQuality = 3
 	CloThinness = 3
-	CloTopCut = 2
+	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
@@ -352,29 +352,29 @@ elseif ARGS[1] = 49:
 elseif ARGS[1] = 50:
 	CloQuality = 3
 	CloThinness = 3
-	CloTopCut = 2
+	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 51:
 	CloQuality = 3
 	CloThinness = 3
-	CloTopCut = 2
+	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 52:
 	CloQuality = 3
 	CloThinness = 2
-	CloTopCut = 2
+	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
 	CloStyle = 2
 	
 elseif ARGS[1] = 53:
 	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
+	CloThinness = 2
+	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
@@ -388,7 +388,7 @@ elseif ARGS[1] = 54:
 elseif ARGS[1] = 55:
 	CloQuality = 3
 	CloThinness = 3
-	CloTopCut = 2
+	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
 	
@@ -402,7 +402,7 @@ elseif ARGS[1] = 56:
 	CloStyle = 4
 	
 elseif ARGS[1] = 57:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
@@ -430,7 +430,7 @@ elseif ARGS[1] = 60:
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 61:
-	CloQuality = 4
+	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3

+ 2 - 0
locations/albina_starlets_sex.qsrc

@@ -581,6 +581,7 @@ if $ARGS[0] = 'whore5':
 		tipdarand = rand(0,1)
 
 		if tipdarand = 0:
+			killvar'tipdarand'
 			'The guys then effortlessly lift you to your feet and lead you over to the bed. You get on all fours and one guy kneels in front of you. You resume sucking his huge cock as the other moves in behind you and spits on your anus before sliding his finger inside you.'
 			'You moan softly as you keep sucking the cock in your mouth. The guy keeps fingering your ass before withdrawing and bringing his cock to your asshole.'
 			gs 'arousal', 'bj', 10, 'dick', 'sub', 'group'
@@ -618,6 +619,7 @@ if $ARGS[0] = 'whore5':
 				end
 			end
 		elseif tipdarand = 1:
+			killvar'tipdarand'
 			'The guys then effortlessy lift you up and lay you on the bed, your head leaning over the edge.'
 			'One of them climbs in beside you and spreads your legs as the other moves to the edge of the bed and presses his cock against your lips.'
 

+ 1 - 0
locations/alexandriaChat.qsrc

@@ -771,6 +771,7 @@ if $ARGS[0] = 'sword':
 								moncheri_gown_h[numrand] = 50
 								moncheri_gown_b[numrand] = pcs_hips
 								'<center><img <<$set_imgh>> src="images/pc/items/moncheri/gown/<<numrand>>.jpg"></center>'
+								killvar 'numrand'
 							else
 								jump 'markbuycloalexandria'
 							end

+ 11 - 45
locations/bedrPar.qsrc

@@ -219,13 +219,13 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 					act 'Masturbate':gt 'selfplay', 'start'
 				end
 
-				if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
-				if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
+				if mc_inventory['vintage_card'] > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
+				 if mc_inventory['card'] > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
 			end
 
 			gs 'events', 'read'
 
-			if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
+			if mc_inventory['trinkets_home'] > 0:'You currently have <<mc_inventory[''trinkets_home'']>> trinkets to sell at the station. The maximum you can carry is 30.'
 
 			if locat['Anya_inroom'] = 0: dynamic $palelady
 			
@@ -236,50 +236,16 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			if mc_inventory['sewing_kit'] = 1:
 				'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored neatly under your bed.'
 				*nl
-				if mc_inventory['sewing_fabric'] <= 0:
-					'You do not have any fabric.'
-				else
-					if pcs_sewng < 40:
-						'You have <<mc_inventory[''sewing_fabric'']>> pieces of sewing fabric left.'
-					elseif pcs_sewng < 80:
-						'You have enough fabric for <<mc_inventory[''sewing_fabric'']>> lessons.'
-					else
-						if newgobelen = 0:
-							act'Start a new tapestry':
-								*clr & cla
-								menu_off = 1
-								mc_inventory['sewing_fabric'] -= 1
-								newgobelen = 1
-								minut += 15
-								gs 'stat'
-								'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-
-								act 'Set the tapestry aside': gt 'bedrPar', 'start'
-							end
-						end
-					end
-				end	
-				if newgobelen>=1:
-					'Your tapestry is <<newgobelen/10>> percent finished.'
-					act 'Work on the tapestry':
-						*clr & cla
-						menu_off = 1
-						minut+=60
-						gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
-						gobramax = (pcs_sewng - 70) * 6
-						gobramin = (pcs_sewng - 70) * 2
-						newgobelen += rand(gobramin,gobramax)
-						gs 'stat'
-						if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-							if newgobelen >= 1000:
-							newgobelen = 0
-							gobelen += 1
-							'Your work on the tapestry is done.'
-						end
-						act 'Set the tapestry aside': gt 'bedrPar', 'start'
+				if mc_inventory['sewing_fabric'] <= 0:'You do not have any fabric.'
+				if pcs_sewng >= 80:
+					if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0: 
+						act'Start a new tapestry':gt 'sewing', 'tapestry'
+					elseif newgobelen >= 1:
+						'Your tapestry is <<newgobelen/10>> percent finished.'
+						act 'Work on the tapestry':gt 'sewing', 'tapestry'
 					end
 				end
-				if gobelen > 0: 'You have <<gobelen>> completed tapestries.'
+				if mc_inventory['tapestry'] > 0: 'You have <<mc_inventory[''tapestry'']>> completed tapestries.'
 			end
 
 			!! Computer, music and internet use.

+ 1 - 0
locations/belpicknick.qsrc

@@ -236,6 +236,7 @@ if $ARGS[0] = 'dance':
 		
 		fuckerrand = rand(1,4)
 		gmember = fuckerrand
+		killvar'fuckerrand'
 		gs 'belpicknick', 'vibor'
 		if rand(0,1) = 0:
 			'Suddenly the cock you''re currently sucking on is pulled away from you, and <<$boydesc>> pushes you onto your back saying he wants to try another hole now.'

+ 16 - 16
locations/bicycle.qsrc

@@ -2,16 +2,16 @@
 
 ! BikeLoc - tells us where bicycle is currently located
 !----------------------------------------------
-! BikeLoc = 1 'gadsarai' ''
-! BikeLoc = 2 'gadforest' 'forest_edge'
-! BikeLoc = 3 'swamp_yard' 'start'
+! BikeLoc = 1 'gad_gpbarn' ''
+! BikeLoc = 2 'gad_forest' 'forest_edge'
+! BikeLoc = 3 'gad_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):
+! Example: gs 'bicycle', 'gad_gpbarn'
+if ($ARGS[0] = 'gad_gpbarn' and BikeLoc = 1) or ($ARGS[0] = 'gad_forest' and BikeLoc = 2) or ($ARGS[0] = 'gad_swamp_yard' and BikeLoc = 3):
 	act 'Ride your bicycle':
 		*clr & cla
 		menu_off = 1
@@ -25,11 +25,11 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 		'You see your old bike. It looks like it''s still in good condition. You can probably ride it without any trouble.'
 
 		if BikeLoc = 1:
-			act 'Leave your bike alone':gt 'gadsarai'
+			act 'Leave your bike alone': gt 'gad_gpbarn'
 		elseif BikeLoc = 2:
-			act 'Leave your bike alone':gt 'gadforest','forest_edge'
+			act 'Leave your bike alone': gt 'gad_forest', 'forest_edge'
 		elseif BikeLoc = 3:
-			act 'Leave your bike alone':gt 'swamp_yard','start'
+			act 'Leave your bike alone': gt 'gad_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)':
@@ -96,7 +96,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 					*nl
 					'You ride your bike, enjoying the surrounding countryside.'
 				end
-				act 'Finish your ride':gt 'gadsarai'
+				act 'Finish your ride': gt 'gad_gpbarn'
 			end
 		end
 
@@ -118,8 +118,8 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 					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
+						gs 'clothing', 'strip', 'gad_forest'
+						gs 'clothing', 'gad_swamp_clothes', 0
 					end
 				elseif BikeLoc = 3:
 					minut += 44
@@ -130,8 +130,8 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 					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
+						gs 'clothing', 'strip', 'gad_forest'
+						gs 'clothing', 'gad_swamp_clothes', 0
 					end
 				end
 				BikeLoc = 1
@@ -141,7 +141,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 				*nl
 				'You jump onto your bike and ride to your grandparents'' barn.'
 
-				act 'Finish your ride':gt 'gadsarai'
+				act 'Finish your ride': gt 'gad_gpbarn'
 			end
 		end
 
@@ -176,7 +176,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 				*nl
 				'You jump onto your bike and ride to the edge of the forest.'
 
-				act 'Finish your ride':gt 'gadforest','forest_edge'
+				act 'Finish your ride': gt 'gad_forest', 'forest_edge'
 			end
 		end
 
@@ -211,7 +211,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 				*nl
 				'You jump onto your bike and ride to the hunters'' cabin.'
 
-				act 'Finish your ride':gt 'swamp_yard','start'
+				act 'Finish your ride':gt 'gad_swamp_yard','start'
 			end
 		end
 	end

+ 4 - 4
locations/booty_call_sms.qsrc

@@ -33,13 +33,13 @@ if $ARGS[0] = 'start':
 	if npc_booty_call[$ARGS[1]] = daystart:
 		gs 'booty_call_sms', 'Add SMS2', 'pre_planned_booty_call', $ARGS[1]
 	elseif sugar_daddy_call[$ARGS[1]] = 1:
-		gs 'booty_call_sms', 'Add SMS', 'sugar_daddy_booty_call', $ARGS[1]
-		!gs 'booty_call_sms', 'Add SMS3', 'new_booty_call', $ARGS[1]
+		!gs 'booty_call_sms', 'Add SMS', 'sugar_daddy_booty_call', $ARGS[1]
+		gs 'booty_call_sms', 'Add SMS3', 'new_booty_call', $ARGS[1]
 	elseif npc_std_test[$ARGS[1]] = 1:
 		gs 'booty_call_sms', 'Add SMS', 'std_free', $ARGS[1]
 	else
-		gs 'booty_call_sms', 'Add SMS', 'default_booty_call', $ARGS[1]
-		!gs 'booty_call_sms', 'Add SMS3', 'new_booty_call', $ARGS[1]
+		!gs 'booty_call_sms', 'Add SMS', 'default_booty_call', $ARGS[1]
+		gs 'booty_call_sms', 'Add SMS3', 'new_booty_call', $ARGS[1]
 	end
 end
 

+ 2 - 0
locations/bordel.qsrc

@@ -291,6 +291,8 @@ if $ARGS[0] = 'var':
 	if borrand <= 4 and func('bordel', 'is_open') = 0:
 		'The brothel is closing now, so this is your last chance to work today.'
 	end
+	killvar'borrand'
+	killvar'zpprand'
 end
 
 if $ARGS[0] = 'is_open':

+ 57 - 58
locations/bus.qsrc

@@ -14,9 +14,7 @@
 		!!-----------------------!!
 
 if $ARGS[0] = 'community':
-	*clr & cla
-	$menu_loc = 'bus'
-	$menu_arg = 'community'
+	gs 'shortgs', 'setloc', 'bus', 'community'
 	$location_type = 'public_outdoors'
 	menu_off = 0
 	gs 'stat'
@@ -57,8 +55,7 @@ if $ARGS[0] = 'community':
 	end
 
 elseif $ARGS[0] = 'community_tickets':
-	$menu_loc = 'bus'
-	$menu_arg = 'community_tickets'
+	gs 'shortgs', 'setloc', 'bus', 'community_tickets'
 	menu_off = 0
 
 	act 'Leave the ticket office': gt 'bus', 'community'
@@ -72,8 +69,7 @@ elseif $ARGS[0] = 'community_tickets':
 	gs 'transport_functions', 'buy_bus_ticket', 'community', 'pg'
 
 elseif $ARGS[0] = 'community_busses':
-	$menu_loc = 'bus'
-	$menu_arg = 'community_busses'
+	gs 'shortgs', 'setloc', 'bus', 'community_busses'
 	menu_off = 0
 
 	gs 'transport_functions', 'set_bus_wait_time', 'community'
@@ -101,9 +97,7 @@ end
 		!!-----------------------!!
 
 if $ARGS[0] = 'pavstation':
-	*clr & cla
-	$menu_loc = 'bus'
-	$menu_arg = 'pavstation'
+	gs 'shortgs', 'setloc', 'bus', 'pavstation'
 	$location_type = 'public_outdoors'
 	menu_off = 0
 	gs 'stat'
@@ -146,8 +140,7 @@ if $ARGS[0] = 'pavstation':
 	end
 
 elseif $ARGS[0] = 'pavstation_tickets':
-	$menu_loc = 'bus'
-	$menu_arg = 'pavstation_tickets'
+	gs 'shortgs', 'setloc', 'bus', 'pavstation_tickets'
 	menu_off = 0
 	
 	act 'Leave the ticket office': gt 'bus', 'pavstation'
@@ -164,8 +157,7 @@ elseif $ARGS[0] = 'pavstation_tickets':
 	gs 'transport_functions', 'buy_bus_ticket', 'pavstation', 'pg'
 
 elseif $ARGS[0] = 'pavstation_busses':
-	$menu_loc = 'bus'
-	$menu_arg = 'pavstation_busses'
+	gs 'shortgs', 'setloc', 'bus', 'pavstation_busses'
 	menu_off = 0
 
 	gs 'transport_functions', 'set_bus_wait_time', 'pavstation'
@@ -197,9 +189,7 @@ end
 		!!-----------------------!!
 
 if $ARGS[0] = 'pushkin':
-	*clr & cla
-	$menu_loc = 'bus'
-	$menu_arg = 'pushkin'
+	gs 'shortgs', 'setloc', 'bus', 'pushkin'
 	$location_type = 'public_outdoors'
 	menu_off = 0
 	gs 'stat'
@@ -239,8 +229,7 @@ if $ARGS[0] = 'pushkin':
 	end
 
 elseif $ARGS[0] = 'pushkin_tickets':
-	$menu_loc = 'bus'
-	$menu_arg = 'pushkin_tickets'
+	gs 'shortgs', 'setloc', 'bus', 'pushkin_tickets'
 	menu_off = 0
 	
 	act 'Leave the ticket office': gt 'bus', 'pushkin'
@@ -257,8 +246,7 @@ elseif $ARGS[0] = 'pushkin_tickets':
 	gs 'transport_functions', 'buy_bus_ticket', 'pushkin', 'pg'
 
 elseif $ARGS[0] = 'pushkin_busses':
-	$menu_loc = 'bus'
-	$menu_arg = 'pushkin_busses'
+	gs 'shortgs', 'setloc', 'bus', 'pushkin_busses'
 	menu_off = 0
 
 	gs 'transport_functions', 'set_bus_wait_time', 'pushkin'
@@ -290,9 +278,7 @@ end
 		!!-----------------------!!
 
 if $ARGS[0] = 'construction':
-	*clr & cla
-	$menu_loc = 'bus'
-	$menu_arg = 'construction'
+	gs 'shortgs', 'setloc', 'bus', 'construction'
 	$location_type = 'public_outdoors'
 	menu_off = 0
 	gs 'stat'
@@ -332,8 +318,7 @@ if $ARGS[0] = 'construction':
 	end
 
 elseif $ARGS[0] = 'construction_tickets':
-	$menu_loc = 'bus'
-	$menu_arg = 'construction_tickets'
+	gs 'shortgs', 'setloc', 'bus', 'construction_tickets'
 	menu_off = 0
 	
 	act 'Leave the ticket office': gt 'bus', 'construction'
@@ -350,8 +335,7 @@ elseif $ARGS[0] = 'construction_tickets':
 	gs 'transport_functions', 'buy_bus_ticket', 'construction', 'gp'
 
 elseif $ARGS[0] = 'construction_busses':
-	$menu_loc = 'bus'
-	$menu_arg = 'construction_busses'
+	gs 'shortgs', 'setloc', 'bus', 'construction_busses'
 	menu_off = 0
 
 	gs 'transport_functions', 'set_bus_wait_time', 'construction'
@@ -383,10 +367,7 @@ end
 		!!-----------------------!!
 
 if $ARGS[0] = 'gadukino':
-	*clr & cla
-	$menu_loc = 'bus'
-	$menu_arg = 'gadukino'
-	$location_type = 'public_outdoors'
+	gs 'shortgs', 'setloc', 'bus', 'gadukino'
 	menu_off = 0
 	gs 'stat'
 
@@ -408,7 +389,7 @@ if $ARGS[0] = 'gadukino':
 	*nl
 	gs 'transport_functions', 'set_bus_wait_time', 'gadukino'
 
-	act 'Walk to Gadukino (0:01)': minut += 1 & gt 'gadroad', ''
+	act 'Walk to Gadukino (0:01)': minut += 1 & gt 'gad_road', 'start'
 
 	if temp_transportVars['bus_wait_pavlovsk'] <= 60 or temp_transportVars['bus_wait_suburbs'] <= 60:
 		'The next bus in the direction of Pavlovsk ' + iif(temp_transportVars['bus_wait_pavlovsk'] = 0, 'is leaving now!', 'leaves in <<temp_transportVars[''bus_wait_pavlovsk'']>> minutes.')
@@ -426,8 +407,7 @@ if $ARGS[0] = 'gadukino':
 	end
 
 elseif $ARGS[0] = 'gadukino_tickets':
-	$menu_loc = 'bus'
-	$menu_arg = 'gadukino_tickets'
+	gs 'shortgs', 'setloc', 'bus', 'gadukino_tickets'
 	menu_off = 0
 	
 	act 'Leave the ticket office': gt 'bus', 'gadukino'
@@ -445,8 +425,7 @@ elseif $ARGS[0] = 'gadukino_tickets':
 	gs 'transport_functions', 'buy_bus_ticket', 'gadukino', 'gs'
 
 elseif $ARGS[0] = 'gadukino_busses':
-	$menu_loc = 'bus'
-	$menu_arg = 'gadukino_busses'
+	gs 'shortgs', 'setloc', 'bus', 'gadukino_busses'
 	menu_off = 0
 
 	gs 'transport_functions', 'set_bus_wait_time', 'gadukino'
@@ -482,9 +461,7 @@ end
 		!!-----------------------!!
 
 if $ARGS[0] = 'communal':
-	*clr & cla
-	$menu_loc = 'bus'
-	$menu_arg = 'communal'
+	gs 'shortgs', 'setloc', 'bus', 'communal'
 	$location_type = 'public_outdoors'
 	menu_off = 0
 	gs 'stat'
@@ -527,8 +504,7 @@ if $ARGS[0] = 'communal':
 	end
 
 elseif $ARGS[0] = 'communal_tickets':
-	$menu_loc = 'bus'
-	$menu_arg = 'communal_tickets'
+	gs 'shortgs', 'setloc', 'bus', 'communal_tickets'
 	menu_off = 0
 	
 	act 'Leave the ticket office': gt 'bus', 'communal'
@@ -545,8 +521,7 @@ elseif $ARGS[0] = 'communal_tickets':
 	gs 'transport_functions', 'buy_bus_ticket', 'communal', 'gs'
 
 elseif $ARGS[0] = 'communal_busses':
-	$menu_loc = 'bus'
-	$menu_arg = 'communal_busses'
+	gs 'shortgs', 'setloc', 'bus', 'communal_busses'
 	menu_off = 0
 
 	gs 'transport_functions', 'set_bus_wait_time', 'communal'
@@ -577,9 +552,7 @@ end
 		!!-----------------------!!
 
 if $ARGS[0] = 'graveyard':
-	*clr & cla
-	$menu_loc = 'bus'
-	$menu_arg = 'graveyard'
+	gs 'shortgs', 'setloc', 'bus', 'graveyard'
 	$location_type = 'public_outdoors'
 	menu_off = 0
 	gs 'stat'
@@ -620,8 +593,7 @@ if $ARGS[0] = 'graveyard':
 	end
 
 elseif $ARGS[0] = 'graveyard_tickets':
-	$menu_loc = 'bus'
-	$menu_arg = 'graveyard_tickets'
+	gs 'shortgs', 'setloc', 'bus', 'graveyard_tickets'
 	menu_off = 0
 	
 	act 'Leave the ticket office': gt 'bus', 'graveyard'
@@ -638,8 +610,7 @@ elseif $ARGS[0] = 'graveyard_tickets':
 	gs 'transport_functions', 'buy_bus_ticket', 'graveyard', 'sg'
 
 elseif $ARGS[0] = 'graveyard_busses':
-	$menu_loc = 'bus'
-	$menu_arg = 'graveyard_busses'
+	gs 'shortgs', 'setloc', 'bus', 'graveyard_busses'
 	menu_off = 0
 
 	gs 'transport_functions', 'set_bus_wait_time', 'graveyard'
@@ -670,9 +641,7 @@ end
 		!!-----------------------!!
 
 if $ARGS[0] = 'suburbs':
-	*clr & cla
-	$menu_loc = 'bus'
-	$menu_arg = 'suburbs'
+	gs 'shortgs', 'setloc', 'bus', 'suburbs'
 	$location_type = 'public_outdoors'
 	menu_off = 0
 	gs 'stat'
@@ -714,8 +683,7 @@ if $ARGS[0] = 'suburbs':
 	end
 
 elseif $ARGS[0] = 'suburbs_tickets':
-	$menu_loc = 'bus'
-	$menu_arg = 'suburbs_tickets'
+	gs 'shortgs', 'setloc', 'bus', 'suburbs_tickets'
 	menu_off = 0
 	
 	act 'Leave the ticket office': gt 'bus', 'suburbs'
@@ -729,8 +697,7 @@ elseif $ARGS[0] = 'suburbs_tickets':
 	gs 'transport_functions', 'buy_bus_ticket', 'suburbs', 'sg'
 
 elseif $ARGS[0] = 'suburbs_busses':
-	$menu_loc = 'bus'
-	$menu_arg = 'suburbs_busses'
+	gs 'shortgs', 'setloc', 'bus', 'suburbs_busses'
 	menu_off = 0
 
 	gs 'transport_functions', 'set_bus_wait_time', 'suburbs'
@@ -771,6 +738,7 @@ if $ARGS[0] = 'community_pavstation':
 	$loc_arg = 'pavstation'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'community', 'pavstation') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -798,6 +766,7 @@ elseif $ARGS[0] = 'community_pushkin':
 	$loc_arg = 'pushkin'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'community', 'pushkin') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -824,6 +793,7 @@ elseif $ARGS[0] = 'community_construction':
 	$loc_arg = 'construction'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'community', 'construction') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -850,6 +820,7 @@ elseif $ARGS[0] = 'community_gadukino':
 	$loc_arg = 'gadukino'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'community', 'gadukino') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -884,6 +855,7 @@ if $ARGS[0] = 'pavstation_community':
 	$loc_arg = 'community'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'pavstation', 'community') + temp_transportVars['bus_wait_pavlovsk']
 	minut += temp_transportVars['timecost']
@@ -910,6 +882,7 @@ elseif $ARGS[0] = 'pavstation_pushkin':
 	$loc_arg = 'pushkin'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'pavstation', 'pushkin') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -936,6 +909,7 @@ elseif $ARGS[0] = 'pavstation_construction':
 	$loc_arg = 'construction'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'pavstation', 'construction') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -962,6 +936,7 @@ elseif $ARGS[0] = 'pavstation_gadukino':
 	$loc_arg = 'gadukino'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'pavstation', 'gadukino') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -996,6 +971,7 @@ if $ARGS[0] = 'pushkin_community':
 	$loc_arg = 'community'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'pushkin', 'community') + temp_transportVars['bus_wait_pavlovsk']
 	minut += temp_transportVars['timecost']
@@ -1022,6 +998,7 @@ elseif $ARGS[0] = 'pushkin_pavstation':
 	$loc_arg = 'pavstation'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'pushkin', 'pavstation') + temp_transportVars['bus_wait_pavlovsk']
 	minut += temp_transportVars['timecost']
@@ -1048,6 +1025,7 @@ elseif $ARGS[0] = 'pushkin_construction':
 	$loc_arg = 'construction'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'pushkin', 'construction') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -1074,6 +1052,7 @@ elseif $ARGS[0] = 'pushkin_gadukino':
 	$loc_arg = 'gadukino'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'pushkin', 'gadukino') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -1108,6 +1087,7 @@ if $ARGS[0] = 'construction_community':
 	$loc_arg = 'community'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'construction', 'community') + temp_transportVars['bus_wait_pavlovsk']
 	minut += temp_transportVars['timecost']
@@ -1134,6 +1114,7 @@ elseif $ARGS[0] = 'construction_pavstation':
 	$loc_arg = 'pavstation'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'construction', 'pavstation') + temp_transportVars['bus_wait_pavlovsk']
 	minut += temp_transportVars['timecost']
@@ -1160,6 +1141,7 @@ elseif $ARGS[0] = 'construction_pushkin':
 	$loc_arg = 'pushkin'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'construction', 'pushkin') + temp_transportVars['bus_wait_pavlovsk']
 	minut += temp_transportVars['timecost']
@@ -1186,6 +1168,7 @@ elseif $ARGS[0] = 'construction_gadukino':
 	$loc_arg = 'gadukino'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'construction', 'gadukino') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -1220,6 +1203,7 @@ if $ARGS[0] = 'gadukino_community':
 	$loc_arg = 'community'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'gadukino', 'community') + temp_transportVars['bus_wait_pavlovsk']
 	minut += temp_transportVars['timecost']
@@ -1246,6 +1230,7 @@ elseif $ARGS[0] = 'gadukino_pavstation':
 	$loc_arg = 'pavstation'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'gadukino', 'pavstation') + temp_transportVars['bus_wait_pavlovsk']
 	minut += temp_transportVars['timecost']
@@ -1272,6 +1257,7 @@ elseif $ARGS[0] = 'gadukino_pushkin':
 	$loc_arg = 'pushkin'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'gadukino', 'pushkin') + temp_transportVars['bus_wait_pavlovsk']
 	minut += temp_transportVars['timecost']
@@ -1298,6 +1284,7 @@ elseif $ARGS[0] = 'gadukino_construction':
 	$loc_arg = 'construction'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'gadukino', 'construction') + temp_transportVars['bus_wait_pavlovsk']
 	minut += temp_transportVars['timecost']
@@ -1324,6 +1311,7 @@ elseif $ARGS[0] = 'gadukino_communal':
 	$loc_arg = 'communal'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'gadukino', 'communal') + temp_transportVars['bus_wait_suburbs']
 	minut += temp_transportVars['timecost']
@@ -1350,6 +1338,7 @@ elseif $ARGS[0] = 'gadukino_graveyard':
 	$loc_arg = 'graveyard'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'gadukino', 'graveyard') + temp_transportVars['bus_wait_suburbs']
 	minut += temp_transportVars['timecost']
@@ -1376,6 +1365,7 @@ elseif $ARGS[0] = 'gadukino_suburbs':
 	$loc_arg = 'suburbs'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'gadukino', 'suburbs') + temp_transportVars['bus_wait_suburbs']
 	minut += temp_transportVars['timecost']
@@ -1410,6 +1400,7 @@ if $ARGS[0] = 'communal_gadukino':
 	$loc_arg = 'gadukino'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'communal', 'gadukino') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -1436,6 +1427,7 @@ elseif $ARGS[0] = 'communal_graveyard':
 	$loc_arg = 'graveyard'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'communal', 'graveyard') + temp_transportVars['bus_wait_suburbs']
 	minut += temp_transportVars['timecost']
@@ -1462,6 +1454,7 @@ elseif $ARGS[0] = 'communal_suburbs':
 	$loc_arg = 'suburbs'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'communal', 'suburbs') + temp_transportVars['bus_wait_suburbs']
 	minut += temp_transportVars['timecost']
@@ -1496,6 +1489,7 @@ if $ARGS[0] = 'graveyard_gadukino':
 	$loc_arg = 'gadukino'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'graveyard', 'gadukino') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -1522,6 +1516,7 @@ elseif $ARGS[0] = 'graveyard_communal':
 	$loc_arg = 'communal'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'graveyard', 'communal') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -1548,6 +1543,7 @@ elseif $ARGS[0] = 'graveyard_suburbs':
 	$loc_arg = 'suburbs'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'graveyard', 'suburbs') + temp_transportVars['bus_wait_suburbs']
 	minut += temp_transportVars['timecost']
@@ -1582,6 +1578,7 @@ if $ARGS[0] = 'suburbs_gadukino':
 	$loc_arg = 'gadukino'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'suburbs', 'gadukino') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -1608,6 +1605,7 @@ elseif $ARGS[0] = 'suburbs_communal':
 	$loc_arg = 'communal'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'suburbs', 'communal') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']
@@ -1634,6 +1632,7 @@ elseif $ARGS[0] = 'suburbs_graveyard':
 	$loc_arg = 'graveyard'
 	$location_type = 'public_indoors'
 	menu_off = 1
+
 	gs 'transport_functions', 'set_bus_wait_time'
 	temp_transportVars['timecost'] = func('transport_functions', 'get_bus_timecost', 'suburbs', 'graveyard') + temp_transportVars['bus_wait_gadukino']
 	minut += temp_transportVars['timecost']

+ 5 - 5
locations/camera.qsrc

@@ -28,10 +28,10 @@ $camera_locations['gadukino'] = {
 	$camera_return_loc_arg = ''
 }
 
-$camera_locations['gadforest'] = {
+$camera_locations['gad_forest'] = {
 	$camera_description = 'Gadukino Forest'
-	$camera_event = 'gadforest'
-	$camera_return_loc = 'gadforest'
+	$camera_event = 'gad_forest'
+	$camera_return_loc = 'gad_forest'
 	$camera_return_loc_arg = 'forest_edge'
 }
 
@@ -240,7 +240,7 @@ if $ARGS[0] = 'mother':
 			if $loc = 'kuhrPar' or $loc = 'sitrPar':
 				gt 'pav_complex', 'start'
 			else
-				gt 'gaddvor'
+				gt 'gad_gpyard', 'start'
 			end
 		end
 	end
@@ -321,7 +321,7 @@ if $ARGS[0] = 'gadukino':
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
-if $ARGS[0] = 'gadforest':
+if $ARGS[0] = 'gad_forest':
 	*clr & cla
 	minut += 15
 	gs 'exp_gain', 'photoskl', rand(3,5)

+ 20 - 23
locations/card.qsrc

@@ -3,36 +3,23 @@
 menu_off = 1
 gs 'stat'
 '<center><img <<$set_imgh>> src="images/pc/items/accessories/cards/porndeck.jpg"></center>'
-'You pull your deck of cards out and spread them around '+iif($card_loc = 'gadsarai', 'an old desk in the barn', 'your desk')+' to look at them.'
+'You pull your deck of cards out and spread them around ' + iif($card_loc = 'gad_gpbarn', 'an old desk in the barn', 'your desk') + ' to look at them.'
 
 act 'Put the cards away':
 	killvar '$card_loc'
+	killvar '$papkacard'
+	killvar 'papkarand'
+	killvar 'numcard'
+	killvar 'nomcard'
+	killvar 'card_deck'
 	gt $loc
 end
 act 'Pull a card from the deck':
 	*clr & cla
 	you_slut += 1
 
-	!!if you_slut < 10:end
-
-	if you_slut >= 10 and you_slut < 20:
-		pcs_horny += 1
-	elseif you_slut >= 20 and you_slut < 30:
-		pcs_horny += 2
-	elseif you_slut >= 30 and you_slut < 40:
-		pcs_horny += 3
-	elseif you_slut >= 40 and you_slut < 50:
-		pcs_horny += 4
-	elseif you_slut >= 50 and you_slut < 60:
-		pcs_horny += 5
-	elseif you_slut >= 60 and you_slut < 70:
-		pcs_horny += 6
-	elseif you_slut >= 70 and you_slut < 80:
-		pcs_horny += 7
-	elseif you_slut >= 80 and you_slut < 90:
-		pcs_horny += 8
-	elseif you_slut >= 90 and you_slut < 100:
-		pcs_horny += 9
+	if you_slut >= 10 and you_slut <= 100: 
+		pcs_horny += (you_slut/10)
 	elseif you_slut >= 100:
 		pcs_horny += 10
 	end
@@ -67,15 +54,25 @@ end
 
 if card_deck = 0:
 	act 'Throw away your deck of vintage porn cards': 
-		vcard = 0
+		mc_inventory['vintage_card'] = 0
 		vcard_trash = 1
 		killvar '$card_loc'
+		killvar '$papkacard'
+		killvar 'papkarand'
+		killvar 'numcard'
+		killvar 'nomcard'
+		killvar 'card_deck'
 		gt $loc
 	end
 elseif card_deck = 1:
 	act 'Throw away your deck of new porn cards': 
-		card = 0
+		mc_inventory['card']  = 0
 		killvar '$card_loc'
+		killvar '$papkacard'
+		killvar 'papkarand'
+		killvar 'numcard'
+		killvar 'nomcard'
+		killvar 'card_deck'
 		gt $loc
 	end
 end

+ 6 - 1
locations/cikl.qsrc

@@ -633,6 +633,11 @@ gs 'stat_sklattrib', 'daycall'
 gs 'body', 'DailyUpdate'
 
 
+!! Set Mira''s schedule for the day
+!gs 'miroslava_schedule', 'cikl'
+
+
+
 if husband > 0 and husbandrink ! 11:husbandrink = rand(0, 10)
 
 !!Pussy_Kats job settings
@@ -974,7 +979,7 @@ gs 'drugs', 'cocaine', 'cikl'
 gs 'drugs', 'mentats', 'cikl'
 gs 'drugs', 'aphrodisiac', 'cikl'
 
-gs 'gaddvor','cikl'
+gs 'gad_gpyard', 'cikl'
 
 loc_count = ARRSIZE('$CloLosLoc')
 i = loc_count - 1

+ 2 - 1
locations/city_coffee_hole.qsrc

@@ -145,8 +145,9 @@ if $args[0]= 'counter':
 	$menu_arg = 'counter'
 	menu_off = 0
 	minut += 5
+	gs 'anushka_konstantinov_schedule'
 	gs 'stat'
-	if mid($start_type,1,2) = 'sg' and yearstart >= 2 and (((week = 2 or week = 4 or week = 7) and hour >= 18) or (week = 5 and hour >= 10 and hour < 16)):
+	if locat['A144'] = 9:
 		gt 'city_coffee_hole','anushka_work'
 	else 
 		temprand = rand(1,2)

+ 7 - 45
locations/city_house_res_misc.qsrc

@@ -166,54 +166,16 @@ if $ARGS[0] = 'livroom':
 	if mc_inventory['sewing_kit'] = 1:
 		'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored next to your favorite chair.'
 		*nl
-		if gobelen > 0:
-			'You have completed <<gobelen>> tapestries.'
-			*nl
-		end
-		if mc_inventory['sewing_fabric'] <= 0:
-			'You do not have any fabric.'
-		else
-			if pcs_sewng < 40:
-				'You have <<mc_inventory[''sewing_fabric'']>> pieces of sewing fabric left.'
-			elseif pcs_sewng < 80:
-				'You have enough fabric for <<mc_inventory[''sewing_fabric'']>> lessons.'
-			else
-				if newgobelen = 0:
-					act'Start a new tapestry (00:15)':
-						*clr & cla
-						menu_off = 1
-						mc_inventory['sewing_fabric'] -= 1
-						newgobelen = 1
-						minut += 15
-						gs'stat'
-						'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-						act'Set the tapestry aside':gt 'city_house_res_misc', 'livroom'
-					end
-				end
-			end
-		end	
-		if newgobelen >= 1:
-			'Your tapestry is <<newgobelen/10>> percent finished.'
-			act'Work on the tapestry (01:00)':
-				*clr & cla
-				menu_off = 1
-				minut += 60
-				gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
-				gobramax = (pcs_sewng - 70) * 6
-				gobramin = (pcs_sewng - 70) * 2
-				newgobelen += rand(gobramin,gobramax)
-				gs'stat'
-				if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-					if newgobelen >= 1000:
-					newgobelen = 0
-					gobelen += 1
-					'Your work on the tapestry is done.'
-				end
-				act'Set the tapestry aside':gt 'city_house_res_misc', 'livroom'
+		if pcs_sewng >= 80:
+			if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0: 
+				act'Start a new tapestry':gt 'sewing', 'tapestry'
+			elseif newgobelen >= 1:
+				'Your tapestry is <<newgobelen/10>> percent finished.'
+				act 'Work on the tapestry':gt 'sewing', 'tapestry'
 			end
 		end
+		if mc_inventory['tapestry'] > 0: 'You have <<mc_inventory[''tapestry'']>> completed tapestries.'
 	end
-
 end
 
 --- city_house_res_misc ---------------------------------

+ 17 - 11
locations/city_jorahouse.qsrc

@@ -255,8 +255,7 @@ if $ARGS[0] = 'ev14':
 end
 
 if $ARGS[0] = 'ev15':
-	cla
-	*clr
+	cla & *clr
 	klofQW += 1
 	money += 100
 	spafinloc = 11
@@ -275,13 +274,14 @@ if $ARGS[0] = 'ev15':
 	end
 
 	act 'Continue':
-		cla
-		*clr
+		cla & *clr
 		'Jora discharges himself on your face'
 		picrand = rand(18, 20)
 		'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof<<picrand>>.jpg"></center>'
 		'You get dressed and get ready to go home.'
 		'Jora hands you money, "Earned yourself a crumb."'
+		killvar'horand'
+		killvar'picrand'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Go home':gt 'city_residential'
@@ -289,8 +289,7 @@ if $ARGS[0] = 'ev15':
 end
 
 if $ARGS[0] = 'ev10':
-	cla
-	*clr
+	cla & *clr
 	gs 'boyStat', 'A45'
 	silavag = 2
 	gs 'arousal', 'bj', 5, 'sub'
@@ -356,6 +355,8 @@ if $ARGS[0] = 'ev 17':
 		'You get dressed and get ready to go home.'
 		'Seymon hands you money, "Earned yourself a crumb."'
 		guy += 1
+		killvar'horand'
+		killvar'picrand'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Go home':gt 'city_residential'
@@ -393,6 +394,8 @@ if $ARGS[0] = 'ev 18':
 		'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof18.jpg"></center>'
 		'You get dressed and get ready to go home.'
 		'Seymon hands you money, "Earned yourself a crumb."'
+		killvar'horand'
+		killvar'picrand'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Go home':gt 'city_residential'
@@ -441,6 +444,8 @@ if $ARGS[0] = 'ev19':
 	'The boys throw money at you, "Earned yourself a crumb."'
 	guy += 1
 	gang += 1
+	killvar'horand'
+	killvar'picrand'
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Go home':gt 'city_residential'
@@ -561,7 +566,6 @@ end
 if $ARGS[0] = 'ev26':
 	cla
 	*clr
-	! WD: Correct Image path ~ "images/characters/city/jora/klof26</center>.jpg"
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/klof26.jpg"></center>'
 	'You show your ass to the boss.'
 	'"Let''s get rid of that dress!" He says.'
@@ -759,7 +763,7 @@ if $ARGS[0] = 'ev34':
 	end
 
 	'"Now I try your ass."'
-
+	killvar'horand'
 	act 'Let him fuck your ass':gt 'city_jorahouse', 'ev35'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
@@ -794,7 +798,8 @@ if $ARGS[0] = 'ev35':
 	end
 
 	'You feel that the boss is ready to cum.'
-
+	killvar'horand'
+	killvar'picrand'
 	act 'Kneel in front of him':gt 'city_jorahouse', 'ev36'
 	act 'Let him end in your ass':gt 'city_jorahouse', 'ev37'
 	act 'Stick his cock in your pussy':gt 'city_jorahouse', 'ev38'
@@ -804,7 +809,7 @@ if $ARGS[0] = 'ev36':
 	cla
 	*clr
 	spafinloc = 11
-gs 'cum_manage'
+	gs 'cum_manage'
 	money += 500
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof30.jpg"></center>'
 	'You jump from his member and start wanking his cock until the boss cums on your face.'
@@ -817,7 +822,7 @@ if $ARGS[0] = 'ev37':
 	cla
 	*clr
 	spafinloc = 3
-gs 'cum_manage'
+	gs 'cum_manage'
 	money += 500
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof32.jpg"></center>'
 	'You start furiously thrusting your ass trying to help him quickly reach orgasm. You fill the warm feeling that tells you he has cum in your ass.'
@@ -882,6 +887,7 @@ if $ARGS[0] = 'ev40':
 	elseif horand > stat['vaginal']:
 		pcs_horny += 10 & 'You are not satisfied'
 	end
+	killvar'horand'
 	act 'Get up and get dressed':gt 'city_jorahouse', 'ev41'
 end
 

+ 2 - 2
locations/city_kafeend.qsrc

@@ -73,14 +73,14 @@ end
 if $ARGS[0] = 'end':
 	gs 'arousal', 'erotic_nudity', 5
 	gs 'stat'
-
+	killvar 'kafe_rand'
 	act 'Leave': gt 'city_residential'
 end
 
 if $ARGS[0] = 'end_sex':
 	gs 'arousal', 'voyeur_sex', 5
 	gs 'stat'
-
+	killvar 'kafe_rand'
 	act 'Leave': gt 'city_residential'
 end
 

+ 3 - 3
locations/city_library.qsrc

@@ -99,7 +99,7 @@ if $ARGS[0] = 'read':
 		grupvalue[3] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/science1.jpg"></center>'
-		'You spend an hour reading, trying to make sense of all the clever propositions writen inside and understand the subject it describes.'
+		'You spend an hour reading, trying to make sense of all the clever propositions written inside and understand the subject it describes.'
 		act 'Put the book back': gt 'city_library', 'read'
 	end
 
@@ -119,7 +119,7 @@ if $ARGS[0] = 'read':
 		grupvalue[3] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/fantasy' + rand(1,9) + '.jpg"></center>'
-		'You spend an hour reading a fantasy novel, rescuing damsels from dragons, digging for jewels with dwarves and performing word changing magic alongside elves and druids.'
+		'You spend an hour reading a fantasy novel, rescuing damsels from dragons, digging for jewels with dwarves and performing world changing magic alongside elves and druids.'
 		act 'Put the book back': gt 'city_library', 'read'
 	end
 
@@ -129,7 +129,7 @@ if $ARGS[0] = 'read':
 		grupvalue[3] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/scifi' + rand(1,6) + '.jpg"></center>'
-		'You spend an hour reading a science fiction novel - flying off into space, travelling though time, running from rogue AI and creating monsters with your hunchbacked assistant.'
+		'You spend an hour reading a science fiction novel - flying off into space, traveling through time, running from rogue AI and creating monsters with your hunchbacked assistant.'
 		act 'Put the book back': gt 'city_library', 'read'
 	end
 

+ 9 - 45
locations/city_mansion_residence_2.qsrc

@@ -61,53 +61,17 @@ if $ARGS[0] = 'ylounge':
 		if mc_inventory['sewing_kit'] = 1:
 			'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored next to your favorite chair.'
 			*nl
-			if gobelen > 0:
-				'You have completed <<gobelen>> tapestries.'
-				*nl
-			end
-			if mc_inventory['sewing_fabric'] <= 0:
-				'You do not have any fabric.'
-			else
-				if pcs_sewng < 40:
-					'You have <<mc_inventory[''sewing_fabric'']>> pieces of sewing fabric left.'
-				elseif pcs_sewng < 80:
-					'You have enough fabric for <<mc_inventory[''sewing_fabric'']>> lessons.'
-				else
-					if newgobelen = 0:
-						act'Start a new tapestry (00:15)':
-							*clr & cla
-							menu_off = 1
-							mc_inventory['sewing_fabric'] -= 1
-							newgobelen = 1
-							minut += 15
-							gs'stat'
-							'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-
-							act'Set the tapestry aside':gt 'city_mansion_residence_2', 'ylounge'
-						end
-					end
-				end
-			end	
-			if newgobelen >= 1:
-				'Your tapestry is <<newgobelen/10>> percent finished.'
-				act'Work on the tapestry (01:00)':
-					*clr & cla
-					menu_off = 1
-					minut += 60
-					gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
-					gobramax = (pcs_sewng - 70) * 6
-					gobramin = (pcs_sewng - 70) * 2
-					newgobelen += rand(gobramin,gobramax)
-					gs'stat'
-					if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-						if newgobelen >= 1000:
-						newgobelen = 0
-						gobelen += 1
-						'Your work on the tapestry is done.'
-					end
-					act'Set the tapestry aside':gt 'city_mansion_residence_2', 'ylounge'
+			if mc_inventory['sewing_fabric'] <= 0:'You do not have any fabric.'
+			*nl
+			if pcs_sewng >= 80:
+				if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0: 
+					act'Start a new tapestry':gt 'sewing', 'tapestry'
+				elseif newgobelen >= 1:
+					'Your tapestry is <<newgobelen/10>> percent finished.'
+					act 'Work on the tapestry':gt 'sewing', 'tapestry'
 				end
 			end
+			if mc_inventory['tapestry'] > 0: 'You have <<mc_inventory[''tapestry'']>> completed tapestries.'
 		end
 	end
 end

+ 1 - 1
locations/city_park.qsrc

@@ -376,7 +376,7 @@ if $ARGS[0] = 'luna':
 					else
 						'You can''t even hit one target.'
 					end
-
+					killvar 'tirand'
 					gs 'exp_gain', 'shoot', 1
 
 					act 'Move away':gt 'city_park', 'luna'

+ 2 - 2
locations/clothing.qsrc

@@ -1699,7 +1699,7 @@ if $ARGS[0] = 'view_clothing_item':
 end
 
 if $args[0] = 'school_check':
-	if CloInhibit <= 10:
+	if CloInhibit <= 5:
 		'<font color="blue">This uniform is very conservative. Only the nerds would approve of you wearing it.</font>'
 	elseif CloSkirtShortness < 5 and CloThinness < 5 and CloBra = 0:
 		if CloInhibit >= 30 or CloTopCut = 4:
@@ -2009,7 +2009,7 @@ if $ARGS[0] = 'wear_last_worn':
 	gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 end
 
-if $ARGS[0] = 'swamp_clothes':
+if $ARGS[0] = 'gad_swamp_clothes':
 	if ARGS[1] = 1:
 	!hessian clothing to owned, sets size and equipped.
 		misc_outfits[1] = 1

+ 1 - 1
locations/clothing_attributes.qsrc

@@ -21,7 +21,7 @@
 !!		Notes:   Clothing with large cut-away sections or transparent sections should have a decreased CloThinness score
 !!		Ex: 	6 intentionally reveals breast or pubic areas, with translucent or transparent areas and should trigger some sort of indecent exposure/arrest event if worn in public without underwear. 
 !!				5 is thin enough to be seen through only in bright light, or is otherwise tight enough to show the body in detail if opaque (skin tight).  
-!!				4 is thin or tight enough to be flirty and fine in most places except the most conservative (church, school, etc). 
+!!				4 is thin or tight enough to be flirty and fine in most places except the most conservative (church, court, etc). 
 !!				3-2 is the range of clothing that is modest enough to be worn in all public places.
 !!				1 does not follow the curves of the body in great detail, and makes it hard to see the body shape.
 !!Top!!

+ 2 - 2
locations/dachain.qsrc

@@ -28,8 +28,8 @@ if $args[0] = 'start':
 	*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 stol = 0:$stol = 'an old wooden <a href="exec:gt ''stol'', ''start''">table</a>'
-	if stol = 1:$stol = 'a new <a href="exec:gt ''stol'', ''start''">table</a>'
+	if mc_inventory['desk'] = 0:$stol = 'an old wooden <a href="exec:gt ''stol'', ''start''">table</a>'
+	if mc_inventory['desk'] = 1:$stol = 'a new <a href="exec:gt ''stol'', ''start''">table</a>'
 	'In front of the window there is <<$stol>>.'
 	*nl
 	if mc_inventory['tech_computer'] = 1:

+ 19 - 9
locations/din_bad.qsrc

@@ -236,13 +236,15 @@ if $ARGS[0] = 'd_bag':
 	if mc_inventory['breastcream'] > 0:'<a href="exec: gs ''drugs'', ''breastcream'' & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<mc_inventory[''breastcream'']>></b> cream left in your purse.'
 	if mc_inventory['aphrodisiac'] > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $drugVars[''aphrodisiac_msg''] & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<mc_inventory[''aphrodisiac'']>></b> gum left in your purse.'
 
-	if mc_inventory['refill_bottle'] = 4: 
-		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: mc_inventory[''refill_bottle''] = 3 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
-	elseif mc_inventory['refill_bottle'] = 3:
-		'You carry your sports water bottle in your purse. It''s two-thirds full. <a href="exec: mc_inventory[''refill_bottle''] = 2 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
-	elseif mc_inventory['refill_bottle'] = 2:
-		'You carry your sports water bottle in your purse. It''s one-third full. <a href="exec: mc_inventory[''refill_bottle''] = 1 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'	
-	elseif mc_inventory['refill_bottle'] = 1:
+	if mc_inventory['refill_bottle_water'] = 4: 
+		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: mc_inventory[''refill_bottle_water''] = 3 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
+	elseif mc_inventory['refill_bottle_water'] = 3:
+		'You carry your sports water bottle in your purse. It''s almost full. <a href="exec: mc_inventory[''refill_bottle_water''] = 2 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
+	elseif mc_inventory['refill_bottle_water'] = 2:
+		'You carry your sports water bottle in your purse. It''s half full. <a href="exec: mc_inventory[''refill_bottle_water''] = 1 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'	
+	elseif mc_inventory['refill_bottle_water'] = 1:
+		'You carry your sports water bottle in your purse. It''s almost empty. <a href="exec: mc_inventory[''refill_bottle_water''] = 0 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
+	elseif mc_inventory['refill_bottle_water'] = 0:
 		'You carry your sports water bottle in your purse. It''s empty.'
 	end
 	if mc_inventory['food_water'] > 0: 'There''s a bottle of water in your purse. <a href="exec:mc_inventory[''food_water''] = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
@@ -320,7 +322,11 @@ $din_Table_Condom_Menu = {
 	dynamic $din_Update_Condom_Counts
 	*clr & cla
 	'<center><h1>Condoms</h1></center>'
-	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	if mc_inventory['desk'] = 0:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol1.jpg"></center>'
+	end
 	*nl
 	i = 1
 	'You have <<iif(preziktype < 2, mc_inventory[''equipped_condoms'']+mc_inventory[''normal_condoms''], mc_inventory[''normal_condoms''])>> normal condoms left and	<<iif(preziktype = 2, mc_inventory[''equipped_condoms'']+mc_inventory[''sabotaged_condoms''], mc_inventory[''sabotaged_condoms''])>> sabotaged condoms left.'
@@ -471,7 +477,11 @@ $d_tabletkied = {
 $d_tabletkiedt = {
 	*clr & cla
 	'<center><h1>Birth Control</h1></center>'
-	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	if mc_inventory['desk'] = 0:
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol1.jpg"></center>'
+	end
 	*nl
 	tabloc = 1
 	if thinkpreg = 0 and knowpreg = 0:

+ 2 - 2
locations/din_npc.qsrc

@@ -7,11 +7,11 @@
 
 if $ARGS[0] = 'go_home':
 	if $home['current'] = 'hunters_lodge':
-		gt 'swamp_yard','start'		
+		gt 'gad_swamp_yard','start'
 	elseif $home['location'] = 'pav_complex':
 		gt 'pav_complex', 'start'
 	else
-		gt $home['location']				
+		gt $home['location']
 	end
 end
 

+ 4 - 4
locations/exercise.qsrc

@@ -174,7 +174,7 @@ if $ARGS[0] = 'manual':
 			if pcs_stam >= 5*4 * (10 - sport_clothes_exercise_bonus): act '60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
 		end
 
-		if mc_inventory['skipping_rope'] > 0 and $loc ! 'meadow':
+		if mc_inventory['skipping_rope'] > 0 and $loc ! 'gad_meadow':
 			act 'Jump rope':
 				cla
 				act 'Return':gt 'exercise', 'manual'
@@ -196,7 +196,7 @@ if $ARGS[0] = 'manual':
 			end
 		end
 
-		if mc_inventory['hula_hoop'] > 0 and $loc ! 'meadow':
+		if mc_inventory['hula_hoop'] > 0 and $loc ! 'gad_meadow':
 			act 'Use your hula hoop':
 				cla
 				act 'Return':gt 'exercise', 'manual'
@@ -291,9 +291,9 @@ if $ARGS[0] = 'matrix':
 	'<center><table border=0 cellspacing=0 cellpadding=10 width=1000><TH>Exercise</TH><TH>None</TH><TH>15 mins</TH><TH>30 mins</TH><TH>45 mins</TH><TH>60 mins</TH>'
 	gs 'exercise', 'matrixdata', 0, 'Push ups'
 	gs 'exercise', 'matrixdata', 1, 'Crunches'
-	if mc_inventory['skipping_rope'] > 0 and $loc ! 'meadow': gs 'exercise', 'matrixdata', 2, 'Jump rope'
+	if mc_inventory['skipping_rope'] > 0 and $loc ! 'gad_meadow': gs 'exercise', 'matrixdata', 2, 'Jump rope'
 	if mc_inventory['book_yoga'] > 0: gs 'exercise', 'matrixdata', 3, 'Yoga'
-	if mc_inventory['hula_hoop'] > 0 and $loc ! 'meadow': gs 'exercise', 'matrixdata', 4, 'Hula hoop'
+	if mc_inventory['hula_hoop'] > 0 and $loc ! 'gad_meadow': gs 'exercise', 'matrixdata', 4, 'Hula hoop'
 	gs 'exercise', 'matrixdata', 5, 'Squats'
 
 	'</center></table>'

+ 21 - 24
locations/backwater.qsrc → locations/gad_backwater.qsrc

@@ -1,10 +1,7 @@
-# backwater
+# gad_backwater
 
+gs 'shortgs', 'setloc', 'gad_backwater', ''
 $location_type = 'secluded'
-$loc = 'backwater'
-$loc_arg = ''
-$menu_loc = 'backwater'
-$menu_arg = ''
 menu_off = 0
 gs 'gadukino_event', 'sound'
 clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
@@ -21,7 +18,7 @@ if $ARGS[0] = '':
 
 		act 'Further':gt 'hunters', 'start'
 	else
-		if $clothingworntype = 'nude' and $igor_away = 'no' or (hunters_outside = 1 and hunters_available = 1) and rand(1,10) = 1: gt 'backwater','hunter' else gt 'backwater','alone'
+		if $clothingworntype = 'nude' and $igor_away = 'no' or (hunters_outside = 1 and hunters_available = 1) and rand(1,10) = 1: gt 'gad_backwater','hunter' else gt 'gad_backwater','alone'
 	end
 end
 
@@ -42,7 +39,7 @@ if $ARGS[0] = 'alone':
 	act 'Go back to the hut':
 		minut += 5
 		hunter_refuse = 0
-		gt 'swamp_yard', 'start'
+		gt 'gad_swamp_yard', 'start'
 	end
 
 
@@ -62,7 +59,7 @@ if $ARGS[0] = 'alone':
 			inhib_exp += rand(1,3)
 			if huntersRape = 1: huntersRape = 2
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-			act 'Finish': gt 'backwater'
+			act 'Finish': gt 'gad_backwater'
 		end
 	end
 	if cumloc[11]+cumloc[12]+cumloc[16] > 0:
@@ -81,7 +78,7 @@ if $ARGS[0] = 'alone':
 			if huntersRape = 1: huntersRape = 2
 			gs 'stat'
 
-			act 'Finish': gt 'backwater'
+			act 'Finish': gt 'gad_backwater'
 		end
 	end
 	if body_write > 0 or face_write > 0:
@@ -95,7 +92,7 @@ if $ARGS[0] = 'alone':
 			minut += 10
 			gs'stat'
 
-			act 'Finish': gt 'backwater'
+			act 'Finish': gt 'gad_backwater'
 		end
 	end
 	if cumloc[2]+cumloc[5]+cumloc[6]+cumloc[7] > 0:
@@ -110,7 +107,7 @@ if $ARGS[0] = 'alone':
 			if huntersRape = 1: huntersRape = 2
 			gs'stat'
 
-			act 'Finish':gt 'backwater'
+			act 'Finish':gt 'gad_backwater'
 		end
 	end
 	if cumsumbod-cumsumvag-cumsumass > 0 or pcs_sweat > 20:
@@ -125,7 +122,7 @@ if $ARGS[0] = 'alone':
 			minut += 15
 			if huntersRape = 1: huntersRape = 2
 			gs'stat'
-			act 'Finish':gt 'backwater'
+			act 'Finish':gt 'gad_backwater'
 		end
 	end
 
@@ -139,14 +136,14 @@ if $ARGS[0] = 'alone':
 					'You do not hesitate to get undressed, not caring if anyone is watching.'
 					minut+=5
 					if huntersRape = 1: huntersRape = 2
-					gs 'clothing', 'strip_all', 'backwater'
+					gs 'clothing', 'strip_all', 'gad_backwater'
 
-					act'Back': gt 'backwater'
+					act'Back': gt 'gad_backwater'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/noundress.jpg"></center>'
 					'You hesitate to get undressed. What if someone suddenly sees you?'
 
-					act'Back': gt 'backwater'
+					act'Back': gt 'gad_backwater'
 				end
 			end
 		else
@@ -155,16 +152,16 @@ if $ARGS[0] = 'alone':
 	else
 		if $clothingworntype ! 'nude':
 			act 'Pick up your clothes':
-				gs 'clothing', 'recover_lost_clothes', 'backwater'
+				gs 'clothing', 'recover_lost_clothes', 'gad_backwater'
 				!! 'You pick up your clothes laying on the ground.'
-				gt 'backwater'
+				gt 'gad_backwater'
 			end
 		elseif forced_naked_day < daystart:
 			act 'Get dressed':
-				gs 'clothing', 'recover_lost_clothes', 'backwater', 1
+				gs 'clothing', 'recover_lost_clothes', 'gad_backwater', 1
 				gs 'underwear', 'wear'
 				!! 'You pick up your clothes laying on the ground and get dressed.'
-				gt 'backwater'
+				gt 'gad_backwater'
 			end
 		end
 	end
@@ -185,10 +182,10 @@ if $ARGS[0] = 'hunter':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude1.jpg"></center>'
 			*nl 'Noticing the hunter, you rush to your clothes and begin dressing in panic. As you get fully dressed, you look over your shoulder, expecting the hunter standing there, but there is no one there.'
 			gs 'underwear', 'wear'
-			gs 'clothing', 'recover_lost_clothes', 'backwater', 1
+			gs 'clothing', 'recover_lost_clothes', 'gad_backwater', 1
 			minut += 5
 
-			act'Further':gt 'backwater'
+			act'Further':gt 'gad_backwater'
 		end
 	else
 		act'Hide':
@@ -197,7 +194,7 @@ if $ARGS[0] = 'hunter':
 			'Covering your breasts and crotch, you jump into the nearest bush. In your state of fear and confusion, you start scanning the area, but you don''t see anyone there. So you quickly run back towards the cabin.'
 			minut += 1
 
-			act'Go back to the hut':gt 'swamp_yard', 'start'
+			act'Go back to the hut':gt 'gad_swamp_yard', 'start'
 		end
 	end
 	act'Stay naked':
@@ -208,9 +205,9 @@ if $ARGS[0] = 'hunter':
 		hunterknowday = day
 		gs'stat'
 
-		act'Further':gt 'backwater'
+		act'Further':gt 'gad_backwater'
 	end
 end
 
---- backwater ---------------------------------
+--- gad_backwater ---------------------------------
 

+ 872 - 0
locations/gad_beach.qsrc

@@ -0,0 +1,872 @@
+# gad_beach
+!2024/05/05 - Mira schedule introduced.
+!locat['A60'] = Mira''s location. See 'miroslava_schedule'
+
+$loc = 'gad_beach'
+
+if $ARGS[0] = 'start':
+	$loc_arg = 'start'
+	$location_type = 'public_outdoors'
+	killvar '$locclass'
+	menu_off = 1
+	gs 'miroslava_schedule'
+	gs 'stat'
+
+	'<center><H4>Village Beach</H4></center>'
+	!125e
+	if hour >= 6 and hour < 22:
+		if sunWeather = 1:
+			if month >= 4 and month <= 10:
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadbitch_summer.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadbitch_winter.jpg"></center>'
+			end
+		else
+			if month >= 4 and month <= 10:
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadbitch_soft.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadbitch_cold.jpg"></center>'
+			end
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadbitch_night.jpg"></center>'
+	end
+
+	'A small country beach, where you can sunbathe and swim.'
+
+	if locat['A60'] ! 51 and npc_QW['A63'] >= 13 and rand(0,10) = 0 and hour >= 8 and hour < 20 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1:
+		'<a href="exec: gt ''gad_river'', ''GuysBeach'' ">Kolyamba and Vasyan</a> are resting on the riverbank.'
+	end
+
+	if locat['A60'] = 51:
+		if rand(0, 10) < 5:
+			'<a href="exec:gt ''gad_beach'', ''Mira'', 1 ">Mira</a> is laying on the beach sunbathing.'
+			if npc_rel['A60'] < 15: npc_rel['A60'] += 1
+		else
+			'<a href="exec:& gt ''gad_beach'', ''Mira'', 0 ">Mira</a> is in the river splashing water around and having fun.'
+			if npc_rel['A60'] < 15: npc_rel['A60'] += 1
+		end
+	end
+
+	act 'Walk to the river (0:05)':
+		cla
+		if PCloswimwear = 1:
+			'You need to dress in regular clothes first.'
+			act 'Return': gt 'gad_beach', 'start', 1
+		elseif $clothingworntype = 'nude':
+			'You need to put some clothes on first.'
+			act 'Return': gt 'gad_beach', 'start', 1
+		else
+			minut += 5
+			gt 'gad_river', 'start'
+		end
+	end
+
+	if func('changingroom','count_swim_item') > 0: act 'Get changed': gt 'changingroom', 'view_swim_list'
+
+	if $clothingworntype = 'nude':
+		act 'Get dressed':
+			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
+			cla
+			minut += 5
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			if clothesAtLocation = 1: gs 'clothing', 'recover_lost_clothes', 'VillageRiver', 1
+			act 'Continue': gt 'gad_beach', 'start', 1
+		end
+	end
+
+	if temper >= 15 and month >= 5 and month <= 9:
+		if $clothingworntype ! 'nude' and (pcs_inhib >= 25 or exhibitionist_lvl > 1):
+			act 'Strip naked':
+				cla
+				minut += 5
+				$lastwornclothingtype['swim'] = $clothingworntype
+				lastwornclothingnumber['swim'] = clothingwornnumber
+				$lastwornpantytype['swim'] = $pantyworntype
+				lastwornpantynumber['swim'] = pantywornnumber
+				$lastwornbratype['swim'] = $braworntype
+				lastwornbranumber['swim'] = brawornnumber
+				gs 'clothing', 'strip_all', 'VillageRiver'
+				'Without hesitation, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the river or lie down in the sand and sunbathe.'
+				act 'Continue': gt 'gad_beach', 'start', 1
+			end
+		end
+		gs 'gad_beach', 'set_swimming_act'
+		gs 'gad_beach', 'set_sunbath_act'
+		gs 'gad_beach', 'set_desperado_act'
+	end
+
+!! extraordinary events at the river beach. Be aware, this part has to be at the end because it removes actions, which were set before.
+	if locat['A60'] ! 51 and locat['A60_prev'] = 51:
+		gt 'gad_beach', 'Mira_leaves'
+	elseif locat['A60'] = 51 and ARGS[1] = 0:
+		gt 'gad_beach', 'Arrive_Mira_already_there'
+	end
+end
+
+if $ARGS[0] = 'set_swimming_act':
+	if PCloswimwear = 1 and pcs_stam >= (5 * (10 - sport_clothes_exercise_bonus)) / 2:
+		act 'Go for a swim':
+			cla
+			*clr
+			cumspclnt = 4
+			gs 'cum_cleanup'
+
+			minut += 29
+			gs 'exercise', 'tier1', 1, 'stren', 'vital'
+
+			if pcs_inhib < 50:inhib_exp += rand(1,3)
+			pcs_sweat = 10 + rand(0,4)
+			if hour >= 22 or hour <= 6:
+				if rand(0, 10) < 5 and locat['A60'] = 51:
+					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/rivertwogirls.jpg"></center>'
+					'You and Mira take a nighttime swim in the river, splashing water at each other and having fun.'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverswim.jpg"></center>'
+					'You take a nighttime swim in the river, feeling the refreshing and invigorating water flowing across your body.'
+				end
+			else
+				if rand(0, 10) < 5 and locat['A60'] = 51:
+					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/rivertwogirls.jpg"></center>'
+					'You and Mira swim in the river, splashing water at each other and having fun.'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverswim.jpg"></center>'
+					'You swim in the river, feeling the refreshing and invigorating water across your body.'
+				end
+			end
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+
+			act 'Get out of the water':
+				temp_rand = rand(0, 9)
+				if temp_rand <= 1 and locat['A60'] ! 51 and npc_QW['A63'] >= 13 and hour >= 8 and hour < 20:
+					if temp_rand = 0:
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex13.jpg"></center>'
+						'When you decide it''s time to get out of the river, you hear the sound of men laughing as they walk on the river bank approaching you. As they get closer, you see the village boys'' smirking faces, led by Mitya, headed towards the river bank while you are still in the shallow waters.'
+						'They quickly undress and jump in the water. Within a few seconds, you are surrounded by the grinning boys. Then, without a word, they reach for you and roughly take turns forcing you to suck their cocks.'
+						gs 'arousal', 'bj', 15, 'gangbang', 'sub', 'rough'
+						gs 'arousal', 'hj', 15, 'gangbang', 'sub', 'rough'
+						gs 'arousal', 'end'
+						gs 'boyStat', 'A63'
+						npc_sex[$boy] += 1
+						gs 'cum_call','face',$boy, 1,'','',20
+						gs 'cum_call','hair',$boy, 1,'','',20
+						gs 'boyStat', 'A61'
+						npc_sex[$boy] += 1
+						gs 'cum_call','face',$boy, 1,'','',20
+						gs 'cum_call', 'mouth_swallow', $boy, 1,'','',20
+						gs 'boyStat', 'A62'
+						npc_sex[$boy] += 1
+						minut -= 10
+						gs 'cum_call','face',$boy, 1,'','',20
+						gs 'cum_call', 'mouth_swallow', $boy, 1,'','',20
+						gang +=1
+						gs 'stat'
+
+						act 'Finish': gt 'gad_beach', 'start', 1
+					else
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex19.jpg"></center>'
+						'As soon as you get out of the river, you meet a grinning Kolyamba. He smiles wickedly and commands you to get down on your hands and knees so he can fuck you in the ass...'
+						gs 'arousal', 'auto_lube', 'anal'
+						gs 'boyStat', 'A61'
+						npc_sex[$boy] += 1
+						pose = 1
+						gs 'dinSex','boy_wants_anal'
+						gs 'arousal', 'anal', 20, 'sub'
+						gs 'cum_call','anus',$boy, 1,'','',20
+						gs 'cum_call','butt',$boy, 1,'','',20
+						gs 'arousal', 'end'
+						gs 'stat'
+
+						act 'Finish': gt 'gad_beach', 'start', 1
+					end
+				else
+					gt 'gad_beach', 'start', 1
+				end
+				killvar 'temp_rand'
+			end
+		end
+	else
+		if $clothingworntype = 'nude':
+			act 'Go skinny dipping':
+				*clr & cla
+				cumspclnt = 4
+				gs 'cum_cleanup'
+				minut = minut + 20
+				pcs_sweat = 10 + rand(0, 4)
+				pcs_mood += 5
+				inhib_exp += rand(1, 3)
+				if pcs_stren < 30: gs 'exp_gain', 'stren', 1
+
+				if hour >= 22 and hour <= 6:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls1.jpg"></center>'
+					'You strip your clothes off and slowly step into the cold river, knowing that the darkness hides your nudity. You swim around, feeling the refreshing and invigorating water caressing your body.'
+				else
+					if rand(0, 15) >= 10 and locat['A60'] = 51:
+						pcs_horny += rand(5, 15)
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
+						'You step into the river with Mira and have a good old-fashioned water fight, splashing each other until one of you finally surrenders.'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls.jpg"></center>'
+						'You take your clothes off and swiftly step into the river. You sigh, feeling the cold, refreshing and tonic water.'
+					end
+				end
+				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+				act 'Get out of the water':
+					if rand(0, 15) = 0 and locat['A60'] ! 51 and npc_QW['A63'] >= 13 and hour >= 8 and hour < 20:
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex12.jpg"></center>'
+						'As soon as you step out of the water, you find your naked self in front of three boys here to do some fishing.'
+						'Seeing you skinny dipping, they start to talk amongst themselves about how much of a shameless slut you are and that the only good thing you are for is serving men. You tell them to fuck off, but they are too worked up and not listening to you at all.'
+						'One of the boys flips you over and starts penetrating your pussy as the other boy shoves his hardened cock into your protesting mouth. They have started to fuck you in an earnest and lust-filled frenzy.'
+						'Your muffled moans and the sound of your wet pussy getting pounded fill the air. The boys soon orgasm and decide to ejaculate all over your body to show dominance.'
+						gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
+						gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
+						gs 'arousal', 'hj', 10, 'gangbang', 'sub', 'rough'
+						gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
+						gs 'arousal', 'end'
+						gs 'boyStat', 'A63'
+						npc_sex[$boy] += 1
+						gs 'cum_call','butt',$boy, 1
+						gs 'boyStat', 'A61'
+						npc_sex[$boy] += 1
+						gs 'cum_call','anus',$boy, 1,'','',20
+						gs 'boyStat', 'A62'
+						npc_sex[$boy] += 1
+						gs 'cum_call', 'mouth_swallow', $boy
+						gs 'stat'
+						gang +=1
+
+						act 'Finish': gt 'gad_beach', 'start', 1
+					else
+						gt 'gad_beach', 'start', 1
+					end
+				end
+			end
+		end
+	end
+end
+
+
+if $ARGS[0] = 'set_sunbath_act':
+	if hour >= 8 and hour < 20 and sunWeather = 1:
+		if PCloswimwear = 1 or $clothingworntype = 'nude':
+			act 'Sunbathe (1:00)':
+				if locat['A60'] = 51 and locat['A60_prev'] ! 51:
+					*clr & cla
+					minut += 5
+					MiraVars['follow_time'] = 1
+					if pcs_inhib < 50:inhib_exp += rand(1,3)
+					gs 'stat'
+					if $clothingworntype = 'nude':
+						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_go_river_nude.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_go_river.jpg"></center>'
+					end
+					'You are sunbathing by the river when Mira comes along. You smile, and she undresses and lays her towel next to yours.'
+
+					act 'Continue': gt 'gad_beach', 'start', 1
+				elseif $clothingworntype = 'nude':
+					*clr & cla
+					minut += 60
+					inhib_exp += rand(1,3)
+					if pcs_sweat < 35 : gs 'sweat', 'add', 5
+					pcs_mood += 5
+					if locat['A60'] = 51:
+						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/beachtwogirlsnude.jpg"></center>'
+						'You lie next to Mira and gossip about the villagers, enjoying the sun.'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadrivernude.jpg"></center>'
+						'You lie down on your towel and start sunbathing.'
+					end
+					if mc_inventory['suncream'] =  0:
+						pcs_tan += 1
+					elseif  mc_inventory['suncream'] > 0:
+						mc_inventory['suncream'] -=  1
+						'You smear the suntan lotion all over your body to help prevent sunburn.'
+						pcs_tan += 3
+					end
+					act 'Finish sunbathing':
+						if rand(0, 9) = 0 and locat['A60'] ! 51 and npc_QW['A63'] >= 13 and hour >= 8 and hour < 20:
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex14.jpg"></center>'
+							'You hear several men''s voices rapidly approaching. Suddenly, a couple of the village boys emerge in front of you. Noticing that you are nude, they brighten up considerably. In a few minutes, despite you protesting lively, they have you on all fours and are roughly fucking you...'
+							gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'hj', 10, 'gangbang', 'sub', 'rough'
+							gs 'boyStat', 'A62'
+							npc_sex[$boy] += 1
+							gs 'cum_call','butt',$boy, 1
+							gs 'boyStat', 'A63'
+							npc_sex[$boy] += 1
+							gs 'cum_call','anus',$boy, 1,'','',20
+							gs 'boyStat', 'A61'
+							npc_sex[$boy] += 1
+							gs 'cum_call','mouth_swallow',$boy
+							gs 'arousal', 'end'
+							gs 'stat'
+
+							act 'Get dressed': gt 'gad_beach', 'start', 1
+						else
+							gt 'gad_beach', 'start', 1
+						end
+					end
+				else
+					*clr & cla
+					minut += 60
+					if pcs_sweat < 35 : gs 'sweat', 'add', 5
+					pcs_mood += 5
+
+					if locat['A60'] = 51:
+						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/beachtwogirls.jpg"></center>'
+						'You lie next to Mira and gossip about trivial things, enjoying the sun.'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadrivergirl.jpg"></center>'
+						'You sunbathe alone on the riverbank.'
+					end
+					if mc_inventory['suncream'] =  0:
+						pcs_tan += 1
+					elseif  mc_inventory['suncream'] > 0:
+						mc_inventory['suncream'] -=  1
+						pcs_tan += 3
+						'You smear suntan lotion all over your body to prevent sunburn. Then, you''re all lathered up and sunbathing a few minutes later.'
+					end
+					act 'Finish':
+						temp_rand = rand(0, 9)
+						if temp_rand = 0 and locat['A60'] ! 51 and npc_QW['A63'] >= 13 and hour >= 8 and hour < 20:
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex15.jpg"></center>'
+							'After a while, you hear some familiar voices quickly approaching you. A couple of minutes later, the village boys emerge from the bushes. Noticing you sunbathing, they brighten up considerably. But, in a short time, despite you protesting lively, all of your holes have been violated...'
+							gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'hj', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'end'
+							gs 'boyStat', 'A61'
+							npc_sex[$boy] += 1
+							gs 'cum_call','butt',$boy, 1
+							gs 'boyStat', 'A62'
+							npc_sex[$boy] += 1
+							gs 'cum_call','anus',$boy, 1,'','',20
+							gs 'boyStat', 'A63'
+							npc_sex[$boy] += 1
+							gs 'cum_call','mouth_swallow',$boy
+							gang += 1
+							gs 'stat'
+
+							act 'Finish': gt 'gad_beach', 'start', 1
+						elseif temp_rand = 1 and locat['A60'] = 51 and MiraVars['QW'] >= 15 and hour >= 8 and hour < 20:
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex16.jpg"></center>'
+							'After a while, you hear voices rapidly approaching from the village. You see the village boys emerge from the bushes in a couple of minutes. Seeing Mira, they smile obscenely, and without hesitation, they quickly surround her as she lies on the sand. You sit up and watch as they fuck her in all her holes...'
+
+							gs 'arousal', 'voyeur_sex', 30, 'gangbang', 'dom'
+							gs 'arousal', 'end'
+							gs 'stat'
+
+							act 'Finish': gt 'gad_beach', 'start', 1
+						else
+							killvar 'temp_rand'
+							gt 'gad_beach', 'start', 1
+						end
+						killvar 'temp_rand'
+					end
+				end
+			end
+		end
+	end
+end
+
+
+if $ARGS[0] = 'set_desperado_act':
+	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 PCloswimwear = 1 or $clothingworntype = 'nude':
+				act 'Wash Desperado':
+					*clr & cla
+
+					cumspclnt = 4
+					gs 'cum_cleanup'
+					minut += 30
+					pcs_sweat = 10 + rand(0,4)
+					pcs_mood += 5
+					if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
+					gs 'exp_gain', 'hndiwrk', 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 PCloswimwear = 1:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/wash_horse_swim.jpg"></center>'
+					end
+					'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 'gad_beach', 'start', 1
+					end
+				end
+				if Mira_Loc = 1 and npc_rel['A60'] > 0:
+					act 'Wash Desperado with Mira':
+						*clr & cla
+
+						cumspclnt = 4
+						gs 'cum_cleanup'
+						minut += 30
+						npc_rel['A60'] += 1
+						pcs_sweat = 10 + rand(0,4)
+						pcs_mood += 5
+						if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
+						gs 'exp_gain', 'hndiwrk', rand(1,3)
+						grandpaQW['chore_bathe_horse_prog'] = 2
+						gs 'stat'
+
+						if $clothingworntype = 'nude':
+							'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/wash_horse_mira_nude.jpg"></center>'
+						elseif PCloswimwear = 1:
+							'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/wash_horse_mira_swim.jpg"></center>'
+						end
+						'You invite Mira to wash Desperado with you; she agrees with nothing better to do.'
+						'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 'gad_beach', 'start', 1
+						end
+					end
+				end
+
+			else
+				'You cannot wear regular clothes to wash Desperado.'
+				act 'Return': gt 'gad_beach', 'start', 1
+			end
+		end
+	end
+	if grandpaQW['chore_bathe_horse_prog'] = 2:
+		act 'Lead Desperado back home (0:30)':
+			if PCloswimwear = 1:
+				cla
+				'You need to dress in regular clothes first.'
+				act'Return': gt 'gad_beach', 'start', 1
+			elseif $clothingworntype = 'nude':
+				cla
+				'You need to put some clothes on first.'
+				act'Return': gt 'gad_beach', 'start', 1
+			else
+				minut += 30
+				gs 'exp_gain', 'hndiwrk', rand(0,3)
+				grandpaQW['chore_bathe_horse'] = 2
+				grandpaQW['chore_bathe_horse_prog'] = 0
+				gs 'stat'
+
+				gt 'gad_gpbarn','horse'
+			end
+		end
+	end
+end
+
+
+if $ARGS[0] = 'Mira_leaves':
+	minut += 5
+	gs 'stat'
+	if $clothingworntype = 'nude':
+		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_go_home_nude.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_go_home.jpg"></center>'
+	end
+	*nl
+	'"<<$pcs_nickname>>, I have to go home, " Mira said and began gathering her stuff.'
+
+	act 'Continue': gt 'gad_beach', 'start', 1
+end
+
+if $ARGS[0] = 'arrive_Mira_already_there':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_in_river.jpg"></center>'
+	*nl
+	'Arriving at the beach, you see Mira lying down, sunbathing on a towel.'
+	minut += 5
+	MiraVars['follow_time'] = 1
+	gs 'stat'
+
+	act 'Continue':
+		if Miraswimday ! daystart:
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirariver.jpg"></center>'
+			*nl
+			'"<<$pcs_nickname>>, why are you moping about on the shore? Get in the water and swim with me?" - Mira called out to you as she waded into the river.'
+			minut += 1
+			Miraswimday = daystart
+			gs 'stat'
+			act 'Agree and get changed':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/undressbch1.jpg"></center>'
+				*nl
+				'"Wait, Mira, I have to change out of my clothes!" you cry in response, although she can hardly hear you as she is already splashing around in the river.'
+				'You start to take off your clothes.'
+				if func('changingroom','count_swim_item') > 0:
+					act 'Change into swimwear':
+						gs 'gad_beach', 'get_changed', 'start'
+					end
+				end
+				if pcs_inhib >= 25 or exhibitionist_lvl > 1:
+					act 'Strip naked':
+						cla
+						minut += 5
+						$lastwornclothingtype['swim'] = $clothingworntype
+						lastwornclothingnumber['swim'] = clothingwornnumber
+						$lastwornpantytype['swim'] = $pantyworntype
+						lastwornpantynumber['swim'] = pantywornnumber
+						$lastwornbratype['swim'] = $braworntype
+						lastwornbranumber['swim'] = brawornnumber
+						gs 'clothing', 'strip_all', 'VillageRiver'
+						inhib_exp += rand(1,3)
+						'Without hesitation, you take off all your clothes and neatly fold them before putting them down in a pile. Without your clothes holding you back, you can go for a nice swim in the river or lie down in the sand and sunbathe.'
+
+						act 'Swim':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
+							*nl
+							'You wade into the river and have fun with Mira spraying each other with water.'
+							if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+							cumspclnt = 4 & gs 'cum_cleanup'
+
+							minut += 20
+							gs 'exercise', 'tier1', 10, 'stren', 'vital'
+
+							pcs_sweat = 10 + rand(0,4)
+							gs'stat'
+
+							act 'Get out of the water': gt 'gad_beach', 1
+						end
+					end
+				end
+				act 'Second thoughts': gt 'gad_beach', 'second_thoughts'
+			end
+			act 'Refuse': gt 'gad_beach', 'second_thoughts'
+		else
+			gt 'gad_beach', 'start', 1
+		end
+	end
+end
+
+
+
+if $ARGS[0] = 'get_changed':
+	menu_off = 1
+	$loc_arg = 'get_changed'
+	if $ARGS[1] = 'start':
+		gt 'changingroom', 'view_swim_list'
+	else
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/river/undressbch.jpg"></center>'
+		*nl
+		'You put on your swimwear and neatly fold your clothes before putting them down in a pile. Now you can go for a nice swim in the river or just lie down in the sand and sunbathe.'
+		if PCloswimwear = 1:
+			act 'Swim':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/rivertwogirls.jpg"></center>'
+				*nl
+				'You wade into the river and have fun with Mira spraying each other with water.'
+				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+				cumspclnt = 4 & gs 'cum_cleanup'
+
+				minut += 29
+				if pcs_inhib < 50: inhib_exp += rand(1, 2)
+				gs 'exercise', 'tier1', 1, 'stren', 'vital'
+
+
+				pcs_sweat = 10 + rand(0, 4)
+				gs 'stat'
+
+				act 'Get out of the water': gt 'gad_beach', 'start', 1
+			end
+		else
+			act 'Second thoughts': gt 'gad_beach', 'second_thoughts'
+		end
+	end
+end
+
+if $ARGS[0] = 'second_thoughts':
+	*clr & cla
+	menu_off = 1
+	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirariver.jpg"></center>'
+	*nl
+	if func('changingroom', 'count_swim_item') = 0:
+		'"Actually, Mira, I can''t come in right now, as I didn''t bring a swimsuit", you replied you here. "I''m going to stay on the shore for a bit."'
+		*nl
+		'You should probably buy some swimwear if you intend to spend time at the beach.'
+		*nl
+	else
+		'"Actually, Mira, I''ve changed my mind. I don''t feel like swimming just now," you replied to her. "I''m going to stay on the shore for a bit."'
+	end
+	minut += 1
+	npc_rel['A60'] -= 1
+	gs 'stat'
+
+	act 'Continue': gt 'gad_beach', 'start', 1
+end
+
+
+if $ARGS[0] = 'Mira':
+	menu_off = 1
+	minut += 2
+	gs 'stat'
+
+	if ARGS[1] = 1:
+		if MiraVars['QW'] < 12:
+			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirabeach.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirabeachnude.jpg"></center>'
+		end
+	else
+		if MiraVars['QW'] < 12:
+			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirariver.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirarivernude.jpg"></center>'
+		end
+	end
+
+	act 'Chat':
+		delact 'Chat'
+		minut += 10
+		pcs_mood += 10
+		gs 'stat'
+
+		if MiraVars['QW'] < 7:
+			if npc_rel['A60'] < 15: npc_rel['A60'] += 1
+			'You and Mira are chatting about trivial things.'
+		elseif MiraVars['QW'] = 7:
+			'You decide to speak with Mira, "So what is there to do here in the village?"'
+			'"It''s a lot quieter than a town, but we have a shop, this lovely beach, and some beautiful walks. Other than that, there are only the Gopnik guys, but they are just after one thing, and I don''t want that. Plus, dad would kill me."'
+		elseif MiraVars['QW'] = 8:
+			'Mira breaks the silence, "What brings you here to the village?"'
+			'"My granma-ma and Pop-pop live here. My folks like to come here over the summer. They think the country air will be good for me."'
+		elseif MiraVars['QW'] <= 10:
+			'You talk to Mira about what it is like living in the village.'
+		elseif MiraVars['QW'] <= 14:
+			'Mira asks you about Pavlovsk, and you tell her all about it.'
+		elseif MiraVars['QW'] <= 19:
+			'You and Mira talk about clothes and shopping, she has a thing for shoes but can''t wear pretty heels because of all the mud.'
+		elseif MiraVars['QW'] <= 29 or MiraVars['prostitute'] = 0:
+			'It is always lovely to talk with Mira, and you gossip about boys.'
+		elseif MiraVars['QW'] >= 30 and MiraVars['prostitute'] > 0:
+			'You and Mira talk about her being the village prostitute and how she can improve her performance.'
+		end
+	end
+	act 'Leave': gt 'gad_beach', 'start', 1
+end
+
+
+if $ARGS[0] = 'GuysBeach':
+	*clr & cla
+	menu_off = 1
+	minut += 5
+	pcs_horny += 10
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/river/mitkaguysriver.jpg"></center>'
+	'"Oh, hi, <<$pcs_nickname>>. So it''s just you today?" Kolyamba grinned.'
+
+	temp_rand = rand(0, 10)
+	if temp_rand <= 4:
+		'"There doesn''t seem to be anyone else around, and all of us are as horny as bullfrogs. Do you want to have a little fun with us? Come on, spread your legs, show us your pussy and start playing with yourself..."'
+	elseif temp_rand <= 8:
+		'"There doesn''t seem to be anyone around, and we are as horny as bullfrogs. Do you want to have a little fun with us? How about you give us a blowjob? We''ll be really grateful, ha-ha!"'
+	else
+		'"Ah, no, Mira, it''s just our other hot babe. Come here, lovely. We have something exceptional for you."'
+	end
+	if temp_rand < 4:
+		act 'Pleasure Kolyamba':
+			*clr & cla
+			gs 'boyStat', 'A61'
+			pose = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex.jpg"></center>'
+			'You quickly take off your pants and climb onto Kolyamba, grabbing his cock, and leading it inside you.'
+
+			gs 'arousal', 'vaginal', 10, 'sub', 'group'
+			gs 'stat'
+
+			act 'Pleasure Vasyan':
+				*clr & cla
+				gs 'boyStat', 'A62'
+				pose = 0
+				gs 'stat'
+				temp_rand = rand(0, 2)
+				if temp_rand = 0:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex1.jpg"></center>'
+					'Vasyan rolls you onto your back, sticking his cock into your wet pussy.'
+					gs 'arousal', 'vaginal', 10, 'sub', 'group'
+					gs 'arousal', 'end'
+					gs 'stat'
+				elseif temp_rand = 1:
+					gs 'boyStat', 'A62'
+					spafinloc = 12
+					gs 'cum_manage'
+					gs'stat'
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex2.jpg"></center>'
+					'Vasya steps up to you and slaps you in the face while pulling out his cock, forcing you on your knees so he can beat you with his dick.'
+					'He forcefully shoves the cock into your mouth and cums lavishly in your mouth...'
+					gs 'arousal', 'bj', 5, 'sub', 'group', 'rough'
+					gs 'arousal', 'end'
+					gs 'stat'
+				else
+					gs 'boyStat', 'A62'
+					pcs_ass += 1
+					spafinloc = 3
+					gs 'cum_manage'
+					gs'stat'
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex3.jpg"></center>'
+					'Vasyan forces you on all four and starts pumping his dick into your ass.'
+					gs 'arousal', 'anal', 10, 'sub', 'group', 'rough'
+					gs 'arousal', 'end'
+					gs 'stat'
+				end
+				act 'Leave': gt 'gad_beach', 'start', 1
+				killvar 'temp_rand'
+			end
+		end
+	elseif temp_rand < 8:
+		act 'Pleasure Kolyamba':
+			*clr & cla
+			gs 'boyStat', 'A61'
+			spafinloc = 12
+			gs 'cum_manage'
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex4.jpg"></center>'
+			'You get down on your knees and start licking Kolyamba''s dick. Then, after a while, you start sucking it like a popsicle...'
+			'He only manages to hold out for a short time finishing in your mouth...'
+
+			gs 'arousal', 'bj', 5, 'sub', 'group', 'rough'
+			gs 'stat'
+			act 'Pleasure Vasyan':
+				*clr & cla
+				gs 'boyStat', 'A62'
+				pose = 0
+				gs 'stat'
+
+				temp_rand = rand(0, 2)
+				if temp_rand = 0:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex5.jpg"></center>'
+					'Vasyan lays you onto your back, using his fingers to stimulate your vaginal lips while sticking his cock into your wet pussy.'
+					gs 'arousal', 'vaginal', 10, 'sub', 'group', 'rough'
+					gs 'arousal', 'end'
+					gs 'stat'
+				elseif temp_rand = 1:
+					gs 'boyStat', 'A62'
+					spafinloc = 12
+					gs 'cum_manage'
+					gs'stat'
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex6.jpg"></center>'
+					'Vasyan roughs you up with his hands and then takes out his dick, forcing you to suck him off.'
+					'He shoves the cock into your mouth and soon cums violently...'
+					gs 'arousal', 'bj', 5, 'sub', 'group', 'rough'
+					gs 'arousal', 'end'
+					gs 'stat'
+				else
+					gs 'boyStat', 'A62'
+					pcs_ass += 1
+					spafinloc = 3
+					gs 'cum_manage'
+					gs'stat'
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex7.jpg"></center>'
+					'Vasyan forces you on all fours, telling you that you will enjoy this. Then, he pulls out his dick and starts fucking you in the ass.'
+					gs 'arousal', 'anal', 10, 'sub', 'group', 'rough'
+					gs 'arousal', 'end'
+					gs 'stat'
+				end
+				act 'Leave': gt 'gad_beach', 'start', 1
+				killvar 'temp_rand'
+			end
+		end
+	else
+		act 'Pleasure Kolyamba':
+			*clr & cla
+			gs 'boyStat', 'A61'
+			pcs_ass += 1
+			spafinloc = 3
+			gs 'cum_manage'
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex8.jpg"></center>'
+			'Kolyamba looks you in the eyes and asks if you trust him. You gulp and reply, "Yes." He takes out a blindfold and places it over your eyes so you can''t see what''s happening next. Kolyamba then proceeds to take both of your clothes off. You stand in front of him, blindfolded, naked, and full of anticipation.'
+			'He orders you to get down on your knees. He grabs your head and tells you to open your mouth. While pleasuring him, he orders you to stop and moves the cock away from the mouth. He then lies down on the ground and tells you to mount him. You move on top of him while he grabs his cock and leads it inside your ass. He frantically starts thrusting his cock inside your ass, cumming after a short while.'
+
+			gs 'arousal', 'bj', 10, 'sub', 'group', 'rough'
+			gs 'arousal', 'anal', 10, 'sub', 'group', 'rough'
+			minut -= 10
+			gs 'stat'
+
+			act 'Pleasure Vasyan':
+				*clr & cla
+				gs 'boyStat', 'A62'
+				pose = 1
+				gs 'stat'
+
+				temp_rand = rand(0, 2)
+				if temp_rand = 0:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex9.jpg"></center>'
+					'Vasyan tells you he heard about a sex position where both of you will reach ecstasy. Intrigued by this, you take your clothes off and start caressing his cock. He removes your hand from his cock and tells you to get down on your hands and knees. Vasya walks behind you, grabs his cock and enters you from behind. You gasp as he mounts you. Soon enough, you both cry out in ecstasy cumming at the same time.'
+
+					$orgasm_or = 'yes'
+					gs 'arousal', 'bj', 10, 'sub', 'group', 'rough'
+					gs 'arousal', 'vaginal', 10, 'sub', 'group', 'rough'
+					minut -= 10
+					gs 'arousal', 'end'
+					gs 'stat'
+
+				elseif temp_rand = 1:
+					gs 'boyStat', 'A62'
+					spafinloc = 12
+					gs 'cum_manage'
+					gs'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex10.jpg"></center>'
+					'Vasyan steps closer to you and tells you he wants his cock sucked. You drop down on your knees and start sucking his glans.'
+					'Feeling dissatisfied by your performance, he grabs you by the head. He forces his cock deep down your throat, mumbling something about teaching you how to do it properly. Finally, he finishes inside your mouth...'
+					gs 'arousal', 'bj', 5, 'sub', 'group', 'rough', 'deepthroat'
+					gs 'arousal', 'end'
+					gs 'stat'
+				else
+					gs 'boyStat', 'A62'
+					pcs_ass += 1
+					spafinloc = 3
+					gs 'cum_manage'
+					gs'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex11.jpg"></center>'
+					'Vasyan forces you to your hands and knees and starts thrusting his dick into your anus.'
+					gs 'arousal', 'anal', 10, 'sub', 'group', 'rough'
+					gs 'arousal', 'end'
+					gs 'stat'
+				end
+				act 'Leave': gt 'gad_beach', 'start', 1
+				killvar 'temp_rand'
+			end
+		end
+	end
+	act 'Leave': gt 'gad_beach', 'start', 1
+	killvar 'temp_rand'
+end
+
+
+
+
+--- gad_beach ---------------------------------

+ 162 - 293
locations/gadfield.qsrc → locations/gad_field.qsrc

@@ -1,24 +1,13 @@
-# gadfield
+# gad_field
 !2021/05/05
-!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)
-!---------------------------------------------
+!2024/05/05 - Mira schedule introduced.
+!locat['A60'] = Mira''s location. See 'miroslava_schedule'
 
 if $ARGS[0] = 'field':
-	$loc = 'gadfield'
-	$loc_arg = 'field'
+	gs 'shortgs', 'setloc', 'gad_field', 'field'
 	$location_type = 'secluded'
-
-	$menu_loc = 'gadfield'
-	$menu_arg = 'field'
 	menu_off = 0
-
+	gs 'miroslava_schedule'
 	gs 'gadukino_event', 'sound'
 	gs'stat'
 
@@ -43,12 +32,12 @@ if $ARGS[0] = 'field':
 	if grigory_flower > 0 and grigory_flower < 10: gt 'grigory', 'flower5'
 	if flowerday ! daystart and grigory_flower = 10: gt 'grigory', 'flower6'
 	if flowerday ! daystart and grigory_flower > 10: gt 'grigory', 'flower8'
-	if hour >= 9 and hour <= 19 and week < 6:'Grandfather''s horse <a href="exec: gt ''gadfield'',''horse''">Desperado</a> is grazing the field.'
-	if hour >= 9 and hour <= 19 and grandpaQW['chore_herd_cattle'] = 0:'You notice a large <a href="exec: gt ''gadfield'',''cow''">herd of cows</a> in the middle of the field.'
-	if hour >= 6 and hour <= 20 and grandpaQW['chore_herd_cattle'] = 1:'You see the <a href="exec: gt ''gadfield'',''cow''">herd of cows</a> out in the middle of the field.'
+	if hour >= 9 and hour <= 19 and week < 6:'Grandfather''s horse <a href="exec: gt ''gad_field'',''horse''">Desperado</a> is grazing the field.'
+	if hour >= 9 and hour <= 19 and grandpaQW['chore_herd_cattle'] = 0:'You notice a large <a href="exec: gt ''gad_field'',''cow''">herd of cows</a> in the middle of the field.'
+	if hour >= 6 and hour <= 20 and grandpaQW['chore_herd_cattle'] = 1:'You see the <a href="exec: gt ''gad_field'',''cow''">herd of cows</a> out in the middle of the field.'
 	if hour >= 7 and hour <= 20 and grandpaQW['chore_bale_hay'] = 1:'You see a crowd of people working on the field.'
 
-	act 'Head back to the road (0:10)':minut += 10 & gt'gadroad'
+	act 'Head back to the road (0:10)':minut += 10 & gt 'gad_road', 'start'
 	
 	if hour >= 7 and hour <= 13 and grandpaQW['chore_bale_hay'] = 1:
 		act 'Spend the day helping to bale hay (6:00)':
@@ -72,20 +61,16 @@ if $ARGS[0] = 'field':
 			gs 'exp_gain', 'hndiwrk', rand(0,8)
 			gs 'stat'
 
-			act 'Continue':gt'gadfield','field'
-			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gadhouse', 'grandpa'
+			act 'Continue': gt 'gad_field', 'field'
+			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gad_gphouse', 'grandpa'
 		end
 	end
 
 end
 
 if $ARGS[0] = 'horse':
-	$loc = 'gadfield'
-	$loc_arg = 'horse'
+	gs 'shortgs', 'setloc', 'gad_field', 'horse'
 	$location_type = 'public_outdoors'
-
-	$menu_loc = 'gadfield'
-	$menu_arg = 'horse'
 	menu_off = 0
 
 	gs 'gadukino_event', 'sound'
@@ -94,7 +79,7 @@ if $ARGS[0] = 'horse':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse.jpg"></center>'
 	'Your grandfather''s horse, Desperado.'
 
-	act 'Go back to the field':gt'gadfield','field'
+	act 'Go back to the field': gt 'gad_field', 'field'
 
 	if hour = 19:
 		act 'Lead the horse home (1:00)':
@@ -107,7 +92,7 @@ if $ARGS[0] = 'horse':
 			gs 'exp_gain', 'hndiwrk', rand(0,3)
 			gs 'stat'
 
-			act 'Continue':gt'gadsarai',''
+			act 'Continue': gt 'gad_gpbarn', ''
 		end
 	end
 end
@@ -131,23 +116,19 @@ $downlibrary['read'] = {
 }
 
 if $ARGS[0] = 'cow':
-	$loc = 'gadfield'
-	$loc_arg = 'cow'
+	gs 'shortgs', 'setloc', 'gad_field', 'cow'
 	$location_type = 'secluded'
-
-	$menu_loc = 'gadfield'
-	$menu_arg = 'cow'
 	menu_off = 0
-
+	gs 'miroslava_schedule'
 	gs 'gadukino_event', 'sound'
 	gs'stat'
 	temp = rand(1,5)
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow.jpg"></center>'
 	'The cattle herd is standing in the middle of the field. Some cows are munching on grass, and others just stare idly around.'
-	if mira = 1: MiraLoc = 41 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is standing next to you.'
+	if locat['A60'] = 70: '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is standing next to you.'
 
-	if grandpaQW['chore_herd_cattle'] = 0:act 'Leave them be':gt'gadfield','field'
+	if grandpaQW['chore_herd_cattle'] = 0: act 'Leave them be': gt 'gad_field', 'field'
 	if hour = 19 and grandpaQW['chore_herd_cattle'] = 0:
 		act 'Lead the cows home (1:00)':
 			*clr & cla
@@ -156,10 +137,10 @@ if $ARGS[0] = 'cow':
 			'Seeing the cow herd on the field, you decide to help your grandfather bring the cows home...'
 			minut += 60
 			grandmaQW['help_amount'] += 1
-			gs 'exp_gain', 'hndiwrk', rand(0,3)
+			gs 'exp_gain', 'hndiwrk', rand(0, 3)
 			gs 'stat'
 
-			act 'Continue':gt'gadukino'
+			act 'Continue': gt 'gadukino'
 		end
 	end
 	if grandpaQW['chore_herd_cattle'] = 1:
@@ -168,15 +149,15 @@ if $ARGS[0] = 'cow':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_wait.jpg"></center>'
-				if grandpaQW['chore_herd_cattle_experience'] = 0:'Some time flies by while waiting for the locals to finish bringing their cows to the field.'
-				if grandpaQW['chore_herd_cattle_experience'] = 1:'Some time flies by while waiting for the locals and their children to finish bringing their cows to the field.'
+				if grandpaQW['chore_herd_cattle_experience'] = 0: 'Some time flies by while waiting for the locals to finish bringing their cows to the field.'
+				if grandpaQW['chore_herd_cattle_experience'] = 1: 'Some time flies by while waiting for the locals and their children to finish bringing their cows to the field.'
 
 				if hour >= 9:minut += 20
 				if hour < 9:minut += 60
-				gs 'exp_gain', 'hndiwrk', rand(0,4)
+				gs 'exp_gain', 'hndiwrk', rand(0, 4)
 				gs 'stat'
 
-				act 'Continue':gt'gadfield','cow'
+				act 'Continue': gt 'gad_field', 'cow'
 			end
 		end
 		if hour >= 10 and hour < 13:
@@ -197,104 +178,14 @@ if $ARGS[0] = 'cow':
 					pcs_stam -= 5
 				end
 				grandpaQW['chore_herd_cattle_experience'] = 1
-				if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
-				gs 'exp_gain', 'hndiwrk', rand(0,3)
+				grandmaQW['help_amount'] += rand(0, 1) / 3
+				gs 'exp_gain', 'hndiwrk', rand(0, 3)
 				gs 'stat'
 
-				act 'Continue':gt'gadfield','cow'
+				act 'Continue': gt 'gad_field', 'cow'
 			end
 
-			if mira = 0:
-				act 'Go for a run in the field (1:00)':
-					*clr & cla
-					menu_off = 1
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_run.jpg"></center>'
-					'Since the cows are all behaving, you spend some time jogging around the field.'
-
-					frost = 0
-					minut += 60
-					fat -= 5
-					gs 'exp_gain', 'run', 1
-					gs 'sweat', 'add', 10
-					pcs_mood += 5
-					pcs_stam -= 8
-					if temper >= 25 and sunWeather = 1:
-						pcs_hydra -= 24
-						gs 'sweat', 'add', 12
-					else
-						pcs_hydra -= 18
-						gs 'sweat', 'add', 10
-					end
-					gs 'stat'
-
-					act 'Continue':gt'gadfield','cow'
-				end
-			end
-			if temper >= 15 and sunWeather = 1 and mira = 0:
-				act 'Tan (1:00)':
-					*clr & cla
-					menu_off = 1
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_sun.jpg"></center>'
-					'It''s sunny and warm outside, and since the cows are behaving, you decide to work on your tan for an hour.'
-					minut += 60
-					pcs_mood += 10
-					pcs_tan += 1
-					gs 'sweat', 'add', 5
-					gs 'stat'
-
-					act 'Continue':gt'gadfield','cow'
-				end
-				if pcs_sleep < 40:
-					act 'Take a nap (1:00)':
-						*clr & cla
-						menu_off = 1
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_lying.jpg"></center>'
-						'You feel drowsy watching the cows stand around, so you lie down on the grass. You doze off and wake up about an hour later.'
-
-						if temper >= 25 and sunWeather = 1: pcs_hydra -= 12
-						gs 'sleep_simple', 'nap', 1
-
-						act 'Continue': gt'gadfield','cow'
-					end
-				end
-				act 'Pick flowers (1:00)':
-					*clr & cla
-					menu_off = 1
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_flowers.jpg"></center>'
-					'Keeping one eye on the cattle, you spend an hour wandering the field, picking flowers.'
-					minut += 60
-					pcs_mood += 20
-					pcs_stam -= 4
-					if temper >= 25 and sunWeather = 1:
-						pcs_hydra -= 8
-						gs 'sweat', 'add', 5
-					else
-						pcs_hydra -= 5
-						gs 'sweat', 'add', 3
-					end
-					gs 'stat'
-
-
-					act 'Continue':gt'gadfield','cow'
-				end
-				act 'Read a book (1:00)':
-					dynamic $downlibrary['read']
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_book'+rand(1,2)+'.jpg"></center>'
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 6
-					if pcs_nerd > 0:
-						pcs_mood = 100
-						if pcs_stren > 1: stren_deg -= 1
-						if pcs_vital > 5: vital_deg -= 1
-						'You start reading a book you brought with you. You are so engrossed in the story you forget about the time.'
-					else
-						pcs_mood += 10
-						'While reading the book, time flies by because you are really engaged in the plot.'
-					end
-					gs 'stat'
-
-					act 'Close the book':gt'gadfield','cow'
-				end
-			end
+			gs 'gad_field', 'set_nomira_acts', 1
 		end
 		if hour >= 13 and hour < 16:
 			*clr & cla
@@ -313,25 +204,16 @@ if $ARGS[0] = 'cow':
 			end
 			grandmaQW['help_amount'] += 1
 			minut += 60
-			gs 'exp_gain', 'hndiwrk', rand(0,3)
+			gs 'exp_gain', 'hndiwrk', rand(0, 3)
 			gs 'stat'
 
-			act 'Herd the cows nearer to the river (0:15)': minut += 15 & gt'gadfield','cow2'
+			act 'Herd the cows nearer to the river (0:15)': minut += 15 & gt 'gad_field', 'cow2'
 		end
 	end
 end
 
-!MiaLoc tells us where Mira is Located
-!----------------------------------------------
-!MiraLoc = 0 (Mira at home)
-!MiraLoc = 1 (Mira at river)
-!MiraLoc = 2 (Mira at meadow)
-!MiraLoc = 3 (Mira at forest)
-!MiraLoc = 4 (Mira at field)
-!MiraLoc = 5 (Mira with gop)
-!---------------------------------------------
-
-if grandpaQW['chore_herd_cattle'] = 1 and npc_rel['A60'] >= 15 and mira = 0 and sunWeather = 1 and hour >= 10 and temp = 1 and Mira_no = 0 and(npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1) and npc_known['A60'] = 1:
+
+if grandpaQW['chore_herd_cattle'] = 1 and locat['A60'] = 70 and locat['A60_prev'] ! 70:
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira2.jpg"></center>'
@@ -339,21 +221,26 @@ if grandpaQW['chore_herd_cattle'] = 1 and npc_rel['A60'] >= 15 and mira = 0 and
 	'"Hi, <<$pcs_nickname>>. I wanted to visit you, and I''ve brought some water with me," she says, nearing you. "Have you missed me?"'
 	minut += 5
 	npc_rel['A60'] += 1
-	mira = 1
 	gs 'stat'
 
-	act 'Continue':pcs_hydra +=40 & gt'gadfield','cow'
+	MiraVars['follow_time'] = 20 - hour
+	act 'Continue':
+		pcs_hydra += 40
+		if hour < 13:
+			gt 'gad_field', 'cow'
+		elseif hour < 16:
+			gt 'gad_field', 'cow2'
+		else
+			gt 'gad_field', 'cow3'
+		end
+	end
 end
 
 if $ARGS[0] = 'cow2':
-	$loc = 'gadfield'
-	$loc_arg = 'cow2'
+	gs 'shortgs', 'setloc', 'gad_field', 'cow2'
 	$location_type = 'secluded'
-
-	$menu_loc = 'gadfield'
-	$menu_arg = 'cow2'
 	menu_off = 0
-
+	gs 'miroslava_schedule'
 	gs 'gadukino_event', 'sound'
 	gs'stat'
 
@@ -362,7 +249,7 @@ if $ARGS[0] = 'cow2':
 
 	'The cattle herd is near the river. Some cows are munching on grass, some drink from the river, and some just stand or lie around.'
 
-	if mira = 1: MiraLoc = 42 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
+	if locat['A60'] = 70: '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
 	if temper >= 15 and sunWeather = 1:'"You can go for a swim if you want, <<$pcs_nickname>>. I''ll keep an eye on the herd," says your grandfather.'
 
 	if grandpaQW['chore_herd_cattle'] = 1:
@@ -388,58 +275,9 @@ if $ARGS[0] = 'cow2':
 				gs 'exp_gain', 'hndiwrk', rand(0,3)
 				gs 'stat'
 
-				act 'Continue':gt'gadfield','cow2'
-			end
-			if temper >= 15 and sunWeather = 1 and mira = 0:
-				if pcs_stam >= (5 * (10 - sport_clothes_exercise_bonus)) / 2:
-					act 'Swim (0:15)':
-						*clr & cla
-						menu_off = 1
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_river.jpg"></center>'
-						'You spend a few minutes splashing around in the river, which feels cool and refreshing.'
-						if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-						cumspclnt = 4 & gs 'cum_cleanup'
-						pcs_stam -= 3
-						pcs_mood += 5
-						if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
-						gs 'exercise', 'tier1', 15, 'stren'
-						gs 'stat'
-
-						act 'Continue':gt'gadfield','cow2'
-					end
-				end
-
-				act 'Tan (0:30)':
-					*clr & cla
-					menu_off = 1
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_sun.jpg"></center>'
-					'You lie down to sunbathe by the river while Grandpa looks after the herd.'
-					minut += 30
-					gs 'sweat', 'add', 10
-					pcs_mood += 5
-					pcs_tan += 1
-					gs 'stat'
-
-					act 'Continue':gt'gadfield','cow2'
-				end
-				act 'Read a book (1:00)':
-					dynamic $downlibrary['read']
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_book'+rand(1,2)+'.jpg"></center>'
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-					if pcs_nerd > 0:
-						pcs_mood = 100
-						if pcs_stren > 1: stren_deg -= 1
-						if pcs_vital > 5: vital_deg -= 1
-						'You start reading a book you brought with you. You are so engrossed in the story you forget about the time.'
-					else
-						pcs_mood += 10
-						'While reading the book, time flies by because you are really engaged in the plot.'
-					end
-					gs 'stat'
-
-					act 'Close the book':gt 'gadfield','cow2'
-				end
+				act 'Continue': gt 'gad_field', 'cow2'
 			end
+			gs 'gad_field', 'set_nomira_acts', 2
 		end
 		if hour >= 16 and hour < 19:
 			*clr & cla
@@ -457,24 +295,20 @@ if $ARGS[0] = 'cow2':
 				gs 'sweat', 'add', 5
 				pcs_stam -= 5
 			end
-			if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
-			gs 'exp_gain', 'hndiwrk', rand(0,3)
+			grandmaQW['help_amount'] += rand(0, 3) / 3
+			gs 'exp_gain', 'hndiwrk', rand(0, 3)
 			gs 'stat'
 
-			act 'Herd the cows nearer to the forest (0:30)': minut += 15 & gt'gadfield','cow3'
+			act 'Herd the cows nearer to the forest (0:30)': minut += 15 & gt 'gad_field', 'cow3'
 		end
 	end
 end
 
 if $ARGS[0] = 'cow3':
-	$loc = 'gadfield'
-	$loc_arg = 'cow3'
+	gs 'shortgs', 'setloc', 'gad_field', 'cow3'
 	$location_type = 'secluded'
-
-	$menu_loc = 'gadfield'
-	$menu_arg = 'cow3'
 	menu_off = 0
-
+	gs 'miroslava_schedule'
 	gs 'gadukino_event', 'sound'
 	gs'stat'
 
@@ -483,7 +317,7 @@ if $ARGS[0] = 'cow3':
 
 	'The cattle herd is grazing in a field near the forest.'
 
-	if mira = 1: MiraLoc = 43 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
+	if locat['A60'] = 70: '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
 
 	if grandpaQW['chore_herd_cattle'] = 1:
 		if hour < 19:
@@ -508,48 +342,71 @@ if $ARGS[0] = 'cow3':
 				gs 'exp_gain', 'hndiwrk', rand(0,3)
 				gs 'stat'
 
-				act 'Continue':gt'gadfield','cow3'
+				act 'Continue': gt 'gad_field', 'cow3'
 			end
-			if mira = 0:
-				act 'Go for a run in the field (1:00)':
-					*clr & cla
-					menu_off = 1
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_run.jpg"></center>'
-					'Since the cows are all behaving, you spend some time jogging around the field.'
 
-					frost = 0
-					minut += 60
-					fat -= 5
-					gs 'exp_gain', 'run', 1
-					gs 'sweat', 'add', 10
-					pcs_mood += 5
-					pcs_stam -= 8
-					if temper >= 25 and sunWeather = 1:
-						pcs_hydra -= 24
-						gs 'sweat', 'add', 12
-					else
-						pcs_hydra -= 18
-						gs 'sweat', 'add', 10
-					end
-					gs 'stat'
+			gs 'gad_field', 'set_nomira_acts', 1
+		end
+		if hour >= 19:
+			*clr & cla
+			menu_off = 1
 
-					act 'Continue':gt'gadfield','cow3'
-				end
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go_home.jpg"></center>'
+			'As sunset approaches, Grandpa says that it is late and time to drive the herd home. So you hurry, gather the cows, and guide them back towards the village.'
+
+			if temper >= 25 and sunWeather = 1:
+				pcs_hydra -= 12
+				pcs_stam -= 8
+				gs 'sweat', 'add', 10
+			else
+				pcs_hydra -= 6
+				gs 'sweat', 'add', 5
+				pcs_stam -= 5
 			end
-			if temper >= 15 and sunWeather = 1 and mira = 0:
-				act 'Tan (1:00)':
-					*clr & cla
-					menu_off = 1
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_sun.jpg"></center>'
-					'It''s sunny and warm outside, and since the cows are behaving, you decide to work on your tan for an hour.'
-					minut += 60
-					pcs_mood += 10
-					pcs_tan += 1
-					gs 'sweat', 'add', 5
-					gs 'stat'
+			minut += 60
+			grandpaQW['chore_herd_cattle'] = 0
+			grandmaQW['help_amount'] += 2
+			gs 'exp_gain', 'hndiwrk', rand(0,3)
+			gs 'stat'
+
+			MiraVars['follower'] = 0
+			MiraVars['follow_time'] = 0
+			act 'Back to the village': gt 'gadukino'
+		end
+	end
+end
+
+
+
+
+if $ARGS[0] = 'set_nomira_acts':
+	if locat['A60'] ! 70:
+		if ARGS[1] = 1:
+			act 'Go for a run in the field (1:00)':
+				*clr & cla
+				menu_off = 1
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_run.jpg"></center>'
+				'Since the cows are all behaving, you spend some time jogging around the field.'
 
-					act 'Continue':gt'gadfield','cow3'
+				frost = 0
+				minut += 60
+				fat -= 5
+				gs 'exp_gain', 'run', 1
+				gs 'sweat', 'add', 10
+				pcs_mood += 5
+				pcs_stam -= 8
+				if temper >= 25 and sunWeather = 1:
+					pcs_hydra -= 24
+					gs 'sweat', 'add', 12
+				else
+					pcs_hydra -= 18
+					gs 'sweat', 'add', 10
 				end
+				gs 'stat'
+
+				act 'Continue': gt $loc, $loc_arg
+			end
+			if temper >= 15 and sunWeather = 1:
 				if pcs_sleep < 40:
 					act 'Take a nap (1:00)':
 						*clr & cla
@@ -557,10 +414,10 @@ if $ARGS[0] = 'cow3':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_lying.jpg"></center>'
 						'You feel drowsy watching the cows stand around, so you lie down on the grass. You doze off and wake up about an hour later.'
 
-						if temper >= 25 and sunWeather = 1: pcs_hydra -= 12
+						if temper >= 25: pcs_hydra -= 12
 						gs 'sleep_simple', 'nap', 1
 
-						act 'Continue':gt'gadfield','cow3'
+						act 'Continue': gt $loc, $loc_arg
 					end
 				end
 				act 'Pick flowers (1:00)':
@@ -571,7 +428,7 @@ if $ARGS[0] = 'cow3':
 					minut += 60
 					pcs_mood += 20
 					pcs_stam -= 4
-					if temper >= 25 and sunWeather = 1:
+					if temper >= 25:
 						pcs_hydra -= 8
 						gs 'sweat', 'add', 5
 					else
@@ -580,55 +437,67 @@ if $ARGS[0] = 'cow3':
 					end
 					gs 'stat'
 
-
-					act 'Continue':gt'gadfield','cow3'
+					act 'Continue': gt $loc, $loc_arg
 				end
-				act 'Read a book (1:00)':
-					dynamic $downlibrary['read']
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_book'+rand(1,2)+'.jpg"></center>'
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 6
-					if pcs_nerd > 0:
-						pcs_mood = 100
-						if pcs_stren > 1: stren_deg -= 1
-						if pcs_vital > 5: vital_deg -= 1
-						'You start reading a book you brought with you. You are so engrossed in the story you forget about the time.'
-					else
-						pcs_mood += 10
-						'While reading the book, time flies by because you are really engaged in the plot.'
-					end
-					gs 'stat'
+			end
+		elseif ARGS[1] = 2:
+			if temper >= 15 and sunWeather = 1:
+				if pcs_stam >= (5 * (10 - sport_clothes_exercise_bonus)) / 2:
+					act 'Swim (0:15)':
+						*clr & cla
+						menu_off = 1
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_river.jpg"></center>'
+						'You spend a few minutes splashing around in the river, which feels cool and refreshing.'
+						if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+						cumspclnt = 4 & gs 'cum_cleanup'
+						pcs_stam -= 3
+						pcs_mood += 5
+						if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
+						gs 'exercise', 'tier1', 15, 'stren'
+						gs 'stat'
 
-					act 'Close the book':gt 'gadfield','cow3'
+						act 'Continue': gt 'gad_field', 'cow2'
+					end
 				end
 			end
 		end
-		if hour >= 19:
+
+		act 'Tan (0:30)':
 			*clr & cla
 			menu_off = 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_sun.jpg"></center>'
+			'You lie down to sunbathe by the river while Grandpa looks after the herd.'
+			minut += 30
+			gs 'sweat', 'add', 10
+			pcs_mood += 5
+			pcs_tan += 1
+			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go_home.jpg"></center>'
-			'As sunset approaches, Grandpa says that it is late and time to drive the herd home. So you hurry, gather the cows, and guide them back towards the village.'
+			act 'Continue': gt $loc, $loc_arg
+		end
 
-			if temper >= 25 and sunWeather = 1:
-				pcs_hydra -= 12
-				pcs_stam -= 8
-				gs 'sweat', 'add', 10
+		act 'Read a book (1:00)':
+			dynamic $downlibrary['read']
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_book'+rand(1,2)+'.jpg"></center>'
+			if temper >= 25: pcs_hydra -= 12
+			if pcs_nerd > 0:
+				pcs_mood = 100
+				if pcs_stren > 1: stren_deg -= 1
+				if pcs_vital > 5: vital_deg -= 1
+				'You start reading a book you brought with you. You are so engrossed in the story you forget about the time.'
 			else
-				pcs_hydra -= 6
-				gs 'sweat', 'add', 5
-				pcs_stam -= 5
+				pcs_mood += 10
+				'While reading the book, time flies by because you are really engaged in the plot.'
 			end
-			minut += 60
-			mira = 0
-			grandpaQW['chore_herd_cattle'] = 0
-			grandmaQW['help_amount'] += 2
-			gs 'exp_gain', 'hndiwrk', rand(0,3)
 			gs 'stat'
 
-			act 'Back to the village':gt'gadukino'
+			act 'Close the book': gt $loc, $loc_arg
 		end
 	end
 end
 
---- gadfield ---------------------------------
+
+
+
+--- gad_field ---------------------------------
 

+ 164 - 165
locations/gadforest.qsrc → locations/gad_forest.qsrc

@@ -1,18 +1,16 @@
-# gadforest
+# gad_forest
 !2021/05/05
+!2024/05/05 - Mira schedule introduced.
+!locat['A60'] = Mira''s location. See 'miroslava_schedule'
 
 if $ARGS[0] = 'forest_edge':
-	*clr & cla
-	gs 'shortgs', 'setloc', 'gadforest', 'forest_edge'
+	gs 'shortgs', 'setloc', 'gad_forest', 'forest_edge'
 	$region = 'gad'
 	$location_type = 'secluded'
 	$forest_args1 = 'forest_edge'
+	gs 'miroslava_schedule'
 
-	! 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')
-
+	clothesAtLocation = func('lost_clothes_here', 'forest_edge')
 	menu_off = 0
 
 	CLOSE ALL
@@ -42,7 +40,8 @@ if $ARGS[0] = 'forest_edge':
 		end
 	end
 
-	gs 'gadforest','bushcraft','forest_edge'
+	gs 'gad_forest', 'bushcraft', 'forest_edge'
+
 	*nl
 	if pcs_bushcraft < 20:
 		'<font color="red">You don''t know this part of the forest very well. You could get lost if you go any deeper into the woods.</font>'
@@ -50,13 +49,13 @@ if $ARGS[0] = 'forest_edge':
 		'<font color="green">You are comfortable navigating this part of the forest and can adventure further into the woods if you want.</font>'
 	end
 
-	if clothesAtLocation = 1:*nl & 'Your clothes are nearby on the ground.'
+	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>.'
+			'On the edge of the forest, you see people. Apparently, they are having a family <a href="exec:gt ''gad_forest_events'', ''picnic''">picnic</a>.'
 		end
 	end
 	if hour < 8 or hour > 16 and mushroom_pickers ! 0:
@@ -73,93 +72,87 @@ if $ARGS[0] = 'forest_edge':
 			'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.'
+	if locat['A60'] = 60: '<a href="exec: gt ''Miroslava'' ">Mira</a> is here with you.'
 
-	foresteventrand = rand(1,20)
+	foresteventrand = rand(1, 20)
 	! Events with Mira
-	if MiraLoc = 3:
-		if hour >= 11 and Mira_Stay = 0:
-			*clr & cla
+	if locat['A60_prev'] = 60 and locat['A60'] ! 60:
+		*clr & cla
 
-			gs 'miroslava','miraclothes'
-			*nl
-			'"<<$pcs_nickname>>, I''m going to head home now, but we can hang out again later," Mira said as she began walking out of the forest.'
+		gs 'miroslava','miraclothes'
+		*nl
+		'"<<$pcs_nickname>>, I''m going to head home now, but we can hang out again later," Mira said as she began walking 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
+		! 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':
+			MiraVars['follower'] = 1
+			MiraVars['follow_time'] = iif(minut > 30, 2, 1)
+			gt 'gad_forest', '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':
+			gt 'gad_forest', 'forest_edge'
 		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'
+	elseif locat['A60'] = 60:
+		if mirapickingtalk = 0 and miratalkday ! daystart: gt 'gad_forest_events', 'mira_picking_talk'
+		if miranudetalk = 0 and miratalkday ! daystart: gt 'gad_forest_events', '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'
+		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 'gad_forest_events', 'mira_nude_event'
 	! Events without Mira
 	else
-		if npc_known['A60'] = 1 and MiraLoc ! 3 and hour >= 8 and hour <= 10:
+		if npc_known['A60'] = 1 and locat['A60'] ! 60 and hour >= 8 and hour <= 10:
 			mirarand = rand(1,10)
-			if mirarand >= 6: MiraLoc = 3 & gt 'gadforest_event', 'mira_morning_walk'
+			if mirarand >= 6: locat['A60'] = 60 & gt 'gad_forest_events', 'mira_morning_walk'
 		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'
+		if foresteventrand <= 2 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 1 & gt 'gad_forest_events', '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 'gad_forest_events', '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 'gad_forest_events', '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:
-			if MiraLoc = 3: gt 'gadforest_event', 'mitka_temporary_event'
+		if GadBoy['mitka_day'] ! daystart:
+			if locat['A60'] = 60: gt 'gad_forest_events', 'mitka_temporary_event'
 		!	gt 'mitka_forest_1', 'mitka'
-		!elseif kolyambaday ! daystart:
+		!elseif GadBoy['kolyamba_day'] ! daystart:
 		!	gt 'mitka_forest_1', 'kolyamba'
-		!elseif vasyanday ! daystart:
+		!elseif GadBoy['vasyan_day'] ! 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:
+	!	if GadBoy['mitka_day'] ! daystart and GadBoy['kolyamba_day'] ! daystart:
 	!		gt 'mitka_forest_2', '1'
-	!	elseif mitkaday ! daystart and vasyanday ! daystart:
+	!	elseif GadBoy['mitka_day'] ! daystart and GadBoy['vasyan_day'] ! daystart:
 	!		gt 'mitka_forest_2', '2'
-	!	elseif kolyambaday ! daystart and vasyanday ! daystart:
+	!	elseif GadBoy['kolyamba_day'] ! daystart and GadBoy['vasyan_day'] ! daystart:
 	!		gt 'mitka_forest_2', '3'
-	!	elseif mitkaday ! daystart:
+	!	elseif GadBoy['mitka_day'] ! daystart:
 	!		gt 'mitka_forest_1', 'mitka'
-	!	elseif kolyambaday ! daystart:
+	!	elseif GadBoy['kolyamba_day'] ! daystart:
 	!		gt 'mitka_forest_1', 'kolyamba'
-	!	elseif vasyanday ! daystart:
+	!	elseif GadBoy['vasyan_day'] ! 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:
+	!	if GadBoy['mitka_day'] ! daystart and GadBoy['kolyamba_day'] ! daystart and GadBoy['vasyan_day'] ! daystart:
 	!		gt 'mitka_forest_3'
-	!	elseif mitkaday ! daystart and kolyambaday ! daystart:
+	!	elseif GadBoy['mitka_day'] ! daystart and GadBoy['kolyamba_day'] ! daystart:
 	!		gt 'mitka_forest_2', '1'
-	!	elseif mitkaday ! daystart and vasyanday ! daystart:
+	!	elseif GadBoy['mitka_day'] ! daystart and GadBoy['vasyan_day'] ! daystart:
 	!		gt 'mitka_forest_2', '2'
-	!	elseif kolyambaday ! daystart and vasyanday ! daystart:
+	!	elseif GadBoy['kolyamba_day'] ! daystart and GadBoy['vasyan_day'] ! daystart:
 	!		gt 'mitka_forest_2', '3'
-	!	elseif mitkaday ! daystart:
+	!	elseif GadBoy['mitka_day'] ! daystart:
 	!		gt 'mitka_forest_1', 'mitka'
-	!	elseif kolyambaday ! daystart:
+	!	elseif GadBoy['kolyamba_day'] ! daystart:
 	!		gt 'mitka_forest_1', 'kolyamba'
-	!	elseif vasyanday ! daystart:
+	!	elseif GadBoy['vasyan_day'] ! daystart:
 	!		gt 'mitka_forest_1', 'vasyan'
 	!	end
 	!end
 
 	act 'Leave the woods (0:15)':
-		! 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
@@ -240,7 +233,7 @@ if $ARGS[0] = 'forest_edge':
 						minut += 30
 						gs 'stat'
 
-						gt'gaddvor'
+						gt 'gad_gpyard', 'start'
 					end
 				else
 					gm_outfits[2] = 1
@@ -259,7 +252,7 @@ if $ARGS[0] = 'forest_edge':
 						minut += 15
 						gs 'stat'
 
-						gt 'gadroad'
+						gt 'gad_road', 'start'
 					end
 				end
 			end
@@ -268,7 +261,7 @@ if $ARGS[0] = 'forest_edge':
 				act 'Get dressed instead':
 					*clr & cla
 					minut += 5
-					gs 'clothing', 'swamp_clothes', 0
+					gs 'clothing', 'gad_swamp_clothes', 0
 					gs 'underwear', 'wear'
 					gs 'clothing', 'recover_lost_clothes', 'forest_edge', 1
 					gs 'stat'
@@ -282,7 +275,7 @@ if $ARGS[0] = 'forest_edge':
 						minut += 15
 						gs 'stat'
 
-						gt 'gadroad'
+						gt 'gad_road', 'start'
 					end
 				end
 			end
@@ -294,56 +287,60 @@ if $ARGS[0] = 'forest_edge':
 			minut += 15
 			gs 'stat'
 
-			gt 'gadroad'
+			gt 'gad_road', 'start'
 		end
 	end
 
 	! Sveta cannot travel further into the forest if Mira is here at the forest with Sveta
-	if MiraLoc ! 3:
-		act 'Walk further into the forest (0:15)': minut += 15 & gt 'gadforest','forest_outskirts'
+	if locat['A60'] ! 60:
+		act 'Walk further into the forest (0:15)': minut += 15 & gt 'gad_forest','forest_outskirts'
 	end
 
-	gs 'bicycle', 'gadforest'
+	gs 'bicycle', 'gad_forest'
 
 	! 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 'Walk to the meadow (0:20)': minut += 20 & gt 'meadow'
-	elseif ((meadow = 3 or (meadow = 6 and npc_QW['A60'] >= 3)) and MiraLoc = 3):
-		act 'Walk to the meadow with Mira (0:20)': minut += 20 & MiraLoc = 2 & gt 'meadow'
+	if gad_meadow_found = 1:
+		if locat['A60'] ! 60:
+			act 'Walk to the meadow (0:20)': minut += 20 & gt 'gad_meadow', 'start'
+		elseif MiraVars['meadow'] = 2 or (MiraVars['meadow'] = 5 and MiraVars['QW'] >= 3):
+			act 'Walk to the meadow with Mira (0:20)': minut += 20 & MiraVars['follower'] = 1 & gt 'gad_meadow', 'start'
+		end
 	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 hunters_were_met = 1 and MiraLoc ! 3:
+	if hunterscabin = 1 and hunters_were_met = 1 and locat['A60'] ! 60:
 		act 'Walk to the hunters cabin (1:00)':
 			! 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'
+				gt 'gad_swamp', 'stuck'
 			! nighttime chased by wolves - Sveta probably should not be roaming the forest at this time
 			else
-				gt 'gadforestlost','wolves','forest_edge'
+				gt 'gad_forest_lost', 'wolves', 'forest_edge'
 			end
 		end
 	end
 
 	! tree circle teleportation for magic users - only found at the edge of the forest
-	gs 'treeCircEntry', 'GadForest'
+	gs 'treeCircEntry', 'gad_forest'
 
 	! 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'
+	gs 'gad_forest', 'stripping'
 
-	gs 'gadforest', 'dressing'
+	gs 'gad_forest', 'dressing'
 
-	gs 'gadforest', 'walking'
+	gs 'gad_forest', 'walking'
 
-	gs 'gadforest', 'picking'
+	gs 'gad_forest', 'picking'
 	gs 'camera', 'check_location'
 
 	gs 'blackmailer', 'set_park_act'
 end
 
+
+
 if $ARGS[0] = 'forest_outskirts':
 	*clr & cla
-	gs 'shortgs', 'setloc', 'gadforest', 'forest_outskirts'
+	gs 'shortgs', 'setloc', 'gad_forest', 'forest_outskirts'
 	$location_type = 'secluded'
 	$region = 'gad_forest'
 	$forest_args1 = 'forest_outskirts'
@@ -375,7 +372,7 @@ if $ARGS[0] = 'forest_outskirts':
 		end
 	end
 
-	gs 'gadforest','bushcraft','forest_outskirts'
+	gs 'gad_forest', 'bushcraft', 'forest_outskirts'
 	*nl
 	if pcs_bushcraft < 30:
 		'<font color="red">You don''t know this part of the forest very well. You could get lost if you go any deeper into the woods.</font>'
@@ -399,27 +396,29 @@ if $ARGS[0] = 'forest_outskirts':
 	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)): gt 'gadforest_event', 'forest_hunters', 'forest_outskirts'
+	if foresteventrand <= 2 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart:mushroom_pickers = 2 & gt 'gad_forest_events', '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 'gad_forest_events', 'mushroom_pickers3'
+	if foresteventrand = 5 and month >= 4 and month <= 10 and ((hour >= 6 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gad_forest_events', 'forest_hunters', 'forest_outskirts'
 
-	act 'Head back out of the forest (0:15)': minut += 15 & gt 'gadforest', 'forest_edge'
+	act 'Head back out of the forest (0:15)': minut += 15 & gt 'gad_forest', 'forest_edge'
 
-	act 'Walk further into the forest (0:15)': minut += 15 & gt 'gadforest','forest_center'
+	act 'Walk further into the forest (0:15)': minut += 15 & gt 'gad_forest','forest_center'
 
 	! 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'
+	gs 'gad_forest', 'stripping'
 
-	gs 'gadforest', 'dressing'
+	gs 'gad_forest', 'dressing'
 
-	gs 'gadforest', 'walking'
+	gs 'gad_forest', 'walking'
 
-	gs 'gadforest', 'picking'
+	gs 'gad_forest', 'picking'
 end
 
+
+
 if $ARGS[0] = 'forest_center':
 	*clr & cla
-	gs 'shortgs', 'setloc', 'gadforest', 'forest_center'
+	gs 'shortgs', 'setloc', 'gad_forest', 'forest_center'
 	$region = 'gad_forest'
 	$location_type = 'secluded'
 	$forest_args1 = 'forest_center'
@@ -451,7 +450,7 @@ if $ARGS[0] = 'forest_center':
 		end
 	end
 
-	gs 'gadforest','bushcraft','forest_center'
+	gs 'gad_forest', 'bushcraft', 'forest_center'
 	*nl
 	if pcs_bushcraft < 40:
 		'<font color="red">You don''t know this part of the forest very well. You could get lost if you go any deeper into the woods.</font>'
@@ -475,29 +474,29 @@ if $ARGS[0] = 'forest_center':
 	end
 
 	foresteventrand = rand(1,20)
-	if foresteventrand <= 2 and month >= 6 and month <= 9: gt 'gadforest_event', 'basket'
-	if foresteventrand <= 3 and month >= 6 and month <= 9: gt 'gadforest_event', 'bilberry'
-	if foresteventrand <= 4 and month >= 6 and month <= 9: 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)): gt 'gadforest_event', 'forest_hunters', 'forest_center'
+	if foresteventrand <= 2 and month >= 6 and month <= 9: gt 'gad_forest_events', 'basket'
+	if foresteventrand <= 3 and month >= 6 and month <= 9: gt 'gad_forest_events', 'bilberry'
+	if foresteventrand <= 4 and month >= 6 and month <= 9: gt 'gad_forest_events', 'mushroom'
+	if foresteventrand = 5 and month >= 4 and month <= 10 and ((hour >= 6 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gad_forest_events', 'forest_hunters', 'forest_center'
 
-	act 'Head back out of the forest (0:15)': minut += 15 & gt 'gadforest', 'forest_outskirts'
+	act 'Head back out of the forest (0:15)': minut += 15 & gt 'gad_forest', 'forest_outskirts'
 
-	act 'Walk further into the swamp (0:15)': minut += 15 & gt 'swamp', 'start'
+	act 'Walk further into the swamp (0:15)': minut += 15 & gt 'gad_swamp', 'start'
 
 	! 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'
+	gs 'gad_forest', 'stripping'
 
-	gs 'gadforest', 'dressing'
+	gs 'gad_forest', 'dressing'
 
-	gs 'gadforest', 'walking'
+	gs 'gad_forest', 'walking'
 
-	gs 'gadforest', 'picking'
+	gs 'gad_forest', 'picking'
 end
 
 
 ! 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'
+! Example: gs 'gad_forest', '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
@@ -523,7 +522,7 @@ if $ARGS[0] = 'bushcraft':
 		bushcraft_lost = 30
 		torncloth_high_bushcraft = 8
 		torncloth_low_bushcraft = 5
-	elseif $ARGS[1] = 'swamp_woods':
+	elseif $ARGS[1] = 'gad_swamp_woods':
 		bushcraft_rand = 4
 		bushcraft_limit = 50
 		! Sveta cannot get lost at the swamp_woods part of the forest either
@@ -538,7 +537,7 @@ if $ARGS[0] = 'bushcraft':
 	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'
+		if ripclothesrand >= torncloth_low_bushcraft: gs 'gad_forest', 'torncloth'
 
 		! bushcraft exp gained is random to keep it from increasing too fast
 		if rand(0,1) = 0:
@@ -546,19 +545,19 @@ if $ARGS[0] = 'bushcraft':
 		end
 	else
 		! use the lower chance of ripping clothes when Sveta has higher bushcraft
-		if ripclothesrand >= torncloth_high_bushcraft: gs 'gadforest', 'torncloth'
+		if ripclothesrand >= torncloth_high_bushcraft: gs 'gad_forest', '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)
 		forest_lostday = daystart
-		if pcs_bushcraft < lostrand: lost_girl = 1 & gt 'gadforestlost', $ARGS[1]
+		if pcs_bushcraft < lostrand: lost_girl = 1 & gt 'gad_forest_lost', $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'
+! this should only be called from inside of gs 'gad_forest', 'bushcraft'
 if $ARGS[0] = 'torncloth':
 	if $clothingworntype ! 'nude':
 		if (PCloThinness = 1 or PCloSkirt > 0) and PCloQuality < 5:
@@ -569,7 +568,7 @@ if $ARGS[0] = 'torncloth':
 			if dyneval('RESULT = <<$clothingworntype>>_h[<<clothingwornnumber>>]') <= 0:
 				'<font color="red">Your clothes were barely holding together, but now they have fallen apart completely. You discard the remains and are left naked.</font>'
 				gadforest_clothestorn = 1
-				gs 'clothing', 'strip', 'gadforest'
+				gs 'clothing', 'strip', 'gad_forest'
 				gs 'stat'
 			end
 		end
@@ -578,24 +577,24 @@ 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'
+! Example: gs 'gad_forest', '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':
+		if locat['A60'] = 60 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 (0:05)':
 					*clr & cla
 					menu_off = 1
 					minut += 5
-					if pcs_inhib < 50:inhib_exp += rand(1,3)
+					if pcs_inhib < 50: inhib_exp += rand(1,3)
 					if swamp_clothes = 0:
 						gs 'clothing', 'strip_all', $forest_args1
 					elseif swamp_clothes = 1:
-						gs 'clothing', 'strip_all', 'gadforest'
-						gs 'clothing', 'swamp_clothes', 0
+						gs 'clothing', 'strip_all', 'gad_forest'
+						gs 'clothing', 'gad_swamp_clothes', 0
 					end
 					gs 'arousal', 'flash', 5
 					gs 'arousal', 'end'
@@ -605,7 +604,7 @@ if $ARGS[0] = 'stripping':
 
 					'You and Mira quickly get undressed, leaving your clothes in a neat pile on the ground.'
 
-					act 'Continue': gt 'gadforest', $forest_args1
+					act 'Continue': gt 'gad_forest', $forest_args1
 				end
 			end
 		else
@@ -619,8 +618,8 @@ if $ARGS[0] = 'stripping':
 					if swamp_clothes = 0:
 						gs 'clothing', 'strip_all', $forest_args1
 					elseif swamp_clothes = 1:
-						gs 'clothing', 'strip_all', 'gadforest'
-						gs 'clothing', 'swamp_clothes', 0
+						gs 'clothing', 'strip_all', 'gad_forest'
+						gs 'clothing', 'gad_swamp_clothes', 0
 					end
 					gs 'stat'
 
@@ -629,10 +628,10 @@ if $ARGS[0] = 'stripping':
 
 					'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'
+					if $forest_args1 = 'gad_swamp_woods':
+						act 'Continue': gt 'gad_swamp_woods', 'start'
 					else
-						act 'Continue': gt 'gadforest', $forest_args1
+						act 'Continue': gt 'gad_forest', $forest_args1
 					end
 				end
 			end
@@ -642,7 +641,7 @@ end
 
 ! 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'
+! Example: gs 'gad_forest', 'dressing'
 if $ARGS[0] = 'dressing':
 	! code for different variations of getting dressed or dealing with clothes left in the forest
 	if clothesAtLocation = 1:
@@ -651,7 +650,7 @@ if $ARGS[0] = 'dressing':
 				*clr & cla
 				menu_off = 1
 				minut += 5
-				gs 'clothing', 'swamp_clothes', 0
+				gs 'clothing', 'gad_swamp_clothes', 0
 				gs 'underwear', 'wear'
 				gs 'clothing', 'recover_lost_clothes', $forest_args1, 1
 				gs 'stat'
@@ -661,10 +660,10 @@ if $ARGS[0] = 'dressing':
 				*nl
 				'You change back into your clothes.'
 
-				if $forest_args1 = 'swamp_woods':
-					act 'Continue': gt 'swamp_woods', 'start'
+				if $forest_args1 = 'gad_swamp_woods':
+					act 'Continue': gt 'gad_swamp_woods', 'start'
 				else
-					act 'Continue': gt 'gadforest', $forest_args1
+					act 'Continue': gt 'gad_forest', $forest_args1
 				end
 			end
 		elseif $clothingworntype ! 'nude':
@@ -674,7 +673,7 @@ if $ARGS[0] = 'dressing':
 					*clr & cla
 					menu_off = 1
 					minut += 5
-					gs 'clothing', 'swamp_clothes', 0
+					gs 'clothing', 'gad_swamp_clothes', 0
 					gs 'underwear', 'wear'
 					gs 'clothing', 'recover_lost_clothes', $forest_args1, 1
 					gs 'stat'
@@ -684,10 +683,10 @@ if $ARGS[0] = 'dressing':
 					*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'
+					if $forest_args1 = 'gad_swamp_woods':
+						act 'Continue': gt 'gad_swamp_woods', 'start'
 					else
-						act 'Continue': gt 'gadforest', $forest_args1
+						act 'Continue': gt 'gad_forest', $forest_args1
 					end
 				end
 			else
@@ -695,7 +694,7 @@ if $ARGS[0] = 'dressing':
 					cla
 					menu_off = 1
 					minut += 5
-					gs 'clothing', 'swamp_clothes', 0
+					gs 'clothing', 'gad_swamp_clothes', 0
 					gs 'underwear', 'wear'
 					gs 'clothing', 'recover_lost_clothes', $forest_args1
 					gs 'stat'
@@ -703,10 +702,10 @@ if $ARGS[0] = 'dressing':
 					*nl
 					'You pick up your abandoned clothing.'
 
-					if $forest_args1 = 'swamp_woods':
-						act 'Continue': gt 'swamp_woods', 'start'
+					if $forest_args1 = 'gad_swamp_woods':
+						act 'Continue': gt 'gad_swamp_woods', 'start'
 					else
-						act 'Continue': gt 'gadforest', $forest_args1
+						act 'Continue': gt 'gad_forest', $forest_args1
 					end
 				end
 			end
@@ -716,18 +715,18 @@ 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'
+! Example: gs 'gad_forest', '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':
+		if locat['A60'] = 60 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
+				gs 'gad_forest', 'bushcraft', $forest_args1
 				if $clothingworntype = 'nude':
 					if pcs_inhib < 50:inhib_exp += rand(1,5)
 					gs 'arousal', 'flash', 5
@@ -737,8 +736,8 @@ if $ARGS[0] = 'walking':
 
 				if month >= 4 and month <= 10:
 					!  25% chance of finding meadow (needed to advance Miras quest)
-					if rand(0,4) = 0 and meadow = 0 and $forest_args1 = 'forest_edge':
-						gt 'gadforest_event', 'find_meadow'
+					if rand(0, 4) = 0 and gad_meadow_found = 0 and $forest_args1 = 'forest_edge':
+						gt 'gad_forest_events', 'find_meadow'
 					else
 						if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miraforest'+rand(1,3)+'.jpg"></center>'
 						if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miraforest_nude'+rand(1,3)+'.jpg"></center>'
@@ -751,7 +750,7 @@ if $ARGS[0] = 'walking':
 					'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
+				act 'Continue': gt 'gad_forest', $forest_args1
 			end
 		else
 			act 'Go for a walk in the woods (1:00)':
@@ -760,13 +759,13 @@ if $ARGS[0] = 'walking':
 				minut += 60
 				pcs_mood += 20
 				pcs_health += healthmax/5
-				gs 'gadforest', 'bushcraft', $forest_args1
+				gs 'gad_forest', 'bushcraft', $forest_args1
 				if $clothingworntype = 'nude' and pcs_inhib < 50:inhib_exp += rand(1,5)
 				gs 'stat'
 
 				! 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'
+				if rand(0, 9) = 0 and gad_meadow_found = 0 and $forest_args1 = 'forest_edge':
+					gt 'gad_forest_events', 'find_meadow'
 				else
 					if month >= 4 and month <= 10:
 						if ($clothingworntype ! 'nude' and PCloswimwear = 0) and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
@@ -781,10 +780,10 @@ if $ARGS[0] = 'walking':
 						'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'
+					if $forest_args1 = 'gad_swamp_woods':
+						act 'Continue': gt 'gad_swamp_woods', 'start'
 					else
-						act 'Continue': gt 'gadforest', $forest_args1
+						act 'Continue': gt 'gad_forest', $forest_args1
 					end
 				end
 			end
@@ -794,11 +793,11 @@ end
 
 ! 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'
+! Example: gs 'gad_forest', 'picking'
 if $ARGS[0] = 'picking':
 	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)'):
+		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 = 'gad_swamp_woods' and swamp_pickingday ! daystart):
+			act 'Look for mushrooms and berries ' + iif(locat['A60'] = 60 and $forest_args1 = 'forest_edge', 'with Mira ', '') + '(0:30)':
 				*clr & cla
 				menu_off = 1
 
@@ -817,7 +816,7 @@ if $ARGS[0] = 'picking':
 					mushroom_pickers_check = 3
 					max_boletus = 3
 					max_bilberry = 3
-				elseif $forest_args1 = 'swamp_woods':
+				elseif $forest_args1 = 'gad_swamp_woods':
 					swamp_pickingday = daystart
 					mushroom_pickers_check = 4
 					max_boletus = 4
@@ -827,10 +826,10 @@ if $ARGS[0] = 'picking':
 				minut += 30
 				new_boletus = 0
 				new_bilberry = 0
-				gs 'gadforest', 'bushcraft', $forest_args1
+				gs 'gad_forest', 'bushcraft', $forest_args1
 				if $clothingworntype = 'nude':
 					if pcs_inhib < 50:inhib_exp += rand(1,5)
-					if MiraLoc = 3 and $forest_args1 = 'forest_edge':
+					if locat['A60'] = 60 and $forest_args1 = 'forest_edge':
 						gs 'arousal', 'flash', 5
 						gs 'arousal', 'end'
 					end
@@ -846,7 +845,7 @@ if $ARGS[0] = 'picking':
 					pcs_mood += 10
 					gs 'stat'
 
-					gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+					gs 'gad_forest', '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
@@ -861,37 +860,37 @@ if $ARGS[0] = 'picking':
 						pcs_mood += 10
 						gs 'stat'
 
-						gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+						gs 'gad_forest', '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'
+						gs 'gad_forest', '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'
+						gs 'gad_forest', '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
+						gs 'gad_forest', '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'
+				if $forest_args1 = 'gad_swamp_woods':
+					act 'Continue': gt 'gad_swamp_woods', 'start'
 				else
-					act 'Continue': gt 'gadforest', $forest_args1
+					act 'Continue': gt 'gad_forest', $forest_args1
 				end
 			end
 		end
@@ -901,10 +900,10 @@ end
 ! 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'
+! Example: gs 'gad_forest', 'picking_clothes', 'forest_edge', 'mushroom'
 if $ARGS[0] = 'picking_clothes':
 	if $ARGS[2] = 'mushroom':
-		if MiraLoc = 3 and $ARGS[1] = 'forest_edge':
+		if locat['A60'] = 60 and $ARGS[1] = 'forest_edge':
 			if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miramushroom'+rand(1,2)+'.jpg"></center>'
 			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miramushroom_nude'+rand(1,2)+'.jpg"></center>'
 		else
@@ -914,7 +913,7 @@ if $ARGS[0] = 'picking_clothes':
 			if $clothingworntype ! 'nude' and $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 locat['A60'] = 60 and $ARGS[1] = 'forest_edge':
 			if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miramushroom'+rand(1,2)+'.jpg"></center>'
 			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miramushroom_nude'+rand(1,2)+'.jpg"></center>'
 		else
@@ -928,9 +927,9 @@ end
 
 ! 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'
+! Example: gs 'gad_forest', 'picking_clothes_empty', 'forest_edge'
 if $ARGS[0] = 'picking_clothes_empty':
-	if MiraLoc = 3 and $ARGS[1] = 'forest_edge':
+	if locat['A60'] = 60 and $ARGS[1] = 'forest_edge':
 		if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miramushroom3.jpg"></center>'
 		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miramushroom_nude3.jpg"></center>'
 	else
@@ -941,5 +940,5 @@ if $ARGS[0] = 'picking_clothes_empty':
 	end
 end
 
---- gadforest ---------------------------------
+--- gad_forest ---------------------------------
 

+ 74 - 74
locations/gadforest_event.qsrc → locations/gad_forest_events.qsrc

@@ -1,4 +1,4 @@
-# gadforest_event
+# gad_forest_events
 !2021/05/05
 
 $location_type = 'event_outdoors'
@@ -12,13 +12,13 @@ if $ARGS[0] = 'find_meadow':
 	*nl
 	'Walking through the forest, you notice a small path that runs along some bushes and a small ravine. The trail leads away from the well-worn tracks you are currently on and into a dense thicket.'
 
-	act 'Ignore it and keep walking':gt 'gadforest', 'forest_edge'
+	act 'Ignore it and keep walking': gt 'gad_forest', 'forest_edge'
 	act 'Follow the path to see where it goes':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_thicket.jpg"></center>'
 		*nl
 		'You follow the path to see where it goes, but soon it becomes indistinguishable from the bushes and trees around you.'
-		meadow = 1
+		gad_meadow_found = 1
 		minut += 10
 		gs 'stat'
 
@@ -46,7 +46,7 @@ if $ARGS[0] = 'find_meadow':
 					minut += 10
 					gs 'stat'
 
-					act 'Continue':gt 'meadow', 'start'
+					act 'Continue': gt 'gad_meadow', 'start'
 				end
 			end
 		end
@@ -60,7 +60,7 @@ if $ARGS[0] = 'mira_picking_talk':
 	mirapickingtalk = 1
 	miratalkday = daystart
 	npc_rel['A60'] += 2
-	gs 'gadforest', 'bushcraft', 'forest_edge'
+	gs 'gad_forest', 'bushcraft', 'forest_edge'
 	gs 'stat'
 
 	gs 'miroslava','miraclothes'
@@ -71,7 +71,7 @@ if $ARGS[0] = 'mira_picking_talk':
 	'"One more warning, I''ve heard some other villagers say there are wolves in the forest that come out after dark, so you shouldn''t stay in the forest after sundown."'
 	'"That''s one of the reasons why I prefer to walk around the forest''s edge in the morning. It''s much safer in the daylight when more people are around."'
 
-	act 'Continue':gt 'gadforest', 'forest_edge'
+	act 'Continue': gt 'gad_forest', 'forest_edge'
 end
 
 if $ARGS[0] = 'mira_nude_talk':
@@ -81,7 +81,7 @@ if $ARGS[0] = 'mira_nude_talk':
 	miranudetalk = 1
 	miratalkday = daystart
 	npc_rel['A60'] += 2
-	gs 'gadforest', 'bushcraft', 'forest_edge'
+	gs 'gad_forest', 'bushcraft', 'forest_edge'
 	gs 'stat'
 
 	gs 'miroslava','miraclothes'
@@ -90,7 +90,7 @@ if $ARGS[0] = 'mira_nude_talk':
 	'"I don''t know if it''s the fresh air or just being surrounded by nature, but it did make me feel better."'
 	'"I may have tried it once to see if what they said was true. Maybe we can go together sometime?"'
 
-	act 'Continue':gt 'gadforest', 'forest_edge'
+	act 'Continue': gt 'gad_forest', 'forest_edge'
 end
 
 if $ARGS[0] = 'mira_nude_event':
@@ -100,7 +100,7 @@ if $ARGS[0] = 'mira_nude_event':
 	miranudetalk = 2
 	miratalkday = daystart
 	npc_rel['A60'] += 2
-	gs 'gadforest', 'bushcraft', 'forest_edge'
+	gs 'gad_forest', 'bushcraft', 'forest_edge'
 	pcs_horny += 10
 	gs 'stat'
 
@@ -145,7 +145,7 @@ if $ARGS[0] = 'mira_nude_event':
 			*nl
 			'Mira pouts at you for refusing to undress for a moment, then she smiles again, "Alright then, <<$pcs_nickname>>, we can still just go for a normal walk instead."'
 
-			act'Continue':gt 'gadforest','forest_edge'
+			act'Continue': gt 'gad_forest', 'forest_edge'
 		end
 	else
 		act 'Resist and keep your clothes on (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'mira_nude_event':
 		*nl
 		'Seeing that your resistance had stopped, Mira quickly began to undress you, leaving your clothes in a pile on the forest floor.'
 
-		act'Continue':gt 'gadforest','forest_edge'
+		act'Continue': gt 'gad_forest', 'forest_edge'
 	end
 end
 
@@ -177,7 +177,7 @@ if $ARGS[0] = 'mira_morning_walk':
 	'As you walk through the forest, you hear a familiar voice call out, "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 Hello': gt 'gadforest', 'forest_edge'
+	act 'Say Hello': gt 'gad_forest', 'forest_edge'
 end
 
 if $ARGS[0] = 'mushroom_pickers1':
@@ -214,11 +214,11 @@ if $ARGS[0] = 'mushroom_pickers2':
 		pcs_horny += 5
 		inhib_exp += rand(1,3)
 	else
-		act 'Follow them':gt 'gadforest','forest_outskirts'
+		act 'Follow them': gt 'gad_forest', 'forest_outskirts'
 	end
 	gs 'stat'
 
-	act 'Stay here':gt 'gadforest','forest_edge'
+	act 'Stay here': gt 'gad_forest', 'forest_edge'
 
 end
 
@@ -251,7 +251,7 @@ if $ARGS[0] = 'mushroom_pickers3':
 				act 'Chat':
 					*clr & cla
 					minut += 10
-					gs 'gadforest', 'bushcraft', 'forest_outskirts'
+					gs 'gad_forest', 'bushcraft', 'forest_outskirts'
 					gs 'stat'
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers3.jpg"></center>'
@@ -271,24 +271,24 @@ if $ARGS[0] = 'mushroom_pickers3':
 							'You spend ten minutes talking about the forest and the best places to find mushrooms and berries before continuing your day.'
 						end
 					end
-					act 'Leave':gt 'gadforest','forest_outskirts'
+					act 'Leave': gt 'gad_forest', 'forest_outskirts'
 				end
 			end
 			gs 'stat'
 
-			act 'Leave':gt 'gadforest','forest_outskirts'
+			act 'Leave': gt 'gad_forest', 'forest_outskirts'
 		end
 	end
 	gs 'stat'
 
-	act 'Leave them be':gt 'gadforest','forest_outskirts'
+	act 'Leave them be': gt 'gad_forest', 'forest_outskirts'
 end
 
 if $ARGS[0] = 'mushroom':
 	*clr & cla
 	menu_off = 1
 	minut += 5
-	gs 'gadforest', 'bushcraft', 'forest_center'
+	gs 'gad_forest', 'bushcraft', 'forest_center'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom0.'+rand(1,3)+'.jpg"></center>'
 	*nl
@@ -302,27 +302,27 @@ if $ARGS[0] = 'mushroom':
 			boletus += rand(3,5)
 			gs 'stat'
 
-			gs 'gadforest', 'picking_clothes', 'forest_center', 'mushroom'
+			gs 'gad_forest', 'picking_clothes', 'forest_center', 'mushroom'
 			*nl
 			'You begin collecting mushrooms trying to make everything fit in your basket.'
 
-			act 'Continue':gt 'gadforest','forest_center'
+			act 'Continue': gt 'gad_forest', 'forest_center'
 		end
 	else
-		gs 'gadforest', 'picking_clothes_empty', 'forest_center'
+		gs 'gad_forest', 'picking_clothes_empty', 'forest_center'
 		*nl
 		'Unfortunately, your basket is full, and you cannot carry any more mushrooms.'
 	end
 
 	gs 'stat'
-	act 'Continue':gt 'gadforest','forest_center'
+	act 'Continue': gt 'gad_forest', 'forest_center'
 end
 
 if $ARGS[0] = 'bilberry':
 	*clr & cla
 	menu_off = 1
 	minut += 5
-	gs 'gadforest', 'bushcraft', 'forest_center'
+	gs 'gad_forest', 'bushcraft', 'forest_center'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/bilberry'+rand(3,5)+'.jpg"></center>'
 	*nl
@@ -336,27 +336,27 @@ if $ARGS[0] = 'bilberry':
 			bilberry += rand(3,5)
 			gs 'stat'
 
-			gs 'gadforest', 'picking_clothes', 'forest_center', 'berry'
+			gs 'gad_forest', 'picking_clothes', 'forest_center', 'berry'
 			*nl
 			'You begin collecting berries trying to make everything fit in your basket.'
 
-			act 'Continue':gt 'gadforest','forest_center'
+			act 'Continue': gt 'gad_forest', 'forest_center'
 		end
 	else
-		gs 'gadforest', 'picking_clothes_empty', 'forest_center'
+		gs 'gad_forest', 'picking_clothes_empty', 'forest_center'
 		*nl
 		'Unfortunately, your basket is already full, and you cannot carry any more berries.'
 	end
 	gs 'stat'
 
-	act 'Continue':gt 'gadforest','forest_center'
+	act 'Continue': gt 'gad_forest', 'forest_center'
 end
 
 if $ARGS[0] = 'basket':
 	*clr & cla
 	menu_off = 1
 	minut += 5
-	gs 'gadforest', 'bushcraft', 'forest_center'
+	gs 'gad_forest', 'bushcraft', 'forest_center'
 
 
 	if rand(1,2) = 1:
@@ -365,7 +365,7 @@ if $ARGS[0] = 'basket':
 		'Wandering in the forest, you find a basket full of mushrooms. Strange, someone must have left it here or lost it.'
 
 		if boletus + boletus_cooked + bilberry < 5:
-			act 'Steal and empty them into your basket':boletus += 5 & gt 'gadforest','forest_center'
+			act 'Steal and empty them into your basket': boletus += 5 & gt 'gad_forest', 'forest_center'
 		else
 			'Unfortunately, your basket is full, and you cannot carry any more mushrooms.'
 		end
@@ -375,14 +375,14 @@ if $ARGS[0] = 'basket':
 		'Wandering in the forest, you find a basket full of berries. Strange, someone must have left it here or lost it.'
 
 		if boletus + boletus_cooked + bilberry < 5:
-			act 'Steal and empty them into your basket':bilberry += 5 & gt 'gadforest','forest_center'
+			act 'Steal and empty them into your basket': bilberry += 5 & gt 'gad_forest','forest_center'
 		else
 			'Unfortunately, your basket is already full, and you cannot carry any more berries.'
 		end
 	end
 	gs 'stat'
 
-	act 'Leave the basket alone':gt 'gadforest','forest_center'
+	act 'Leave the basket alone': gt 'gad_forest', 'forest_center'
 end
 
 if $ARGS[0] = 'picnic':
@@ -401,7 +401,7 @@ if $ARGS[0] = 'picnic':
 			act 'Hide and get dressed':
 				*clr & cla
 				minut += 5
-				gs 'clothing', 'swamp_clothes', 0
+				gs 'clothing', 'gad_swamp_clothes', 0
 				gs 'underwear', 'wear'
 				gs 'clothing', 'recover_lost_clothes', 'forest_edge',1
 				gs 'stat'
@@ -411,13 +411,13 @@ if $ARGS[0] = 'picnic':
 				*nl
 				'You change into your clothes before anyone spots you.'
 
-				act 'Continue':gt 'gadforest','forest_edge'
+				act 'Continue': gt 'gad_forest', 'forest_edge'
 			end
 		end
-		if meadow > 0:act 'Go to the meadow': minut += 15 & gt 'Meadow'
-		act 'Go further into the forest':gt 'gadforest','forest_outskirts'
+		if gad_meadow_found = 1: act 'Go to the meadow': minut += 15 & gt 'gad_meadow', 'start'
+		act 'Go further into the forest': gt 'gad_forest', 'forest_outskirts'
  	else
-		act 'Continue':gt 'gadforest','forest_edge'
+		act 'Continue': gt 'gad_forest', 'forest_edge'
 	end
 end
 
@@ -432,7 +432,7 @@ if $ARGS[0] = 'forest_hunters':
 	if hunters_were_met = 0:'Wandering through the woods you come across some people. Judging by their appearance they must be hunters.'
 	if hunters_were_met = 1:'Wandering through the woods you see the hunters, Andrei, Sergei and Igor.'
 
-	act 'Leave them alone':gt 'gadforest', $ReturnAdr
+	act 'Leave them alone': gt 'gad_forest', $ReturnAdr
 
 	!%TODO: Move to hunter interactions
 	act 'Approach the hunters':
@@ -447,7 +447,7 @@ if $ARGS[0] = 'forest_hunters':
 			'"What''s your name'+iif(pcs_apprnc >= 60,', beautiful','')+'?" one of them asks.'
 			'"<<$pcs_nickname>>," you answer.'
 			*nl
-			if gadriver_gang = 0:
+			if GadBoy['river_gang'] = 0:
 				minut += 30
 				gs 'stat'
 
@@ -458,8 +458,8 @@ if $ARGS[0] = 'forest_hunters':
 				'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
 				'"Okay, <<$pcs_nickname>>, it''s time for us to go," said Andrei.'
 				'"If you want, we will show you our camp," he added after a short pause. "From there, we have made a path back to the village. We can show it to you if you come with us. Or you can stay with us for a bit if you want."'
-				act 'Stay in the forest':gt 'gadforest', $ReturnAdr
-				act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
+				act 'Stay in the forest': gt 'gad_forest', $ReturnAdr
+				act 'Go with them': minut += 60 & gt 'gad_swamp_yard', 'start'
 			else
 				minut += 15
 				huntersRape = 1
@@ -471,11 +471,11 @@ if $ARGS[0] = 'forest_hunters':
 				'You don''t even remember us. We remember you from that day by the river with Uncle Stepan.'
 				'"I''m Andrei, " he added further, "And these are my friends, also from the village, Igor and Sergei."'
 				*nl
-				if gadriver_gang > 2:'I''m not a whore. I told Uncle Stepan to go to hell! I didn''t want that to happen to me!'
+				if GadBoy['river_gang'] > 2:'I''m not a whore. I told Uncle Stepan to go to hell! I didn''t want that to happen to me!'
 				'"Don''t run away. We won''t hurt you," said Sergei, seeing you jump to your feet.'
 				'"I think it''s about time I left", you reply.'
 				'You quickly move away from them, only slowing once you can no longer hear them talking.'
-				act 'Go back to the forest':gt 'gadforest', $ReturnAdr
+				act 'Go back to the forest': gt 'gad_forest', $ReturnAdr
 			end
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
@@ -486,8 +486,8 @@ if $ARGS[0] = 'forest_hunters':
 				minut += 30
 				'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
 				'"Okay, <<$pcs_nickname>>, it''s time for us to go," said Andrei. "You should pay us another visit sometime, okay?"'
-				act 'Stay in the forest':gt 'gadforest', $ReturnAdr
-				act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
+				act 'Stay in the forest': gt 'gad_forest', $ReturnAdr
+				act 'Go with them': minut += 60 & gt 'gad_swamp_yard', 'start'
 			else
 				'"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again," Andrei said with a smile.'
 				'"How about you come back with us to our hut, we were just about to head back there anyways."'
@@ -497,12 +497,12 @@ if $ARGS[0] = 'forest_hunters':
 					act 'Stay in the forest  (<<will_cost>> Willpower)':
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'gadforest', $ReturnAdr
+						gt 'gad_forest', $ReturnAdr
 					end
 				else
 					act 'Stay in the forest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
+				act 'Go with them': minut += 60 & gt 'gad_swamp_yard', 'start'
 			end
 		end
 	end
@@ -518,7 +518,7 @@ if $ARGS[0] = 'forest_hunters':
 				*nl
 				'You pretend not to notice the hunters and walk right past them, swaying your hips pointedly to maximize the effect. Looking around, you see that the impact has exceeded your expectations. The men have been stopped in their tracks and are staring at you...'
 
-				act 'Continue':gt 'gadforest', $ReturnAdr
+				act 'Continue': gt 'gad_forest', $ReturnAdr
 			end
 			act 'Hide':
 				*clr & cla
@@ -529,7 +529,7 @@ if $ARGS[0] = 'forest_hunters':
 				*nl
 				'They haven''t noticed you yet, so you quickly hide from sight in a nearby bush. You wait until you can no longer hear them talking to continue on your way.'
 
-				act 'Continue':gt 'gadforest', $ReturnAdr
+				act 'Continue': gt 'gad_forest', $ReturnAdr
 			end
 		if hunters_were_met = 1:
 			'"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again," Andrei said with a smile.'
@@ -540,25 +540,25 @@ if $ARGS[0] = 'forest_hunters':
 				act 'Stay in the forest  (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
-					gt 'gadforest', $ReturnAdr
+					gt 'gad_forest', $ReturnAdr
 				end
 			else
 				act 'Stay in the forest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-			act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
+			act 'Go with them': minut += 60 & gt 'gad_swamp_yard', 'start'
 		end
 	end
 end
 
 if $ARGS[0] = 'mitka_temporary_event':
 	! never had sex with Mitka or not the village whore
-	if npc_QW['A63'] = 0 or gadriver_gang >= 3:
+	if npc_QW['A63'] = 0 or GadBoy['river_gang'] >= 3:
 		! Mira is already fucking Mitka but not the boys slut yet
-		if npc_QW['A60'] >= 2 and npc_QW['A60'] < 11:
+		if MiraVars['QW'] >= 2 and MiraVars['QW'] < 11:
 			*clr & cla
 			minut += 5
-			mitkaday = daystart
-			MiraLoc = 0
+			GadBoy['mitka_day'] = daystart
+			gs 'miroslava_schedule', 'force_change'
 			gs 'stat'
 
 			'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
@@ -568,10 +568,10 @@ if $ARGS[0] = 'mitka_temporary_event':
 			'"<<$pcs_nickname>>, you go on. I need to talk to Mitka in private." She says, blushing. "He''ll take me home."'
 			'"Have fun!" you reply to Mira with a wink.'
 
-			act 'Continue': gt 'gadforest','forest_edge'
+			act 'Continue': gt 'gad_forest', 'forest_edge'
 			act 'Spy on them':
 				! Sveta has not made Mira give her anal virginity to Mitka yet
-				if npc_QW['A60'] < 6:
+				if MiraVars['QW'] < 6:
 					*clr & cla
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
@@ -588,7 +588,7 @@ if $ARGS[0] = 'mitka_temporary_event':
 
 						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex1.jpg"></center>'
 						*nl
-						if npc_QW['A60'] = 2:
+						if MiraVars['QW'] = 2:
 							'Eventually, you arrive at your secret meadow. Mira lays down on a blanket before Mitka and spreads her legs invitingly. He doesn''t waste a second before he is on top of her. He positions himself between her legs and eagerly slams his cock roughly into her vagina. Mira seems to be enjoying it, though, as she moans and begs for more.'
 						else
 							'Eventually, you arrive at your not-so-secret meadow. You already know what will happen, having seen it all before. Mira lays down on a blanket before Mitka and spreads her legs invitingly. He doesn''t waste a second before he is on top of her. He positions himself between her legs and eagerly slams his cock roughly into her vagina. Mira seems to be enjoying it even more than last time as she moans and begs for more.'
@@ -596,8 +596,8 @@ if $ARGS[0] = 'mitka_temporary_event':
 
 						act 'Continue Watching':
 							*clr & cla
-							if npc_QW['A60'] = 2:npc_QW['A60'] = 3
-							mirasextimes += 1
+							if MiraVars['QW'] = 2: MiraVars['QW'] = 3
+							MiraVars['Mitka_fucks'] += 1
 							gs 'arousal', 'voyeur', 5
 							gs 'stat'
 
@@ -605,7 +605,7 @@ if $ARGS[0] = 'mitka_temporary_event':
 							*nl
 							'After a few more minutes, Mitka pulls out and cums on her stomach. They rest for a little while, then get dressed and leave to head back to the village.'
 
-							act 'Leave': gt 'gadforest','forest_edge'
+							act 'Leave': gt 'gad_forest', 'forest_edge'
 						end
 					end
 				! Sveta has made Mira give her anal virginity to Mitka
@@ -637,7 +637,7 @@ if $ARGS[0] = 'mitka_temporary_event':
 
 						act 'Continue Watching':
 							*clr & cla
-							mirasextimes += 1
+							MiraVars['Mitka_fucks'] += 1
 							gs 'arousal', 'voyeur', 5
 							gs 'stat'
 
@@ -645,17 +645,17 @@ if $ARGS[0] = 'mitka_temporary_event':
 							*nl
 							'After a couple of minutes, Mitka vigorously slaps her ass. Mira quickly turns around, gets on her knees before him and sucks his cock for a few seconds before he shoots his warm cum all over her face.'
 
-							act 'Leave': gt 'gadforest','forest_edge'
+							act 'Leave': gt 'gad_forest', 'forest_edge'
 						end
 					end
 				end
 			end
 		! mira is the boys slut
-		elseif npc_QW['A60'] >= 11:
+		elseif MiraVars['QW'] >= 11:
 			*clr & cla
 			minut += 5
-			mitkaday = daystart
-			MiraLoc = 0
+			GadBoy['mitka_day'] = daystart
+			gs 'miroslava_schedule', 'force_change'
 			gs 'stat'
 
 			'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
@@ -663,7 +663,7 @@ if $ARGS[0] = 'mitka_temporary_event':
 			*nl
 			'Walking through the forest with Mira, you meet Mitka. Seeing Mira, Mitka grabbed her hand and pulled her into the nearest bush. Seeing Mira is not resisting, you decide not to interfere and mind your business.'
 
-			act 'Continue': gt 'gadforest','forest_edge'
+			act 'Continue': gt 'gad_forest', 'forest_edge'
 			act 'Spy on them':
 				*clr & cla
 				gs 'arousal', 'voyeur', 10
@@ -682,7 +682,7 @@ if $ARGS[0] = 'mitka_temporary_event':
 
 				act 'Continue Watching':
 					*clr & cla
-					mirasextimes += 1
+					MiraVars['Mitka_fucks'] += 1
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
@@ -690,14 +690,14 @@ if $ARGS[0] = 'mitka_temporary_event':
 					*nl
 					'After a couple of minutes, Mitka vigorously slaps her ass. Mira quickly turns around, gets on her knees before him and sucks his cock for a few seconds before he shoots his warm cum all over her face.'
 
-					act 'Leave': gt 'gadforest','forest_edge'
+					act 'Leave': gt 'gad_forest', 'forest_edge'
 				end
 			end
 		! Sveta does not know about Mira and Mitka yet or Miras quest is not started yet
 		else
 			*clr & cla
 			minut += 5
-			mitkaday = daystart
+			GadBoy['mitka_day'] = daystart
 			gs 'stat'
 
 			'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
@@ -705,13 +705,13 @@ if $ARGS[0] = 'mitka_temporary_event':
 			*nl
 			'Walking through the forest with Mira, you meet Mitka. You chat for a little while, noticing the interest Mira showed Mitka before saying goodbye.'
 
-			act 'Continue': gt 'gadforest','forest_edge'
+			act 'Continue': gt 'gad_forest', 'forest_edge'
 		end
 	! Sveta and Mira are both fucking Mitka but don''t know about it
 	else
 		*clr & cla
 		minut += 5
-		mitkaday = daystart
+		GadBoy['mitka_day'] = daystart
 		gs 'stat'
 
 		'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
@@ -719,9 +719,9 @@ if $ARGS[0] = 'mitka_temporary_event':
 		*nl
 		'Walking through the forest with Mira, you meet Mitka. He looks at you both like he is trying to decide something but must have thought better because he continues to chat usually. So you talk for a bit longer before saying goodbye.'
 
-		act 'Continue':gt 'gadforest','forest_edge'
+		act 'Continue': gt 'gad_forest', 'forest_edge'
 	end
 end
 
---- gadforest_event ---------------------------------
+--- gad_forest_events ---------------------------------
 

+ 150 - 158
locations/gadforestlost.qsrc → locations/gad_forest_lost.qsrc

@@ -1,16 +1,12 @@
-# gadforestlost
+# gad_forest_lost
 
 ! 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
+! it is structured like the normal gad_forest file with similar actions and arguments but with unique events
 if $ARGS[0] = 'forest_outskirts':
 	*clr & cla
 
-	$loc = 'gadforestlost'
-	$loc_arg = 'forest_outskirts'
+	gs 'shortgs', 'setloc', 'gad_forest_lost', 'forest_outskirts'
 	$location_type = 'secluded'
-
-	$menu_loc = 'gadforestlost'
-	$menu_arg = 'forest_outskirts'
 	menu_off = 0
 
 	$forest_args1 = 'forest_outskirts'
@@ -19,30 +15,30 @@ if $ARGS[0] = 'forest_outskirts':
 	gs 'gadukino_event', 'sound'
 	gs 'stat'
 
-	gs 'gadforestlost', 'gadforestlost_picture'
+	gs 'gad_forest_lost', 'gad_forest_lost_picture'
 
 	! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 	foresteventrand = rand(1,40)
-	if foresteventrand <= (2+(bonfire*5)) and daystart >= forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', 'forest_outskirts'
-	if foresteventrand <= (4+(bonfire*5)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and daystart > forest_lostday + 1: gt 'gadforestlost', 'rescue', 'hunters', 'forest_outskirts'
-	if foresteventrand <= (6+(bonfire*5)) and daystart > forest_lostday: gt 'gadforestlost', 'rescue', 'ranger', 'forest_outskirts'
-	if foresteventrand <= (8-(bonfire*5)) and (hour < 6 or hour > 22): gt 'gadforestlost', 'wolves', 'forest_outskirts'
+	if foresteventrand <= (2+(bonfire*5)) and daystart >= forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gad_forest_lost', 'rescue', 'pickers', 'forest_outskirts'
+	if foresteventrand <= (4+(bonfire*5)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and daystart > forest_lostday + 1: gt 'gad_forest_lost', 'rescue', 'hunters', 'forest_outskirts'
+	if foresteventrand <= (6+(bonfire*5)) and daystart > forest_lostday: gt 'gad_forest_lost', 'rescue', 'ranger', 'forest_outskirts'
+	if foresteventrand <= (8-(bonfire*5)) and (hour < 6 or hour > 22): gt 'gad_forest_lost', 'wolves', 'forest_outskirts'
 
-	gs 'gadforestlost', 'wander'
+	gs 'gad_forest_lost', 'wander'
 
-	act 'Relax here for a bit': gt 'gadforestlost', 'relax'
+	act 'Relax here for a bit': gt 'gad_forest_lost', 'relax'
 
-	gs 'gadforestlost', 'picking'
+	gs 'gad_forest_lost', 'picking'
 end
 
 if $ARGS[0] = 'forest_center':
 	*clr & cla
 
-	$loc = 'gadforestlost'
+	$loc = 'gad_forest_lost'
 	$loc_arg = 'forest_center'
 	$location_type = 'secluded'
 
-	$menu_loc = 'gadforestlost'
+	$menu_loc = 'gad_forest_lost'
 	$menu_arg = 'forest_center'
 	menu_off = 0
 
@@ -52,24 +48,24 @@ if $ARGS[0] = 'forest_center':
 	gs 'gadukino_event', 'sound'
 	gs 'stat'
 
-	gs 'gadforestlost', 'gadforestlost_picture'
+	gs 'gad_forest_lost', 'gad_forest_lost_picture'
 
 	! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 	foresteventrand = rand(1,40)
-	if foresteventrand <= (1+(bonfire*2)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and daystart > forest_lostday: gt 'gadforestlost', 'rescue', 'hunters', 'forest_center'
-	if foresteventrand <= (3+(bonfire*2)) and daystart > forest_lostday + 1: gt 'gadforestlost', 'rescue', 'ranger', 'forest_center'
-	if foresteventrand <= (8-(bonfire*2)) and (hour < 6 or hour > 22): gt 'gadforestlost', 'wolves', 'forest_center'
+	if foresteventrand <= (1+(bonfire*2)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and daystart > forest_lostday: gt 'gad_forest_lost', 'rescue', 'hunters', 'forest_center'
+	if foresteventrand <= (3+(bonfire*2)) and daystart > forest_lostday + 1: gt 'gad_forest_lost', 'rescue', 'ranger', 'forest_center'
+	if foresteventrand <= (8-(bonfire*2)) and (hour < 6 or hour > 22): gt 'gad_forest_lost', 'wolves', 'forest_center'
 
-	gs 'gadforestlost', 'wander'
+	gs 'gad_forest_lost', 'wander'
 
-	act 'Relax here for a bit': gt 'gadforestlost', 'relax'
+	act 'Relax here for a bit': gt 'gad_forest_lost', 'relax'
 
-	gs 'gadforestlost', 'picking'
+	gs 'gad_forest_lost', 'picking'
 end
 
 ! 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'
+! Example: gs 'gad_forest_lost', 'bushcraft', 'forest_outskirts'
 if $ARGS[0] = 'bushcraft':
 	if $ARGS[1] = 'forest_outskirts':
 		bushcraft_rand = 2
@@ -87,16 +83,16 @@ if $ARGS[0] = 'bushcraft':
 
 	ripclothesrand = rand(1,10)
 	if pcs_bushcraft < bushcraft_limit:
-		if ripclothesrand >= torncloth_low_bushcraft: gs 'gadforest', 'torncloth'
+		if ripclothesrand >= torncloth_low_bushcraft: gs 'gad_forest', 'torncloth'
 	else
-		if ripclothesrand >= torncloth_high_bushcraft: gs 'gadforest', 'torncloth'
+		if ripclothesrand >= torncloth_high_bushcraft: gs 'gad_forest', 'torncloth'
 	end
 	gs 'stat'
 end
 
 ! 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'
+! Example: gs 'gad_forest_lost', 'wander'
 if $ARGS[0] = 'wander':
 	if DayStage < 4:
 		act 'Wander trying to get your bearings (1:30)':
@@ -105,7 +101,7 @@ if $ARGS[0] = 'wander':
 			minut += 90
 			gs 'stat'
 
-			gs 'gadforestlost', 'bushcraft', $forest_args1
+			gs 'gad_forest_lost', '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>'
@@ -116,29 +112,25 @@ if $ARGS[0] = 'wander':
 			if pcs_bushcraft < bushcraft_lost:
 				lostrand = rand(1,bushcraft_lost)
 				if pcs_bushcraft > lostrand:
-					gt 'gadforestlost','finish', $forest_args1
+					gt 'gad_forest_lost','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
+					act 'Continue': gt 'gad_forest_lost', $forest_args1
 				end
 			else
-				gt 'gadforestlost','finish', $forest_args1
+				gt 'gad_forest_lost', 'finish', $forest_args1
 			end
 		end
 	end
 end
 
 ! $forest_args1 - location of forest where this is called from
-! Example: gt 'gadforestlost', 'relax'
+! Example: gt 'gad_forest_lost', 'relax'
 if $ARGS[0] = 'relax':
 	*clr & cla
 
-	$loc = 'gadforestlost'
-	$loc_arg = 'relax'
+	gs 'shortgs', 'setloc', 'gad_forest_lost', 'relax'
 	$location_type = 'secluded'
-
-	$menu_loc = 'gadforestlost'
-	$menu_arg = 'relax'
 	menu_off = 0
 
 	CLOSE ALL
@@ -148,14 +140,14 @@ if $ARGS[0] = 'relax':
 	if $forest_args1 = 'forest_outskirts':
 		! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 		foresteventrand = rand(1,30)
-		if foresteventrand <= (2+(bonfire*5)) and daystart >= forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', $forest_args1
-		if foresteventrand <= (4+(bonfire*5)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
-		if foresteventrand <= (6+(bonfire*5)) and daystart > forest_lostday+1: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
+		if foresteventrand <= (2+(bonfire*5)) and daystart >= forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gad_forest_lost', 'rescue', 'pickers', $forest_args1
+		if foresteventrand <= (4+(bonfire*5)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gad_forest_lost', 'rescue', 'hunters', $forest_args1
+		if foresteventrand <= (6+(bonfire*5)) and daystart > forest_lostday+1: gt 'gad_forest_lost', 'rescue', 'ranger', $forest_args1
 	elseif $forest_args1 = 'forest_center':
 		! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 		foresteventrand = rand(1,40)
-		if foresteventrand <= (1+(bonfire*5)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
-		if foresteventrand <= (3+(bonfire*5)) and daystart > forest_lostday+1: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
+		if foresteventrand <= (1+(bonfire*5)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gad_forest_lost', 'rescue', 'hunters', $forest_args1
+		if foresteventrand <= (3+(bonfire*5)) and daystart > forest_lostday + 1: gt 'gad_forest_lost', 'rescue', 'ranger', $forest_args1
 	end
 
 	'<center><H4>Somewhere in the forest</H4></center>'
@@ -172,7 +164,7 @@ if $ARGS[0] = 'relax':
 	else
 		'<font color="green">Your bonfire burns bright, increasing the chance of being rescued and decreasing the chance of being attacked by wolves.</font>'
 	end
-	act 'Explore the forest': gt 'gadforestlost', $forest_args1
+	act 'Explore the forest': gt 'gad_forest_lost', $forest_args1
 
 	if bonfire = 0:
 		act 'Build a fire (0:30)':
@@ -186,7 +178,7 @@ if $ARGS[0] = 'relax':
 			*nl
 			'After a few minutes, you are able to get a nice sized fire started.'
 
-			act 'Continue':gt 'gadforestlost', 'relax'
+			act 'Continue': gt 'gad_forest_lost', 'relax'
 		end
 		act 'Sit and relax (1:00)':
 			*clr & cla
@@ -194,14 +186,14 @@ if $ARGS[0] = 'relax':
 			minut += 60
 			gs 'stat'
 
-			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_nude'+rand(1,2)+'.jpg"></center>'
+			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'
+			act 'Continue': gt 'gad_forest_lost', 'relax'
 		end
 		if pcs_sleep < 40:
 			act 'Nap on the ground (2:00)':
@@ -211,7 +203,7 @@ if $ARGS[0] = 'relax':
 				pcs_health -= 5
 				gs 'sleep_simple', 'nap_base', 120
 
-				if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepnude1.'+rand(1,2)+'.jpg"></center>'
+				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>'
@@ -219,7 +211,7 @@ if $ARGS[0] = 'relax':
 				'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'
+				act 'Continue': gt 'gad_forest_lost', 'relax'
 			end
 		end
 	elseif bonfire = 1:
@@ -238,7 +230,7 @@ if $ARGS[0] = 'relax':
 			*nl
 			'You spend half an hour huddled by the flames'
 
-			act 'Continue':gt 'gadforestlost', 'relax'
+			act 'Continue': gt 'gad_forest_lost', 'relax'
 		end
 		if pcs_sleep < 40:
 			act 'Nap by the fire (2:00)':
@@ -253,7 +245,7 @@ if $ARGS[0] = 'relax':
 				'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'
+				act 'Continue': gt 'gad_forest_lost', 'relax'
 			end
 		end
 		if boletus > 0:
@@ -270,7 +262,7 @@ if $ARGS[0] = 'relax':
 				*nl
 				'You spend 15 minutes grilling some mushrooms in the fire.'
 
-				act 'Continue':gt 'gadforestlost', 'relax'
+				act 'Continue': gt 'gad_forest_lost', 'relax'
 			end
 		end
 	end
@@ -290,7 +282,7 @@ if $ARGS[0] = 'relax':
 			*nl
 			'You eat some cooked mushrooms. They are pretty tasty considering your circumstances.'
 
-			act 'Continue':gt 'gadforestlost', 'relax'
+			act 'Continue': gt 'gad_forest_lost', 'relax'
 		end
 	end
 	if bilberry > 0:
@@ -310,14 +302,14 @@ if $ARGS[0] = 'relax':
 			*nl
 			'You eat some berries. These would be great to eat even if you weren''t lost.'
 
-			act 'Continue':gt 'gadforestlost', 'relax'
+			act 'Continue': gt 'gad_forest_lost', 'relax'
 		end
 	end
 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'
+! Example: gs 'gad_forest_lost', 'picking'
 if $ARGS[0] = 'picking':
 	if DayStage < 4 and month >= 6 and month <= 9 and boletus + boletus_cooked + bilberry < 5:
 		act 'Look for mushrooms and berries (0:30)':
@@ -339,7 +331,7 @@ if $ARGS[0] = 'picking':
 			minut += 30
 			new_boletus = 0
 			new_bilberry = 0
-			gs 'gadforestlost', 'bushcraft', $forest_args1
+			gs 'gad_forest_lost', 'bushcraft', $forest_args1
 			if $clothingworntype = 'nude' and pcs_inhib < 50:inhib_exp += rand(1,5)
 			gs 'stat'
 
@@ -351,7 +343,7 @@ if $ARGS[0] = 'picking':
 				pcs_mood += 10
 				gs 'stat'
 
-				gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+				gs 'gad_forest', '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:
@@ -365,33 +357,33 @@ if $ARGS[0] = 'picking':
 					pcs_mood += 10
 					gs 'stat'
 
-					gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+					gs 'gad_forest', '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'
+					gs 'gad_forest', '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'
+					gs 'gad_forest', '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
+					gs 'gad_forest', '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
+			act 'Continue': gt 'gad_forest_lost', $forest_args1
 		end
 	end
 end
@@ -403,7 +395,7 @@ if $ARGS[0] = 'finish':
 	bonfire = 0
 	pcs_mood += 20
 	gs 'exp_gain', 'bushcraft', rand(1,5)
-	gs 'clothing', 'swamp_clothes', 0
+	gs 'clothing', 'gad_swamp_clothes', 0
 	gs 'stat'
 
 	'<center><H4>Somewhere in the forest</H4></center>'
@@ -414,63 +406,63 @@ if $ARGS[0] = 'finish':
 	if $clothingworntype = 'nude':
 		if $ARGS[1] = 'forest_outskirts':
 			act 'Continue':
-				if meadow > 0:
+				if gad_meadow_found = 1:
 					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'
+				if foresteventrand = 1: minut += 15 & gt 'gad_forest', 'forest_edge'
+				if foresteventrand = 2: gt 'gad_forest', 'forest_outskirts'
+				if foresteventrand = 3: minut += 35 & gt 'gad_meadow', 'start'
 			end
 		elseif $ARGS[1] = 'forest_center':
 			act 'Continue':
-				if hunterscabin = 1 and meadow > 0:
+				if hunterscabin = 1 and gad_meadow_found = 1:
 					foresteventrand = rand(1,5)
-				elseif meadow > 0:
+				elseif gad_meadow_found = 1:
 					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'
+				if foresteventrand = 1: minut += 30 & gt 'gad_forest', 'forest_edge'
+				if foresteventrand = 2: minut += 15 & gt 'gad_forest',' forest_outskirts'
+				if foresteventrand = 3: gt 'gad_forest', 'forest_center'
+				if foresteventrand = 4: minut += 50 & gt 'gad_meadow', 'start'
+				if foresteventrand = 5: minut += 30 & gt 'gad_swamp_yard', 'start'
 			end
 		end
 	else
 		if $ARGS[1] = 'forest_outskirts':
 			act 'Continue':
-				if meadow > 0:
+				if gad_meadow_found = 1:
 					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'
+				if foresteventrand = 1: minut += 15 & gt 'gad_forest', 'forest_edge'
+				if foresteventrand = 2: gt 'gad_forest', 'forest_outskirts'
+				if foresteventrand = 3: minut += 40 & gt 'gad_field', 'field'
+				if foresteventrand = 4: minut += 30 & gt 'gad_road', 'start'
+				if foresteventrand = 5: minut += 40 & gt 'gad_river', 'start'
+				if foresteventrand = 6: minut += 35 & gt 'gad_meadow', 'start'
 			end
 		elseif $ARGS[1] = 'forest_center':
 			act 'Continue':
-				if hunterscabin = 1 and meadow > 0:
+				if hunterscabin = 1 and gad_meadow_found = 1:
 					foresteventrand = rand(1,8)
-				elseif meadow > 0:
+				elseif gad_meadow_found = 1:
 					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'
+				if foresteventrand = 1: minut += 30 & gt 'gad_forest', 'forest_edge'
+				if foresteventrand = 2: minut += 15 & gt 'gad_forest', 'forest_outskirts'
+				if foresteventrand = 3: gt 'gad_forest', 'forest_center'
+				if foresteventrand = 4: minut += 55 & gt 'gad_field', 'field'
+				if foresteventrand = 5: minut += 45 & gt 'gad_road', 'start'
+				if foresteventrand = 6: minut += 55 & gt 'gad_river', 'start'
+				if foresteventrand = 7: minut += 50 & gt 'gad_meadow', 'start'
+				if foresteventrand = 8: minut += 30 & gt 'gad_swamp_yard', 'start'
 			end
 		end
 	end
@@ -487,8 +479,8 @@ if $ARGS[0] = 'rescue':
 	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 at your grandparents house.'
-		gs 'clothing', 'strip', 'gadforest'
-		gs 'clothing', 'swamp_clothes', 0
+		gs 'clothing', 'strip', 'gad_forest'
+		gs 'clothing', 'gad_swamp_clothes', 0
 	end
 	gs 'stat'
 
@@ -501,30 +493,30 @@ if $ARGS[0] = 'rescue':
 			'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'
+					act 'Continue': minut += 45 & gt 'gad_gphouse', 'start'
 				elseif $ARGS[2] = 'forest_center':
-					act 'Continue': minut += 60 & gt 'gadhouse', 'start'
+					act 'Continue': minut += 60 & gt 'gad_gphouse', 'start'
 				end
 			else
 				if $ARGS[2] = 'forest_outskirts':
-					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+					act 'Continue': minut += 15 & gt 'gad_forest', 'forest_edge'
 				elseif $ARGS[2] = 'forest_center':
-					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+					act 'Continue': minut += 30 & gt 'gad_forest', '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'
+					act 'Continue': minut += 30 & gt 'gad_road', 'start'
 				elseif $ARGS[2] = 'forest_center':
-					act 'Continue': minut += 45 & gt 'gadroad'
+					act 'Continue': minut += 45 & gt 'gad_road', 'start'
 				end
 			else
 				if $ARGS[2] = 'forest_outskirts':
-					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+					act 'Continue': minut += 15 & gt 'gad_forest', 'forest_edge'
 				elseif $ARGS[2] = 'forest_center':
-					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+					act 'Continue': minut += 30 & gt 'gad_forest', 'forest_edge'
 				end
 			end
 		end
@@ -557,38 +549,38 @@ if $ARGS[0] = 'rescue':
 			'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'
+					act 'Continue': minut += 45 & gt 'gad_gphouse', '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'
+					act 'Continue': minut += 60 & gt 'gad_gphouse', 'start'
+				elseif $ARGS[2] = 'gad_swamp_yard':
+					act 'Continue': minut += 90 & gt 'gad_gphouse', 'start'
 				end
 			else
 				if $ARGS[2] = 'forest_outskirts':
-					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+					act 'Continue': minut += 15 & gt 'gad_forest', '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'
+					act 'Continue': minut += 30 & gt 'gad_forest', 'forest_edge'
+				elseif $ARGS[2] = 'gad_swamp_yard':
+					act 'Continue': minut += 60 & gt 'gad_forest', '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'
+					act 'Continue': minut += 30 & gt 'gad_road', 'start'
 				elseif $ARGS[2] = 'forest_center':
-					act 'Continue': minut += 45 & gt 'gadroad'
-				elseif $ARGS[2] = 'swamp_yard':
-					act 'Continue': minut += 75 & gt 'gadroad'
+					act 'Continue': minut += 45 & gt 'gad_road', 'start'
+				elseif $ARGS[2] = 'gad_swamp_yard':
+					act 'Continue': minut += 75 & gt 'gad_road', 'start'
 				end
 			else
 				if $ARGS[2] = 'forest_outskirts':
-					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+					act 'Continue': minut += 15 & gt 'gad_forest', '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'
+					act 'Continue': minut += 30 & gt 'gad_forest', 'forest_edge'
+				elseif $ARGS[2] = 'gad_swamp_yard':
+					act 'Continue': minut += 60 & gt 'gad_forest', 'forest_edge'
 				end
 			end
 		end
@@ -644,17 +636,17 @@ if $ARGS[0] = 'wolves':
 				if foresteventrand = 0:
 					gs 'gameover', 'check', 11
 					msg '<font color=red><B>You should die in this forest, but Cheat Mode keeps you Alive.</B></font>'
-					gt 'gadforestlost', 'forest_edge'
+					gt 'gad_forest_lost', 'forest_edge'
 				elseif foresteventrand <= 10:
-					gt 'gadforestlost', 'forest_edge'
+					gt 'gad_forest_lost', 'forest_edge'
 				elseif foresteventrand <= 13:
-					gt 'gadforestlost', 'forest_edge'
+					gt 'gad_forest_lost', 'forest_edge'
 				elseif foresteventrand <= 15:
-					gt 'gadfield', 'field'
+					gt 'gad_field', 'field'
 				elseif foresteventrand <= 17:
-					gt 'gadroad'
+					gt 'gad_road', 'start'
 				else
-					gt 'gadriver', 'start'
+					gt 'gad_river', 'start'
 				end
 			end
 
@@ -689,21 +681,21 @@ if $ARGS[0] = 'wolves':
 				if foresteventrand = 0:
 					gt 'gameover', 'check', 11
 					msg '<font color=red><B>You should die in this forest, but Cheat Mode keeps you Alive.</B></font>'
-					gt 'gadforestlost', 'forest_outskirts'
+					gt 'gad_forest_lost', 'forest_outskirts'
 				elseif foresteventrand <= 9:
-					gt 'gadforestlost', 'forest_outskirts'
+					gt 'gad_forest_lost', 'forest_outskirts'
 				elseif foresteventrand <= 14:
-					gt 'gadforestlost', 'forest_edge'
+					gt 'gad_forest_lost', 'forest_edge'
 				elseif foresteventrand = 15:
-					gt 'gadforest', 'forest_outskirts'
+					gt 'gad_forest', 'forest_outskirts'
 				elseif foresteventrand = 16:
-					gt 'gadforest', 'forest_edge'
+					gt 'gad_forest', 'forest_edge'
 				elseif foresteventrand = 17:
-					gt 'gadfield', 'field'
+					gt 'gad_field', 'field'
 				elseif foresteventrand = 18:
-					gt 'gadroad'
+					gt 'gad_road', 'start'
 				else
-					gt 'gadriver', 'start'
+					gt 'gad_river', 'start'
 				end
 			end
 
@@ -738,25 +730,25 @@ if $ARGS[0] = 'wolves':
 				if foresteventrand = 0:
 					gt 'gameover', 'check', 11
 					msg '<font color=red><B>You should die in this forest, but Cheat Mode keeps you Alive.</B></font>'
-					gt 'gadforestlost', 'forest_center'
+					gt 'gad_forest_lost', 'forest_center'
 				elseif foresteventrand <= 8:
-					gt 'gadforestlost', 'forest_center'
+					gt 'gad_forest_lost', 'forest_center'
 				elseif foresteventrand <= 11:
-					gt 'gadforestlost', 'forest_outskirts'
+					gt 'gad_forest_lost', 'forest_outskirts'
 				elseif foresteventrand <= 13:
-					gt 'gadforestlost', 'forest_edge'
+					gt 'gad_forest_lost', 'forest_edge'
 				elseif foresteventrand = 14:
-					gt 'gadforest','forest_center'
+					gt 'gad_forest', 'forest_center'
 				elseif foresteventrand = 15:
-					gt 'gadforest','forest_outskirts'
+					gt 'gad_forest', 'forest_outskirts'
 				elseif foresteventrand = 16:
-					gt 'gadforest','forest_edge'
+					gt 'gad_forest', 'forest_edge'
 				elseif foresteventrand = 17:
-					gt 'gadfield','field'
+					gt 'gad_field', 'field'
 				elseif foresteventrand = 18:
-					gt 'gadroad'
+					gt 'gad_road', 'start'
 				else
-					gt 'gadriver','start'
+					gt 'gad_river', 'start'
 				end
 			end
 
@@ -791,33 +783,33 @@ if $ARGS[0] = 'wolves':
 				if foresteventrand = 0:
 					gt 'gameover', 'check', 11
 					msg '<font color=red><B>You should die in this forest, but Cheat Mode keeps you Alive.</B></font>'
-					gt 'gadforestlost', 'swamp'
+					gt 'gad_forest_lost', 'swamp'
 				elseif foresteventrand <= 4:
-					gt 'gadforestlost','swamp'
+					gt 'gad_forest_lost', 'swamp'
 				elseif foresteventrand <= 6:
-					gt 'gadforestlost','forest_center'
+					gt 'gad_forest_lost', 'forest_center'
 				elseif foresteventrand <= 8:
-					gt 'gadforestlost','forest_outskirts'
+					gt 'gad_forest_lost', 'forest_outskirts'
 				elseif foresteventrand <= 10:
-					gt 'gadforestlost','forest_edge'
+					gt 'gad_forest_lost', 'forest_edge'
 				elseif foresteventrand = 11:
-					gt 'gadforest','swamp'
+					gt 'gad_forest', 'swamp'
 				elseif foresteventrand = 12:
-					gt 'gadforest','forest_center'
+					gt 'gad_forest', 'forest_center'
 				elseif foresteventrand = 13:
-					gt 'gadforest','forest_outskirts'
+					gt 'gad_forest', 'forest_outskirts'
 				elseif foresteventrand = 14:
-					gt 'gadforest','forest_edge'
+					gt 'gad_forest', 'forest_edge'
 				elseif foresteventrand = 15:
-					gt 'gadfield','field'
+					gt 'gad_field', 'field'
 				elseif foresteventrand = 16:
-					gt 'gadroad'
+					gt 'gad_road', 'start'
 				elseif foresteventrand = 17:
-					gt 'gadriver','start'
+					gt 'gad_river', 'start'
 				elseif foresteventrand = 18:
-					gt 'swamp_yard','start'
+					gt 'gad_swamp_yard', 'start'
 				else
-					gt 'swamp_woods','start'
+					gt 'gad_swamp_woods', 'start'
 				end
 			end
 		end
@@ -825,8 +817,8 @@ if $ARGS[0] = 'wolves':
 end
 
 ! this gs handles images for generic forest locations while lost
-! Example: gs 'gadforestlost', 'gadforestlost_picture'
-if $ARGS[0] = 'gadforestlost_picture':
+! Example: gs 'gad_forest_lost', 'gad_forest_lost_picture'
+if $ARGS[0] = 'gad_forest_lost_picture':
 	'<center><H4>Somewhere in the forest</H4></center>'
 	if month >= 4 and month <= 10:
 		if DayStage < 4:
@@ -855,5 +847,5 @@ if $ARGS[0] = 'gadforestlost_picture':
 	end
 end
 
---- gadforestlost ---------------------------------
+--- gad_forest_lost ---------------------------------
 

+ 49 - 47
locations/gadsarai.qsrc → locations/gad_gpbarn.qsrc

@@ -1,14 +1,12 @@
-# gadsarai
+# gad_gpbarn
 !2021/05/08
 
 $default_img_path = 'locations/gadukino/'
 if $ARGS[0] = '':
-	$loc_arg = ''
-	$loc = 'gadsarai'
-	$menu_loc = 'gadsarai'
-	$menu_arg = ''
+	gs 'shortgs', 'setloc', 'gad_gpbarn', ''
 	menu_off = 0
 	$location_type = 'secluded'
+	gs 'miroslava_schedule'
 
 	'<center><h4>Grandparents'' Barn</h4></center>'
 	if month >= 4 and month <= 10:
@@ -33,8 +31,8 @@ if $ARGS[0] = '':
 	clr
 	gs 'stat'
 
-	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
-	act 'Go to your room': gt 'gadsarai', 'barn_room'
+	act 'Go back to the yard': minut += 1 & gt 'gad_gpyard', 'start'
+	act 'Go to your room': gt 'gad_gpbarn', 'barn_room'
 	if grandpaQW['chore_fetch_firewood'] = 1:
 		act 'Gather firewood for Grandpa (0:10)':
 			*clr & cla
@@ -48,21 +46,21 @@ if $ARGS[0] = '':
 			minut += 10
 			gs'stat'
 
-			act 'Finish':gt 'gadsarai'
-			act 'Return back to your grandfather': minut += 2 & gt 'gadhouse', 'grandpa'
+			act 'Finish': gt 'gad_gpbarn'
+			act 'Return back to your grandfather': minut += 2 & gt 'gad_gphouse', 'grandpa'
 		end
 	end
-	gs 'bicycle', 'gadsarai'
+	gs 'bicycle', 'gad_gpbarn'
 	if (month < 4 or month > 10) or (hour < 9 or hour > 20) or (grandpaQW['chore_feed_horse'] = 1 or grandpaQW['chore_brush_horse'] = 1 or grandpaQW['chore_lead_horse_to_field'] = 1 or grandpaQW['chore_bathe_horse'] = 1):
-		act 'Enter the horses stall': gt 'gadsarai', 'horse'
+		act 'Enter the horses stall': gt 'gad_gpbarn', 'horse'
 	end
 	if (month < 4 or month > 10) or (hour < 9 or hour > 20) or (grandpaQW['chore_feed_cow'] = 1 or grandmaQW['chore_milk_cow'] or grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_herd_cattle'] = 1):
-		act 'Enter the cows stall': gt 'gadsarai', 'cow'
+		act 'Enter the cows stall': gt 'gad_gpbarn', 'cow'
 	end
-	act 'Enter the boars stall': gt 'gadsarai', 'boar'
-	act 'Search around in the barn (0:15)': gt 'gadsarai', 'search'
-	if vcard > 0: act 'View your vintage porn cards': $card_loc = 'gadsarai' & card_deck = 0 & gt 'card'
-	if card > 0: act 'View your new porn cards': $card_loc = 'gadsarai' & card_deck = 1 & gt 'card'
+	act 'Enter the boars stall': gt 'gad_gpbarn', 'boar'
+	act 'Search around in the barn (0:15)': gt 'gad_gpbarn', 'search'
+	if mc_inventory['vintage_card'] > 0: act 'View your vintage porn cards': $card_loc = 'gad_gpbarn' & card_deck = 0 & gt 'card'
+	if mc_inventory['card'] > 0: act 'View your new porn cards': $card_loc = 'gad_gpbarn' & card_deck = 1 & gt 'card'
 	if pcs_horny >= 50:	act 'Masturbate':gt 'selfplay', 'start'
 !!	Serpent is not ready yet, so remarking out til then.
 !!	if findneck = 1: act 'You hear a scraping noice above you.':gt 'serpent'
@@ -94,9 +92,9 @@ if $ARGS[0] = 'search':
 		gm_purses[5] = 1
 		$currentpursetype = 'gm'
 		currentpursenumber = 5
-	elseif vcard = 0 and vcard_trash = 0 and rand(0,10) >= 8:
+	elseif mc_inventory['vintage_card'] = 0 and vcard_trash = 0 and rand(0,10) >= 8:
 		*clr & cla
-		vcard = 1
+		mc_inventory['vintage_card'] = 1
 		gs 'exp_gain', 'observ', 3
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vcards.jpg"></center>'
@@ -129,7 +127,7 @@ if $ARGS[0] = 'search':
 		*nl
 		'In the barn, you find many mouldy magazines, rusty tools and equipment, toys, and dusty, yellowed books. The entire barn reeks of mould and decay.'
 	end
-	act 'Finish':gt 'gadsarai'
+	act 'Finish': gt 'gad_gpbarn'
 end
 
 if $ARGS[0] = 'horse':
@@ -141,7 +139,7 @@ if $ARGS[0] = 'horse':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse.jpg"></center>'
 	'Grandfather''s trusted workhorse, Desperado.'
 
-	act 'Leave':minut += 1 & gt 'gadsarai'
+	act 'Leave': minut += 1 & gt 'gad_gpbarn'
 
 	if grandpaQW['chore_feed_horse'] = 1:
 		act 'Feed the horse (0:30)':
@@ -155,8 +153,8 @@ if $ARGS[0] = 'horse':
 			'You grab a sack of grain and fill Desperado''s feed bucket. Then, you hang the bucket from his stall and gently pat his nose as he begins to eat.'
 			'You watch him eat for a little while before moving on.'
 
-			act 'Finish':gt 'gadsarai','horse'
-			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
+			act 'Finish': gt 'gad_gpbarn','horse'
+			act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
 		end
 	end
 	if grandpaQW['chore_lead_horse_to_field'] = 1:
@@ -170,8 +168,8 @@ if $ARGS[0] = 'horse':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
 			'You take Desperado by the bridle and lead him to the field. You let him free in the paddock area and watch him run about before moving on.'
 
-			act 'Continue':gt'gadfield','field'
-			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gadhouse', 'grandpa'
+			act 'Continue': gt 'gad_field', 'field'
+			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gad_gphouse', 'grandpa'
 		end
 	end
 	if grandpaQW['chore_bathe_horse'] = 1:
@@ -185,11 +183,11 @@ if $ARGS[0] = 'horse':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
 			'You take Desperado by the bridle and lead him to the river.'
 
-			act 'Continue':gt'gadriver', 'gadbitch'
+			act 'Continue': gt 'gad_beach', 'start'
 		end
 	end
 	if grandpaQW['chore_bathe_horse'] = 2:
-		act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
+		act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
 	end
 	if grandpaQW['chore_brush_horse'] = 1:
 		act 'Groom the horse (1:00)':
@@ -202,8 +200,8 @@ if $ARGS[0] = 'horse':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/comb_horse.jpg"></center>'
 			'You spend about an hour cleaning and brushing Desperado, scrubbing his coat and brushing his mane and tail. Finally, you are satisfied with the result - he looks as clean and healthy as ever.'
 
-			act 'Finish':gt 'gadsarai','horse'
-			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
+			act 'Finish': gt 'gad_gpbarn','horse'
+			act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
 		end
 	end
 end
@@ -218,7 +216,7 @@ if $ARGS[0] = 'cow':
 	*nl
 	'Grandma''s favorite animal, the cow, Dawn.'
 
-	act 'Leave':minut += 1 & gt 'gadsarai'
+	act 'Leave': minut += 1 & gt 'gad_gpbarn'
 
 	if grandmaQW['chore_milk_cow'] = 1:
 		act 'Milk the cow (0:30)':
@@ -231,8 +229,8 @@ if $ARGS[0] = 'cow':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/milk_cow.jpg"></center>'
 			'You start milking Dawn, improving each time you do it.'
 
-			act 'Finish':gt 'gadsarai','cow'
-			act 'Return back to your grandmother': minut += 3 & gt 'gadhouse', 'grandma'
+			act 'Finish': gt 'gad_gpbarn', 'cow'
+			act 'Return back to your grandmother': minut += 3 & gt 'gad_gphouse', 'grandma'
 		end
 	end
 	if grandpaQW['chore_feed_cow'] = 1:
@@ -246,8 +244,8 @@ if $ARGS[0] = 'cow':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_cow.jpg"></center>'
 			'Dawn is excited about feeding time, shaking her head and doing little cow tippy-taps with her feet. You dump some hay in her trough and watch as she digs in.'
 
-			act 'Finish':gt 'gadsarai','cow'
-			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
+			act 'Finish': gt 'gad_gpbarn','cow'
+			act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
 		end
 	end
 	if grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_herd_cattle'] = 1:
@@ -264,8 +262,8 @@ if $ARGS[0] = 'cow':
 			end
 			if grandpaQW['chore_herd_cattle'] = 1:'You lead Dawn to the field, where your grandfather awaits you. It''s his turn to keep an eye on the cows..'
 
-			act 'Continue':gt'gadfield','cow'
-			if grandpaQW['chore_lead_cow_to_field'] = 2: act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gadhouse', 'grandpa'
+			act 'Continue': gt 'gad_field', 'cow'
+			if grandpaQW['chore_lead_cow_to_field'] = 2: act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gad_gphouse', 'grandpa'
 		end
 	end
 end
@@ -279,7 +277,7 @@ if $ARGS[0] = 'boar':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/boar.jpg"></center>'
 	'One of your grandparents'' dearest possessions, the boar, Nickle.'
 
-	act 'Leave':minut += 1 & gt 'gadsarai'
+	act 'Leave':minut += 1 & gt 'gad_gpbarn'
 
 	if grandpaQW['chore_feed_boar'] = 1:
 		act 'Feed the hog (0:30)':
@@ -292,8 +290,8 @@ if $ARGS[0] = 'boar':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_boar.jpg"></center>'
 			'You grab the feed bag and fill Nickle''s trough. You stand there and watch for a few minutes as he eats like a... well, like a pig.'
 
-			act 'Finish':gt 'gadsarai','boar'
-			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
+			act 'Finish': gt 'gad_gpbarn','boar'
+			act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
 		end
 	end
 end
@@ -302,18 +300,19 @@ if $ARGS[0] = 'barn_room':
 	$location_type = 'private'
 	$setloc['StageTitle'] = 'Guest Room'
 	$setloc['StageImage'] =   '<<$default_img_path>>village/gad_room.jpg'
-	gs 'shortgs', 'setloc', 'gadsarai', $ARGS[0]
+	gs 'shortgs', 'setloc', 'gad_gpbarn', $ARGS[0]
+	gs 'miroslava_schedule'
 	gs 'themes', 'indoors'
 	gs 'stat'
 	gs 'themes', 'indoors'
-    gs 'stat'
+	gs 'stat'
 	gs 'core_library', 'stage_title'
 	gs 'music_actions', 'clear_restrictions'
 
 	act '<b>Leave and go to the yard</b>':
 		if $clothingworntype ! 'nude':
 			minut += 5
-			gt 'gaddvor'
+			gt 'gad_gpyard', 'start'
 		else
 			msg'<b><font color = red>You need to get dressed.</font></b>'
 			gt $loc, $loc_arg
@@ -322,7 +321,7 @@ if $ARGS[0] = 'barn_room':
 	act '<b>Leave and enter the dacha</b>':
 		if $clothingworntype ! 'nude':
 			minut += 5
-			gt 'gadhouse', 'start'
+			gt 'gad_gphouse', 'start'
 		else
 			msg'<b><font color = red>You need to get dressed.</font></b>'
 			gt $loc, $loc_arg
@@ -337,12 +336,15 @@ if $ARGS[0] = 'barn_room':
 	if pcs_horny >= 50:
 		act 'Masturbate':gt 'selfplay', 'start'
 	end
-	if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
-	if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
+
+	if mc_inventory['vintage_card'] > 0: act 'View your vintage porn cards': card_deck = 0 & gt 'card'
+	if mc_inventory['card'] > 0: act 'View your new porn cards': card_deck = 1 & gt 'card'
 	gs 'music_actions', 'start'
+
+
 	!! Activities End
 	!! TODO: if winter create task for chopping wood for log stove.
-	!! act 'light log stove': gt  'gadsarai', 'log_stove' 
+	!! act 'light log stove': gt 'gad_gpbarn', 'log_stove' 
 
 	!! Game functions
 	'At the foot of your bed is a small <a href="exec:gt ''wardrobe'', ''start''">chest</a> containing some of your clothes.'
@@ -357,7 +359,7 @@ if $ARGS[0] = 'barn_room':
 		'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden behind a loose brick.'
 	end
 	
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and detention_warning ! daystart:
+	if $start_type['loc'] = 'sg' and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and detention_warning ! daystart:
 		detention_warning = daystart
 		msg 'You have detention this morning and must be at school before 09:00.'
 	end
@@ -368,5 +370,5 @@ end
 if $ARGS[0] = 'log_stove':
 	!! simple iron stove that requires wood logs. Make it a task to fill and light in winter.
 end
---- gadsarai ---------------------------------
+--- gad_gpbarn ---------------------------------
 

+ 83 - 154
locations/gadbana.qsrc → locations/gad_gpbath.qsrc

@@ -1,78 +1,91 @@
-# Gadbana
+# gad_gpbath
 !2021/05/05
+!2024/05/05 - Mira schedule introduced.
+!locat['A60'] = Mira''s location. See 'miroslava_schedule'
 CLOSE ALL
-$loc_arg = ''
-$loc = 'gadbana'
-$locM_arg = ''
-$locM = 'gadbana'
-$location_type = 'bathroom'
-$menu_loc = 'gadbana'
-$menu_arg = ''
-menu_off = 0
-frost = 0
-if banya_underwear = 0:
-	if $pantyworntype ! 'none' and $braworntype ! 'none':
-		banya_underwear = 1
-	else
-		banya_underwear = 2
+
+if $ARGS[0] = 'start':
+	gs 'shortgs', 'setloc', 'gad_gpbath', 'start'
+	$location_type = 'bathroom'
+	menu_off = 0
+	gs 'miroslava_schedule'
+
+	frost = 0
+	if banya_underwear = 0:
+		if $pantyworntype ! 'none' and $braworntype ! 'none':
+			banya_underwear = 1
+		else
+			banya_underwear = 2
+		end
 	end
-end
-!!clothesAtLocation = FUNC('lost_clothes_here','gadbana')
+	!!clothesAtLocation = FUNC('lost_clothes_here','gad_gpbath')
+
+	'<center><h4>Bath</h4></center>'
 
-'<center><h4>Bath</h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bana.jpg"></center>'
+	'A small room with a low, smoky ceiling, a small stove, a couple of stainless steel water tanks, and a blackened wooden shelf.'
+	'Grandma''s enema bulb is hidden behind some stuff on the shelf.'
+	gs 'stat'
 
-'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bana.jpg"></center>'
-'A small room with a low, smoky ceiling, a small stove, a couple of stainless steel water tanks, and a blackened wooden shelf.'
-'Grandma''s enema bulb is hidden behind some stuff on the shelf.'
-gs 'stat'
+	gs 'gad_gpbath', 'set_leave_acts'
 
-if mira_guest = 0:
-	if $clothingworntype = 'nude':
+	if locat['A60'] ! 22:
+		gs 'gad_gpbath', 'alone'
+	else
+		gs 'gad_gpbath', 'with_Mira'
+	end
+end
+
+if $ARGS[0] = 'set_leave_acts':
+	if $clothingworntype ! 'nude':
+		act 'Go outside': minut += 1 & gt 'gad_gpyard', 'start'
+	else
 		act 'Get dressed and leave':
 			minut += 1
 			menu_off = 1
-			!!gs 'clothing', 'recover_lost_clothes', 'gadbana', 1
+			!!gs 'clothing', 'recover_lost_clothes', 'gad_gpbath', 1
 			gs 'clothing', 'wear_last_worn'
 			if banya_underwear = 1: gs 'underwear', 'wear'
 			gs 'stat'
 			killvar 'banya_underwear'
-			gt 'gaddvor'
+			gt 'gad_gpyard', 'start'
 		end
-	end
-	if $clothingworntype ! 'nude':
-		act 'Go outside':minut += 1 & gt'gaddvor'
-	elseif $clothingworntype = 'nude':
 		act 'Go outside naked':
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			inhib_exp += rand(0,2)
-			grandmaQW['nudity_trouble'] += rand(0,2)
+			inhib_exp += rand(0, 2)
+			grandmaQW['nudity_trouble'] += rand(0, 2)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s undoubtedly risky leaving the bathhouse like this. But, 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 'clothing', 'recover_lost_clothes', 'gad_gpbath'
 			gs 'arousal', 'flash', 10, 'exhibitionism'
 			killvar 'banya_underwear'
 			gs 'stat'
-			act 'Continue': gt 'gaddvor'
+			act 'Continue': gt 'gad_gpyard', 'start'
 		end
-	elseif $clothingworntype = 'nude' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
-		act 'Go outside in your underwear':
-			*clr & cla
-			menu_off = 1
-			minut += 1
-			inhib_exp += rand(0,1)
-			grandmaQW['nudity_trouble'] += rand(0,1)
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
-			'It''s undoubtedly risky leaving the bathhouse like this. But, 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', 'flashlite', 10, 'exhibitionism'
-			killvar 'banya_underwear'
-			gs 'stat'
-			act 'Continue': gt 'gaddvor'
+
+		if ($pantyworntype ! 'none' or $braworntype ! 'none'):
+			act 'Go outside in your underwear':
+				*clr & cla
+				menu_off = 1
+				minut += 1
+				inhib_exp += rand(0, 1)
+				grandmaQW['nudity_trouble'] += rand(0,1)
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
+				'It''s undoubtedly risky leaving the bathhouse like this. But, 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', 'gad_gpbath'
+				gs 'arousal', 'flashlite', 10, 'exhibitionism'
+				killvar 'banya_underwear'
+				gs 'stat'
+				act 'Continue': gt 'gad_gpyard', 'start'
+			end
 		end
 	end
+end
 
+
+if $ARGS[0] = 'alone':
 	if week >= 6:
 		if hour >= 12 and hour <= 18:
 			'You put the wood into the stove to feed the fire. The banya will be ready to use around 19:00.'
@@ -107,7 +120,7 @@ if mira_guest = 0:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/par.jpg"></center>'
 					'You strip, sit down and relax. Then, after a proper banya session, you pick up a bucket filled with cold water, pour it over yourself, and head over to the shower. You feel like a completely new person.'
 					if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-					act 'Finish': gt $loc, $loc_arg
+					act 'Finish': gt 'gad_gpbath', 'start'
 				end
 			end
 		else
@@ -126,14 +139,14 @@ if mira_guest = 0:
 			if locat['Fam_inGad'] = 1 and func('homes_properties', 'has_access', 'parents_home'): noshampoo = 1
 			dynamic $showerdin
 			if frost > 0:frost = 0
-			!!gs 'clothing', 'strip', 'gadbana'
+			!!gs 'clothing', 'strip', 'gad_gpbath'
 			gs 'clothing', 'strip_all'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mit.jpg"></center>'
 			'You lather up your washcloth and start scrubbing your body. Next, you rinse off the soap and begin to lather your hair with shampoo. After rinsing off the shampoo, you feel completely clean.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-			act 'Finish':gt $loc, $loc_arg
+			act 'Finish': gt 'gad_gpbath', 'start'
 		end
 	else
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash.</font>'
@@ -146,10 +159,10 @@ if mira_guest = 0:
 	if $clothingworntype ! 'nude':
 		act 'Remove clothes':
 			minut += 1
-			!!gs 'clothing', 'strip', 'gadbana'
+			!!gs 'clothing', 'strip', 'gad_gpbath'
 			gs 'clothing', 'strip'
 			gs 'stat'
-			gt 'gadbana'
+			gt 'gad_gpbath', 'start'
 		end
 	end
 
@@ -172,7 +185,7 @@ if mira_guest = 0:
 				*nl
 				'You take a painkiller and gulp it down with a glass of water.'
 
-				act 'Finish':gt $loc, $loc_arg
+				act 'Finish': gt 'gad_gpbath', 'start'
 			end
 		end
 	end
@@ -198,7 +211,7 @@ if mira_guest = 0:
 	end
 
 	if mc_inventory['breastcream'] > 0:
-		'<a href="exec: gs ''drugs'', ''breastcream'' & gt $loc, $loc_arg">Apply breast cream.</a> Uses left: <<mc_inventory[''breastcream'']>>.'
+		'<a href="exec: gs ''drugs'', ''breastcream'' & gt ''gad_gpbath'', ''start''">Apply breast cream.</a> Uses left: <<mc_inventory[''breastcream'']>>.'
 	end
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):
@@ -212,7 +225,7 @@ if mira_guest = 0:
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/frotsp.jpg"></center>'
 			'You scrub all the cum from your clothes.'
 
-			act 'Finish':gt $curloc
+			act 'Finish': gt 'gad_gpbath', 'start'
 		end
 	end
 
@@ -243,75 +256,34 @@ if mira_guest = 0:
 			gs 'stat'
 			'You take a tube of cream and rub it onto your itchy vulva.'
 
-			act 'Finish':gt $loc, $loc_arg
+			act 'Finish': gt 'gad_gpbath', 'start'
 		end
 	end
-else
+end
+
+if $ARGS[0] = 'with_Mira':
 	!125st
-	if $clothingworntype = 'nude':
-		act 'Get dressed and leave':
-			minut += 1
-			menu_off = 1
-			!!gs 'clothing', 'recover_lost_clothes', 'gadbana', 1
-			gs 'clothing', 'wear_last_worn'
-			if banya_underwear = 1: gs 'underwear', 'wear'
-			gs 'stat'
-			killvar 'banya_underwear'
-			gt 'gaddvor'
-		end
-	end
-	if $clothingworntype ! 'nude':
-		act 'Go outside':minut += 1 & gt'gaddvor'
-	elseif $clothingworntype = 'nude':
-		act 'Go outside naked':
-			*clr & cla
-			menu_off = 1
-			minut += 1
-			inhib_exp += rand(0,2)
-			grandmaQW['nudity_trouble'] += rand(0,2)
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s undoubtedly risky leaving the bathhouse like this. But, 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'
-			killvar 'banya_underwear'
-			gs 'stat'
-			act 'Continue': gt 'gaddvor'
-		end
-	elseif $clothingworntype = 'nude' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
-		act 'Go outside in your underwear':
-			*clr & cla
-			menu_off = 1
-			minut += 1
-			inhib_exp += rand(0,1)
-			grandmaQW['nudity_trouble'] += rand(0,1)
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s undoubtedly risky leaving the bathhouse like this. But, 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', 'flashlite', 10, 'exhibitionism'
-			killvar 'banya_underwear'
-			gs 'stat'
-			act 'Continue': gt 'gaddvor'
-		end
-	end
 	act 'Undress and bathe with Mira':
-		cls
+		*clr & cla
 		menu_off = 1
-		!!gs 'clothing', 'strip', 'gadbana'
+		!!gs 'clothing', 'strip', 'gad_gpbath'
 		gs 'clothing', 'strip_all'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miraban.jpg"></center>'
-			'While you undress, you notice Mira removing her panties from the corner of your eye.'
+		'While you undress, you notice Mira removing her panties from the corner of your eye.'
 
-			gs 'arousal', 'erotic_nudity', 5
-			gs 'stat'
+		gs 'arousal', 'erotic_nudity', 5
+		gs 'stat'
 
-			act 'Watch Mira clean herself':
-			cls
+		act 'Watch Mira clean herself':
+			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miraban1.jpg"></center>'
 			'You feel the hot steam penetrate into your pores while you blissfully watch Mira lather up. She sometimes throws at you short glances and smiles hesitantly in response...'
 			gs 'arousal', 'erotic_nudity', 5
 			gs 'stat'
 			act 'Steam':
-				cls
+				*clr & cla
 				noshampoo = 1
 				dynamic $showerdin
 				pcs_hairbsh = 0
@@ -330,54 +302,11 @@ else
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				if $clothingworntype = 'nude':
-					act 'Get dressed and leave':
-						minut += 1
-						menu_off = 1
-						!!gs 'clothing', 'recover_lost_clothes', 'gadbana', 1
-						gs 'clothing', 'wear_last_worn'
-						if banya_underwear = 1: gs 'underwear', 'wear'
-						gs 'stat'
-						killvar 'banya_underwear'
-						gt 'gaddvor'
-					end
-				end
-				if $clothingworntype ! 'nude':
-					act 'Go outside':minut += 1 & gt'gaddvor'
-				elseif $clothingworntype = 'nude':
-					act 'Go outside naked':
-						*clr & cla
-						menu_off = 1
-						minut += 1
-						inhib_exp += rand(0,2)
-						grandmaQW['nudity_trouble'] += rand(0,2)
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s undoubtedly risky leaving the bathhouse like this. But, 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'
-						killvar 'banya_underwear'
-						gs 'stat'
-						act 'Continue': gt 'gaddvor'
-					end
-				elseif $clothingworntype = 'nude' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
-					act 'Go outside in your underwear':
-						*clr & cla
-						menu_off = 1
-						minut += 1
-						inhib_exp += rand(0,1)
-						grandmaQW['nudity_trouble'] += rand(0,1)
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s undoubtedly risky leaving the bathhouse like this. But, 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'
-						killvar 'banya_underwear'
-						gs 'stat'
-						act 'Continue': gt 'gaddvor'
-					end
-				end
+				gs 'gad_gpbath', 'set_leave_acts'
 			end
 		end
 	end
 end
 
-
---- Gadbana ---------------------------------
+--- gad_gpbath ---------------------------------
 

+ 124 - 155
locations/gadhouse.qsrc → locations/gad_gphouse.qsrc

@@ -1,4 +1,6 @@
-# gadhouse
+# gad_gphouse
+!2024/05/05 - Mira schedule introduced.
+!locat['A60'] = Mira''s location. See 'miroslava_schedule'
 
 !! VARIABLE LIST FOR GRANDPARENTS AND THEIR CHORES - START
 !!
@@ -87,18 +89,16 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	CLOSE ALL
 	$location_type = 'indoors'
-	$loc_arg = 'start'
-	$loc = 'gadhouse'
-	$menu_loc = 'gadhouse'
-	$menu_arg = ''
+	gs 'shortgs', 'setloc', 'gad_gphouse', 'start'
 	menu_off = 1
+	gs 'miroslava_schedule'
 	$locclass = 'singleroom'
 	display_bb = 1
 	frost = 0
 	
 	gs 'homes_properties', 'give_access', 'grandparents_house'
 
-	gs 'gadhouse', 'nudity_trouble_limit'
+	gs 'gad_gphouse', '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:
@@ -127,7 +127,7 @@ if $ARGS[0] = 'start':
 
 		'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'
+		act 'Leave': gadstay = 0 & gt 'gad_gpyard', 'start'
 	!! Returning home after being lost at least overnight; no penalty for not doing chores or disappointing either grandparent
 	elseif lost_girl = 1 and hour >= 6 and hour < 20 and daystart > forest_lostday:
 		*clr & cla
@@ -145,11 +145,11 @@ if $ARGS[0] = 'start':
 		'"We are so glad you are back safe and sound. Go have a hot meal and shower and relax."'
 		'"Also, don''t worry about any chores today. Just focus on recovering."'
 
-		act 'Continue':gt 'gadhouse', 'main'
+		act 'Continue': gt 'gad_gphouse', 'main'
 	!! Returning home after being lost but escaped within the same day; no reaction from grandparents and still expected to get chores done
 	elseif lost_girl = 1:
 		lost_girl = 0
-		gt 'gadhouse', 'main'
+		gt 'gad_gphouse', 'main'
 	!!Grandma kicks Sveta out for being a whore
 	elseif grandmaQW['nudity_trouble_limit'] = 50 and hour >= 6 and hour < 20:
 		*clr & cla
@@ -184,7 +184,7 @@ if $ARGS[0] = 'start':
 		'"This will be reflected in your allowance, don''t act surprised at the beginning of the month."'
 		'"Unlike you, we have to live in this village and get along with its people. If you keep this up, I''ll be cutting your time here short and sending you back to your mother, and she can deal with your sinful behaviour. We better not hear any more about this!" She then walks off before you can even respond.'
 
-		act 'Continue': gt 'gadhouse', 'main'
+		act 'Continue': gt 'gad_gphouse', '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
@@ -210,7 +210,7 @@ if $ARGS[0] = 'start':
 		'"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', 'main'
+		act 'Continue': gt 'gad_gphouse', '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
@@ -231,7 +231,7 @@ if $ARGS[0] = 'start':
 		'"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'
+		act 'Continue': gt 'gad_gphouse', 'main'
 	elseif grandmaQW['first_visit'] = 0 and hour >= 6 and hour < 20:
 		*clr & cla
 		grandmaQW['first_visit'] = 1
@@ -251,10 +251,10 @@ if $ARGS[0] = 'start':
 		if (kanikuli = 4 or kanikuli = 5) and ((month = 6 or month = 7) or (month = 8 and day <= 25)):
 			'"Will you be staying with us during the summer or will you be traveling back and forth with your parents?" she asks.'
 
-			act 'Stay with your grandparents':gadstay = 1 & gt 'gadhouse', 'main'
-			act 'Stay in Pavlovsk':gadstay = 0 & gt 'gadhouse', 'main'
+			act 'Stay with your grandparents': gadstay = 1 & gt 'gad_gphouse', 'main'
+			act 'Stay in Pavlovsk': gadstay = 0 & gt 'gad_gphouse', 'main'
 		else
-			act 'Continue':gt 'gadhouse', 'main'
+			act 'Continue': gt 'gad_gphouse', 'main'
 		end
 	elseif grandmaQW['last_month_paid'] ! month and hour >= 6 and hour < 20:
 		*clr & cla
@@ -274,13 +274,12 @@ if $ARGS[0] = 'start':
 			'"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 rand(1,10) = 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) and npc_known['A60'] = 1:
+		act 'Continue': gt 'gad_gphouse', 'main'
+	elseif locat['A60'] = 21:
 		*clr & cla
-		mira_guestday = daystart
+		MiraVars['guestday'] = daystart + 1
+		MiraVars['guest'] = 1
 		minut += 5
-		mira_guest = 1
-		MiraLoc = 6
 		gs 'stat'
 
 		gs 'miroslava', 'miraclothes'
@@ -288,19 +287,14 @@ if $ARGS[0] = 'start':
 		'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', 'main'
+		act 'Continue': gt 'gad_gphouse', 'main'
 	else
-		gt 'gadhouse', 'main'
+		gt 'gad_gphouse', 'main'
 	end
 end
 
 if $ARGS[0] = 'main':
-	$loc = 'gadhouse'
-	$locM = 'gadhouse'
-	$menu_loc = 'gadhouse'
-	$loc_arg = 'main'
-	$locM_arg = 'main'
-	$menu_arg = 'main'
+	gs 'shortgs', 'setloc', 'gad_gphouse', 'main'
 	$locclass = 'livingr'
 	menu_off = 0
 	*clr & cla
@@ -315,67 +309,67 @@ if $ARGS[0] = 'main':
 
 	if hour < 8:
 		temp = rand(0,9)
-		if temp = 0:'In a box filled with scraps of cloth, <a href="exec: gt ''gadhouse'',''villagecat''">Boniface</a>is curled up, sleeping peacefully.'
+		if temp = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a>is curled up, sleeping peacefully.'
 	elseif hour >= 8 and hour < 12 and sunWeather = 1:
 		temp = rand(0,2)
-		if temp = 1:'<a href="exec: gt ''gadhouse'',''villagecat''">Boniface</a> is busy cleaning himself with his tongue on the table by the window.'
-		if temp = 2:'<a href="exec: gt ''gadhouse'',''villagecat''">Boniface</a> lies lazily on the table by the window, soaking up some sunshine rays.'
+		if temp = 1: '<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is busy cleaning himself with his tongue on the table by the window.'
+		if temp = 2: '<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> lies lazily on the table by the window, soaking up some sunshine rays.'
 	elseif hour >= 8 and hour < 12 and sunWeather = 0:
 		temp = rand(0,1)
-		if temp = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gadhouse'',''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
-		if temp = 1: 'On the table by the window, <a href="exec: gt ''gadhouse'',''villagecat''">Boniface</a> stares in disgust at the rain outside.'
+		if temp = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
+		if temp = 1: 'On the table by the window, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> stares in disgust at the rain outside.'
 	elseif hour >= 12 and hour < 18:
 		temp = rand(0,5)
-		if temp = 3:'Next to the table by the window, <a href="exec:feedcat = 1 & gt ''gadhouse'',''villagecat''">Boniface</a> stretches and meows loudly. It''s time for dinner.'
-		if temp = 4 and sunWeather = 1: '<a href="exec: gt ''gadhouse'',''villagecat''">Boniface</a> lies lazily on the table by the window, soaking up some sunshine rays.'
-		if temp = 4 and sunWeather = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gadhouse'',''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
+		if temp = 3: 'Next to the table by the window, <a href="exec:feedcat = 1 & gt ''gad_gphouse'',''villagecat''">Boniface</a> stretches and meows loudly. It''s time for dinner.'
+		if temp = 4 and sunWeather = 1: '<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> lies lazily on the table by the window, soaking up some sunshine rays.'
+		if temp = 4 and sunWeather = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
 	elseif hour >= 18 and hour < 22 and catout ! 2:
 		temp = rand(0,3)
-		if temp = 0:'<a href="exec: gt ''gadhouse'',''villagecat''">Boniface</a> is stalking around the main floor, looking for a nice juicy mouse to play with.'
-		if temp = 1 and catout = 0: catout = 1 &'<a href="exec: gt ''gadhouse'',''villagecat''">Boniface</a> twines around your ankles, then goes to the door, meowing pitifully.'
+		if temp = 0:'<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is stalking around the main floor, looking for a nice juicy mouse to play with.'
+		if temp = 1 and catout = 0: catout = 1 &'<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> twines around your ankles, then goes to the door, meowing pitifully.'
 	elseif hour >= 22:
 		temp = rand(0,2)
-		if temp = 1:'In a box filled with scraps of cloth, <a href="exec: gt ''gadhouse'',''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
+		if temp = 1:'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
 	end
 
 	if hour >= 6 and hour < 8:
-		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> is puttering around in the kitchen, making breakfast.'
-		'Your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> sits at the kitchen table, drinking a black cup of coffee.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> is puttering around in the kitchen, making breakfast.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> sits at the kitchen table, drinking a black cup of coffee.'
 	elseif hour >= 8 and hour < 10:
-		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> is slowly wandering through the house, tidying up as she goes along.'
-		'Your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> is sitting in his recliner, watching the morning news.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> is slowly wandering through the house, tidying up as she goes along.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> is sitting in his recliner, watching the morning news.'
 	elseif hour >= 10 and hour < 11:
 		'Your grandmother is napping on the sofa, curled up under a heavy quilt.'
-		'Your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> is sitting in his recliner, watching the morning news.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> is sitting in his recliner, watching the morning news.'
 	elseif hour >= 11 and hour < 12:
 		'Your grandmother is napping on the sofa, curled up under a heavy quilt.'
-		'Your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> sits next to her, stroking her hair and faintly smiling.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> sits next to her, stroking her hair and faintly smiling.'
 	elseif hour >= 12 and hour < 13:
-		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> is in the kitchen, making a sandwich, while your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> waits at the kitchen table.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> is in the kitchen, making a sandwich, while your <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> waits at the kitchen table.'
 	elseif hour >= 13 and hour < 15:
-		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> is sitting by the window, '+iif(sunWeather = 0, 'watching the rain','looking outside')+'.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> is sitting by the window, '+iif(sunWeather = 0, 'watching the rain','looking outside')+'.'
 		'Your grandfather is leaning back in his recliner, fast asleep.'
 	elseif hour >= 15 and hour < 17:
-		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> and <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> are watching an old-timey-looking show on the TV.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> and <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> are watching an old-timey-looking show on the TV.'
 	elseif hour >= 17 and hour < 18:
-		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> is puttering around in the kitchen, making dinner.'
-		'Your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> sits at the kitchen table, waiting for grandma to bring his food.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> is puttering around in the kitchen, making dinner.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> sits at the kitchen table, waiting for grandma to bring his food.'
 	elseif hour >= 18 and hour < 20:
-		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> and <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> are watching the evening news on TV.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> and <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> are watching the evening news on TV.'
 	else
 		'Your grandparents are asleep. They sleep in separate beds, which is strange since they''re still madly in love.'
 	end
 
-	if mira_guest = 1: MiraLoc = 6 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
+	if MiraVars['guest'] = 1: locat['A60'] = 21 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
 
 	gs 'stat'
 	gs 'themes', 'indoors'
 	gs 'kit_din'
 
-	gs 'gadhouse', 'family_trip'
+	gs 'gad_gphouse', 'family_trip'
 
 	if $clothingworntype ! 'nude':
-		act 'Go outside':minut += 1 & gt 'gaddvor'
+		act 'Go outside':minut += 1 & gt 'gad_gpyard', 'start'
 	elseif $clothingworntype = 'nude':
 		act 'Go outside naked':
 			*clr & cla
@@ -388,7 +382,7 @@ if $ARGS[0] = 'main':
 			gs 'arousal', 'flash', 10, 'exhibitionism'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Continue': gt 'gaddvor'
+			act 'Continue': gt 'gad_gpyard', 'start'
 		end
 	elseif $clothingworntype = 'nude' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
 		act 'Go outside in your underwear':
@@ -401,10 +395,10 @@ if $ARGS[0] = 'main':
 			gs 'arousal', 'flashlite', 10, 'exhibitionism'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Continue': gt 'gaddvor'
+			act 'Continue': gt 'gad_gpyard', 'start'
 		end
 	end
-	act 'Go to your room':  gt 'gadsarai', 'barn_room'
+	act 'Go to your room': gt 'gad_gpbarn', 'barn_room'
 	if grandmaQW['chore_clean_floor'] = 1:
 		act 'Clean the floor for Grandma (1:00)':
 			*clr & cla
@@ -415,8 +409,8 @@ if $ARGS[0] = 'main':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
 			'You grab a bucket and a rag, get down on your knees and begin scrubbing the floor. Within the hour, the floor shines, and you are satisfied with your work. You put the cleaning supplies into a corner and continue your day.'
 
-			act 'Continue':gt 'gadhouse', 'start'
-			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
+			act 'Continue':gt 'gad_gphouse', 'start'
+			act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
 		end
 	end
 
@@ -437,14 +431,14 @@ if $ARGS[0] = 'main':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
 				'Once done with the washing, you walk to the clothesline, where you carefully hang the clothes to dry.'
 
-				act 'Continue':gt'gaddvor'
-				act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
+				act 'Continue': gt 'gad_gpyard', 'start'
+				act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
 			end
 		end
 	end
 
-	if (hour >= 6 and hour < 10) or (hour >= 12 and hour < 20): act 'Talk to Grandma':gt 'gadhouse','grandma'
-	if (hour >= 6 and hour < 13) or (hour >= 15 and hour < 20): act 'Talk to Grandpa':gt 'gadhouse','grandpa'
+	if (hour >= 6 and hour < 10) or (hour >= 12 and hour < 20): act 'Talk to Grandma': gt 'gad_gphouse', 'grandma'
+	if (hour >= 6 and hour < 13) or (hour >= 15 and hour < 20): act 'Talk to Grandpa': gt 'gad_gphouse', 'grandpa'
 	act 'Eat a hearty meal (0:20)':gs 'food', 'l_meal'
 	act 'Eat a normal meal (0:15)':gs 'food', 'm_meal'
 	act 'Eat a light meal (0:10)':gs 'food', 's_meal'
@@ -462,45 +456,20 @@ if $ARGS[0] = 'main':
 	gs 'events', 'read'
 	gs 'subkid'
 
-	if gobelen>0:'You have <<gobelen>> completed tapestries.'
+	if mc_inventory['tapestry'] > 0:'You have <<gobelen>> completed tapestries.'
 	if pcs_sewng >= 40 and mc_inventory['sewing_fabric'] > 0:
 		'You have enough fabric for <<mc_inventory[''sewing_fabric'']>> lessons.'
-	elseif pcs_sewng >= 40 and mc_inventory['sewing_fabric'] <= 0:
-		'You do not have any fabric.'
 	end
+	if mc_inventory['sewing_fabric'] <= 0:'You do not have any fabric.'
+
 	if pcs_sewng >= 80:
-		if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0:
-			act'Start a new tapestry':
-				*clr & cla
-				menu_off = 1
-				mc_inventory['sewing_fabric'] -= 1
-				newgobelen = 1
-				minut += 15
-				gs'stat'
-				'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-				act'Set the tapestry aside':gt 'gadhouse', 'main'
-			end
-		end
-		if newgobelen >= 1:
+		if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0: 
+			act'Start a new tapestry': gt 'sewing', 'tapestry'
+		elseif newgobelen >= 1:
 			'Your tapestry is <<newgobelen/10>> percent finished.'
-			act'Work on the tapestry for an hour':
-				*clr & cla
-				menu_off = 1
-				minut += 60
-				gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
-				gobramax = (pcs_sewng - 70) * 6
-				gobramin = (pcs_sewng - 70) * 2
-				newgobelen += rand(gobramin,gobramax)
-				gs'stat'
-				if newgobelen < 1000:'You spent an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-					if newgobelen >= 1000:
-					newgobelen = 0
-					gobelen+=1
-					'Your work on the tapestry is done.'
-				end
-				act'Set the tapestry aside':gt 'gadhouse', 'main'
-			end
+			act 'Work on the tapestry': gt 'sewing', 'tapestry'
 		end
+
 	end
 
 	if rand(0,2) ! 0: gs 'din_bad' & dynamic $mobile_check
@@ -520,9 +489,9 @@ if $ARGS[0] = 'grandma':
 		'Grandma looks a little shocked, but it''s nothing she hasn''t seen before.'
 		'"Go put some clothes on, dear. You''ll give your poor grandpa a heart attack if he sees you."'
 
-		act 'Maybe you should get dressed before talking to her':gt 'gadhouse', 'start'
+		act 'Maybe you should get dressed before talking to her': gt 'gad_gphouse', 'start'
 	else
-		act 'Leave her alone':gt 'gadhouse', 'start'
+		act 'Leave her alone': gt 'gad_gphouse', 'start'
 
 		if grandmaQW['chore_can_mushrooms'] = 1:
 			act 'Help Grandma can mushrooms (2:00)':
@@ -551,7 +520,7 @@ if $ARGS[0] = 'grandma':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_mushrooms.jpg"></center>'
 						'Finally, you help Grandma take them out of the canner and set them aside to cool.'
 						'"Thank you, <<$pcs_nickname>>," she says. "It is important to save food up for the hard winter months. Sure, now you can walk to the store and get whatever you want, but it wasn''t always that way!"'
-						act 'Finish':gt 'gadhouse','start'
+						act 'Finish': gt 'gad_gphouse','start'
 					end
 				end
 			end
@@ -583,7 +552,7 @@ if $ARGS[0] = 'grandma':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_berries.jpg"></center>'
 						'Finally, you help Grandma take them out of the canner and set them aside to cool.'
 						'"There, now we will have berries for the winter," she says. "I think your grandfather could live off of these berries alone! He will be very grateful that you helped me."'
-						act 'Finish':gt 'gadhouse','start'
+						act 'Finish': gt 'gad_gphouse','start'
 					end
 				end
 			end
@@ -616,7 +585,7 @@ if $ARGS[0] = 'grandma':
 						'Finally, you help Grandma take the last jars out of the canner and set them aside to cool.'
 						'"You know, <<$pcs_nickname>>, if you know how to can your own food, you can survive years of poor harvests," she says.'
 						'"Your grandfather and I had many hard times when we were younger, but saving our crops when we could, kept us from starving to death in the bad times. You would do well to remember that, young lady!"'
-						act 'Finish':gt 'gadhouse','start'
+						act 'Finish': gt 'gad_gphouse','start'
 					end
 				end
 			end
@@ -643,7 +612,7 @@ if $ARGS[0] = 'grandma':
 				'"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'
+				act 'Continue': gt 'gad_gphouse', 'grandma'
 			end
 		end
 
@@ -660,7 +629,7 @@ if $ARGS[0] = 'grandma':
 				'"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'
+				act 'Continue': gt 'gad_gphouse', 'grandma'
 			end
 		end
 
@@ -678,7 +647,7 @@ if $ARGS[0] = 'grandma':
 				'"Um, yes, she is very nice for a cow," you smile. "She''s the nicest cow I know."'
 				'Grandma nods sagely at that, and you grin and continue on with your day.'
 
-				act 'Continue': gt 'gadhouse', 'grandma'
+				act 'Continue': gt 'gad_gphouse', 'grandma'
 			end
 		end
 
@@ -699,7 +668,7 @@ if $ARGS[0] = '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'
+				act 'Continue': gt 'gad_gphouse', 'grandma'
 			end
 		end
 
@@ -717,7 +686,7 @@ if $ARGS[0] = 'grandma':
 				'She nods to herself as if she has said something sagacious.'
 				'"Um, well, I''m happy to help, Grandma," you say and hug her quickly.'
 
-				act 'Continue': gt 'gadhouse', 'grandma'
+				act 'Continue': gt 'gad_gphouse', 'grandma'
 			end
 		end
 
@@ -748,7 +717,7 @@ if $ARGS[0] = 'grandma':
 				'"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'
+				act 'Continue': gt 'gad_gphouse', 'grandma'
 			end
 		end
 
@@ -766,7 +735,7 @@ if $ARGS[0] = 'grandma':
 				'"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'
+				act 'Continue': gt 'gad_gphouse', 'grandma'
 			end
 		end
 
@@ -786,7 +755,7 @@ if $ARGS[0] = 'grandma':
 				'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'
+				act 'Continue': gt 'gad_gphouse', 'grandma'
 			end
 		end
 
@@ -804,7 +773,7 @@ if $ARGS[0] = 'grandma':
 				'"Thank you, <<$pcs_nickname>>," she says. "I cannot reach or bend like I used to, so you have done me a great favour."'
 				'You smile and hug your grandmother and go on about your day.'
 
-				act 'Continue': gt 'gadhouse', 'grandma'
+				act 'Continue': gt 'gad_gphouse', 'grandma'
 			end
 		end
 
@@ -826,7 +795,7 @@ if $ARGS[0] = 'grandma':
 				'You place your youthful hand over her wizened old one and smile at her. "I am happy to help, Grandma. Is there anything else you need?"'
 				'"No, child, you have done more than your fair share today. Of course, soon, we will have to preserve these vegetables to keep them from spoiling, but for now, you can rest."'
 
-				act 'Continue': gt 'gadhouse', 'grandma'
+				act 'Continue': gt 'gad_gphouse', 'grandma'
 			end
 		end
 
@@ -852,7 +821,7 @@ if $ARGS[0] = 'grandma':
 					'"No need for that, little one," she clucks. "You''ve done enough for now."'
 					'You give her a quick hug in response and carry on.'
 
-					act 'Continue': grandmaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'grandma'
+					act 'Continue': grandmaQW['chore_mushroom_quantity'] = 0 & gt 'gad_gphouse', 'grandma'
 				end
 			else
 				act 'Give Grandma the mushrooms she asked for':
@@ -873,7 +842,7 @@ if $ARGS[0] = 'grandma':
 					'"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'
+					act 'Continue': grandmaQW['chore_mushroom_quantity'] = 0 & gt 'gad_gphouse', 'grandma'
 				end
 			end
 		end
@@ -900,7 +869,7 @@ if $ARGS[0] = 'grandma':
 					'Seeing the dismayed look on your face, she adds, "But that is enough for today! I know it is harder work than it seems. You can rest now, child."'
 					'Relieved, you give your grandmother a peck on the cheek and move on.'
 
-					act 'Continue': grandmaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'grandma'
+					act 'Continue': grandmaQW['chore_berry_quantity'] = 0 & gt 'gad_gphouse', 'grandma'
 				end
 			else
 				act 'Give Grandma the berries she asked for':
@@ -921,7 +890,7 @@ if $ARGS[0] = 'grandma':
 					'Seeing the dismayed look on your face, she adds, "But that is enough for today! I know it is harder work than it seems. You can rest now, child."'
 					'Relieved, you give your grandmother a peck on the cheek and move on.'
 
-					act 'Continue': grandmaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'grandma'
+					act 'Continue': grandmaQW['chore_berry_quantity'] = 0 & gt 'gad_gphouse', 'grandma'
 				end
 			end
 		end
@@ -953,7 +922,7 @@ if $ARGS[0] = 'grandma':
 					'She smiles gently and pats your head. "You''ve done enough for today, child."'
 					'You smile back awkwardly, still unsure, but give your Grandma a smooch on the cheek and go on with your day.'
 
-					act 'Continue': grandmaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'grandma'
+					act 'Continue': grandmaQW['chore_berry_quantity'] = 0 & gt 'gad_gphouse', 'grandma'
 				end
 			else
 				act 'Give Grandma the mushrooms and berries she asked for':
@@ -977,7 +946,7 @@ if $ARGS[0] = 'grandma':
 					'She smiles gently and pats your head. "You''ve done enough for today, child."'
 					'You smile back awkwardly, still unsure, but give your Grandma a smooch on the cheek and go on with your day.'
 
-					act 'Continue': grandmaQW['chore_mushroom_quantity'] = 0 & grandmaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'grandma'
+					act 'Continue': grandmaQW['chore_mushroom_quantity'] = 0 & grandmaQW['chore_berry_quantity'] = 0 & gt 'gad_gphouse', 'grandma'
 				end
 			end
 		end
@@ -1004,7 +973,7 @@ if $ARGS[0] = 'grandma':
 				'"If you like running, you can take a run on the road leading into the forest. Or you can take a ride on our old bike. I''m pretty sure the bike is in the shed. Make sure to look for it if you''re interested. And if you want to watch your figure, go to the garden, and have some fruit. It''s as healthy as the diet meals you''re eating, if not healthier."'
 				'"That''s about it, my dear granddaughter. Now run along, don''t bother me anymore. My soap opera "Santa Barbara" is about to begin. I don''t want to miss a second of it."'
 
-				act 'Continue':gt 'gadhouse', 'grandma'
+				act 'Continue':gt 'gad_gphouse', 'grandma'
 			end
 		end
 
@@ -1020,7 +989,7 @@ if $ARGS[0] = 'grandma':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'You spend some time talking with your grandmother. She''s sometimes challenging to understand. Her nearly toothless mouth makes the pronunciation of words difficult for her. But most of what she says boils down to the same thing, life is much more fun when you''re young!'
 
-				act 'Continue':gt 'gadhouse', 'grandma'
+				act 'Continue':gt 'gad_gphouse', 'grandma'
 			end
 		end
 
@@ -1087,7 +1056,7 @@ if $ARGS[0] = 'grandma':
 					'"Ever since that day, the fear I experienced never disappeared, as I''ve felt it throughout my life. I''ll carry on this fear for the remaining days of my life..."'
 				end
 				!125e
-				act 'Thank her for the story':gt 'gadhouse', 'grandma'
+				act 'Thank her for the story':gt 'gad_gphouse', 'grandma'
 			end
 		end
 	end
@@ -1106,9 +1075,9 @@ if $ARGS[0]='grandpa':
 		'Grandpa looks shocked, but it doesn''t stop him from having a good look at you.'
 		'"My God, <<$pcs_nickname>>! Are you trying to give me a heart attack? Go and put some clothes on!"'
 
-		act 'Maybe you should get dressed before talking to him':gt 'gadhouse', 'start'
+		act 'Maybe you should get dressed before talking to him':gt 'gad_gphouse', 'start'
 	else
-		act 'Leave him alone':gt 'gadhouse', 'start'
+		act 'Leave him alone':gt 'gad_gphouse', 'start'
 
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to him about the flowers': gt 'grigory', 'flower3'
 
@@ -1139,7 +1108,7 @@ if $ARGS[0]='grandpa':
 				'You put down the heavy wood gratefully. "Is there anything else you need?"'
 				'"No, that is all I have for you today," he says.'
 
-				act 'Continue': gt 'gadhouse', 'grandpa'
+				act 'Continue': gt 'gad_gphouse', 'grandpa'
 			end
 		end
 
@@ -1158,7 +1127,7 @@ if $ARGS[0]='grandpa':
 				'"He may not be the young stallion he once was," your grandfather says, "but he is a trusted friend."'
 				'He obviously cares a great deal about his horse.'
 
-				act 'Continue': gt 'gadhouse', 'grandpa'
+				act 'Continue': gt 'gad_gphouse', 'grandpa'
 			end
 		end
 
@@ -1176,7 +1145,7 @@ if $ARGS[0]='grandpa':
 				'"Well, she was definitely excited," you say with a laugh.'
 				'"She always is when it comes to eating," he says.'
 
-				act 'Continue': gt 'gadhouse', 'grandpa'
+				act 'Continue': gt 'gad_gphouse', 'grandpa'
 			end
 		end
 
@@ -1194,7 +1163,7 @@ if $ARGS[0]='grandpa':
 				'"Yes sir, it is," you agree. "Is there anything else you need me to do?"'
 				'"No, that is all for today, <<$pcs_nickname>>."'
 
-				act 'Continue': gt 'gadhouse', 'grandpa'
+				act 'Continue': gt 'gad_gphouse', 'grandpa'
 			end
 		end
 
@@ -1220,7 +1189,7 @@ if $ARGS[0]='grandpa':
 				'"It''s okay, Grandpa. I know Desperado is important to you," you say.'
 				'He smiles and rubs your shoulder. "Thank you again. You may rest now. There is nothing else to do today."'
 
-				act 'Continue': gt 'gadhouse', 'grandpa'
+				act 'Continue': gt 'gad_gphouse', 'grandpa'
 			end
 		end
 
@@ -1237,7 +1206,7 @@ if $ARGS[0]='grandpa':
 				'"Thank you, <<$pcs_nickname>>," he says.'
 				'"You''re welcome! Is there anything else you need?"'
 				'"No, you can take the rest of the day off, granddaughter."'
-				act 'Continue': gt 'gadhouse', 'grandpa'
+				act 'Continue': gt 'gad_gphouse', 'grandpa'
 			end
 		end
 
@@ -1255,7 +1224,7 @@ if $ARGS[0]='grandpa':
 				'You nod. "He seemed pretty happy to be able to run around."'
 				'Your grandfather smiles at that. "Thank you, <<$pcs_nickname>>. You can rest for now."'
 
-				act 'Continue': gt 'gadhouse', 'grandpa'
+				act 'Continue': gt 'gad_gphouse', 'grandpa'
 			end
 		end
 
@@ -1277,7 +1246,7 @@ if $ARGS[0]='grandpa':
 				'You think of the stories you have heard of a few herders driving thousands of cattle. "Hmm, I guess that''s true..."'
 				'Your grandfather smiles and ruffles your hair. "But that is not a problem for today. Go and take the rest of the day off."'
 
-				act 'Continue': gt 'gadhouse', 'grandpa'
+				act 'Continue': gt 'gad_gphouse', 'grandpa'
 			end
 		end
 
@@ -1295,7 +1264,7 @@ if $ARGS[0]='grandpa':
 				'"You''re welcome! It was actually a lot of fun. Is there anything else you need?"'
 				'"No, you can take the rest of the day off, granddaughter."'
 
-				act 'Continue': gt 'gadhouse', 'grandpa'
+				act 'Continue': gt 'gad_gphouse', 'grandpa'
 			end
 		end
 
@@ -1320,7 +1289,7 @@ if $ARGS[0]='grandpa':
 					'"There''s no need <<$pcs_nickname>>," said your grandfather. "But if I need some help, I''ll let you know. They will have to go down in the root cellar until your grandmother is ready to can them."'
 					'You kiss your grandfather on the cheek and get on with your day.'
 
-					act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
+					act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gad_gphouse', 'start'
 				end
 			else
 				act 'Give him the mushrooms he asked for':
@@ -1340,7 +1309,7 @@ if $ARGS[0]='grandpa':
 					'"There''s no need, <<$pcs_nickname>>," said your grandfather. "But if I need some help, I''ll let you know. They will have to go down in the root cellar until your grandmother is ready to can them."'
 					'You kiss your grandfather on the cheek and get on with your day.'
 
-					act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
+					act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gad_gphouse', 'start'
 				end
 			end
 		end
@@ -1366,7 +1335,7 @@ if $ARGS[0]='grandpa':
 					'There''s no need, <<$pcs_nickname>>," your grandfather said. "But if your grandma needs some more berries, I''ll let you know. They will have to go down in the root cellar until your grandmother is ready to can them."'
 					'You kiss your grandfather on the cheek and go on with your business.'
 
-					act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
+					act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gad_gphouse', 'start'
 				end
 			else
 				act 'Give him the berries he asked for':
@@ -1386,7 +1355,7 @@ if $ARGS[0]='grandpa':
 					'"There''s no need <<$pcs_nickname>>," your grandfather said. "But if your grandma needs some more berries, I''ll let you know. They will have to go down in the root cellar until your grandmother is ready to can them."'
 					'You kiss your grandfather on the cheek and go on with your business.'
 
-					act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
+					act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gad_gphouse', 'start'
 				end
 			end
 		end
@@ -1415,7 +1384,7 @@ if $ARGS[0]='grandpa':
 					'"You don''t need to do that, <<$pcs_nickname>>," your grandfather said. "But I''ll let you know if something comes up. They will have to go down in the root cellar until your grandmother is ready to can them."'
 					'You give him a smooch on the cheek and go on with your day.'
 
-					act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
+					act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gad_gphouse', 'start'
 				end
 			else
 				act 'Give him the mushrooms and berries he asked for':
@@ -1437,7 +1406,7 @@ if $ARGS[0]='grandpa':
 					'"You don''t need to do that, <<$pcs_nickname>>," your grandfather said. "But I''ll let you know if something comes up. They will have to go down in the root cellar until your grandmother is ready to can them."'
 					'You give him a smooch on the cheek and go on with your day.'
 
-					act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
+					act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gad_gphouse', 'start'
 				end
 			end
 		end
@@ -1459,7 +1428,7 @@ if $ARGS[0]='grandpa':
 				'"Thank you, Grandpa," you say, giving him a tight hug, which he returns with surprising strength for his age.'
 				'After a few moments, he lets go and tells you, "Go and get some rest, child. You have earned it."'
 
-				act 'Continue': gt 'gadhouse', 'grandpa'
+				act 'Continue': gt 'gad_gphouse', 'grandpa'
 			end
 		end
 
@@ -1480,7 +1449,7 @@ if $ARGS[0]='grandpa':
 				'"There''s one more thing... While you''re in the woods, avoid dressing yourself up in fancy clothes. You might damage them. It''s better to dress in more comfortable clothes instead..."'
 				'"Well, I think that''s everything, <<$pcs_nickname>>, run along now and remember what I''ve told you."'
 
-				act 'Continue':gt 'gadhouse', 'grandpa'
+				act 'Continue':gt 'gad_gphouse', 'grandpa'
 			end
 		end
 
@@ -1496,7 +1465,7 @@ if $ARGS[0]='grandpa':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'Your grandfather stops complaining and smiles at you. He loves telling stories. He has lived a rich and eventful life, and you enjoy listening to his stories and talking to him. He mostly reminisces about his past and reflects on his earlier life.'
 
-				act 'Continue':gt 'gadhouse', 'grandpa'
+				act 'Continue':gt 'gad_gphouse', 'grandpa'
 			end
 		end
 	end
@@ -1511,7 +1480,7 @@ if $ARGS[0]='villagecat':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat.jpg"></center>'
 	'Your grandparents'' fat tomcat, Boniface, is aware of you approaching him, even though his eyes are closed. He tracks you with his ears and simply ignores you.'
 
-	act 'Leave Boniface alone':minut += 2 & gt 'gadhouse', 'start'
+	act 'Leave Boniface alone':minut += 2 & gt 'gad_gphouse', 'start'
 
 	act 'Pet Boniface':
 		*clr & cla
@@ -1522,7 +1491,7 @@ if $ARGS[0]='villagecat':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat1.jpg"></center>'
 		'You gently pet Boniface, giving him a good scratch behind the ears. You hear him start to purr. As soon as you stop scratching him, the purring stops too. That lazy bastard... he''s living the good life!'
 
-		act 'Continue':minut += 2 & gt 'gadhouse', 'start'
+		act 'Continue':minut += 2 & gt 'gad_gphouse', 'start'
 	end
 
 	if feedcat = 1:
@@ -1533,7 +1502,7 @@ if $ARGS[0]='villagecat':
 			feedcat = 2
 			'<center><video autoplay loop src="images/locations/gadukino/grandparents/feedboniface.mp4"></video></center>'
 			'When Boniface sees you moving towards the cupboard, he jumps off the table and runs to his food dish. He obviously feels that you are moving far too slowly and rattles his bowl to make sure you understand that he is starving while you dawdle.'
-			act 'Continue': gt 'gadhouse', 'start'
+			act 'Continue': gt 'gad_gphouse', 'start'
 		end
 	end
 
@@ -1544,14 +1513,14 @@ if $ARGS[0]='villagecat':
 				minut += 10
 				gs 'stat'
 				'You open the door for Boniface, who saunters around you only to stop in the doorway as he becomes aware that it is raining. He glares up at you as if the rain was your fault. He stares out into the wet for another moment, then sedately turns around and returns to his box.'
-				act 'Continue': gt 'gadhouse', 'start'
+				act 'Continue': gt 'gad_gphouse', 'start'
 			else
 				*clr & cla
 				minut +=10
 				gs 'stat'
 				catout = 2
 				'You open the door for Boniface, who saunters around you only to stop in the doorway as he stops to consider if he really wants to go outside. After considering all the pros and cons, he finally decides to go out.'
-				act 'Continue': gt 'gadhouse', 'start'
+				act 'Continue': gt 'gad_gphouse', 'start'
 			end
 		end
 	end
@@ -1580,11 +1549,11 @@ if $ARGS[0] = 'nudity_trouble_limit':
 		if sisterknowslut > 1 and sisboypartyQW > 1: grandmaQW['nudity_trouble_limit'] += 3
 		if sisterknowslut > 0: grandmaQW['nudity_trouble_limit'] += 2
 	end
-	if gadriver_gang = 2:
+	if GadBoy['river_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
+		if MiraVars['QW'] >= 15: grandmaQW['nudity_trouble_limit'] += 2
 	end
 end
 
@@ -1609,10 +1578,10 @@ if $ARGS[0] = 'family_trip':
 						*nl
 						'<<$npc_nickname[''A29'']>> asks, "<<$pcs_nickname>>, are you coming home with us or are you going to stay in the village with your grandparents?"'
 
-						act 'Stay with your grandparents':gadstay_day = daystart & gadstay = 1 & locat['Fam_inGad'] = 0 & gt 'gadhouse', 'main'
-						act 'Go home to Pavlovsk': gt 'gadhouse', 'to_pavlovsk'
+						act 'Stay with your grandparents':gadstay_day = daystart & gadstay = 1 & locat['Fam_inGad'] = 0 & gt 'gad_gphouse', 'main'
+						act 'Go home to Pavlovsk': gt 'gad_gphouse', 'to_pavlovsk'
 					else
-						act 'Go home to Pavlovsk': gt 'gadhouse', 'to_pavlovsk'
+						act 'Go home to Pavlovsk': gt 'gad_gphouse', 'to_pavlovsk'
 					end
 				elseif hour > 20:
 					locat['Fam_month_inGad'] = month
@@ -1656,13 +1625,13 @@ if $ARGS[0] = 'to_gadukino':
 
 	'You get into the Volga 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'
+	act 'Go to your grandparents house': gt 'gad_gphouse', 'start'
 end
 
 if $ARGS[0] = 'intro':
 	cla & *clr
+	$loc = 'gad_gphouse'
 	$loc_arg = ''
-	$loc = 'gadhouse'
 	gs 'homes_properties', 'give_access',  'grandparents_house'
 	gs 'homes_properties', 'set_home', 'grandparents_house'
 	$temp_nickname = '<<$npc_nickname[''A29'']>>'
@@ -1742,13 +1711,13 @@ if $ARGS[0] = 'intro':
 						cla & *clr
 						minut += 2
 						gs 'stat'
-						$loc = 'gadhouse'
+						$loc = 'gad_gphouse'
 						$loc_arg = 'start'
 						'<center><H4>Your Grandparents'' Cottage</H4></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
 						*nl
 						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" <<$npc_nickname[''A29'']>> says as she storms off towards your grandparent''s outside door. "Don''t forget to talk to your grandparents and ask if they need help!" she shouts. Then, without waiting for your response, she closes the door, and with that, she''s gone.'
-						act 'I understand...':gt 'alarmclock', 'start'
+						act 'I understand...': gt 'alarmclock', 'start'
 					end
 				end
 			end
@@ -1756,5 +1725,5 @@ if $ARGS[0] = 'intro':
 	end
 end
 
---- gadhouse ---------------------------------
+--- gad_gphouse ---------------------------------
 

+ 262 - 41
locations/gaddvor.qsrc → locations/gad_gpyard.qsrc

@@ -1,14 +1,14 @@
-# gaddvor
+# gad_gpyard
+!2024/05/05 - Mira schedule introduced.
+!locat['A60'] = Mira''s location. See 'miroslava_schedule'
 
-if $ARGS[0]='':
+if $ARGS[0] = 'start':
 	music_loop = 0
-	$loc_arg = ''
-	$loc = 'gaddvor'
+	gs 'shortgs', 'setloc', 'gad_gpyard', 'start'
 	$location_type = 'public_outdoors'
-	$menu_loc = 'gaddvor'
-	$menu_arg = ''
 	menu_off = 0
 	killvar '$locclass'
+	gs 'miroslava_schedule'
 	gs 'stat'
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
@@ -34,10 +34,10 @@ if $ARGS[0]='':
 	if $clothingworntype = 'nude':
 		*nl
 		'You are naked and can only go into your grandparent''s house to get dressed or go to the banya.'
-		act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
-		act 'Enter the banya':minut += 1 & gt 'gadbana'
+		act 'Enter your grandparents'' house':minut += 1 & gt 'gad_gphouse', 'start'
+		act 'Enter the banya': minut += 1 & gt 'gad_gpbath', 'start'
 	else
-		if grandmaQW['chore_feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):'In the yard there are several <a href="exec:gt ''gaddvor'',''chickens''">chickens</a> running around.'
+		if grandmaQW['chore_feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):'In the yard there are several <a href="exec:gt ''gad_gpyard'', ''chickens''">chickens</a> running around.'
 		if func('homes_properties', 'is_current_home') and hour > 7 and hour < 20 and rex['owned'] = 1:
 			if $status['dog'] = '':
 				gt 'pet_dog', 'name'
@@ -51,8 +51,8 @@ if $ARGS[0]='':
 		end
 	end
 
-	if mira_guest = 1: Miraloc = 7 & 'Your friend <a href="exec: gt ''miroslava'', ''Start''">Mira</a> stands next to you.'
-	if MiraLoc ! 7: mira_guest = 0
+	if MiraVars['guest'] = 1: locat['A60'] = 20 & 'Your friend <a href="exec: gt ''miroslava'', ''Start''">Mira</a> stands next to you.'
+	!if locat['A60'] ! 20: MiraVars['guest'] = 0
 
 	act '<b>Leave and go into the village</b>':
 		if $clothingworntype ! 'nude':	
@@ -60,7 +60,7 @@ if $ARGS[0]='':
 			gt 'gadukino'
 		else
 			msg'<b><font color = red>You need to get dressed.</font></b>'
-			gt 'gaddvor'
+			gt 'gad_gpyard', 'start'
 		end
 	end
 	if 	grandpaQW['chore_clean_yard'] = 1:
@@ -86,30 +86,30 @@ if $ARGS[0]='':
 				gs 'sweat', 'add', 5
 			end
 			gs'stat'
-			act 'Finish':gt'gaddvor'
-			act 'Return back to your grandfather': minut += 1 & gt 'gadhouse', 'grandpa'
+			act 'Finish': gt 'gad_gpyard', 'start'
+			act 'Return back to your grandfather': minut += 1 & gt 'gad_gphouse', 'grandpa'
 		end
 	end
-	act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
-	act 'Enter the banya':minut += 1 & gt 'gadbana'
-	act 'Go to the barn':minut += 1 & gt 'gadsarai'
-	act 'Go to the root cellar': minut += 1 & gt 'gaddvor', 'root_cellar'
-	act 'Go to the garden':minut += 1 & gt'gadgarden','garden'
+	act 'Enter your grandparents'' house': minut += 1 & gt 'gad_gphouse', 'start'
+	act 'Enter the banya': minut += 1 & gt 'gad_gpbath', 'start'
+	act 'Go to the barn': minut += 1 & gt 'gad_gpbarn'
+	act 'Go to the root cellar': minut += 1 & gt 'gad_gpyard', 'root_cellar'
+	act 'Go to the garden': minut += 1 & gt 'gad_gpyard', 'garden'
 
-	if grandmaQW['chore_feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):act 'Look at your grandparents'' chickens':gt 'gaddvor','chickens'
+	if grandmaQW['chore_feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):act 'Look at your grandparents'' chickens': gt 'gad_gpyard', 'chickens'
 
-	if rand(1,5) = 1 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 1 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1) and npc_known['A60'] = 1:
+	if rand(1,5) = 1 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and daystart > MiraVars['emb_day'] and sunWeather = 1 and MiraVars['guestday'] ! daystart and (npc_QW['A63'] < 13 or MiraVars['QW'] >= 10 or MiraVars['had_sex'] > 1) and npc_known['A60'] = 1:
 		*clr & cla
 		menu_off = 1
 		gs 'miroslava', 'miraclothes'
 		'You went out into the yard and noticed Mira standing there.'
 		'"Oh, <<$pcs_nickname>>, hi. I hope you don''t mind me visiting. I was bored being home alone," she said, smiling.'
-		mira_guestday = daystart
+		MiraVars['guestday'] = daystart
 		minut += 5
-		mira_guest = 1
+		MiraVars['guest'] = 1
 		gs 'stat'
 
-		act 'Continue':gt'gaddvor'
+		act 'Continue': gt 'gad_gpyard', 'start'
 	end
 
 
@@ -117,15 +117,15 @@ if $ARGS[0]='':
 	if clothesAtLocation = 1:
 		if $clothingworntype = 'nude':
 			act 'Get dressed':
-				gs 'clothing', 'recover_lost_clothes', 'gaddvor', 1
+				gs 'clothing', 'recover_lost_clothes', 'gad_gpyard', 1
 				gs 'underwear', 'wear'
-				gt 'gaddvor'
+				gt 'gad_gpyard', 'start'
 			end
 		else
 			act 'Pick up your clothes':
-				gs 'clothing', 'recover_lost_clothes', 'gaddvor'
+				gs 'clothing', 'recover_lost_clothes', 'gad_gpyard'
 				'You picked up your clothes.'
-				gt 'gaddvor'
+				gt 'gad_gpyard', 'start'
 			end
 		end
 	end
@@ -160,7 +160,7 @@ if $ARGS[0] = 'root_cellar':
 	if boletus_cooked > 0: 'You currently are carrying <b><<boletus_cooked>></b> kg of cooked mushrooms.'
 	if bilberry > 0: 'You currently are carrying <b><<bilberry>></b> kg of raw berries.'
 
-	act 'Go back to the yard': minut += 1 & gt 'gaddvor'
+	act 'Go back to the yard': minut += 1 & gt 'gad_gpyard', 'start'
 	if (boletus_stored + bilberry_stored < 20) and (boletus > 0 or bilberry > 0):
 		act 'Store as many raw mushrooms and berries that will fit (Max 20 kgs):':
 			:store_bb_loop
@@ -174,20 +174,20 @@ if $ARGS[0] = 'root_cellar':
 				bilberry -= 1
 				if boletus_stored + bilberry_stored < 20: jump 'store_bb_loop'
 			end
-			gt 'gaddvor', 'root_cellar'
+			gt 'gad_gpyard', 'root_cellar'
 		end
 		if boletus > 0:
 			act 'Store 1 kg of raw mushrooms':
 				boletus_stored += 1
 				boletus -= 1
-				gt 'gaddvor', 'root_cellar'
+				gt 'gad_gpyard', 'root_cellar'
 			end
 		end
 		if bilberry > 0:
 			act 'Store 1 kg of raw berries':
 				bilberry_stored += 1
 				bilberry -= 1
-				gt 'gaddvor', 'root_cellar'
+				gt 'gad_gpyard', 'root_cellar'
 			end
 		end
 	end
@@ -204,20 +204,20 @@ if $ARGS[0] = 'root_cellar':
 				bilberry_stored -= 1
 				if boletus + boletus_cooked + bilberry < 5: jump 'retrieve_bb_loop'
 			end
-			gt 'gaddvor', 'root_cellar'
+			gt 'gad_gpyard', 'root_cellar'
 		end
 		if (boletus_stored > 0 and grandmaQW['chore_can_mushrooms'] ! 1) or (boletus_stored > 5 and grandmaQW['chore_can_mushrooms'] = 1):
 			act 'Retrieve 1 kg of raw mushrooms':
 				boletus += 1
 				boletus_stored -= 1
-				gt 'gaddvor', 'root_cellar'
+				gt 'gad_gpyard', 'root_cellar'
 			end
 		end
 		if (bilberry_stored > 0 and grandmaQW['chore_can_berries'] ! 1) or (bilberry_stored > 5 and grandmaQW['chore_can_berries'] = 1):
 			act 'Retrieve 1 kg of raw berries':
 				bilberry += 1
 				bilberry_stored -= 1
-				gt 'gaddvor', 'root_cellar'
+				gt 'gad_gpyard', 'root_cellar'
 			end
 		end
 	end
@@ -231,7 +231,7 @@ if $ARGS[0] = 'chickens':
 	minut += 1
 	gs 'stat'
 
-	act 'Leave': gt'gaddvor'
+	act 'Leave': gt 'gad_gpyard', 'start'
 	!job Granny
 	if grandmaQW['chore_feed_chickens'] = 1:
 		act 'Feed the chickens':
@@ -243,20 +243,241 @@ if $ARGS[0] = 'chickens':
 			gs 'exp_gain', 'hndiwrk', rand(0,3)
 			gs 'stat'
 
-			act 'Finish':gt'gaddvor'
-			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
+			act 'Finish': gt 'gad_gpyard', 'start'
+			act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
 		end
 	end
 end
 
+
+if $ARGS[0] = 'garden':
+	$location_type = 'secluded'
+	gs 'shortgs', 'setloc', 'gad_gpyard', 'garden'
+	menu_off = 0
+	gs 'gadukino_event', 'sound'
+	gs 'miroslava_schedule'
+	gs 'stat'
+	!gs'time'
+
+	if month >= 4 and month <= 10:
+		if hour >= 6 and hour < 21:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/garden.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/garden_night.jpg"></center>'
+		end
+	else
+		if hour >= 8 and hour < 18:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/garden_winter.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/garden_winter_night.jpg"></center>'
+		end
+	end
+
+	'A large vegetable garden that your grandparents are very proud of.'
+	if month >= 4 and month <= 10:
+		'There is also a small land plot is dedicated to growing <a href="exec: gt ''gad_gpyard'', ''strawberry'' ">strawberries</a> and a <a href="exec: gt ''gad_gpyard'',''fruit_garden'' ">fruit tree orchard</a>.'
+	else
+		'There is also a small plot of land dedicated to growing strawberries and a small fruit tree orchard, but they are not in season right now.'
+	end
+
+	act 'Go back to the yard': minut += 1 & gt 'gad_gpyard', 'start'
+
+	!job Granny
+	if grandmaQW['chore_work_in_garden'] = 1:
+		act 'Work in the garden (3:00)':
+			*clr & cla
+			menu_off = 1
+			minut += 180
+			gs 'sweat', 'add', 10
+			grandmaQW['chore_work_in_garden'] = 2
+			gs 'exp_gain', 'stren', 1
+			fat -= rand(1,5)
+			gs 'exp_gain', 'hndiwrk', rand(3,9)
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/work_garden'+rand(1,5)+'.jpg"></center>'
+			'You spend some time doing some gardening.'
+			act 'Finish': gt 'gad_gpyard', 'garden'
+			act 'Return back to your grandmother': minut += 2 & gt 'gad_gphouse', 'grandma'
+		end
+	end
+	!job Granny
+	if grandmaQW['chore_water_garden'] = 1:
+		act 'Water the plants (1:00)':
+			*clr & cla
+			menu_off = 1
+			gs 'sweat', 'add', 10
+			minut += 60
+			grandmaQW['chore_water_garden'] = 2
+			gs 'exp_gain', 'vital', 1
+			fat -= rand(1,2)
+			gs 'exp_gain', 'hndiwrk', rand(0,3)
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/water_garden.jpg"></center>'
+			'You spend an hour watering the garden.'
+			act 'Finish': gt 'gad_gpyard', 'garden'
+			act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
+		end
+	end
+	!job Granny
+	if grandmaQW['chore_harvest_garden'] = 1:
+		act 'Harvest (3:00)':
+			*clr & cla
+			menu_off = 1
+			minut += 180
+			gs 'sweat', 'add', 10
+			grandmaQW['chore_harvest_garden'] = 2
+			gs 'exp_gain', 'stren', 1
+			fat -= rand(1,3)
+			gs 'exp_gain', 'hndiwrk', rand(3,9)
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/harvest_garden'+rand(1,5)+'.jpg"></center>'
+			'You spend a few hours harvesting vegetables in the garden.'
+			act 'Finish': gt 'gad_gpyard', 'garden'
+			act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
+		end
+	end
+end
+
+if $ARGS[0] = 'strawberry':
+	gs 'shortgs', 'setloc', 'gad_gpyard', 'strawberry'
+	menu_off = 0
+	gs 'gadukino_event', 'sound'
+	gs 'stat'
+	!gs'time'
+
+	if month = 6 or month = 7:
+		if hour >= 6 and hour < 21:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/strawberry1.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/strawberry_night.jpg"></center>'
+		end
+	else
+		if hour >= 6 and hour < 21:
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/strawberry2.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/strawberry_night.jpg"></center>'
+		end
+	end
+
+	'It''s strawberry season, you approach the field where the strawberries grow, searching for some ripe strawberries.'
+
+	act 'Go back to the garden': minut += 1 & gt 'gad_gpyard', 'garden'
+
+	if month >= 7 and month <= 9 and strawberriesday ! daystart:
+		act 'Eat some strawberries (1:00)':
+			*clr & cla
+			menu_off = 1
+			strawberriesday = daystart
+			minut += 60
+			pcs_mood += 10
+			pcs_hydra += 40
+			pcs_energy += 15
+			cumspclnt = 2 & gs 'cum_cleanup' & pcs_breath = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/eat_strawberries.jpg"></center>'
+			'You spend some time wandering through the plot searching for ripe strawberries. You walk along, picking off the ones that you find and popping them in your mouth.'
+
+			act 'Finish': gt 'gad_gpyard', 'strawberry'
+		end
+	end
+	!job Granny
+	if grandmaQW['chore_collect_strawberries'] = 1:
+		act 'Collect strawberries (3:00)':
+			*clr & cla
+			menu_off = 1
+			minut += 180
+			gs 'sweat', 'add', 10
+			grandmaQW['chore_collect_strawberries'] = 2
+			gs 'exp_gain', 'agil', 1
+			fat -= 1
+			gs 'exp_gain', 'hndiwrk', rand(3,9)
+			gs 'stat'
+
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_ski.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_tanga.jpg"></center>'
+			'You wander through the plot for several hours, collecting ripe strawberries and placing them in the basket.'
+
+			act 'Finish': gt 'gad_gpyard', 'strawberry'
+			act 'Return back to your grandmother': minut += 3 & gt 'gad_gphouse', 'grandma'
+		end
+	end
+end
+
+
+if $ARGS[0] = 'fruit_garden':
+	gs 'shortgs', 'setloc', 'gad_gpyard', 'fruit_garden'
+	menu_off = 0
+	gs 'gadukino_event', 'sound'
+	cls
+	gs'stat'
+	!gs'time'
+
+	if hour >= 6 and hour < 21:
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_garden.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_garden_night.jpg"></center>'
+	end
+
+	'There are apples and pears growing in the fruit orchard.'
+
+	act 'Go back to the garden': minut += 1 & gt 'gad_gpyard', 'garden'
+
+	if month >= 7 and month <= 9 and fruitday ! daystart:
+		act 'Eat the fruit (1:00)':
+			*clr & cla
+			menu_off = 1
+			fruitday = daystart
+			minut += 60
+			pcs_mood += 10
+			pcs_hydra += 20
+			pcs_energy += 30
+			cumspclnt = 2 & gs 'cum_cleanup' & pcs_breath = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/eat_fruit.jpg"></center>'
+			'You spend some time wandering around the orchard munching on the ripe fruit.'
+
+			act 'Finish': gt 'gad_gpyard', 'fruit_garden'
+		end
+	end
+	!job Granny
+	if grandmaQW['chore_collect_fruit'] = 1:
+		act 'Collect fruit (3:00)':
+			*clr & cla
+			menu_off = 1
+			minut += 180
+			gs 'sweat', 'add', 10
+			grandmaQW['chore_collect_fruit'] = 2
+			gs 'exp_gain', 'agil', 1
+			fat -= rand(1,3)
+			gs 'exp_gain', 'hndiwrk', rand(3,9)
+			gs 'stat'
+
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect_ski.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect_tanga.jpg"></center>'
+			'You walk around the orchard and pick the ripe fruit hanging from the trees.'
+
+			act 'Finish': gt 'gad_gpyard', 'fruit_garden'
+			act 'Return back to your grandmother': minut += 3 & gt 'gad_gphouse', 'grandma'
+		end
+	end
+end
+
+
+
+
 if $ARGS[0] = 'cikl':
 	!! vovan, from 1.2.5
 	hunters_check = 0
 	mushroom_pickers = 0
 	mira_go_river = 0
 	forestpicnic = 0
-	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 and lost_girl = 0:
@@ -399,5 +620,5 @@ if $ARGS[0] = 'cikl':
 
 end
 
---- gaddvor ---------------------------------
+--- gad_gpyard ---------------------------------
 

+ 8 - 11
locations/gadmarket.qsrc → locations/gad_market.qsrc

@@ -1,13 +1,10 @@
-# gadmarket
+# gad_market
 
 
 *clr & cla
-$loc = 'gadmarket'
-$loc_arg = ''
-$menu_loc = 'gadmarket'
-$menu_arg = ''
-menu_off = 0
+gs 'shortgs', 'setloc', 'gad_market', ''
 $location_type = 'public_indoors'
+menu_off = 0
 
 frost = 0
 
@@ -19,7 +16,7 @@ frost = 0
 *nl
 'As you approach the teller, you notice a rack full of magazines, cigarettes, and a few hygienic items.'
 *nl
-act 'Browse the aisles': gt'gadmarket', 'cart'
+act 'Browse the aisles': gt 'gad_market', 'cart'
 
 act 'Leave the market': minut += 5 & gt 'gadukino'
 if grandmaQW['chore_groceries'] = 1:
@@ -38,13 +35,13 @@ if grandmaQW['chore_groceries'] = 1:
 		'"Of course! Go ahead and take these on home to her. Tell her I will be by this evening to pick up her payment. I know it''s hard for her to get out anymore..."'
 	
 		act 'Thank him and leave': minut += 5 & gt 'gadukino'
-		act 'Thank him and take the groceries back to your grandmother (0:10)':minut += 10 & gt 'gadhouse','grandma'
+		act 'Thank him and take the groceries back to your grandmother (0:10)': minut += 10 & gt 'gad_gphouse', 'grandma'
 	end
 end
 
 
 if $ARGS[0] = 'cart':
-	$loc_s = 'gadmarket'
+	$loc_s = 'gad_market'
 	$args_s = 'cart'
 	*clr & cla
 
@@ -60,10 +57,10 @@ if $ARGS[0] = 'cart':
 	gs 'themes', 'indoors'
 	$backimage= 'images/locations/gadukino/village/market.jpg'
 
-	act 'Exit shopping cart': $backimage = '' & gt 'gadmarket'
+	act 'Exit shopping cart': $backimage = '' & gt 'gad_market'
 	act 'Leave the market': minut += 5 & gt 'gadukino'
 end
 
 
---- gadmarket ---------------------------------
+--- gad_market ---------------------------------
 

+ 309 - 302
locations/meadow.qsrc → locations/gad_meadow.qsrc

@@ -1,77 +1,75 @@
-# meadow
+# gad_meadow
 !2021/05/05
+!2024/05/05 - Mira schedule introduced.
+!locat['A60'] = Mira''s location. See 'miroslava_schedule'
+
 if $ARGS[0] = 'start' or $ARGS[0] = '':
-	$loc = 'meadow'
-	$loc_arg = 'start'
+	gs 'shortgs', 'setloc', 'gad_meadow', 'start'
 	$location_type = 'secluded'
-
-	$menu_loc = 'meadow'
-	$menu_arg = 'start'
 	menu_off = 0
-
+	gs 'miroslava_schedule'
 	gs 'stat'
 
-	!MiraLoc = 0 (Mira at home)
-	!MiraLoc = 1 (Mira at river)
-	!MiraLoc = 2 (Mira at meadow)
-	!MiraLoc = 3 (Mira at forest)
-	!MiraLoc = 4 (Mira at field)
-	!MiraLoc = 5 (Mira with gop)
+	!locat['A60'] = Mira''s location. See 'miroslava_schedule'
 
-	!meadow = 1 'You have found the meadow'
-	!meadow = 2 'Your first visit with Mira'
-	!meadow = 3 'You allowed Mira to come here without you'
-	!meadow = 4 'You have denied Mira from coming here without you. Blocks wish and father events.'
-	!meadow = 5 'You are interested in Mira''s father'
-	!meadow = 6 'You have seduced Mira''s father, now its her turn'
+	!gad_meadow_found = 1 'You have found the meadow'
+	!MiraVars['meadow'] = 1 'Your first visit with Mira'
+	!MiraVars['meadow'] = 2 'You allowed Mira to come here without you'
+	!MiraVars['meadow'] = 3 'You have denied Mira from coming here without you. Blocks wish and father events.'
+	!MiraVars['meadow'] = 4 'You are interested in Mira''s father'
+	!MiraVars['meadow'] = 5 'You have seduced Mira''s father, now its her turn'
 
 	'<center><H4>Meadow</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
 	*nl
 	'A quiet and deserted open field of grass and wildflowers in the forest, well hidden from civilization.'
-	'There are <a href="exec:gt ''meadow'', ''ruins''">ruins</a> of a long-abandoned house and some <a href="exec: gt ''meadow'', ''fruit_trees''">fruit trees</a>  hinting at the area''s original purpose.'
+	'There are <a href="exec:gt ''gad_meadow'', ''ruins''">ruins</a> of a long-abandoned house and some <a href="exec: gt ''gad_meadow'', ''fruit_trees''">fruit trees</a> hinting at the area''s 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'
-	if npc_QW['A63'] > 13 and mirasex = 0 and npc_QW['A60'] > 11:gt 'meadow','mira_lesb_talk1'
-	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'
-
-	if MiraLoc = 2:
-		act 'Talk to Mira': gt 'meadow', 'Mira'
-		'<a href="exec: gt ''meadow'', ''Mira''">Mira</a> is in the meadow, spinning with a delightful smile and laughing.'
-	elseif Mira_no = 0:
-		temp_md = 20
-		if (meadow = 3 or meadow = 6) and sunWeather = 1:temp_md = rand(0,20)
-		if mirasextimes < 15 and temper >= 12 and temp_md = 0:
-			'In the clearing you notice <a href="exec: gt ''meadow'', ''0''">Mira</a>.'
-		elseif npc_QW['A60'] >= 2 and temper >= 15 and temp_md = 1:
-			'In the clearing you notice <a href="exec: gt ''meadow'', ''1''">Mira with Mitka</a>.'
-		elseif npc_QW['A60'] >= 8 and temper >= 15 and temp_md = 2:
-			'In the clearing you notice <a href="exec: gt ''meadow'', ''2''">Mira with Mitka</a>.'
-		elseif npc_QW['A60'] >= 11 and temper >= 10 and temp_md = 3:
-			'In the clearing you notice <a href="exec: gt ''meadow'', ''3''">Mira with Kolyamba</a>.'
-		elseif npc_QW['A60'] >= 11 and temper >= 10 and temp_md = 4:
-			'In the clearing you notice <a href="exec: gt ''meadow'', ''4''">Mira with Vasyan</a>.'
-		elseif npc_QW['A60'] >= 11 and temper >= 25 and temp_md = 5:
-			'In the clearing you notice <a href="exec: gt ''meadow'', ''5''">Mira with Vasyan</a>.'
-		elseif npc_QW['A60'] >= 11 and temper >= 12 and temp_md = 6:
-			'In the clearing you notice <a href="exec: gt ''meadow'', ''6''">Mira with Mitka, Vasyan and Kolyamba</a>.'
-		elseif npc_QW['A60'] >= 20 and temper >= 12 and temp_md = 7:
-			'In the clearing you notice <a href="exec: gt ''meadow'', ''7''">Mira with Vasyan and Kolyamba</a>.'
-		elseif npc_QW['A60'] >= 30 and temper >= 20 and temp_md = 8:
-			'In the clearing you notice <a href="exec: gt ''meadow'', ''8''">A bunch of half-naked hillbilly men</a>.'
-		elseif npc_QW['A60'] >= 20 and temper >= 25 and temp_md = 9:
-			'In a clearing you see <a href="exec: gt ''meadow'', ''9''">Mira</a>.'
+	if locat['A60'] = 61:
+		if (MiraVars['meadow'] = 2 or MiraVars['meadow'] = 5) and MiraVars['QW'] = 2 and temper >= 12 and sunWeather = 1: gt 'gad_meadow','mira_mitka'
+		if (MiraVars['meadow'] = 2 or MiraVars['meadow'] = 5) and daystart >= MiraVars['emb_day'] and MiraVars['QW'] = 33 and temper >= 12 and sunWeather = 1: gt 'gad_meadow','mira_gang'
+		if npc_QW['A63'] > 13 and MiraVars['had_sex'] = 0 and MiraVars['QW'] > 11: gt 'gad_meadow','mira_lesb_talk1'
+		if npc_QW['A63'] > 13 and MiraVars['had_sex'] = 1 and MiraVars['QW'] > 11 and rand(1,5) = 1 and MiraVars['event_day'] ! daystart: gt 'gad_meadow','mira_lesb_talk3'
+		if npc_QW['A63'] > 13 and MiraVars['had_sex'] = 1 and MiraVars['QW'] > 11:gt 'gad_meadow','mira_lesb_talk2'
+		if MiraVars['had_sex'] = 2 and rand(1,5) > 3 and MiraVars['event_day'] ! daystart and npc_rel['A60'] >= 15: gt 'gad_meadow','mira_lesb'
+
+		if (MiraVars['meadow'] = 2 or MiraVars['meadow'] = 5) and daystart >= MiraVars['emb_day']:
+			temp_md = rand(0,20)
+			if MiraVars['Mitka_fucks'] < 15 and temper >= 12 and temp_md = 0:
+				'In the clearing you notice <a href="exec: gt ''gad_meadow'', ''0''">Mira</a>.'
+			elseif MiraVars['QW'] >= 2 and temper >= 15 and temp_md = 1:
+				'In the clearing you notice <a href="exec: gt ''gad_meadow'', ''1''">Mira with Mitka</a>.'
+			elseif MiraVars['QW'] >= 8 and temper >= 15 and temp_md = 2:
+				'In the clearing you notice <a href="exec: gt ''gad_meadow'', ''2''">Mira with Mitka</a>.'
+			elseif MiraVars['QW'] >= 11 and temper >= 10 and temp_md = 3:
+				'In the clearing you notice <a href="exec: gt ''gad_meadow'', ''3''">Mira with Kolyamba</a>.'
+			elseif MiraVars['QW'] >= 11 and temper >= 10 and temp_md = 4:
+				'In the clearing you notice <a href="exec: gt ''gad_meadow'', ''4''">Mira with Vasyan</a>.'
+			elseif MiraVars['QW'] >= 11 and temper >= 25 and temp_md = 5:
+				'In the clearing you notice <a href="exec: gt ''gad_meadow'', ''5''">Mira with Vasyan</a>.'
+			elseif MiraVars['QW'] >= 11 and temper >= 12 and temp_md = 6:
+				'In the clearing you notice <a href="exec: gt ''gad_meadow'', ''6''">Mira with Mitka, Vasyan and Kolyamba</a>.'
+			elseif MiraVars['QW'] >= 20 and temper >= 12 and temp_md = 7:
+				'In the clearing you notice <a href="exec: gt ''gad_meadow'', ''7''">Mira with Vasyan and Kolyamba</a>.'
+			elseif MiraVars['QW'] >= 30 and temper >= 20 and temp_md = 8:
+				'In the clearing you notice <a href="exec: gt ''gad_meadow'', ''8''">A bunch of half-naked hillbilly men</a>.'
+			elseif MiraVars['QW'] >= 20 and temper >= 25 and temp_md = 9:
+				'In a clearing you see <a href="exec: gt ''gad_meadow'', ''9''">Mira</a>.'
+			end
 		end
+
+		act 'Talk to Mira': gt 'gad_meadow', 'Mira'
+		'<a href="exec: gt ''gad_meadow'', ''Mira''">Mira</a> is in the meadow, spinning with a delightful smile and laughing.'
+
+		if MiraVars['meadow'] ! 1:
+			act 'Walk back to the forest': minut += 20 & MiraVars['follower'] = 1 & gt 'gad_forest', 'forest_edge'
+		end
+
 	end
 
-	if MiraLoc = 2 and meadow ! 2:
-		act 'Walk back to the forest': minut += 20 & MiraLoc = 3 & gt 'gadforest', 'forest_edge'
-	elseif meadow ! 2:
-		act 'Walk back to the forest': minut += 20 & gt 'gadforest', 'forest_edge'
+	if MiraVars['meadow'] ! 1:
+		act 'Walk back to the forest': minut += 20 & gt 'gad_forest', 'forest_edge'
 	end
 
 	if sunWeather = 1:
@@ -79,26 +77,27 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			if $clothingworntype ! 'danilovich_outfits':
 				*nl
 				'Your meadow would be a perfect place to workout if you were wearing exercise clothes'
-			   if temper >= 10:
-                    *nl
-                    gs 'willpower', 'skill', 'pcs_inhib', 'resist'
-                    if Miraloc ! 2 or (npc_rel['A60'] > 40 and npc_known['A60'] = 1) or mirasex = 1:
-                        if Miraloc = 2:
-                            'Your meadow is a perfect place to exercise. Mira is here, but she wouldn''t mind if you exercised for a little bit, even if in the nude.'
-                        else
-                            'Your meadow is a perfect place to exercise. No one is around, so you could probably exercise nude if you wanted.'
-                        end
-                        if will_cost <= pcs_willpwr:
-                            act 'Exercise nude':gt 'meadow', 'workout', 'nude'
-                        else
-                            act'Exercise nude (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-                        end
-                    end
-               end
+				if temper >= 10:
+					*nl
+					gs 'willpower', 'skill', 'pcs_inhib', 'resist'
+					if locat['A60'] ! 61 or (npc_rel['A60'] > 40 and npc_known['A60'] = 1) or MiraVars['had_sex'] = 1:
+						if locat['A60'] = 61:
+							'Your meadow is a perfect place to exercise. Mira is here, but she wouldn''t mind if you exercised for a little bit, even if in the nude.'
+						else
+							'Your meadow is a perfect place to exercise. No one is around, so you could probably exercise nude if you wanted.'
+						end
+
+						if will_cost > pcs_willpwr:
+							act'Exercise nude (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						else
+							act 'Exercise nude': gt 'gad_meadow', 'workout', 'nude'
+						end
+					end
+				end
 			else
 				*nl
 				'Your meadow is a perfect place to exercise.'
-				act 'Exercise': gt 'meadow', 'workout'
+				act 'Exercise': gt 'gad_meadow', 'workout'
 			end
 		else
 			'Your meadow is a perfect place to exercise, but you don''t have the energy right now.'
@@ -108,6 +107,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 end
 
+
 if $ARGS[0] = 'workout':
 	*clr & cla
 	if $ARGS[1] = 'nude':
@@ -119,8 +119,8 @@ if $ARGS[0] = 'workout':
 		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_all', 'meadow'
+		clothesAtLocation = func('lost_clothes_here', 'gad_meadow')
+		gs 'clothing', 'strip_all', 'gad_meadow'
 		gs 'arousal', 'flash', -10
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -130,41 +130,44 @@ if $ARGS[0] = '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. But, unfortunately, all the fruit is out of your reach.'
-	act 'Continue': gt 'meadow', 'start'
+	act 'Continue': gt 'gad_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. But, you wonder how long it has been here.'
-	act 'Continue': gt 'meadow', 'start'
+	act 'Continue': gt 'gad_meadow', 'start'
 end
 
+
 if $ARGS[0] = 'Mira':
 	minut += 2
 	menu_off = 1
 	gs 'stat'
 	! first time here with Mira
-	if meadow = 2:
+	if MiraVars['meadow'] = 1:
 		gs 'miroslava', 'miraclothes'
 		'"Wow! This place is awesome. My family and I have only been in the village for a few months, but I have never heard anyone talk about this place." Mira tells you. "Now I know where I can come to when I want to be alone. You don''t mind, do you?"'
 		act 'You allow her to come here on her own':
 			*clr & cla
-			meadow = 3
+			MiraVars['meadow'] = 2
 			minut += 2
 			gs 'stat'
 			gs 'miroslava', 'miraclothes'
 			'"I think you are a responsible person, Mira. So, you can come to the meadow whenever it pleases you. But, I want this place to remain a secret, so you can never tell anyone about this place."'
 			'Mira readily agrees and is as happy as a lark. Mira energetically nods and says, "I''ll take this secret to the grave, I swear. But, if I don''t, I''ll grant you three wishes, which I promise I will perform no matter what..."'
-			act 'Finish': gt 'meadow', 'start'
+			act 'Finish': gt 'gad_meadow', 'start'
 		end
 		act 'Sorry, I want to keep this meadow private':
 			*clr & cla
-			meadow = 4
+			MiraVars['meadow'] = 3
 			minut += 2
 			gs 'stat'
 			gs 'miroslava', 'miraclothes'
@@ -175,12 +178,12 @@ if $ARGS[0] = 'Mira':
 				'Mira then asks if you could help cheer up her father. He has been depressed ever since her mother''s death nearly two years ago.'
 				act 'Maybe':
 					*clr & cla
-					meadow = 5
+					MiraVars['meadow'] = 4
 					minut += 2
 					pcs_horny += 40
 					gs 'stat'
 
-					if npc_QW['A60'] = 0:
+					if MiraVars['QW'] = 0:
 						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira.jpg"></center>'
 					else
 						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira3.jpg"></center>'
@@ -188,11 +191,11 @@ if $ARGS[0] = 'Mira':
 					'You agree, intrigued. You ask Mira what she has in mind? After a few seconds, she tells you she saw her father masturbating that morning. She doesn''t think her father has been with a woman since her mother died. Mira is sorry for her father''s loss, she''s too, for that matter, but she has an overwhelming desire to help him. She can''t just do nothing.'
 					'You know Mira loves her father very much. But you don''t know what you can do to help. You don''t want or need this drama in your life. So you tell her that there is nothing you can do to help with her father''s depression. Mira pouts and stands with her arms crossed. Her whole demeanour is one of injured innocence.'
 					'A few minutes later, to your surprise, you feel a bit sorry for how you snapped at Mira. But, you think to yourself, chatting with her dad couldn''t hurt, and it would be a good deed.'
-					act 'Leave': gt 'meadow', 'start'
+					act 'Leave': gt 'gad_meadow', 'start'
 				end
-				act 'Leave': gt 'meadow', 'start'
+				act 'Leave': gt 'gad_meadow', 'start'
 			else
-				meadow = 6
+				MiraVars['meadow'] = 5
 				'You and Mira speak for a while. Her mood is a little down, but a smile slowly creeps onto her face as you chat.'
 				'"I saw you meeting with my father. I want to thank you for attending to him. He had been depressed since my mother died two years ago. Being with you has really cheered him up."'
 				minut += 2
@@ -205,7 +208,7 @@ if $ARGS[0] = 'Mira':
 						pcs_horny += 20
 						inhib_exp += 1
 						gs 'stat'
-						act 'Leave': gt 'meadow', 'start'
+						act 'Leave': gt 'gad_meadow', 'start'
 					end
 				!! If Svetka isnt a total prude she can be a little bold
 				elseif pcs_inhib > 30:
@@ -216,20 +219,20 @@ if $ARGS[0] = 'Mira':
 						pcs_horny += 40
 						inhib_exp += 2
 						gs 'stat'
-						act 'Leave': gt 'meadow', 'start'
+						act 'Leave': gt 'gad_meadow', 'start'
 					end
 				end
 				!! Svetka can always choose to be silently emotional without me defining what that emotion is
-				act 'Say nothing and leave': gt 'meadow', 'start'
+				act 'Say nothing and leave': gt 'gad_meadow', 'start'
 			end
 		end
-	elseif MiraLoc = 2:
+	elseif locat['A60'] = 61:
 		gs 'miroslava', 'miraclothes'
 		'"What a wonderful place you have found. It''s so comfortable and sunny!"'
-		if pcs_horny >= 60 and npc_QW['A60'] > 15 and temper >= 20 and sunWeather = 1:
+		if pcs_horny >= 60 and MiraVars['QW'] > 15 and temper >= 20 and sunWeather = 1:
 			act 'Mira, come here and stick that tongue of your in my wet pussy!':
 				*clr & cla
-				if miralick = 0:miralick = 1 & girl += 1
+				if MiraVars['cuni_given'] = 0: MiraVars['cuni_given'] = 1 & girl += 1
 				! WD: missing horny adjust
 				gs 'stat'
 				if $pantyworntype ! 'none':
@@ -253,7 +256,7 @@ if $ARGS[0] = 'Mira':
 							gs 'arousal', 'cuni', 5, 'lesbian'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Finish': gt 'meadow', 'start'
+							act 'Finish': gt 'gad_meadow', 'start'
 						end
 					end
 				else
@@ -264,16 +267,15 @@ if $ARGS[0] = 'Mira':
 						'Mira obediently kneels at your feet, licking your clit and fingering your pussy. After a few minutes of this treatment, Mira brings you to a blazing orgasm.'
 						$orgasm_or = 'yes'
 						gs 'arousal', 'cuni', 5, 'lesbian'
-						gs 'arousal', 'vaginal_finger', 5, 'lesbian'
-						minut -= 5
+						gs 'arousal', 'vaginal_finger', -5, 'lesbian'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Finish': gt 'meadow', 'start'
+						act 'Finish': gt 'gad_meadow', 'start'
 					end
 				end
 			end
 		end
-		act 'Finish': gt 'meadow', 'start'
+		act 'Finish': gt 'gad_meadow', 'start'
 	end
 end
 
@@ -321,7 +323,7 @@ if $ARGS[0] = '0':
 								gs 'arousal', 'voyeur_sex', 10, 'lesbian'
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Hide until she leaves': minut += 10 & gt 'meadow'
+								act 'Hide until she leaves': minut += 10 & gt 'gad_meadow', 'start'
 							end
 						end
 					end
@@ -358,7 +360,7 @@ if $ARGS[0] = '0':
 						gs 'arousal', 'voyeur_sex', 10, 'lesbian'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Hide until she leaves': minut += 10 & gt 'meadow'
+						act 'Hide until she leaves': minut += 10 & gt 'gad_meadow', 'start'
 					end
 				end
 			end
@@ -392,7 +394,7 @@ if $ARGS[0] = '0':
 						gs 'arousal', 'voyeur_sex', 10, 'lesbian'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Hide until she leaves': minut += 10 & gt 'meadow'
+						act 'Hide until she leaves': minut += 10 & gt 'gad_meadow', 'start'
 					end
 				end
 			end
@@ -415,21 +417,20 @@ if $ARGS[0] = '1':
 		gs 'stat'
 		act 'Watch':
 			*clr & cla
-			if npc_QW['A60'] = 2:npc_QW['A60'] = 3
+			if MiraVars['QW'] = 2: MiraVars['QW'] = 3
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex2.jpg"></center>'
 			'Fifteen minutes Mitka finally cums in Mira and leaves. Mira cleans up and then leaves as well.'
 			gs 'arousal', 'voyeur_sex', 5
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Hide until they leave': minut += 10 & gt 'meadow'
+			act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
 		end
 	end
 end
 
 if $ARGS[0] = '2':
 	menu_off = 1
-	temp_md = RAND(0,1)
-	if temp_md = 0:
+	if rand(0, 1) = 0:
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal.jpg"></center>'
 		'You see Mira lower her ass onto Mitka''s member and begin to bounce on top of him. You can hear the sound every time her butt cheeks hit his thighs...'
 		gs 'arousal', 'voyeur_sex', 2
@@ -440,6 +441,7 @@ if $ARGS[0] = '2':
 		gs 'arousal', 'voyeur_sex', 2
 		gs 'stat'
 	end
+
 	act 'Watch':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal2.jpg"></center>'
@@ -447,7 +449,7 @@ if $ARGS[0] = '2':
 		gs 'arousal', 'voyeur_sex', 10
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Hide until they leave': minut += 10 & gt 'meadow'
+		act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
 	end
 end
 
@@ -466,7 +468,7 @@ if $ARGS[0] = '3':
 			gs 'arousal', 'voyeur_sex', 2
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Hide until they leave': minut += 10 & gt 'meadow'
+			act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj2.jpg"></center>'
@@ -474,7 +476,7 @@ if $ARGS[0] = '3':
 		gs 'arousal', 'voyeur_sex', 10
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Hide until they leave': minut += 10 & gt 'meadow'
+		act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
 	end
 end
 
@@ -486,28 +488,30 @@ if $ARGS[0] = '4' or $ARGS[0] = '5':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Hide until they leave': minut += 10 & gt 'meadow'
+		act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
+
 	elseif temper >= 12 and temper < 15:
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj3.jpg"></center>'
 		'They are completely naked, and Mira sticks her ass up in the air as she deepthroats Vasyan. After a few minutes, you see Mira gulp down his sperm without removing her mouth from his cock.'
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Hide until they leave': minut += 10 & gt 'meadow'
+		act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
+
 	elseif temper >= 15 and temper < 20:
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj4.jpg"></center>'
 		'They are completely naked, and Mira squeals joyfully as she rides on Vasyan''s member. Unfortunately, he does not last long and cums all over her butt as soon as he pulls out of her.'
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Hide until they leave': minut += 10 & gt 'meadow'
-	elseif temper >= 20:
+		act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
+	else
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj6.jpg"></center>'
 		'Mira is completely naked and bent over in front of Vasyan. She is really enjoying it as he thrusts into her ass. After a few minutes, he pulls and sprays cum over his back.'
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Hide until they leave': minut += 10 & gt 'meadow'
+		act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
 	end
 end
 
@@ -515,7 +519,7 @@ end
 !{
 if $ARGS[0] = '5':
 	menu_off = 1
-	if (meadow = 3 or meadow = 6) and MiraLoc = 0 and npc_QW['A60'] >= 11 and temper >= 25 and sunWeather = 1 and temp_md = 5:
+	if locat['A60'] = 61 and MiraVars['QW'] >= 11 and temper >= 25 and sunWeather = 1 and temp_md = 5:
 		*clr & cla
 		minut += 5
 		pcs_horny += 20
@@ -537,11 +541,11 @@ if $ARGS[0] = '6':
 	end
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Hide until they leave': minut += 10 & gt 'meadow'
+	act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
 end
 
 if $ARGS[0] = '7':
-	npc_QW['A60'] += 1
+	MiraVars['QW'] += 1
 	menu_off = 1
 	if temper < 15:
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj11.jpg"></center>'
@@ -558,18 +562,18 @@ if $ARGS[0] = '7':
 	end
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Hide until they leave': minut += 10 & gt 'meadow'
+	act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
 end
 
 if $ARGS[0] = '8':
-	npc_QW['A60'] += 1
+	MiraVars['QW'] += 1
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj12.jpg"></center>'
 	'Mira is almost invisible with all the bodies around her. You can only see her naked ass and feet swaying in the air. You spend half an hour watching as the men take turns fucking Mira until they are all tired.'
 	gs 'arousal', 'voyeur_sex', 30
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Hide until they leave': minut += 10 & gt 'meadow'
+	act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
 end
 
 if $ARGS[0] = '9':
@@ -579,7 +583,7 @@ if $ARGS[0] = '9':
 	gs 'arousal', 'voyeur_sex', 30
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Hide until she leaves': minut += 10 & gt 'meadow'
+	act 'Hide until she leaves': minut += 10 & gt 'gad_meadow', 'start'
 end
 
 !125s
@@ -599,36 +603,36 @@ if $ARGS[0] = 'mira_mitka':
 		gs 'stat'
 		act 'Watch':
 			*clr & cla
-			if npc_QW['A60'] = 2:npc_QW['A60'] = 3
-			mirasextimes += 1
+			if MiraVars['QW'] = 2: MiraVars['QW'] = 3
+			MiraVars['Mitka_fucks'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex2.jpg"></center>'
 			'Fifteen minutes Mitka finally cums in Mira and leaves. Mira cleans up and then leaves as well.'
 			gs 'arousal', 'voyeur_sex', 15
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Hide until they leave': minut += 10 & gt 'meadow'
+			act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
 		end
 	end
 end
 
 if $ARGS[0] = 'mira_gang':
-	npc_QW['A60'] = 31
+	MiraVars['QW'] = 31
 	menu_off = 1
-	mirasextimes += 1
+	MiraVars['Mitka_fucks'] += 1
 
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj12.jpg"></center>'
 	'Mira is almost invisible with all the bodies around her. You can only see her naked ass and feet swaying in the air. You spend half an hour watching as the men take turns fucking Mira until they are all tired.'
 	gs 'arousal', 'voyeur_sex', 30
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Hide until they leave': minut += 10 & gt 'meadow'
+	act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
 end
 
 if $ARGS[0] = 'miraperversion11':
 	minut += 5
 	menu_off = 1
 	pcs_horny += 10
-	npc_QW['A60'] = 12
+	MiraVars['QW'] = 12
 	gs 'stat'
 
 	gs 'miroslava', 'miraclothes'
@@ -643,21 +647,21 @@ end
 
 if $ARGS[0] = 'lesb_mira':
 	menu_off = 1
-	miraday = daystart
-	mirahorny = rand(0,80)
+	MiraVars['event_day'] = daystart
+	MiraVars['arousal'] = rand(0, 80)
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirakiss1.jpg"></center>'
 	'"I''m glad you came, Mira," you say.'
 	'You continue, "Mira, I want you," you whispered in her ear and kissed her passionately on the lips.'
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
-	if mirahorny < 20:act 'Continue':gt 'mirasex','mirakiss'
-	if mirahorny >= 20:act 'Continue':gt 'mirasex','foreplay'
+	if MiraVars['arousal'] < 20: act 'Continue': gt 'mirasex','mirakiss'
+	if MiraVars['arousal'] >= 20: act 'Continue': gt 'mirasex','foreplay'
 end
 
 if $ARGS[0] = 'mira_lesb':
 	menu_off = 1
-	miraday = daystart
-	mirahorny = rand(40,80)
+	MiraVars['event_day'] = daystart
+	MiraVars['arousal'] = rand(40, 80)
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirakiss4.jpg"></center>'
 	'In the meadow, Mira walks up to you, smiling mischievously.'
 	'"<<$pcs_nickname>>, let me see your pussy", she whispered in your ear while pinning you to the tree and kissing your lips.'
@@ -707,7 +711,7 @@ if $ARGS[0] = 'lesb_talk_mira2':
 	menu_off = 1
 	minut += 5
 	pcs_horny += 5
-	mirasex = 2
+	MiraVars['had_sex'] = 2
 	gs 'miroslava', 'miraclothes'
 	gs 'stat'
 	'You walk up to Mira with a malicious smile on your face.'
@@ -740,12 +744,12 @@ if $ARGS[0] = 'mira_lesb_talk1':
 	menu_off = 1
 	minut += 5
 	pcs_horny += 5
-	mirahorny = rand(0,80)
+	MiraVars['arousal'] = rand(0, 80)
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_lesb_talk.jpg"></center>'
-	if MiraLoc ! 2:'In the clearing, you met Mira. Seeing you, she immediately came up with a sly smile on his lips.'
-	if MiraLoc = 2:'When you came into the clearing, Mira immediately came to you with a sly smile on his lips.'
+	if locat['A60'] ! 61:'In the clearing, you met Mira. Seeing you, she immediately came up with a sly smile on his lips.'
+	if locat['A60'] = 61:'When you came into the clearing, Mira immediately came to you with a sly smile on his lips.'
 	'"<<$pcs_nickname>>, you fucked all the boys in the village now.'
 	'You tried to keep silent, but Mira wouldn''t let it go.'
 	'"So did they or didn''t they?" - she insisted on your answer.'
@@ -794,8 +798,8 @@ if $ARGS[0] = 'mira_lesb_talk2':
 	menu_off = 1
 	minut += 5
 	pcs_horny += 5
-	mirasex = 2
-	mirahorny = rand(0,80)
+	MiraVars['had_sex'] = 2
+	MiraVars['arousal'] = rand(0, 80)
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_lesb_talk2.jpg"></center>'
@@ -805,7 +809,7 @@ if $ARGS[0] = 'mira_lesb_talk2':
 	'"So, did they or didn''t they?" she insists on an answer.'
 	'"Well, yes", you acknowledged.'
 	'"You know what that means?" she continues.'
-	'"What?"  you ask, blushing terribly, although you already guessed where this is going.'
+	'"What?" you ask, blushing terribly, although you already guessed where this is going.'
 	'"It''s time to return the favour, " she said triumphantly, leaning on a tree, beckoning you with her finger. "You can start."'
 	'You hesitated for a couple of moments as if pondering something, and then you knelt down on your knees in front of her.'
 	act 'Lick Mira':gt 'mirasex','lickmira_first'
@@ -815,12 +819,12 @@ if $ARGS[0] = 'mira_lesb_talk3':
 	menu_off = 1
 	minut += 5
 	pcs_horny += 5
-	mirahorny = rand(40,80)
-	miraday = daystart
+	MiraVars['arousal'] = rand(40, 80)
+	MiraVars['event_day'] = daystart
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_lesb_talk3.jpg"></center>'
-	if MiraLoc ! 2:
+	if locat['A60'] ! 61:
 		'In the clearing, you meet Mira. Seeing you, she immediately approached you with an excited face.'
 		'"Where were you, <<$pcs_nickname>>? I was looking for you," she said. So get over here and help me out.'
 	else
@@ -836,8 +840,8 @@ if $ARGS[0] = 'mira_lesb_talk4':
 	menu_off = 1
 	minut += 20
 	pcs_horny += 5
-	mirahorny = rand(40,80)
-	miraday = daystart
+	MiraVars['arousal'] = rand(40, 80)
+	MiraVars['event_day'] = daystart
 	gs 'stat'
 
 	gs 'miroslava', 'miraclothes'
@@ -855,7 +859,7 @@ if $ARGS[0] = 'mirameadow':
 	menu_off = 1
 	minut += 2
 	gs 'stat'
-	if (meadow = 3 or meadow = 6) and MiraLoc = 0 and mirasextimes < 15 and temper >= 12 and temper < 20 and sunWeather = 1 and temp_md = 0:
+	if locat['A60'] = 61 and (MiraVars['meadow'] = 2 or MiraVars['meadow'] = 5) and MiraVars['Mitka_fucks'] < 15 and temper >= 12 and temper < 20 and sunWeather = 1 and temp_md = 0:
 		*clr & cla
 		minut += 2
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr.jpg"></center>'
@@ -897,14 +901,14 @@ if $ARGS[0] = 'mirameadow':
 								gs 'arousal', 'voyeur', 10
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Hide until she leaves': minut += 10 & gt 'meadow'
+								act 'Hide until she leaves': minut += 10 & gt 'gad_meadow', 'start'
 							end
 						end
 					end
 				end
 			end
 		end
-	elseif meadow = 3 and MiraLoc = 0 and mirasextimes < 15 and temper >= 20 and temper < 25 and sunWeather = 1 and temp_md = 0:
+	elseif MiraVars['meadow'] = 3 and locat['A60'] = 61 and MiraVars['Mitka_fucks'] < 15 and temper >= 20 and temper < 25 and sunWeather = 1 and temp_md = 0:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr7.jpg"></center>'
 		'Mira is leaning against a tree and starts to caress herself.'
@@ -935,12 +939,12 @@ if $ARGS[0] = 'mirameadow':
 						gs 'arousal', 'voyeur', 10
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Hide until she leaves': minut += 10 & gt 'meadow'
+						act 'Hide until she leaves': minut += 10 & gt 'gad_meadow', 'start'
 					end
 				end
 			end
 		end
-	elseif meadow = 3 and MiraLoc = 0 and mirasextimes < 15 and temper >= 25 and sunWeather = 1 and temp_md = 0:
+	elseif locat['A60'] = 61 and MiraVars['meadow'] = 2 and MiraVars['Mitka_fucks'] < 15 and temper >= 25 and sunWeather = 1 and temp_md = 0:
 		*clr & cla
 		minut += 2
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr12.jpg"></center>'
@@ -970,190 +974,193 @@ if $ARGS[0] = 'mirameadow':
 						gs 'arousal', 'voyeur', 10
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Hide until she leaves': minut += 10 & gt 'meadow'
+						act 'Hide until she leaves': minut += 10 & gt 'gad_meadow', 'start'
 					end
 				end
 			end
 		end
 	end
-	if meadow = 3 and MiraLoc = 0 and npc_QW['A60'] >= 2 and temper >= 15 and sunWeather = 1 and temp_md = 1:
-		*clr & cla
-		minut += 2
-		pcs_horny += 15
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex.jpg"></center>'
-		'You see Mira and Mitka talking to each other. You can''t hear what they say from this far away, but they begin to undress in your meadow.'
-		act 'Watch':
+
+	if locat['A60'] = 61 and MiraVars['meadow'] = 2 and temper >= 15 and sunWeather = 1:
+		if temp_md = 1 and MiraVars['QW'] >= 2:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex1.jpg"></center>'
-			'Mira lies before Mitka on the bedspread and opens her legs invitingly in front of him. Mitka wastes no time and immediately starts roughly fucking her pussy.'
-			gs 'arousal', 'voyeur', 5
+			minut += 2
+			pcs_horny += 15
 			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex.jpg"></center>'
+			'You see Mira and Mitka talking to each other. You can''t hear what they say from this far away, but they begin to undress in your meadow.'
 			act 'Watch':
 				*clr & cla
-				if npc_QW['A60'] = 2:npc_QW['A60'] = 3
-				mirasextimes += 1
-				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex2.jpg"></center>'
-				'Fifteen minutes Mitka finally cums in Mira and leaves. Mira cleans up and then leaves as well.'
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex1.jpg"></center>'
+				'Mira lies before Mitka on the bedspread and opens her legs invitingly in front of him. Mitka wastes no time and immediately starts roughly fucking her pussy.'
 				gs 'arousal', 'voyeur', 5
-				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Hide until they leave': minut += 10 & gt 'meadow'
+				act 'Watch':
+					*clr & cla
+					if MiraVars['QW'] = 2:MiraVars['QW'] = 3
+					MiraVars['Mitka_fucks'] += 1
+					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex2.jpg"></center>'
+					'Fifteen minutes Mitka finally cums in Mira and leaves. Mira cleans up and then leaves as well.'
+					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
+				end
 			end
-		end
-	end
-	if meadow = 3 and MiraLoc = 0 and npc_QW['A60'] >= 8 and temper >= 15 and sunWeather = 1 and temp_md = 2:
-		*clr & cla
-		temp_md = RAND(0,1)
-		gs 'stat'
-		if temp_md = 0:
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal.jpg"></center>'
-			'You see Mira lower her ass onto Mitka''s member and begin to bounce on top of him. You can hear the sound every time her butt cheeks hit his thighs...'
-			gs 'arousal', 'voyeur', 2
-			gs 'stat'
-		else
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal1.jpg"></center>'
-			'Mira gets down on all fours and spreads her ass cheeks wide apart. She moans loudly as Mitka drives his cock into her ass.'
-			gs 'arousal', 'voyeur', 2
-			gs 'stat'
-		end
-		act 'Watch':
+
+		elseif temp_md = 2 and MiraVars['QW'] >= 8:
 			*clr & cla
-			mirasextimes += 1
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal2.jpg"></center>'
-			'After a couple of minutes, Mitka slaps her ass and pulls out of Mira. She gets up on her knees before him and sticks her tongue out as his warm cum shoots all over her face.'
-			gs 'arousal', 'voyeur', 5
-			gs 'arousal', 'end'
-			gs 'stat'
-			act 'Hide until they leave': minut += 10 & gt 'meadow'
-		end
-	end
-	if meadow = 3 and MiraLoc = 0 and npc_QW['A60'] >= 11 and temper >= 15 and sunWeather = 1 and temp_md = 3:
-		*clr & cla
-		if temper < 15:
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj.jpg"></center>'
-			'She enthusiastically sucks his cock and takes his whole member down her throat...'
-			gs 'arousal', 'voyeur', 2
 			gs 'stat'
+			if RAND(0, 1) = 0:
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal.jpg"></center>'
+				'You see Mira lower her ass onto Mitka''s member and begin to bounce on top of him. You can hear the sound every time her butt cheeks hit his thighs...'
+				gs 'arousal', 'voyeur', 2
+				gs 'stat'
+			else
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal1.jpg"></center>'
+				'Mira gets down on all fours and spreads her ass cheeks wide apart. She moans loudly as Mitka drives his cock into her ass.'
+				gs 'arousal', 'voyeur', 2
+				gs 'stat'
+			end
 			act 'Watch':
 				*clr & cla
-				mirasextimes += 1
-				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj1.jpg"></center>'
-				'But, apparently, you''re a little late because, after a couple minutes, Kolyamba puts a hand on the back of Mira''s head and holds her while he cums down her throat. At first, she gags but eventually obediently swallows his cum...'
+				MiraVars['Mitka_fucks'] += 1
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal2.jpg"></center>'
+				'After a couple of minutes, Mitka slaps her ass and pulls out of Mira. She gets up on her knees before him and sticks her tongue out as his warm cum shoots all over her face.'
 				gs 'arousal', 'voyeur', 5
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Hide until they leave': minut += 10 & gt 'meadow'
+				act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
 			end
-		else
+
+		elseif temp_md = 3 and MiraVars['QW'] >= 11:
+			*clr & cla
+			!! temper >= 15 per definition..???
+			if temper < 15:
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj.jpg"></center>'
+				'She enthusiastically sucks his cock and takes his whole member down her throat...'
+				gs 'arousal', 'voyeur', 2
+				gs 'stat'
+				act 'Watch':
+					*clr & cla
+					MiraVars['Mitka_fucks'] += 1
+					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj1.jpg"></center>'
+					'But, apparently, you''re a little late because, after a couple minutes, Kolyamba puts a hand on the back of Mira''s head and holds her while he cums down her throat. At first, she gags but eventually obediently swallows his cum...'
+					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
+				end
+			else
+				*clr & cla
+				MiraVars['Mitka_fucks'] += 1
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj2.jpg"></center>'
+				'All Mira has on is some flip-flops with her face on the ground and her ass in the air. She moans loudly as Kolyamba pounds her pussy and cums inside of her...'
+				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
+			end
+
+		elseif temp_md = 4 and MiraVars['QW'] >= 11:
 			*clr & cla
-			mirasextimes += 1
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj2.jpg"></center>'
-			'All Mira has on is some flip-flops with her face on the ground and her ass in the air. She moans loudly as Kolyamba pounds her pussy and cums inside of her...'
-			gs 'arousal', 'voyeur', 5
-			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Hide until they leave': minut += 10 & gt 'meadow'
-		end
-	end
-	if meadow = 3 and MiraLoc = 0 and npc_QW['A60'] >= 11 and temper >= 15 and sunWeather = 1 and temp_md = 4:
-		*clr & cla
-		gs 'stat'
-		if temper < 20:
-			mirasextimes += 1
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj5.jpg"></center>'
-			'Mira is tied to a tree as Vasyan enthusiastically drives his cock in her mouth. She gags and coughs, but simultaneously, she moves her head farther down his member. Finally, after a couple of minutes, Vasyan tilts back his head and, with a blissful roar cums in her mouth...'
-			gs 'arousal', 'voyeur', 5
+			if temper < 20:
+				MiraVars['Mitka_fucks'] += 1
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj5.jpg"></center>'
+				'Mira is tied to a tree as Vasyan enthusiastically drives his cock in her mouth. She gags and coughs, but simultaneously, she moves her head farther down his member. Finally, after a couple of minutes, Vasyan tilts back his head and, with a blissful roar cums in her mouth...'
+				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
+			else
+				MiraVars['Mitka_fucks'] += 1
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj6.jpg"></center>'
+				'Mira is completely naked and bent over in front of Vasyan. She is really enjoying it as he thrusts into her ass. After a few minutes, he pulls out and sprays cum over her back.'
+				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
+			end
+
+		elseif temp_md = 5 and MiraVars['QW'] >= 11:
+			*clr & cla
+			gs 'stat'
+			if temper < 20:
+				MiraVars['Mitka_fucks'] += 1
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj3.jpg"></center>'
+				'They are completely naked, and Mira sticks her ass up in the air as she deepthroats Vasyan. After a few minutes, you see Mira gulp down his sperm without removing her mouth from his cock.'
+				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
+			else
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj4.jpg"></center>'
+				'They are completely naked, and Mira squeals joyfully as she rides on Vasyan''s member. Unfortunately, he does not last long and cums all over her butt as soon as he pulls out of her.'
+				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
+			end
+
+		elseif temp_md = 6 and MiraVars['QW'] >= 11:
+			*clr & cla
+			MiraVars['Mitka_fucks'] += 1
+			if temper < 20:
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj7.jpg"></center>'
+				'Mira is kneeling between the three friends and sucking their cocks with great pleasure. They are all crowded around her, so you can''t determine who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
+				gs 'arousal', 'voyeur', 5
+			else
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj8.jpg"></center>'
+				'Mira is kneeling between the three friends and sucking their cocks with great pleasure. They are all crowded around her, so you can''t determine who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
+				gs 'arousal', 'voyeur', 5
+			end
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Hide until they leave': minut += 10 & gt 'meadow'
-		else
-			mirasextimes += 1
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj6.jpg"></center>'
-			'Mira is completely naked and bent over in front of Vasyan. She is really enjoying it as he thrusts into her ass. After a few minutes, he pulls out and sprays cum over her back.'
-			gs 'arousal', 'voyeur', 5
+			act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
+
+		elseif temp_md = 7 and MiraVars['QW'] >= 11:
+			*clr & cla
+			if MiraVars['QW'] < 20: MiraVars['QW'] += 1
+			if temper < 20:
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj11.jpg"></center>'
+				'Mira squats in front of one of the boys and takes his cock in her mouth while another gets ready for his turn.'
+				gs 'arousal', 'voyeur', 5
+			elseif temper >= 20 and temper < 25:
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj10.jpg"></center>'
+				'Two boys are fucking Mira in her mouth and pussy simultaneously. The whole time they are laughing and talking while Mira moans in between them... Fifteen minutes later, they finish with her and leave.'
+				gs 'arousal', 'voyeur', 5
+			else
+				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj9.jpg"></center>'
+				'Mira and the two boys she is with are all naked. She is sucking one of them while another plays with her breasts and pussy from behind.'
+				gs 'arousal', 'voyeur', 5
+			end
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Hide until they leave': minut += 10 & gt 'meadow'
-		end
-	end
-	if meadow = 3 and MiraLoc = 0 and npc_QW['A60'] >= 11 and temper >= 15 and sunWeather = 1 and temp_md = 5:
-		*clr & cla
-		gs 'stat'
-		if temper < 20:
-			mirasextimes += 1
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj3.jpg"></center>'
-			'They are completely naked, and Mira sticks her ass up in the air as she deepthroats Vasyan. After a few minutes, you see Mira gulp down his sperm without removing her mouth from his cock.'
-			gs 'arousal', 'voyeur', 5
+			act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
+
+		elseif temp_md = 8 and MiraVars['QW'] > 30:
+			*clr & cla
+			MiraVars['QW'] += 1
+			MiraVars['Mitka_fucks'] += 1
+			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj12.jpg"></center>'
+			'Mira is almost invisible with all the bodies around her. You can only see her naked ass and feet swaying in the air. You spend half an hour watching as the men take turns fucking Mira until they are all tired.'
+			gs 'arousal', 'voyeur', 30
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Hide until they leave': minut += 10 & gt 'meadow'
-		else
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj4.jpg"></center>'
-			'They are completely naked, and Mira squeals joyfully as she rides on Vasyan''s member. Unfortunately, he does not last long and cums all over her butt as soon as he pulls out of her.'
-			gs 'arousal', 'voyeur', 5
+			act 'Hide until they leave': minut += 10 & gt 'gad_meadow', 'start'
+
+		elseif temp_md = 9 and MiraVars['QW'] >= 20:
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadows.jpg"></center>'
+			'You see Mira on all fours with her back to you. She is shoving an ear of corn in her ass which looks painful, but she is still moaning. Eventually, Mira finishes and tosses the cum covered ear of corn off into the bushes, almost hitting you!'
+			gs 'arousal', 'voyeur', 10
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Hide until they leave': minut += 10 & gt 'meadow'
-		end
-	end
-	if meadow = 3 and MiraLoc = 0 and npc_QW['A60'] >= 11 and temper >= 15 and sunWeather = 1 and temp_md = 6:
-		*clr & cla
-		mirasextimes += 1
-		if temper < 20:
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj7.jpg"></center>'
-			'Mira is kneeling between the three friends and sucking their cocks with great pleasure. They are all crowded around her, so you can''t determine who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
-			gs 'arousal', 'voyeur', 5
-		else
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj8.jpg"></center>'
-			'Mira is kneeling between the three friends and sucking their cocks with great pleasure. They are all crowded around her, so you can''t determine who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
-			gs 'arousal', 'voyeur', 5
+			act 'Hide until she leaves': minut += 10 & gt 'gad_meadow', 'start'
 		end
-		gs 'arousal', 'end'
-		gs 'stat'
-		act 'Hide until they leave': minut += 10 & gt 'meadow'
-	end
-	if meadow = 3 and MiraLoc = 0 and npc_QW['A60'] >= 11 and temper >= 15 and sunWeather = 1 and temp_md = 7:
-		*clr & cla
-		if npc_QW['A60'] < 20: npc_QW['A60'] += 1
-		if temper < 20:
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj11.jpg"></center>'
-			'Mira squats in front of one of the boys and takes his cock in her mouth while another gets ready for his turn.'
-			gs 'arousal', 'voyeur', 5
-		elseif temper >= 20 and temper < 25:
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj10.jpg"></center>'
-			'Two boys are fucking Mira in her mouth and pussy simultaneously. The whole time they are laughing and talking while Mira moans in between them... Fifteen minutes later, they finish with her and leave.'
-			gs 'arousal', 'voyeur', 5
-		else
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj9.jpg"></center>'
-			'Mira and the two boys she is with are all naked. She is sucking one of them while another plays with her breasts and pussy from behind.'
-			gs 'arousal', 'voyeur', 5
-		end
-		gs 'arousal', 'end'
-		gs 'stat'
-		act 'Hide until they leave': minut += 10 & gt 'meadow'
-	end
-	if meadow = 3 and MiraLoc = 0 and npc_QW['A60'] > 30 and temper >= 15 and sunWeather = 1 and temp_md = 8:
-		*clr & cla
-		npc_QW['A60'] += 1
-		mirasextimes += 1
-		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj12.jpg"></center>'
-		'Mira is almost invisible with all the bodies around her. You can only see her naked ass and feet swaying in the air. You spend half an hour watching as the men take turns fucking Mira until they are all tired.'
-		gs 'arousal', 'voyeur', 30
-		gs 'arousal', 'end'
-		gs 'stat'
-		act 'Hide until they leave': minut += 10 & gt 'meadow'
-	end
-	if meadow = 3 and MiraLoc = 0 and npc_QW['A60'] >= 20 and temper >= 15 and sunWeather = 1 and temp_md = 9:
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadows.jpg"></center>'
-		'You see Mira on all fours with her back to you. She is shoving an ear of corn in her ass which looks painful, but she is still moaning. Eventually, Mira finishes and tosses the cum covered ear of corn off into the bushes, almost hitting you!'
-		gs 'arousal', 'voyeur', 10
-		gs 'arousal', 'end'
-		gs 'stat'
-		act 'Hide until she leaves': minut += 10 & gt 'meadow'
 	end
 end
 
---- meadow ---------------------------------
+--- gad_meadow ---------------------------------
 

+ 13 - 17
locations/miroslavahome.qsrc → locations/gad_miroslava_home.qsrc

@@ -1,16 +1,12 @@
-# miroslavahome
+# gad_miroslava_home
 !2021/05/02
 
 if $ARGS[0] = 'start':
-	$loc = 'MiroslavaHome'
-	$loc_arg = 'start'
+	*clr & cla
+	gs 'shortgs', 'setloc', 'gad_miroslava_home', 'start'
 	$location_type = 'public_outdoors'
-
-	$menu_loc = 'MiroslavaHome'
-	$menu_arg = 'start'
 	menu_off = 0
-
-	*clr & cla
+	gs 'miroslava_schedule'
 	minut += 5
 	gs 'stat'
 
@@ -43,7 +39,7 @@ if $ARGS[0] = 'start':
 		if month >= 5 and month <= 9 and hour >= 18 and hour <= 21 and week = 5 and mirabrotherday ! daystart:
 			*nl
 			'You see a motorcycle parked outside of Mira''s house. Mira''s brother has come in from the city to visit his sister and father.'
-			act 'Talk to Mira''s brother': gt 'MiroslavaHome', 'mirabrother'
+			act 'Talk to Mira''s brother': gt 'gad_miroslava_home', 'mirabrother'
 		end
 	else
 		*nl
@@ -61,7 +57,7 @@ if $ARGS[0] = 'mirabrother':
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big65.jpg"></center>'
 
-	act 'Leave him be': gt 'MiroslavaHome', 'start'
+	act 'Leave him be': gt 'gad_miroslava_home', 'start'
 	act 'Ask if you can get a ride on his motorcycle':
 		*clr & cla
 		minut += 2
@@ -76,15 +72,15 @@ if $ARGS[0] = 'mirabrother':
 				'He gazes at you for a couple of seconds and then asks, "Who are you again?"'
 			end
 
-			act 'Walk away': gt 'MiroslavaHome', 'start'
+			act 'Walk away': gt 'gad_miroslava_home', 'start'
 		else
 			if $pantyworntype ! 'none':
 				'"No problem", he says to you while looking you up and down with a strange glint in his eyes. "But my bike, well, he only allows girls without panties to ride on his back, and there''s nothing I can do about it. This bike is a little devil."'
-				act 'Look at him in disgust and walk away': gt 'MiroslavaHome', 'start'
+				act 'Look at him in disgust and walk away': gt 'gad_miroslava_home', 'start'
 				act 'Remove panties':
 					gs 'underwear', 'remove'
 					'You really want a ride on his motorcycle and quickly slide them down your legs and stuff them in your pocket.'
-					gt 'MiroslavaHome', 'mirabrother'
+					gt 'gad_miroslava_home', 'mirabrother'
 				end
 			else
 				'"No problem", he says to you and then adds with a mischievous smile, "but first, sit down on him, and he''ll check to make sure he likes you. He is a fussy son of a bitch."'
@@ -98,7 +94,7 @@ if $ARGS[0] = 'mirabrother':
 					'You quickly swing your leg up and over the motorcycle, plop your ass down on the padded seat and grab the handlebars. With a satisfied smile, Mira''s brother never takes his eyes off your crotch. You wiggle your ass on the seat a little giving him a great view of your naked pussy.'
 					'"Fine", he says, still smiling, "Just fine! You have an awesome pussy, and I''m sure my friend," and he slaps the gas tank, "is looking forward to having you ride on him. You know what I mean, yes?" You give him a wicked grin and nod. "We''ll give you a ride to remember, and then you can give me a ride to remember..." You just continue to nod.'
 
-					act 'Change your mind and leave': gt 'MiroslavaHome', 'start'
+					act 'Change your mind and leave': gt 'gad_miroslava_home', 'start'
 					act 'Hell yes, you agree...':
 						*clr & cla
 						pcs_horny += 10
@@ -190,8 +186,8 @@ if $ARGS[0] = 'mirabrother':
 														'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto8.jpg"></center>'
 														'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, eyes closed in bliss. Then, 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'
-														if grandmaQW['block'] = 0:act 'Ask him to drop you off at your grandparents house': gt 'gaddvor'
+														act 'Ask him to take you back to Mira''s house': gt 'gad_miroslava_home', 'start'
+														if grandmaQW['block'] = 0:act 'Ask him to drop you off at your grandparents house': gt 'gad_gpyard', 'start'
 													end
 												end
 											end
@@ -207,5 +203,5 @@ if $ARGS[0] = 'mirabrother':
 	end
 end
 
---- miroslavahome ---------------------------------
+--- gad_miroslava_home ---------------------------------
 

+ 53 - 68
locations/gadprostitutes.qsrc → locations/gad_prostitutes.qsrc

@@ -1,15 +1,13 @@
-# gadprostitutes
+# gad_prostitutes
 !2021/05/05
+!2024/05/05 - Mira schedule introduced.
+!locat['A60'] = Mira''s location. See 'miroslava_schedule'
 
 if $ARGS[0] = 'start':
-	$loc = 'gadprostitutes'
-	$loc_arg = 'start'
+	gs 'shortgs', 'setloc', 'gad_prostitutes', 'start'
 	$location_type = 'public_outdoors'
-
-	$menu_loc = 'gadprostitutes'
-	$menu_arg = 'start'
 	menu_off = 0
-
+	gs 'miroslava_schedule'
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
 	gs'stat'
@@ -23,44 +21,43 @@ if $ARGS[0] = 'start':
 		'<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. So she must be doing something else right now.'
-	!if gadriver_gang = 2 and (mirapimp = 0 or mirapimp = 2):
+	if locat['A60'] ! 80 and MiraVars['QW'] > 15: 'You look around for Mira but don''t see her here. So she must be doing something else right now.'
+	!if GadBoy['river_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:
 	!		'You are too tired to prostitute yourself.'
 	!	end
 	!end
-	if hour >= 16 and hour <= 23:
+	act 'Walk back to the highway': nroad = 10 & gt 'road'
+
+	if hour < 16:
+		'It is not a good time of day for prostitution. Try coming back later in the evening.'
+	else
 		! 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'] >= 11 or gadriver_gang = 2): 
-			gs 'gadprostitutes', 'mira_rebels'
+		if locat['A60'] = 80 and mirapimp = 1 and (npc_QW['A63'] >= 11 or GadBoy['river_gang'] = 2): 
+			gs 'gad_prostitutes', 'mira_rebels'
 		else
-			act 'Walk back to the highway': nroad = 10 & gt 'road'
-			if MiraLoc = 8:
+			if locat['A60'] = 80:
 				'You see Mira standing below a streetlight a little way down the road.'
 
 				! event to become miras pimp if not the boys slut, not the village whore
-				if mirapimp = 0 and npc_QW['A63'] < 11 and gadriver_gang = 0: gt 'gadprostitutes', 'pimp_mira'
+				if mirapimp = 0 and npc_QW['A63'] < 11 and GadBoy['river_gang'] = 0: gt 'gad_prostitutes', 'pimp_mira'
 				
 				! events to prostitute just Mira
-				act 'Watch Mira prostitute herself': gt 'gadprostitutes', 'just_mira'
+				act 'Watch Mira prostitute herself': gt 'gad_prostitutes', '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 or mirapimp = 2) and PCloStyle = 4 and pcs_sleep > 0:
-					! act 'Prostitute yourself with Mira':gt 'gadprostitutes', 'with_mira'
+				!if GadBoy['river_gang'] = 2 and (mirapimp = 0 or mirapimp = 2) and PCloStyle = 4 and pcs_sleep > 0:
+					! act 'Prostitute yourself with Mira':gt 'gad_prostitutes', 'with_mira'
 				!end
 			end
-						
+
 			if prostitute['gadukino'] = 1 and PCloStyle = 4:
 				if prostitute['earnings_day'] > 0: '<br>You have earned <<prostitute[''earnings_day'']>> <b>₽</b> today.'+iif(prostitute['payment_method'] = 0, ' Your share is <<prostitute[''earnings_day''] * prostitute[''share_player''] / 100>> <b>₽</b>'+iif(prostitute['debt_amount'] > 0, ', but your pimp will keep <<prostitute[''earnings_day''] * prostitute[''debt_payment_percent''] / 100>> <b>₽</b> to pay down your debt.', '.'), '')
-				act 'Look for clients': gt 'gadprostitutes', 'work_alone'
+				act 'Look for clients': gt 'gad_prostitutes', 'work'
 			end
 		end
-	else
-		'It is not a good time of day for prostitution. Try coming back later in the evening.'
-		act 'Walk back to the highway': nroad = 10 & gt 'road'
 	end
 end
 
@@ -86,14 +83,14 @@ if $ARGS[0] = 'pimp_mira':
 			'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'
+			act 'Finish': gt 'gad_prostitutes', 'start'
 		end
 	else
 		act 'Make Mira your prostitute (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 
-if $ARGS[0] = 'mira_rebels':	
+if $ARGS[0] = 'mira_rebels':
 	*clr & cla
 	mirapimp = 2
 	gs 'prostitution_functions', 'set_gadukion_prostitute'	
@@ -108,87 +105,79 @@ if $ARGS[0] = 'mira_rebels':
 	'You rise and meet her gaze. She looks very pleased with herself. "Remember that. Now you know exactly how that feels," she says.'
 	if npc_QW['A63'] >= 11:
 		'Mira continues, "Look at you, just another slut. Mitka, Kolyamba, and Vasyan told me how much they all love fucking and sharing you now. You thought you were so much better than me, well no more! I''m not working for you anymore. You have proven yourself perfectly capable of enjoying getting shared by a group of friends."'
-	elseif gadriver_gang = 2:
+	elseif GadBoy['river_gang'] = 2:
 		'Mira continues, "Look at you, just another whore. All the village men can talk about is how much you moaned for each and every one of them. You thought you were so much better than me, well no more! I''m not working for you anymore. You have proven yourself perfectly capable of enjoying getting gangbanged by multiple groups of strangers."'
 	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'
+	act 'Continue': gt 'gad_prostitutes', 'start'
 end
 
 ! Prostitution events for just Mira - SM
 if $ARGS[0] = 'just_mira':
 	gs 'miroslava', 'miraclothes'
+	menu_off = 1
 
-	if hour >= 16 and hour <= 23:
-		act 'Leave Mira to her work': gt 'gadprostitutes', 'start'
+	if hour >= 16 and hour <= 20:
+		act 'Leave Mira to her work': gt 'gad_prostitutes', 'start'
 		act 'Wait for Mira to attract a customer':
 			*clr & cla
 			minut += 30
 			gs 'stat'
 
-			temp_gadpro = rand(1,10)
+			temp_gadpro = rand(1, 10)
 			if temp_gadpro > 5:
-				miraprost += 1
-				if npc_QW['A60'] < 20: npc_QW['A60'] += 1
+				MiraVars['prostitute'] += 1
+				if MiraVars['QW'] < 20: MiraVars['QW'] += 1
 
 				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miraprost.jpg"></center>'
-
 				'It isn''t long before a customer pulls up in a flashy car. 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':
-					gs 'gadprostitutes', 'watch_mira'
-				end
+				act 'Watch Mira and the customer': gt 'gad_prostitutes', 'watch_mira'
 			else
 				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirawish2_1.jpg"></center>'
-
 				'Mira walks along the road showing off her body to passing cars and trucks, but no one stops to pick her up.'
 
-				act 'Continue' :gt 'gadprostitutes', 'just_mira'
+				act 'Continue': gt 'gad_prostitutes', 'just_mira'
 			end
 		end
 	else
 		'It is too late for Mira to work as a prostitute now.'
-		act 'Walk back to Gadukino together':MiraLoc = 0 & gt 'gadukino', ''
+		act 'Walk back to Gadukino together': gt 'gadukino', ''
 	end
 end
 
 if $ARGS[0] = 'watch_mira':
+	gs 'arousal', 'voyeur_sex', 10
+	menu_off = 1
+	gs 'stat'
+
 	temp_gadpro = rand(0,1)
 	if temp_gadpro = 0:
-		*clr & cla
-		gs 'arousal', 'voyeur_sex', 10
-		gs 'stat'
-
 		'<center><video autoplay loop src="images/characters/gadukino/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':
-			gs 'gadprostitutes', 'watch_from_hiding'
+			gt 'gad_prostitutes', 'watch_from_hiding'
 		end
 	elseif temp_gadpro = 1:
-		*clr & cla
-		gs 'arousal', 'voyeur_sex', 10
-		gs 'stat'
-
 		'<center><video autoplay loop src="images/characters/gadukino/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, and you see a hungry gleam in the guy''s eyes, which Mira returns.'
 
 		act 'Keep watching':
-			gs 'gadprostitutes', 'watch_close'
+			gt 'gad_prostitutes', 'watch_close'
 		end
 	end
 end
 
 if $ARGS[0] = 'watch_from_hiding':
-	*clr & cla
 	gs 'arousal', 'voyeur_sex', 10
+	menu_off = 1
 	gs 'stat'
 
 	'<center><video autoplay loop src="images/characters/gadukino/mira/sex/miraprost1_1.mp4"></video></center>'
-
 	'You duck for cover as the guy suddenly gets out of the car, opens the passenger door, grabs Mira''s head, and starts forcing his cock deep into her throat.'
 
 	act 'Keep watching':
@@ -207,14 +196,14 @@ if $ARGS[0] = 'watch_from_hiding':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			gt 'gadprostitutes', 'just_mira'
+			gt 'gad_prostitutes', 'just_mira'
 		end
 	end
 end
 
 if $ARGS[0] = 'watch_close':
-	*clr & cla
 	gs 'arousal', 'voyeur_sex', 10
+	menu_off = 1
 	gs 'stat'
 
 	'<center><video autoplay loop src="images/characters/gadukino/mira/sex/miraprost2_1.mp4"></video></center>'
@@ -237,7 +226,7 @@ if $ARGS[0] = 'watch_close':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			gt 'gadprostitutes', 'just_mira'
+			gt 'gad_prostitutes', 'just_mira'
 		end
 	end
 end
@@ -250,7 +239,7 @@ end
 !
 !		end
 !	end
-!	act 'Stop looking for customers with Mira': gt 'gadprostitutes', 'start'
+!	act 'Stop looking for customers with Mira': gt 'gad_prostitutes', 'start'
 !end
 
 
@@ -264,22 +253,19 @@ end
 !		end
 !	end
 !
-!	act 'Stop looking for customers': gt 'gadprostitutes', 'start'
+!	act 'Stop looking for customers': gt 'gad_prostitutes', 'start'
 !end
 !! TODO: the above was never implemented, so just going with this.
 
 if $ARGS[0] = 'work':
-	gt 'gadprostitutes', 'work_alone'
+	gt 'gad_prostitutes', 'work_alone'
 end
 
 if $ARGS[0] = 'work_alone':
 	CLOSE ALL
-	if sound = 0:PLAY 'sound/highway.mp3',20
+	if sound = 0: PLAY 'sound/highway.mp3', 20
 
-	*clr & cla
-	$loc_arg = 'work'
-	$used_name = 'gadukino'
-	$menu_arg = 'work'
+	gs 'shortgs', 'setloc', 'gad_prostitutes', 'work'
 	menu_off = 0
 	gs 'stat'
 
@@ -305,9 +291,9 @@ if $ARGS[0] = 'work_alone':
 
 	if prostitute['earnings_day'] > 0: 'You have earned <<prostitute[''earnings_day'']>> <b>₽</b> today.'+iif(prostitute['payment_method'] = 0, ' Your share is <<prostitute[''earnings_day''] * prostitute[''share_player''] / 100>> <b>₽</b>'+iif(prostitute['debt_amount'] > 0, ', but your pimp will keep <<prostitute[''earnings_day''] * prostitute[''debt_payment_percent''] / 100>> <b>₽</b> to pay down your debt.', '.'), '')
 
-	if prostitute['payment_method'] = 0: gs 'gadprostitutes', 'event_check'
+	if prostitute['payment_method'] = 0: gs 'gad_prostitutes', 'event_check'
 
-	act 'Stop working for now': gt 'gadprostitutes','start'
+	act 'Stop working for now': gt 'gad_prostitutes', 'start'
 
 	gs 'willpower', 'prostitution', 'self', 'medium'
 	if will_cost <= pcs_willpwr:
@@ -325,7 +311,7 @@ if $ARGS[0] = 'work_alone':
 			mc_inventory['makeup_wipes'] -= 1
 			cumspclnt = 20
 			gs 'cum_cleanup'
-			gt 'gadprostitutes', 'work'
+			gt 'gad_prostitutes', 'work'
 		end
 	elseif mc_inventory['makeup_wipes'] =  0:
 		'<br>You don''t have any tissues with you to remove cum from your body.'
@@ -334,7 +320,6 @@ if $ARGS[0] = 'work_alone':
 	!! NOTE:  This is where the working/negotiationg part begins in the original file. Moved to a separate file.
 	!! This call just displays the explanation and the "config" of the negotiations on the page.
 	gs 'prostitution_car_negotiation', 'general_description'
-
 end 
 
 !!------ Random events and scenes, from police raids to robbery, etc. ----------------------------------------------------
@@ -343,5 +328,5 @@ if $ARGS[0] = 'event_check':
 
 end
 
---- gadprostitutes ---------------------------------
+--- gad_prostitutes ---------------------------------
 

+ 413 - 0
locations/gad_river.qsrc

@@ -0,0 +1,413 @@
+# gad_river
+!2022/05/02
+!2024/05/05 - Mira schedule introduced.
+!locat['A60'] = Mira''s location. See 'miroslava_schedule'
+
+$loc = 'gad_river'
+$menu_loc = 'gad_river'
+
+if $ARGS[0] = 'start':
+	gs 'shortgs', 'setloc', 'gad_river', 'start'
+	$location_type = 'public_outdoors'
+	menu_off = 0
+	gs 'miroslava_schedule'
+	gs 'stat'
+
+	'<center><H2>Slavka River</H2></center>'
+
+	if month >= 5 and month <= 9:
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver_night.jpg"></center>'
+		end
+	else
+		if hour >= 8 and hour < 18:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver_winter.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver_winter_night.jpg"></center>'
+		end
+	end
+
+	'A large river flows lazily for a few hundred meters on the northern outskirts of Gadukino.'
+
+	if hour >= 6 and hour < 21 and sunWeather = 1: 'You see the local <a href="exec:gt ''gad_river'', ''fishers''">fishermen</a> fishing with their rods on the riverbank.'
+
+	temp_rand = rand(0, 20)
+
+	if temp_rand = 1 and hour < 5 and month >= 5 and month <= 9 and MiraVars['QW'] >= 20:
+		'Right next to the path leading to the river, you see <a href="exec: gt ''gad_river'', ''mirapunish'' ">Mira</a> naked, bound with ropes between two trees...'
+	elseif temp_rand = 4 and GadBoy['river_day'] ! daystart and (locat['A60'] / 10) ! 5 and npc_QW['A63'] >= 13 and hour >= 5:
+		GadBoy['river_day'] = daystart
+		'While going to the river, you meet Kolyamba and Vasyan. They first invite you to join them, then insist you go with them.'
+
+		act 'Go with them':
+			*clr & cla
+			menu_off = 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex17.jpg"></center>'
+			'The boys take you to Vasyan''s house, where they rudely keep pushing you until you are bent over the kitchen table. They then take turns fucking you...'
+			gs 'boyStat', 'A61'
+			npc_sex[$boy] += 1
+			pose = 1
+			if mesec = 0:
+				gs 'dinsex', 'boy_puts_condom'
+				gs 'dinsex','vaginal_sex',20,'sub','gangbang'
+				gs 'dinsex','sexcum'
+			else
+				gs 'dinSex','boy_wants_anal','','lubri'
+				gs 'dinsex','analsex',20,'sub','gangbang'
+			end
+			gs 'boyStat', 'A62'
+			npc_sex[$boy] += 1
+			if mesec = 0:
+				gs 'dinsex', 'boy_puts_condom'
+				gs 'dinsex','vaginal_sex',20,'sub','gangbang'
+				gs 'dinsex','sexcum'
+			else
+				gs 'dinSex','boy_wants_anal','','lubri'
+				gs 'dinsex','analsex',20,'sub','gangbang'
+			end
+			gs 'stat'
+
+			act 'Finish': minut += 10 & gt 'gadukino'
+		end
+	elseif temp_rand = 5 and GadBoy['river_day'] ! daystart and (locat['A60'] / 10) ! 5 and npc_QW['A63'] >= 13 and hour >= 5:
+		GadBoy['river_day'] = daystart
+		'While walking towards the river, you meet the village boys you''ve been drinking with recently. They ask you to go with them.'
+
+		act 'Go with them':
+			*clr & cla
+			menu_off = 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex18.jpg"></center>'
+			'The boys lead you to Vasyan''s house and start undressing; following their lead, you strip off, too, "We''re going to fuck your ass. I hope you can enjoy it, but I''m not going to be upset if you don''t."'
+			gs 'arousal', 'auto_lube', 'anal'
+			'They don''t say anything more before they spend the next hour fucking you in the ass...'
+			gs 'arousal', 'anal', 20, 'gangbang', 'sub'
+			gs 'arousal', 'anal', 20, 'gangbang', 'sub'
+			gs 'arousal', 'anal', 20, 'gangbang', 'sub'
+			gs 'arousal', 'end'
+			gs 'boyStat', 'A63'
+			npc_sex[$boy] += 1
+			gs 'cum_call','butt',$boy,1
+			gs 'boyStat', 'A61'
+			npc_sex[$boy] += 1
+			gs 'cum_call','butt',$boy,1
+			gs 'boyStat', 'A62'
+			npc_sex[$boy] += 1
+			gs 'cum_call','butt',$boy,1
+			pcs_ass += 3
+			gs 'stat'
+
+			act 'Leave': gt 'gadukino'
+		end
+	elseif temp_rand = 6 and GadBoy['river_day'] ! daystart and (locat['A60'] / 10) ! 5 and npc_QW['A63'] >= 13 and hour >= 5:
+		GadBoy['river_day'] = daystart
+		'On your way to the river, you meet Vasyan. But, unfortunately, he insists you follow him home...'
+
+		act 'Go with him':
+			*clr & cla
+			menu_off = 1
+			gs 'boyStat', 'A62'
+			npc_sex[$boy] += 1
+			pose = 1
+
+			if mesec = 0:
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex20.jpg"></center>'
+				'As soon as you open the door, Vasyan pushes you inside and pulls your clothes off crudely. Once you are naked, he moves you towards the sofa and forces you to your knees...'
+				gs 'arousal', 'vaginal', 20, 'sub'
+				gs 'cum_call','butt',$boy,1
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex21.jpg"></center>'
+				'As soon as you open the door, Vasyan pushes you inside and pulls your clothes off crudely. He then throws you onto his bed. Noticing that you are slightly bleeding, he asks if it is that time of the month. You whimper, "Yes." He curses angrily, turns you over and begins roughly fucking your ass...'
+				gs 'arousal', 'anal', 20, 'sub'
+				gs 'cum_call','butt',$boy,1
+			end
+			gs 'arousal', 'end'
+			gs 'stat'
+
+			act 'Finish': gt'gadukino'
+		end
+	else
+		act 'Walk to the beach (0:05)': minut += 5 & gt 'gad_beach', 'start'
+		act 'Walk to the road (0:10)': minut += 10 & gt 'gad_road', 'start'
+		act 'Walk to Gadukino (0:20)': minut += 20 & gt 'gadukino'
+	end
+	killvar 'temp_rand'
+end
+
+
+if $ARGS[0] = 'mirapunish':
+	*clr & cla
+	menu_off = 1
+	minut += 10
+	pcs_horny += rand(25,75)
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirapunish.jpg"></center>'
+	'You approach Mira. She looks distressed and embarrassingly smiles as you start asking what happened. She pleads with you to release her. As you untie her, she explains that Kolyamba punished her for barely biting his cock as she sucked it...'
+	'"Thank God you showed up," she says with a sigh of relief as you untie her. "I''m glad you found me and not one of those old hags from the village. They would call me a whore, and I would get scolded for being promiscuous. Those old hags hate us, you know. We''re young and beautiful, and they are just mean old wretches." said the naked Mira, revealing her true feelings about the villagers. She continues quietly, "Or it could have been even worse. Someone could have abused me, raped me or even killed m..." Then, she suddenly stops and lunges in your arms, weeping. "Thank you," she tells you. "You saved my life!"'
+
+	act 'Leave': gt 'gad_beach', 'start'
+end
+
+
+if $ARGS[0] = 'fishers':
+	*clr & cla
+	menu_off = 1
+	minut += 2
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverfishers.jpg"></center>'
+
+	if fishersday ! daystart:
+		act 'Greet':
+			cla
+			*clr
+			fishersday = daystart
+			minut += 3
+			if fishersQW < 3:fishersQW += 1
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/hifishers.jpg"></center>'
+			'You politely greet the fishermen, but they are too focused on fishing. One of them absently waves in your general direction in response.'
+
+			if fishersQW >= 3:
+				act 'Chat':
+					cla
+					*clr
+					minut += 10
+					if fishersQW = 3:fishersQW = 4
+					gs 'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
+					'You keep watching as the fishermen throw out their lures. One catches a fish and shows off his trophy before putting it into the fish bail. The two of you chat about fishing.'
+
+					act 'Leave': gt 'gad_river', 'start'
+				end
+			end
+			if fishersQW = 4:
+				act 'Ask to borrow a fishing rod':
+					cla
+					*clr
+					minut += 10
+					fishersQW = 5
+					gs 'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
+					'You decide to try your luck at fishing and ask the fishermen if they could lend you a fishing rod. Uncle Stepan, a friend of the family, points to a pile of spare rods and tells you to pick one.'
+
+					act 'Fishing': gt 'gad_river', 'fishing'
+				end
+			end
+			if fishersQW = 5:
+				act 'Fishing with them':
+					cla
+					*clr
+					minut += 10
+					gs 'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
+					'You decide to join your new friends. Uncle Stepan tells you he has plenty of spare rods and hands you a rod while his eyes travel up and down your body.'
+
+					act 'Fishing': gt 'gad_river', 'fishing'
+				end
+			end
+
+			act 'Leave': gt 'gad_river', 'start'
+		end
+	else
+		act 'Leave': gt 'gad_river', 'start'
+	end
+end
+
+
+if $ARGS[0] = 'fishing':
+	*clr & cla
+	menu_off = 1
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver.jpg"></center>'
+	'The stream quietly flows over the rocks, pleasantly tickling your ears. You gaze at the village that''s entirely peaceful. There is a sense of serenity about it today.'
+	'You caught <<fish>> fish.'
+	if hour < 22:
+		act 'Throw the bait':
+			*clr & cla
+			minut += rand(5, 10)
+			if hour < 12:
+				temp_rand = rand(0, 15)
+			elseif hour >= 12 and hour < 18:
+				temp_rand = rand(0, 20)
+			else
+				temp_rand = rand(0, 10)
+			end
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/fishingriver.jpg"></center>'
+			'You throw out the lure and watch the bobber for signs of a nibble.'
+
+			if temp_rand < rand(1, 5):
+				cla
+				*clr
+				minut += 1
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/nofishingriver.jpg"></center>'
+				'Suddenly the bobber dives under the water dramatically. You got one!'
+
+				act 'Pull':
+					*clr & cla
+					minut += 1
+					temp_rand = rand(0, 120)
+					if temp_rand < 50: gs 'exp_gain', 'react', 1
+					gs 'stat'
+
+					if pcs_react > temp_rand:
+						pcs_mood += rand(5, 10)
+						minut += 1
+						gs 'exp_gain', 'react', 1
+						fish += 1
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/fishyes.jpg"></center>'
+						'You skillfully strike, pulling the rod up sharply. You feel the rod straining slightly, and after a few moments, you excitedly pull a small fish out of the water.'
+					else
+						pcs_mood -= rand(5, 10)
+						minut += 1
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver.jpg"></center>'
+						'You strike, but the lack of tension makes the fish escape from the hook.'
+
+					end
+					act 'Throw another bait': gt 'gad_river', 'fishing'
+					killvar 'temp_rand'
+				end
+			else
+				'The bobber remains perfectly still. Eventually, you decide to try a different lure.'
+				act 'Retrieve bait': gt 'gad_river', 'fishing'
+			end
+			killvar 'temp_rand'
+		end
+		act 'Finish':
+			cla
+			*clr
+			minut += 5
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
+			'You''re tired, so you return the fishing rod to uncle Stepan.'
+			if fish > 0:
+				act 'Release your catch':
+					cla
+					*clr
+					minut += 5
+					fish = 0
+					gs 'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
+					'You decide to release all the fish you caught today. The other fishermen shake their heads disapprovingly, throwing sidelong glances at your body as you dump the fish back into the river.'
+
+					act 'Leave': gt $loc, $loc_arg
+				end
+				act 'Give the fish to Uncle Stepan':
+					cla
+					*clr
+					minut += 5
+					fish = 0
+					gs 'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
+					'You give all the fish you caught to uncle Stepan, and he makes a show out of reluctantly accepting them. Still, you can see that he is pretty happy with this arrangement.'
+
+					act 'Leave': gt $loc, $loc_arg
+				end
+				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 to the floor and twines around your feet. Then, the furry beast starts loudly yowling 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 points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
+
+					act 'Finish': gt 'gad_gphouse', '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 points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
+
+					act 'Finish': gt 'gad_gphouse', 'start'
+				end
+			else
+				act 'Leave': gt $loc, $loc_arg
+			end
+		end
+	else
+		cla
+		*clr
+		minut += 5
+		pcs_mood -= rand(5,10)
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
+		'Uncle Stepan says, "It''s time to head home, young lady." You reluctantly return his fishing rod, knowing that''s it for today.'
+
+		if fish > 0:
+			act 'Release your catch':
+				cla
+				*clr
+				minut += 5
+				fish = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
+				'You decide to release all the fish you caught today. The other fishermen shake their heads disapprovingly, throwing sidelong glances at your body as you dump the fish back into the river.'
+
+				act 'Leave': gt $loc, $loc_arg
+			end
+			act 'Give to Uncle Stepan':
+				cla
+				*clr
+				minut += 5
+				fish = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
+				'You give all the fish caught to uncle Stepan, who reluctantly accepts them. You can see he is pretty happy with this arrangement.'
+
+				act 'Leave': gt $loc, $loc_arg
+			end
+			if 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 to the floor and twines around your feet. Then, the furry beast starts loudly yowling 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 points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
+
+					act 'Finish': gt 'gad_gphouse', '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 points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
+
+					act 'Finish': gt 'gad_gphouse', 'start'
+				end
+			end
+		else
+			act 'Leave': gt $loc, $loc_arg
+		end
+	end
+end
+
+--- gad_river ---------------------------------

+ 39 - 50
locations/gadroad.qsrc → locations/gad_road.qsrc

@@ -1,14 +1,12 @@
-# gadroad
+# gad_road
+!2024/05/05 - Mira schedule introduced.
+!locat['A60'] = Mira''s location. See 'miroslava_schedule'
 
-if $ARGS[0] = '':
-	$loc = 'gadroad'
-	$loc_arg = ''
+if $ARGS[0] = 'start':
+	gs 'shortgs', 'setloc', 'gad_road', 'start'
 	$location_type = 'public_outdoors'
-
-	$menu_loc = 'gadroad'
-	$menu_arg = ''
 	menu_off = 0
-
+	gs 'miroslava_schedule'
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
 	gs'stat'
@@ -30,40 +28,34 @@ if $ARGS[0] = '':
 	end
 	*nl
 	'A dirt road leading to the outskirts of Gadukino. You are surrounded by grainfields where the grains appear, reaching all the way to the heavens.'
-	'The forest '+iif(meadow > 0, 'and meadow ','')+'can be found further down the road, away from the village.'
+	'The forest '+iif(gad_meadow_found = 1, 'and meadow ', '')+'can be found further down the road, away from the village.'
 	*nl
 	! 10% chance of meeting Mitka once per day on the road when Sveta is not the village boys slut or whole villages whore
-	mitkarand = rand(1,10)
-	if mitka_first_drink > 0 and mitkaday ! daystart and hour >= 17 and hour < 20 and mitkarand = 1 and (npc_QW['A63'] < 11 or gadriver_gang > 2):
+	if rand(0, 9) = 0 and GadBoy['first_drink'] > 0 and GadBoy['mitka_day'] ! daystart and hour >= 17 and hour < 20 and (npc_QW['A63'] < 11 or GadBoy['river_gang'] > 2):
 		'<a href="exec:gt ''mitka''">Mitka</a> is smoking near the road, he smiles at you as you walk by.'
 	! Meet the boys to drink with them at 20 if Sveta has been invited by Mitka already
-	elseif mitka_first_drink > 0 and hour = 20 and alko < 10 and mitkadrinkday ! daystart:
-		'<a href="exec:gt ''gadroad'',''drinking_invite''">Mitka, Kolyamba, and Vasyan</a> are walking down the road towards the woods, drinking moonshine and talking loudly.'
+	elseif GadBoy['first_drink'] > 0 and hour = 20 and alko < 10 and GadBoy['drinkday'] ! daystart:
+		'<a href="exec:gt ''gad_road'', ''drinking_invite''">Mitka, Kolyamba, and Vasyan</a> are walking down the road towards the woods, drinking moonshine and talking loudly.'
 	! If Sveta is late to go drink with the boys if she already knows where the trailer is she can still get there
-	elseif mitka_first_drink = 2 and hour > 20 and alko < 10 and mitkadrinkday ! daystart:
+	elseif GadBoy['first_drink'] = 2 and hour > 20 and alko < 10 and GadBoy['drinkday'] ! daystart:
 		! 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:
-				MiraLoc = 5
-				if npc_QW['A60'] >= 16 and gadriver_gang = 2:
-					'You can go drink with Mira, Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh_group'',''partywithMira''">trailer</a> hidden in the woods.'
-				else
-					'You can go drink with Mira, Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh'',''partywithMira''">trailer</a> hidden in the woods.'
-				end
+
+		if locat['A60'] = 42:
+			if MiraVars['QW'] >= 16 and GadBoy['river_gang'] = 2:
+				'You can go drink with Mira, Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh_group'',''partywithMira''">trailer</a> hidden in the woods.'
 			else
-				'You can go drink with Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh'',''partyalone''">trailer</a> hidden in the woods.'
+				'You can go drink with Mira, Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh'',''partywithMira''">trailer</a> hidden in the woods.'
 			end
 		else
-			'You can go drink with the Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh'',''partyalone''">trailer</a> hidden in the woods.'
+			'You can go drink with Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh'',''partyalone''">trailer</a> hidden in the woods.'
 		end
 	end
 
 	act 'Walk to the bus station (0:01)': minut += 1 & gt 'bus', 'gadukino'
 	act 'Walk to Gadukino (0:10)': minut += 10 & gt 'gadukino'
-	act 'Walk down to the river (0:10)': minut += 10 & gt 'gadriver', 'start'
-	act 'Walk into the woods (0:15)': minut += 15 & gt 'gadforest','forest_edge'
-	act 'Walk to the fields (0:10)': minut += 10 & gt 'gadfield','field'
+	act 'Walk down to the river (0:10)': minut += 10 & gt 'gad_river', 'start'
+	act 'Walk to the fields (0:10)': minut += 10 & gt 'gad_field', 'field'
+	act 'Walk into the woods (0:15)': minut += 15 & gt 'gad_forest', 'forest_edge'
 
 	if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and hour >= 6 and hour < 22:
 		if pcs_energy >= 5 and pcs_stam >= stammax / 5:
@@ -85,7 +77,7 @@ if $ARGS[0] = '':
 				end
 				'You run for an hour enjoying the scenery.'
 
-				act 'Finish':gt'gadroad'
+				act 'Finish': gt 'gad_road', 'start'
 			end
 		elseif pcs_stam >= stammax / 5:
 			act 'Go for a run (1:00)': '<br><font color="red">You are so hungry you cannot face going for a run.</font>'
@@ -98,21 +90,17 @@ if $ARGS[0] = '':
 end
 
 if $ARGS[0] = 'drinking_invite':
-	$loc = 'gadroad'
-	$loc_arg = 'drinking_invite'
+	gs 'shortgs', 'setloc', 'gad_road', 'drinking_invite'
 	$location_type = 'secluded'
-
-	$menu_loc = 'gadroad'
-	$menu_arg = 'drinking_invite'
 	menu_off = 1
-
+	gs 'miroslava_schedule'
 	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.'
 	! Sveta has never been drinking with Mitka before
-	if mitka_first_drink = 1:
+	if GadBoy['first_drink'] = 1:
 		'Mitka is the first to greet you, "Hey <<$pcs_nickname>>, glad you decided to join us today!"'
 		'Kolyamba and Vasyan nod in agreement as they look you over.'
 		'"We know this great spot in the woods to hang out. No one ever bothers us there."'
@@ -123,7 +111,7 @@ if $ARGS[0] = 'drinking_invite':
 	'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):
+	if MiraVars['QW'] > 0 or locat['A60'] ! 42:
 		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'No thanks, not tonight. (<<will_cost>> Willpower)':
@@ -131,7 +119,7 @@ if $ARGS[0] = 'drinking_invite':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 
-				gt 'gadroad'
+				gt 'gad_road', 'start'
 			end
 		else
 			act 'No thanks, not tonight. (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -139,26 +127,27 @@ if $ARGS[0] = 'drinking_invite':
 	end
 
 	! 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: MiraLoc = 5
+	if locat['A60'] = 42 and locat['A60_prev'] ! 42 and MiraVars['follow_time'] = 0:
 		'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:
-		act 'Go with them': minut += 15 & npc_drunk['A60'] = 0 & gt 'mitkabuh_group'
-	! Mira is here and neither or only 1 out 2 of them is the town whore
-	! mitkabuh has the drinking events for group sex for 1 girl and 3 boys or no sex at all if quest is not far enough along
-	elseif MiraLoc = 5:
-		act 'Go with them': minut += 15 & npc_drunk['A60'] = 0 & gt 'mitkabuh'
+	if locat['A60'] = 42:
+		! 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 MiraVars['QW'] >= 16 and GadBoy['river_gang'] = 2:
+			act 'Go with them': minut += 15 & gt 'mitkabuh_group'
+
+		! Mira is here and neither or only 1 out 2 of them is the town whore
+		! mitkabuh has the drinking events for group sex for 1 girl and 3 boys or no sex at all if quest is not far enough along
+		else
+			act 'Go with them': minut += 15 & gt 'mitkabuh'
+		end
 	! Mira is not here so Sveta goes by herself
 	else
 		act 'Go with them': minut += 15 & gt 'mitkabuh'
 	end
 end
 
---- gadroad ---------------------------------
+--- gad_road ---------------------------------
 

+ 19 - 27
locations/swamp.qsrc → locations/gad_swamp.qsrc

@@ -1,14 +1,8 @@
-# swamp
+# gad_swamp
 
 if $ARGS[0] = 'start':
-	*clr & cla
-
-	$loc = 'swamp'
-	$loc_arg = 'start'
+	gs 'shortgs', 'setloc', 'gad_swamp', 'start'
 	$location_type = 'secluded'
-
-	$menu_loc = 'swamp'
-	$menu_arg = 'start'
 	menu_off = 0
 
 	CLOSE ALL
@@ -25,18 +19,22 @@ if $ARGS[0] = 'start':
 	'You are at the village''s swamp on the far side of the woods.'
 	'It can be dangerous to hike in this area unless you are physically fit or know the forest well.'
 
-	act 'Head back to the forest (0:15)': minut += 15 & gt 'gadforest', 'forest_center'
+	act 'Head back to the forest (0:15)': minut += 15 & gt 'gad_forest', 'forest_center'
 
 	if hunterscabin = 1:
 		'You can see the small path to the clearing that contains the hunters'' cabin.'
 		act 'Walk to the hunters'' cabin (0:15)':
 			! daytime chance to get stuck in swamp - use bike to get there 100% of the time
 			if DayStage < 4:
-				swamp_stuck = 0
-				gt 'swamp', 'stuck','swamp'
+				if rand(0, 9) = 0:
+					gt 'gad_swamp_yard', 'start'
+				else
+					swamp_stuck = 0
+					gt 'gad_swamp', 'stuck', 'swamp'
+				end
 			! nighttime chased by wolves - Sveta probably should not be roaming the forest at this time
 			else
-				gt 'gadforestlost','wolves','swamp'
+				gt 'gad_forest_lost', 'wolves', 'swamp'
 			end
 		end
 	end
@@ -46,14 +44,8 @@ end
 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 < 80 and pcs_agil < 70 and pcs_stren < 70:
-		*clr & cla
-
-		$loc = 'swamp'
-		$loc_arg = 'stuck'
+		gs 'shortgs', 'setloc', 'gad_swamp', 'stuck'
 		$location_type = 'secluded'
-
-		$menu_loc = 'swamp'
-		$menu_arg = 'stuck'
 		menu_off = 0
 
 		CLOSE ALL
@@ -111,7 +103,7 @@ if $ARGS[0] = 'stuck':
 				*nl
 				'Your efforts are not vain as you begin to feel the mud''s hold loosen. Then, with another burst of strength, you free yourself and sigh in relief.'
 
-				act 'Success!': gt 'swamp_yard', 'start'
+				act 'Success!': gt 'gad_swamp_yard', 'start'
 			else
 				'<center><H4>Swamp</H4></center>'
 				if $clothingworntype ! 'nude' and PCloSkirt = 0:
@@ -124,7 +116,7 @@ if $ARGS[0] = 'stuck':
 				*nl
 				'Your efforts are for nothing. The mud''s hold feels as tight as ever. In fact, you feel yourself sinking even deeper.'
 
-				act 'Failure': gt 'swamp', 'stuck'
+				act 'Failure': gt 'gad_swamp', 'stuck'
 			end
 		end
 		if month >= 4 and month <= 10:
@@ -150,22 +142,22 @@ if $ARGS[0] = 'stuck':
 						*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 the solid ground.'
 						gs 'stat'
 
-						act 'Relax':gt 'swamp_yard','start'
+						act 'Relax': gt 'gad_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.'
 					gs 'stat'
 
-					act 'Failure':gt 'swamp','stuck'
+					act 'Failure': gt 'gad_swamp','stuck'
 				end
 			end
 		end
 	else
 		'<center><H4>Swamp</H4></center>'
 		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'gadforestlostswamp.jpg','gadforestlostswamp_night.jpg')+'"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'gadforestlostswamp.jpg', 'gadforestlostswamp_night.jpg')+'"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'gadforestlostswamp_winter.jpg','gadforestlostswamp_winter_night.jpg')+'"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'gadforestlostswamp_winter.jpg', 'gadforestlostswamp_winter_night.jpg')+'"></center>'
 		end
 		*nl
 		if $ARGS[1] = 'forest_edge':
@@ -176,9 +168,9 @@ if $ARGS[0] = 'stuck':
 			'After walking through the swamp for a few minutes, you finally see the hunters'' cabin ahead.'
 		end
 		gs 'stat'
-		act 'Continue':gt 'swamp_yard', 'start'
+		act 'Continue': gt 'gad_swamp_yard', 'start'
 	end
 end
 
---- swamp ---------------------------------
+--- gad_swamp ---------------------------------
 

+ 24 - 27
locations/swamp_woods.qsrc → locations/gad_swamp_woods.qsrc

@@ -1,15 +1,12 @@
-# swamp_woods
+# gad_swamp_woods
 
 !TODO: Break into more arg blocks
 if $ARGS[0] = 'start':
 	CLOSE ALL
-	$loc = 'swamp_woods'
-	$loc_arg = 'start'
+	gs 'shortgs', 'setloc', 'gad_swamp_woods', 'start'
 	$location_type = 'secluded'
-	$menu_loc = 'swamp_woods'
-	$menu_arg = 'start'
 	menu_off = 0
-	$forest_args1 = 'swamp_woods'
+	$forest_args1 = 'gad_swamp_woods'
 
 	'<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.'
@@ -20,7 +17,7 @@ if $ARGS[0] = 'start':
 	!TODO: Make schedule more dynamic e.g. more factors
 	*nl
 
-	act 'Go back to the hut': minut += 10 & gt 'swamp_yard', 'start'
+	act 'Go back to the hut': minut += 10 & gt 'gad_swamp_yard', 'start'
 
 	if firewood < 10:
 		'You can pick up some firewood around here to keep the fire going.'
@@ -38,7 +35,7 @@ if $ARGS[0] = 'start':
 			minut += 15
 			gs 'stat'
 
-			act 'Further': gt 'swamp_woods', 'start'
+			act 'Further': gt 'gad_swamp_woods', 'start'
 		end
 	else
 		'You think about picking up firewood before remembering you have plenty back at the yard.'
@@ -52,12 +49,12 @@ if $ARGS[0] = 'start':
 			'You consider trying to circle around the swamp but then think it is better if you do not get too far from the hut.'
 			'If only you were a skilled pathfinder or knew nearby people that could help you get back...'
 
-			act 'Further': gt 'swamp_woods', 'start'
+			act 'Further': gt 'gad_swamp_woods', 'start'
 		elseif pcs_bushcraft < 40:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks2.jpg"></center>'
 			'You consider trying to circle around the swamp. You have a vague idea of how to accomplish that, but there is a good chance you may get lost.'
 
-			act 'Stay around for now': gt 'swamp_woods', 'start'
+			act 'Stay around for now': gt 'gad_swamp_woods', 'start'
 			act 'Try anyway':
 				*clr & cla
 				minut += 30
@@ -70,7 +67,7 @@ if $ARGS[0] = 'start':
 					'Even though you occasionally 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!': gs 'exp_gain', 'bushcraft', 5 & gt 'gadforest','forest_center'
+					act 'Success!': gs 'exp_gain', 'bushcraft', 5 & gt 'gad_forest', 'forest_center'
 				elseif nearby_woods_check <= 3:
 					!End up stuck in the swamp
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','nearby_woods_stuck.jpg','nearby_woods_stuck_nude.jpg')+'"></center>'
@@ -79,7 +76,7 @@ if $ARGS[0] = 'start':
 					*nl
 					'Seems like the forest can camouflage parts of the swamp, fooling careless hikers.'
 
-					act 'If only you knew': gs 'exp_gain', 'bushcraft', 3 & gt 'swamp','stuck'
+					act 'If only you knew': gs 'exp_gain', 'bushcraft', 3 & gt 'gad_swamp','stuck'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','nearby_woods_hike.jpg','nearby_woods_hike_nude.jpg')+'"></center>'
 					!Circle back to where the pcs started
@@ -89,7 +86,7 @@ if $ARGS[0] = 'start':
 					*nl
 					'You can see broken branches and prints ahead of you, marking the direction you initially started walking towards.'
 
-					act 'That''s interesting...': gs 'exp_gain', 'bushcraft', 2 & gt 'swamp_woods', 'start'
+					act 'That''s interesting...': gs 'exp_gain', 'bushcraft', 2 & gt 'gad_swamp_woods', 'start'
 				end
 			end
 		else
@@ -100,7 +97,7 @@ if $ARGS[0] = 'start':
 			'With that in mind, you go into the forest, aware of your surroundings, to ensure you are not stepping too far from the swamp''s edge.'
 			'After a couple hours, you are on the other edge of the forest.'
 
-			act 'Further': gt 'swamp_woods', 'start'
+			act 'Further': gt 'gad_swamp_woods', 'start'
 		end
 	end
 end
@@ -135,23 +132,23 @@ if $ARGS[0] = 'shooting_practice':
 					hunter_collective_opinion -= 2
 					gs 'stat'
 
-					act 'Further': gt 'swamp_woods', 'start'
+					act 'Further': gt 'gad_swamp_woods', 'start'
 				end
 			elseif hunter_collective_opinion > 35:
-				gt 'swamp_woods', 'shooting_practice', 'practice'
+				gt 'gad_swamp_woods', 'shooting_practice', 'practice'
 			else
 				if hunter_sexual_comfort > 20:
-					gt 'swamp_woods', 'shooting_practice', 'andrei_request'
+					gt 'gad_swamp_woods', 'shooting_practice', 'andrei_request'
 				else
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
 					'You try to get Andrei''s attention, but he ignores you. Finally, when you keep trying, he waves his hand to gesture for you to go away.'
-					act 'Further': gt 'swamp_woods', 'start'
+					act 'Further': gt 'gad_swamp_woods', 'start'
 				end
 			end
 		end
 
-		act 'Walk away': gt 'swamp_woods', 'start'
+		act 'Walk away': gt 'gad_swamp_woods', 'start'
 
 	elseif $ARGS[1] = 'practice':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','shooting.jpg','shooting_nude.jpg')+'"></center>'
@@ -160,7 +157,7 @@ if $ARGS[0] = 'shooting_practice':
 		gs 'exp_gain', 'shoot', 2
 		gs 'stat'
 
-		act 'Walk away': gt 'swamp_woods', 'start'
+		act 'Walk away': gt 'gad_swamp_woods', 'start'
 
 	elseif $ARGS[1] = 'andrei_request':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
@@ -185,7 +182,7 @@ if $ARGS[0] = 'shooting_practice':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
+					act 'Further': gt 'gad_swamp_woods', 'shooting_practice', 'practice'
 				end
 			elseif andrei_shooting_request = 2:
 				'"I want you to show me your pussy. Go sit on that log and lift up your bottom. You can shoot the rifle then."'
@@ -199,7 +196,7 @@ if $ARGS[0] = 'shooting_practice':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
+					act 'Further': gt 'gad_swamp_woods', 'shooting_practice', 'practice'
 				end
 			elseif andrei_shooting_request = 3:
 				'"I want you to take off all your clothes. Then hand them all to me. If you want to shoot my rifle, you have to be in your birthday suit."'
@@ -210,12 +207,12 @@ if $ARGS[0] = 'shooting_practice':
 					'You look at the ground and blush as he stares at your exposed tits, ass and pussy. You cannot help but feel your pussy moisten.'
 					'"This naked look suits you better, do you know that?" says Andrei. He ogles your body for a few more minutes before handing you the rifle.'
 					hunter_sexual_comfort += 7
-					gs 'clothing', 'strip_all', 'swamphouse'
+					gs 'clothing', 'strip_all', 'gad_swamphouse'
 					gs 'arousal', 'flash', 10, 'exhibitionism'
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
+					act 'Further': gt 'gad_swamp_woods', 'shooting_practice', 'practice'
 				end
 			elseif andrei_shooting_request = 4:
 				'"Seeing a young, pretty thing like you prancing around gives me a boner. I want you to suck my dick," demands Andrei.'
@@ -231,13 +228,13 @@ if $ARGS[0] = 'shooting_practice':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
+					act 'Further': gt 'gad_swamp_woods', 'shooting_practice', 'practice'
 				end
 			end
 		end
 
-		act 'Walk away': gt 'swamp_woods', 'start'
+		act 'Walk away': gt 'gad_swamp_woods', 'start'
 	end
 end
 
---- swamp_woods ---------------------------------
+--- gad_swamp_woods ---------------------------------

+ 27 - 30
locations/swamp_yard.qsrc → locations/gad_swamp_yard.qsrc

@@ -1,14 +1,11 @@
-# swamp_yard
+# gad_swamp_yard
 
 gs 'hunter_ambient', 'schedule'
 if $ARGS[0] = 'start':
-	$loc = 'swamp_yard'
-	$loc_arg = 'start'
-	$menu_loc = 'swamp_yard'
-	$menu_arg = 'start'
+	gs 'shortgs', 'setloc', 'gad_swamp_yard', 'start'
+	$location_type = 'secluded'
 	menu_off = 0
 
-	$location_type = 'secluded'
 	hunterscabin = 1
 
 	gs 'gadukino_event', 'sound'
@@ -16,7 +13,7 @@ if $ARGS[0] = 'start':
 
 	if lost_girl = 1:
 		if daystart > forest_lostday + 1 and rand(forest_lostday - daystart, 30) >= 30 and DayStage = 2:
-			gt 'gadforestlost','rescue','ranger','swamp_yard'
+			gt 'gad_forest_lost', 'rescue', 'ranger', 'gad_swamp_yard'
 		end
 	end
 
@@ -29,7 +26,7 @@ if $ARGS[0] = 'start':
 	*nl
 
 
-	'Behind the hut, there is a <a href="exec: gt ''swampspring'' ">spring</a>. If you continue further down, there is a small <a href="exec: gt ''backwater'' ">creek</a>  with relatively clean water.'
+	'Behind the hut, there is a <a href="exec: gt ''gad_swampspring'' ">spring</a>. If you continue further down, there is a small <a href="exec: gt ''gad_backwater'' ">creek</a>  with relatively clean water.'
 
 	if hunters_available = 1:
 		if hunters_were_met = 0:
@@ -39,11 +36,11 @@ if $ARGS[0] = 'start':
 		else
 			if hunters_outside = 1:
 				if hunters_evening = 1:
-					'You hear some gunshots and see <a href="exec: gt ''swamp_woods'', ''shooting_practice'' ">Andrei</a>, not too far in the distance, shooting some bottles.'
+					'You hear some gunshots and see <a href="exec: gt ''gad_swamp_woods'', ''shooting_practice'' ">Andrei</a>, not too far in the distance, shooting some bottles.'
 					'<a href="exec: gt ''hunters'', ''start'' ">Igor and Sergey</a> are standing in the front yard.'
 				else
 					if campfire = 1 and hunters_chattime = 0:
-						'You see the hunters are sitting by the <a href="exec: gt ''swamp_yard'', ''campfire''">campfire</a>'
+						'You see the hunters are sitting by the <a href="exec: gt ''gad_swamp_yard'', ''campfire''">campfire</a>'
 					else
 						'You notice the <a href="exec: gt ''hunters'', ''start'' ">hunters</a> standing in the front yard.'
 					end
@@ -67,18 +64,18 @@ if $ARGS[0] = 'start':
 
 
 
-	act '<b>Go to the swamp</b>': gt 'swamp_yard', 'swamp_escape'
-	gs 'bicycle', 'swamp_yard'
-	act 'Go into the house':gt 'swamphouse', 'start'
+	act '<b>Go to the swamp</b>': gt 'gad_swamp_yard', 'swamp_escape'
+	gs 'bicycle', 'gad_swamp_yard'
+	act 'Go into the house':gt 'gad_swamphouse', 'start'
 
-	act 'Approach the firepit': gt 'swamp_yard', 'campfire'
-	act 'Visit the spring': gt 'swampspring'
-	act 'Visit the creek': gt 'backwater'
-	act 'Explore the woods': minut += 10 & gt 'swamp_woods', 'start'
+	act 'Approach the firepit': gt 'gad_swamp_yard', 'campfire'
+	act 'Visit the spring': gt 'gad_swampspring'
+	act 'Visit the creek': gt 'gad_backwater'
+	act 'Explore the woods': minut += 10 & gt 'gad_swamp_woods', 'start'
 
 
 	if hunters_outside = 1 and hunters_available = 1 and rand(1,2) = 1:
-		gs 'swamp_yard', 'daytime_flavor_events'
+		gs 'gad_swamp_yard', 'daytime_flavor_events'
 	end
 end
 
@@ -86,13 +83,13 @@ end
 if $ARGS[0] = 'campfire':
 	!TODO: Add mechanic so that fire slowly goes through wood and extinguishes when there is no more left
 	cla & *clr
-	$loc = 'swamp_yard'
+	$loc = 'gad_swamp_yard'
 	$loc_arg = 'campfire'
 	menu_off = 1
 	gs 'hunter_ambient', 'schedule'
 	gs 'stat'
 
-	act 'Move away': gt 'swamp_yard', 'start'
+	act 'Move away': gt 'gad_swamp_yard', 'start'
 
 	if campfire = 1:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage = 2,'campfire_day.jpg','campfire_night.jpg')+'"></center>'
@@ -134,7 +131,7 @@ if $ARGS[0] = 'campfire':
 					end
 				end
 
-				act 'Further': gt 'swamp_yard', 'campfire'
+				act 'Further': gt 'gad_swamp_yard', 'campfire'
 			end
 		end
 
@@ -162,7 +159,7 @@ if $ARGS[0] = 'campfire':
 				minut += 5
 				bucket -= 3
 
-				act 'Further': gt 'swamp_yard', 'campfire'
+				act 'Further': gt 'gad_swamp_yard', 'campfire'
 			end
 		end
 		if bucket > 0:
@@ -186,13 +183,13 @@ if $ARGS[0] = 'campfire':
 				end
 				gs 'stat'
 
-				act 'Continue': gt 'swamp_yard', 'campfire'
+				act 'Continue': gt 'gad_swamp_yard', 'campfire'
 			end
 		end
 
 		act 'Eat a meal':
 			cla
-			act 'Return': gt 'swamp_yard', 'campfire'
+			act 'Return': gt 'gad_swamp_yard', 'campfire'
 			act 'Eat jerky and trail mix':gt 'food', 'jerky'
 			if meat_stew > 0:
 				act 'Eat meat stew':
@@ -238,7 +235,7 @@ if $ARGS[0] = 'campfire':
 				campfire = 1
 				minut += 15
 
-				act 'Further': gt 'swamp_yard', 'campfire'
+				act 'Further': gt 'gad_swamp_yard', 'campfire'
 			end
 		elseif firewood < 10 and campfire = 0:
 			*nl
@@ -252,7 +249,7 @@ if $ARGS[0] = 'swamp_escape':
 	if hunters_available = 1 and hunters_outside = 1:
 		if hour >= 6 and hour < 21:
 			minut += 5
-			if rand(0,9)>8: gt 'swamp', 'start' else gt 'swamp','stuck'
+			if rand(0, 9) = 0: gt 'gad_swamp', 'start' else gt 'gad_swamp','stuck'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/handshelp.jpg"></center>' & !! instead igorhanter.jpg
 			'As you start moving into the swamp, Igor calls after you.'
@@ -261,18 +258,18 @@ if $ARGS[0] = 'swamp_escape':
 			'"<<$pcs_nickname>>, where are you going? You will get stuck in there!'
 			gs 'stat'
 
-			act 'Turn back':gt 'swamp_yard','start'
+			act 'Turn back':gt 'gad_swamp_yard','start'
 			act 'Ignore him and keep going':
 				minut += 5
 
 				!TODO: Add skill clothing and temp check here instead of praying to RNGesus
-				if rand(0,9)>8: gt 'swamp', 'start' else gt 'swamp','stuck'
+				if rand(0, 9) = 0: gt 'gad_swamp', 'start' else gt 'gad_swamp','stuck'
 			end
 		end
 	else
 		minut += 5
 		!TODO: Here too, also see how to avoid duplicating. Maybe create a child event node?
-		if (hour >= 6 and hour < 21) or rand(0,9)>6: gt 'swamp', 'start' else gt 'swamp','stuck'
+		if (hour >= 6 and hour < 21) or rand(0, 9) < 3: gt 'gad_swamp', 'start' else gt 'gad_swamp', 'stuck'
 	end
 end
 
@@ -291,5 +288,5 @@ if $ARGS[0] = 'daytime_flavor_events':
 	end
 end
 
---- swamp_yard ---------------------------------
+--- gad_swamp_yard ---------------------------------
 

+ 124 - 131
locations/swamphouse.qsrc → locations/gad_swamphouse.qsrc

@@ -1,14 +1,11 @@
-# swamphouse
+# gad_swamphouse
 !2021/05/02
 
 gs 'hunter_ambient', 'schedule'
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	*clr & cla
+	gs 'shortgs', 'setloc', 'gad_swamphouse', 'start'
 	$location_type = 'indoors'
-	$loc = 'swamphouse'
-	$loc_arg = 'start'
-	$menu_loc = 'swamphouse'
-	$menu_arg = 'start'
 	menu_off = 0
 	frost = 0
 	bonusZ = 0
@@ -19,7 +16,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	if hour = 5:stovefire = 0
 	huntslutsexrand = rand(1,3)
 	temp_sh = rand(1,5)
-	clothesAtLocation = FUNC('lost_clothes_here','swamphouse')
+	clothesAtLocation = FUNC('lost_clothes_here','gad_swamphouse')
 
 	'<center><H4>Hut</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampizba.jpg"></center>'
@@ -27,12 +24,12 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'A small hunting cabin. The cabin contains a small room with a low ceiling.'
 	'You see a <a href="exec: gt ''bed'', ''start''">couch</a> where you can lie down and sleep.'
 	if bucket > 0:
-		'A <a href="exec: gs ''swamphouse'', ''bucket'' ">bucket</a> in the corner is filled with water collected from the spring.'
+		'A <a href="exec: gs ''gad_swamphouse'', ''bucket'' ">bucket</a> in the corner is filled with water collected from the spring.'
 	else
 		'There''s an empty bucket placed in the corner. It needs refilling with water from the spring.'
 	end
-	'You see an old <a href="exec: gs ''swamphouse'', ''washstand'' ">washstand</a> you can use to wash your hands and face. There is a well-used <a href="exec: gs ''swamphouse'', ''tub''">tub</a> nearby that you can use to bathe in.'
-	'In the other corner, you see a small <a href="exec: gs ''swamphouse'', ''stove''">stove</a>. With water from the spring and some mushrooms or meat, you could cook something to eat, or you could warm the water so you can bathe in the tub.'
+	'You see an old <a href="exec: gs ''gad_swamphouse'', ''washstand'' ">washstand</a> you can use to wash your hands and face. There is a well-used <a href="exec: gs ''gad_swamphouse'', ''tub''">tub</a> nearby that you can use to bathe in.'
+	'In the other corner, you see a small <a href="exec: gs ''gad_swamphouse'', ''stove''">stove</a>. With water from the spring and some mushrooms or meat, you could cook something to eat, or you could warm the water so you can bathe in the tub.'
 	if stovefire = 0:
 		*nl
 		'The hut feels '+iif(temper < 15, 'quite cold. Maybe you should start a fire on the old stove.', 'quite warm, even without the stove fire burning.')+''
@@ -40,20 +37,20 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		*nl
 		'The hut feels '+iif(temper > 15, 'extremely', 'quite')+' warm with the old stove fire burning away.'
 	end
-	'Besides the stove, there''s a stack of old <a href="exec: gs ''swamphouse'', ''stackmagazines''">magazines</a>, most likely used for ignition.'
+	'Besides the stove, there''s a stack of old <a href="exec: gs ''gad_swamphouse'', ''stackmagazines''">magazines</a>, most likely used for ignition.'
 	!TODO: fix this showing after dare, Sveta accepting Igors request or with hessian
 	if clothesAtLocation = 1:'Your clothes are lying on the shelf.'
 
 	if hunters_were_met = 1:
 		if hunters_inside = 1:
 			if hunters_drink = 1:
-				'You see the <a href="exec: gs ''swamphouse'', ''hunterstable''">hunters</a> sitting around the table talking.'
+				'You see the <a href="exec: gs ''gad_swamphouse'', ''hunterstable''">hunters</a> sitting around the table talking.'
 			elseif hunters_sleep = 1:
 				'The hunters are sleeping on the couch.'
 			elseif hunters_breakfast = 1 or hunters_lunch = 1 or hunters_dinner = 1:
-				'The <a href="exec: gs ''swamphouse'', ''hunterstable''">hunters</a> are sitting around the table.'
+				'The <a href="exec: gs ''gad_swamphouse'', ''hunterstable''">hunters</a> are sitting around the table.'
 			else
-				'You see the <a href="exec: gs ''swamphouse'', ''huntersrelax''">hunters</a> hanging out in the hut.'
+				'You see the <a href="exec: gs ''gad_swamphouse'', ''huntersrelax''">hunters</a> hanging out in the hut.'
 			end
 		end
 	else
@@ -73,7 +70,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 
 
-	act 'Go outside': minut += 1 & hunter_refuse = 0 & gt 'swamp_yard', 'start'
+	act 'Go outside': minut += 1 & hunter_refuse = 0 & gt 'gad_swamp_yard', 'start'
 
 
 
@@ -85,19 +82,19 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				*clr & cla
 				minut+=5
 				if $clothingworntype ! 'nude':
-					gs 'clothing', 'strip', 'swamphouse'
+					gs 'clothing', 'strip', 'gad_swamphouse'
 				end
 				gs 'underwear', 'remove'
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphouseundress.jpg"></center>'
 				''+iif(temper > 23, 'Feeling the heat in the cabin,', 'You feel the need to get naked, so')+' you start removing your clothes.'
-				act 'Back': gt 'swamphouse', 'start'
+				act 'Back': gt 'gad_swamphouse', 'start'
 			else
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/noundress.jpg"></center>'
 				''+iif(temper > 23, 'Despite the heat,', 'Despite your need to get naked,')+' you''re still too shy to get undressed. What if someone suddenly comes in?'
-				act 'Back': gt 'swamphouse', 'start'
+				act 'Back': gt 'gad_swamphouse', 'start'
 			end
 		end
 	end
@@ -110,16 +107,16 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				*nl
 				'You put your clothes back on.'
 				gs 'underwear', 'wear'
-				gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
+				gs 'clothing', 'recover_lost_clothes', 'gad_swamphouse', 1
 				gs 'stat'
-				act 'Back': gt 'swamphouse', 'start'
+				act 'Back': gt 'gad_swamphouse', 'start'
 			end
 		else
 			act 'Pick up your clothes':
 				*clr & cla
-				gs 'clothing', 'recover_lost_clothes', 'swamphouse'
+				gs 'clothing', 'recover_lost_clothes', 'gad_swamphouse'
 				'You pick up your clothes.'
-				act 'Back': gt 'swamphouse', 'start'
+				act 'Back': gt 'gad_swamphouse', 'start'
 			end
 		end
 	elseif swamp_clothes = 1:
@@ -129,10 +126,10 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
 				*nl
 				'You cover yourself with the hessian sack'
-				gs 'clothing', 'recover_lost_clothes', 'swamphouse'
-				gs 'clothing', 'swamp_clothes', 1
+				gs 'clothing', 'recover_lost_clothes', 'gad_swamphouse'
+				gs 'clothing', 'gad_swamp_clothes', 1
 				gs 'stat'
-				act 'Back': gt 'swamphouse', 'start'
+				act 'Back': gt 'gad_swamphouse', 'start'
 			end
 		end
 	end
@@ -154,23 +151,23 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/enema.jpg"></center>'
 				'Your search for your clothes but only find an enema syringe... "What is this doing here?" you wonder.'
-				act 'Continue': gt 'swamphouse', 'start'
+				act 'Continue': gt 'gad_swamphouse', 'start'
 			else
-				gs 'clothing', 'swamp_clothes', 1
+				gs 'clothing', 'gad_swamp_clothes', 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphouse_tkancloth.jpg"></center>'
 				'You find a piece of hessian... "Well, at least it''s something," you say.'
-				act 'Back.': gt 'swamphouse', 'start'
+				act 'Back.': gt 'gad_swamphouse', 'start'
 			end
 		end
 	end
 
-	if stovefire = 0 or (meat_stew = 0 and raw_meat > 0) or (mushroom_soup = 0 and boletus > 0): act 'Use the rickety stove': gt 'swamphouse', 'stove'
-	if pcs_energy < 80: act 'Grab something to eat': gs 'swamphouse', 'food'
-	if bucket > 0 and pcs_hydra < 80: act 'Grab a drink of water': gt 'swamphouse', 'bucket'
-	if bucket > 0 and pcs_hairbsh = 0: act 'Use the wash basin': gt 'swamphouse', 'washstand'
-	if hotwater = 1 and $clothingworntype = 'nude' and pcs_sweat > 19: act 'Bathe in the old tub': gt 'swamphouse', 'tub'
-	if dirty_swamphouse > 25:act 'Clean the hut':hunterslut -= 1 & gt 'swamphouse', 'dirty_swamphouse'
+	if stovefire = 0 or (meat_stew = 0 and raw_meat > 0) or (mushroom_soup = 0 and boletus > 0): act 'Use the rickety stove': gt 'gad_swamphouse', 'stove'
+	if pcs_energy < 80: act 'Grab something to eat': gs 'gad_swamphouse', 'food'
+	if bucket > 0 and pcs_hydra < 80: act 'Grab a drink of water': gt 'gad_swamphouse', 'bucket'
+	if bucket > 0 and pcs_hairbsh = 0: act 'Use the wash basin': gt 'gad_swamphouse', 'washstand'
+	if hotwater = 1 and $clothingworntype = 'nude' and pcs_sweat > 19: act 'Bathe in the old tub': gt 'gad_swamphouse', 'tub'
+	if dirty_swamphouse > 25:act 'Clean the hut':hunterslut -= 1 & gt 'gad_swamphouse', 'dirty_swamphouse'
 
 	act 'Relax on the couch': gt 'bed', 'start'
 	!sex with Igor
@@ -202,7 +199,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 			'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
 			'"I''m sorry, Igor. I''m not in the mood," you say, avoiding eye contact. Igor leaves disappointed...'
-			act 'Walk away': gt 'swamphouse', 'start'
+			act 'Walk away': gt 'gad_swamphouse', 'start'
 		end
 	end
 	!sex with Sergei
@@ -234,7 +231,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 			'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
 			'"I''m sorry, Sergei. I''m not in the mood," you say, avoiding eye contact. Sergei leaves disappointed...'
-			act 'Walk away': gt 'swamphouse', 'start'
+			act 'Walk away': gt 'gad_swamphouse', 'start'
 		end
 	end
 	! sex with Andrew
@@ -267,7 +264,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 			'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
 			'"I''m sorry, Andrei. I''m not in the mood," you say, avoiding eye contact. Andrei leaves disappointed...'
-			act 'Walk away': gt 'swamphouse', 'start'
+			act 'Walk away': gt 'gad_swamphouse', 'start'
 		end
 	end
 	! trio of HS, Andrei and Sergei, if love
@@ -310,7 +307,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 			'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
 			'"No, I refuse. This is something I don''t want part of," you say, and without hesitating, you turn around and walk away.'
-			act 'Walk away': gt 'swamphouse', 'start'
+			act 'Walk away': gt 'gad_swamphouse', 'start'
 		end
 	end
 	!hunters are invited to the table
@@ -326,8 +323,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			'You enter the hut and notice the plastered hunters.'
 			'"Oh, look who''s showed up. <<$pcs_nickname>>, join us for a drink!" they invite you in.'
 
-			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
-			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
+			act 'Join them at the table': gs 'gad_swamphouse', 'hunterstable'
+			act 'Politely decline': hunter_refuse = 1 & gt 'gad_swamphouse', 'start'
 		end
 		if temp_sh = 2:
 			huntersAndreiQw += 1
@@ -335,8 +332,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			'You enter the hut and notice the plastered hunters.'
 			'Oh, <<$pcs_nickname>>, join us for a drink!" says Andrei.'
 
-			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
-			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
+			act 'Join them at the table': gs 'gad_swamphouse', 'hunterstable'
+			act 'Politely decline': hunter_refuse = 1 & gt 'gad_swamphouse', 'start'
 		end
 		if temp_sh = 3:
 			huntersSergeiQw += 1
@@ -344,8 +341,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			'You enter the hut and notice the plastered hunters.'
 			'Oh, <<$pcs_nickname>>, come join us for a drink!" Sergei says, noticing you entering.'
 
-			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
-			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
+			act 'Join them at the table': gs 'gad_swamphouse', 'hunterstable'
+			act 'Politely decline': hunter_refuse = 1 & gt 'gad_swamphouse', 'start'
 		end
 		if temp_sh = 4:
 			huntersIgorQw += 1
@@ -353,8 +350,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			'You enter the hut and notice the plastered hunters.'
 			'Oh, <<$pcs_nickname>>, come join us for a drink!" Igor shouts, ignoring the other conversation.'
 
-			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
-			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
+			act 'Join them at the table': gs 'gad_swamphouse', 'hunterstable'
+			act 'Politely decline': hunter_refuse = 1 & gt 'gad_swamphouse', 'start'
 		end
 	elseif (hunters_breakfast = 1 or hunters_lunch = 1) and huntersbreakfast ! daystart:
 		*clr & cla
@@ -363,8 +360,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		'You go into the hut and notice that the hunters have prepared '+iif(hunters_breakfast = 1, 'breakfast.', 'lunch.')+'.'
 		'"Oh, <<$pcs_nickname>>, you''re just in time, come join us!"'
 
-		act 'Join them at the table': gs 'swamphouse', 'hunterstable'
-		act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
+		act 'Join them at the table': gs 'gad_swamphouse', 'hunterstable'
+		act 'Politely decline': hunter_refuse = 1 & gt 'gad_swamphouse', 'start'
 	end
 
 	! sex if GG whore
@@ -392,7 +389,7 @@ end
 
 if $ARGS[0] = 'stove':
 	*clr & cla
-	$loc = 'swamphouse'
+	$loc = 'gad_swamphouse'
 	$loc_arg = 'stove'
 	menu_off = 1
 	minut += 1
@@ -402,7 +399,7 @@ if $ARGS[0] = 'stove':
 	*nl
 	'A barely functioning wooden stove somehow does what it''s supposed to do. You can heat 5 litres of water at a time or make a mushroom soup or a meat stew.'
 
-	act 'Move away': gt 'swamphouse', 'start'
+	act 'Move away': gt 'gad_swamphouse', 'start'
 
 	if firewood >= 5 and stovefire = 0:
 		act 'Light stove':
@@ -414,7 +411,7 @@ if $ARGS[0] = 'stove':
 			stovefire = 1
 			minut += 5
 
-			act 'Continue': gt 'swamphouse', 'stove'
+			act 'Continue': gt 'gad_swamphouse', 'stove'
 		end
 	elseif firewood < 5 and stovefire = 0:
 		*nl
@@ -441,15 +438,15 @@ if $ARGS[0] = 'stove':
 			*nl
 			'With the now-heated water, you can bathe yourself in the tub.'
 
-			act 'Continue': gt 'swamphouse', 'stove'
+			act 'Continue': gt 'gad_swamphouse', 'stove'
 		end
 	end
-	act 'Grab something to eat': gs 'swamphouse', 'food'
+	act 'Grab something to eat': gs 'gad_swamphouse', 'food'
 end
 
 if $ARGS[0] = 'food':
 	cla
-	act 'Finish': gt 'swamphouse', 'start'
+	act 'Finish': gt 'gad_swamphouse', 'start'
 	act 'Eat jerky and trail mix':gt 'food', 'jerky'
 	if meat_stew > 0:
 		act 'Eat meat stew':
@@ -509,21 +506,17 @@ if $ARGS[0] = 'bucket':
 				gs 'stat'
 				'You take a sip from bucket, quenching your thirst.'
 			end
-			act 'Continue': gt 'swamphouse', 'start'
+			act 'Continue': gt 'gad_swamphouse', 'start'
 		end
 	else
 		'There''s no water left in the bucket. You should go out by the creek and bring some in.'
 	end
-	act 'Move Away': gt 'swamphouse', 'start'
+	act 'Move Away': gt 'gad_swamphouse', 'start'
 end
 
 if $ARGS[0] = 'washstand':
-	cla
-	*clr
-	$loc = 'swamphouse'
-	$loc_arg = 'washstand'
-	$locM_arg = 'washstand'
-	$locM = 'swamphouse'
+	*clr & cla
+	gs 'shortgs', 'setloc', 'gad_swamphouse', 'washstand'
 	menu_off = 1
 	minut += 1
 	gs 'stat'
@@ -537,12 +530,12 @@ if $ARGS[0] = 'washstand':
 		dynamic $basin
 	end
 	if hunters_outside = 1:gs 'lact_bp', 'massage'
-	act 'Move away': gt 'swamphouse', 'start'
+	act 'Move away': gt 'gad_swamphouse', 'start'
 end
 
 if $ARGS[0] = 'tub':
 	*clr & cla
-	$loc = 'swamphouse'
+	$loc = 'gad_swamphouse'
 	$loc_arg = 'tub'
 	minut += 1
 	menu_off = 1
@@ -552,7 +545,7 @@ if $ARGS[0] = 'tub':
 	*nl
 	'An old tub that you can use to bathe yourself. It''s a lot warmer than using the spring! You just need to warm some water and get undressed first.'
 	*nl
-	if lashair ! 1: 'If you are desperate enough, you find a handful of well-used '+iif(mc_inventory['razor'] < 1,'<a href="exec: mc_inventory[''razor''] +=  5 & gt ''swamphouse'', ''tub''">razors</a>','razors')+' on a shelf that you can use to shave with. '+iif(mc_inventory['razor'] > 0, '<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>','')+''
+	if lashair ! 1: 'If you are desperate enough, you find a handful of well-used '+iif(mc_inventory['razor'] < 1,'<a href="exec: mc_inventory[''razor''] +=  5 & gt ''gad_swamphouse'', ''tub''">razors</a>','razors')+' on a shelf that you can use to shave with. '+iif(mc_inventory['razor'] > 0, '<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>','')+''
 	dynamic $brit
 	if swamp_enema = 1:*nl & 'You find an enema syringe on the shelf.'
 	if $clothingworntype = 'nude' and klismaday ! daystart and swamp_enema = 1 and hunters_inside = 0:
@@ -577,10 +570,10 @@ if $ARGS[0] = 'tub':
 			*nl
 			'You fill the tub with warm water, remove your clothes, and climb in. After a good clean and soak, you feel rejuvenated.'
 
-			act 'Continue': gt 'swamphouse', 'tub'
+			act 'Continue': gt 'gad_swamphouse', 'tub'
 		end
 	end
-	act 'Move away': gt 'swamphouse', 'start'
+	act 'Move away': gt 'gad_swamphouse', 'start'
 end
 
 if $ARGS[0] = 'clothes_read_magazines':
@@ -597,7 +590,7 @@ if $ARGS[0] = 'stackmagazines':
 		if blizoruk = 500 or glassqw = 1:
 			glassqw = 1
 			msg '	The text blurs across the page. It seems you have poor eyesight. Maybe you should visit an ophthalmologist?'
-			gt 'swamphouse', 'stackmagazines'
+			gt 'gad_swamphouse', 'stackmagazines'
 		end
 		if pcs_nerd > 0:
 			lastread = totminut
@@ -624,10 +617,10 @@ if $ARGS[0] = 'stackmagazines':
 		pcs_mood += 10
 		gs 'stat'
 
-		gs 'swamphouse', 'clothes_read_magazines'
+		gs 'gad_swamphouse', 'clothes_read_magazines'
 		'You decide to look through the scientific journal, trying to understand all sorts of clever things written in the magazine.'
 
-		act 'Continue': gs 'swamphouse', 'stackmagazines'
+		act 'Continue': gs 'gad_swamphouse', 'stackmagazines'
 	end
 	act 'Read the literary magazine (1:00)':
 		dynamic $downlibrary['read']
@@ -635,10 +628,10 @@ if $ARGS[0] = 'stackmagazines':
 		pcs_mood += 10
 		gs 'stat'
 
-		gs 'swamphouse', 'clothes_read_magazines'
+		gs 'gad_swamphouse', 'clothes_read_magazines'
 		'You decide to look through the literary magazine... But, unfortunately, it''s a real drag. You almost fall asleep several times while reading it.'
 
-		act 'Continue': gs 'swamphouse', 'stackmagazines'
+		act 'Continue': gs 'gad_swamphouse', 'stackmagazines'
 	end
 	act 'Read the entertainment magazine (1:00)':
 		dynamic $downlibrary['read']
@@ -646,10 +639,10 @@ if $ARGS[0] = 'stackmagazines':
 		pcs_mood += 10
 		gs 'stat'
 
-		gs 'swamphouse', 'clothes_read_magazines'
+		gs 'gad_swamphouse', 'clothes_read_magazines'
 		'Flicking through the entertainment magazine, you delve into the world of the rich and famous.'
 
-		act 'Continue': gs 'swamphouse', 'stackmagazines'
+		act 'Continue': gs 'gad_swamphouse', 'stackmagazines'
 	end
 	act 'Read the porn magazine (1:00)':
 		*clr & cla
@@ -657,7 +650,7 @@ if $ARGS[0] = 'stackmagazines':
 		if blizoruk = 500 or glassqw = 1:
 			glassqw = 1
 			msg '	The text blurs across the page, it seems you have poor eyesight. Probably from all the porn. Maybe you should visit an ophthalmologist?'
-			gt 'swamphouse', 'stackmagazines'
+			gt 'gad_swamphouse', 'stackmagazines'
 		end
 		blizoruk += 1
 		pcs_mood += 10
@@ -671,9 +664,9 @@ if $ARGS[0] = 'stackmagazines':
 		gs 'arousal', 'porn', 60
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Continue': gs 'swamphouse', 'stackmagazines'
+		act 'Continue': gs 'gad_swamphouse', 'stackmagazines'
 	end
-	act 'Move away': gt 'swamphouse', 'start'
+	act 'Move away': gt 'gad_swamphouse', 'start'
 end
 
 if $ARGS[0] = 'hunterstableBJ':
@@ -722,7 +715,7 @@ if $ARGS[0] = 'hunterstableBJ':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
+					act 'Continue': gs 'gad_swamphouse', 'hunterstableBJ'
 				end
 			else
 				act 'Keep sucking':
@@ -738,7 +731,7 @@ if $ARGS[0] = 'hunterstableBJ':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
+					act 'Continue': gs 'gad_swamphouse', 'hunterstableBJ'
 				end
 			end
 		end
@@ -775,7 +768,7 @@ if $ARGS[0] = 'hunterstableBJ':
 					'When he is all done, you clean Sergei the best you can, and then you put his cock back in his pants and zip him up.'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
+					act 'Continue': gs 'gad_swamphouse', 'hunterstableBJ'
 				end
 			else
 				act 'Keep sucking':
@@ -791,7 +784,7 @@ if $ARGS[0] = 'hunterstableBJ':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
+					act 'Continue': gs 'gad_swamphouse', 'hunterstableBJ'
 				end
 			end
 		end
@@ -828,7 +821,7 @@ if $ARGS[0] = 'hunterstableBJ':
 					'When he is all done, you clean Igor the best you can, and then you put his cock back in his pants and zip him up.'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
+					act 'Continue': gs 'gad_swamphouse', 'hunterstableBJ'
 				end
 			else
 				act 'Keep sucking':
@@ -844,24 +837,24 @@ if $ARGS[0] = 'hunterstableBJ':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
+					act 'Continue': gs 'gad_swamphouse', 'hunterstableBJ'
 				end
 			end
 		end
 	end
-	if hunterstableBJA = 1 and hunterstableBJS = 1 and hunterstableBJI = 1:act 'Get out from under the table':edahot = 1 & gs 'swamphouse', 'hunterstable'
+	if hunterstableBJA = 1 and hunterstableBJS = 1 and hunterstableBJI = 1:act 'Get out from under the table':edahot = 1 & gs 'gad_swamphouse', 'hunterstable'
 
 end
 
 if $ARGS[0] = 'hunterstable_end':
 !! it is an empty event, however here it should be some action when hunters finished their meal and left the table
-	gt 'swamphouse','start'
+	gt 'gad_swamphouse','start'
 end
 
 if $ARGS[0] = 'hunterstable':
 	*clr & cla
 	gs 'hunter_ambient', 'schedule'
-	if (hunters_available = 0 and hunters_breakfast = 0 and hunters_lunch = 0 and hunters_dinner = 0): gt 'swamphouse', 'hunterstable_end'
+	if (hunters_available = 0 and hunters_breakfast = 0 and hunters_lunch = 0 and hunters_dinner = 0): gt 'gad_swamphouse', 'hunterstable_end'
 
 
 	menu_off = 1
@@ -881,7 +874,7 @@ if $ARGS[0] = 'hunterstable':
 			*nl
 			'You take a shot of vodka. The men laugh at the funny face you''re making after the shot.'
 
-			act 'Continue': gs 'swamphouse', 'hunterstable'
+			act 'Continue': gs 'gad_swamphouse', 'hunterstable'
 		end
 		act 'Drink beer (0:15)':
 			*clr & cla
@@ -891,7 +884,7 @@ if $ARGS[0] = 'hunterstable':
 			*nl
 			'You take a bottle of beer, open it and start drinking it.'
 
-			act 'Continue': gs 'swamphouse', 'hunterstable'
+			act 'Continue': gs 'gad_swamphouse', 'hunterstable'
 		end
 		act 'Eat a snack (0:15)':
 			gs 'food', 'snack'
@@ -901,7 +894,7 @@ if $ARGS[0] = 'hunterstable':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/snack1.'+rand(1,2)+'.jpg"></center>'
 			*nl
 			'You grab something to eat so you don''t get drunk too quickly.'
-			act 'Continue': gs 'swamphouse', 'hunterstable'
+			act 'Continue': gs 'gad_swamphouse', 'hunterstable'
 		end
 		act 'Chat (0:30)':
 			*clr & cla
@@ -915,9 +908,9 @@ if $ARGS[0] = 'hunterstable':
 			*nl
 			'You chat with the men about various topics... You try to keep up with their lingo but sometimes fail, and you all laugh about it.'
 
-			act 'Continue': gs 'swamphouse', 'hunterstable'
+			act 'Continue': gs 'gad_swamphouse', 'hunterstable'
 		end
-		act 'Move away from the table':hunter_refuse = 1 & gt 'swamphouse', 'start'
+		act 'Move away from the table':hunter_refuse = 1 & gt 'gad_swamphouse', 'start'
 		if alko > 3 and alko < 8 and smokertemp = 1:
 			*clr & cla
 			temp_sh = rand(1,4)
@@ -943,9 +936,9 @@ if $ARGS[0] = 'hunterstable':
 					*nl
 					'You follow them outside, they give you a cigarette, and you light it and smoke it...'
 
-					act 'Return to the table': gs 'swamphouse', 'hunterstable'
+					act 'Return to the table': gs 'gad_swamphouse', 'hunterstable'
 				end
-				act 'Refuse': gs 'swamphouse', 'hunterstable'
+				act 'Refuse': gs 'gad_swamphouse', 'hunterstable'
 			end
 			if temp_sh = 2:
 				*clr & cla
@@ -965,7 +958,7 @@ if $ARGS[0] = 'hunterstable':
 						*nl
 						'The two of you walk outside, and Andrei hands you a cigarette. Then, you start talking about your feelings for each other.'
 
-						act 'Return to the table': gs 'swamphouse', 'hunterstable'
+						act 'Return to the table': gs 'gad_swamphouse', 'hunterstable'
 					end
 				end
 				if huntersAndreiQw >= 15 and huntersAndreiLove = 0 and huntersKnowSlut = 0:
@@ -1002,7 +995,7 @@ if $ARGS[0] = 'hunterstable':
 								'"Damn, <<$pcs_nickname>>, I knew you would," he replies. "Well, I wouldn''t mind a blowjob now and then. That''s good enough for me."'
 								'"Go back to the hut, and crawl under the table, so no one notices," he adds while getting up from the bench.'
 
-								act 'Go': gs 'swamphouse', 'huntersmokBJ'
+								act 'Go': gs 'gad_swamphouse', 'huntersmokBJ'
 							end
 
 							if alko < 6:
@@ -1019,7 +1012,7 @@ if $ARGS[0] = 'hunterstable':
 									'"No, Andrei, I''m sorry, but I refuse," you answer. "How could you even think that I would accept your offer?'
 									'You get up from the bench and quickly go back to the hut.'
 
-									act 'Return to the table': gs 'swamphouse', 'hunterstable'
+									act 'Return to the table': gs 'gad_swamphouse', 'hunterstable'
 								end
 							end
 						end
@@ -1036,7 +1029,7 @@ if $ARGS[0] = 'hunterstable':
 							*nl
 							'You go outside for a smoke, with Andrei following you, immediately saying, "Forget the cigarette, <<$pcs_nickname>>. Go back inside and crawl under the table. I need you so bad right now...'
 
-							act 'Go': gs 'swamphouse', 'huntersmokBJ'
+							act 'Go': gs 'gad_swamphouse', 'huntersmokBJ'
 							if alko < 6:
 								act 'Refuse':
 									*clr & cla
@@ -1050,7 +1043,7 @@ if $ARGS[0] = 'hunterstable':
 									'"You know what, Andrei, I''ve changed my mind. Of course, I''m more than happy to help a friend in need, but I''m not some whore that only exists for your pleasure."'
 									'You get up from the bench and quickly go back to the hut.'
 
-									act 'Return to the table': gs 'swamphouse', 'hunterstable'
+									act 'Return to the table': gs 'gad_swamphouse', 'hunterstable'
 								end
 							end
 						end
@@ -1067,10 +1060,10 @@ if $ARGS[0] = 'hunterstable':
 						*nl
 						'You go outside for a smoke, with Andrei following you, immediately saying, "To hell with the cigarette, <<$pcs_nickname>>, I need to relieve some stress."'
 
-						act 'Go': gs 'swamphouse', 'huntersmokBJ'
+						act 'Go': gs 'gad_swamphouse', 'huntersmokBJ'
 					end
 				end
-				act 'Refuse': gs 'swamphouse', 'hunterstable'
+				act 'Refuse': gs 'gad_swamphouse', 'hunterstable'
 			end
 			if temp_sh = 3:
 				*clr & cla
@@ -1089,9 +1082,9 @@ if $ARGS[0] = 'hunterstable':
 					*nl
 					'You follow Sergei outside. He gives you a cigarette, and the two of you continue with your conversation.'
 
-					act 'Return to the table': gs 'swamphouse', 'hunterstable'
+					act 'Return to the table': gs 'gad_swamphouse', 'hunterstable'
 				end
-				act 'Refuse': gs 'swamphouse', 'hunterstable'
+				act 'Refuse': gs 'gad_swamphouse', 'hunterstable'
 			end
 			if temp_sh = 4:
 				*clr & cla
@@ -1110,9 +1103,9 @@ if $ARGS[0] = 'hunterstable':
 					*nl
 					'You follow Igor outside. He gives you a cigarette, and the two of you continue with your conversation.'
 
-					act 'Return to the table': gs 'swamphouse', 'hunterstable'
+					act 'Return to the table': gs 'gad_swamphouse', 'hunterstable'
 				end
-				act 'Refuse': gs 'swamphouse', 'hunterstable'
+				act 'Refuse': gs 'gad_swamphouse', 'hunterstable'
 			end
 		end
 		if alko >= 8 and huntersKnowSlut = 0:
@@ -1144,7 +1137,7 @@ if $ARGS[0] = 'hunterstable':
 							*nl
 							'Three hours later, you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
 
-							act 'Continue': gt 'swamphouse', 'start'
+							act 'Continue': gt 'gad_swamphouse', 'start'
 						end
 					end
 				end
@@ -1169,7 +1162,7 @@ if $ARGS[0] = 'hunterstable':
 							*nl
 							'Four hours later, you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
 
-							act 'Continue': gt 'swamphouse', 'start'
+							act 'Continue': gt 'gad_swamphouse', 'start'
 						end
 					end
 				end
@@ -1193,7 +1186,7 @@ if $ARGS[0] = 'hunterstable':
 							*nl
 							'You sleep for 6 hours, waking up barely able to lift your head from the pillow. You''ve got a headache and vaguely remember yesterday.'
 
-							act 'Continue': gt 'swamphouse', 'start'
+							act 'Continue': gt 'gad_swamphouse', 'start'
 						end
 					end
 				end
@@ -1226,7 +1219,7 @@ if $ARGS[0] = 'hunterstable':
 									*nl
 									'You sleep for eight hours, waking up barely able to get out of bed. You''ve got a headache and vaguely remember yesterday.'
 
-									act 'Continue': gt 'swamphouse', 'start'
+									act 'Continue': gt 'gad_swamphouse', 'start'
 								end
 							end
 						end
@@ -1287,7 +1280,7 @@ if $ARGS[0] = 'hunterstable':
 														*nl
 														'You sleep for four hours, waking up in the middle of the night, barely able to get up off the floor. You''ve got a headache and vaguely remember yesterday.'
 
-														act 'Continue': gt 'swamphouse', 'start'
+														act 'Continue': gt 'gad_swamphouse', 'start'
 													end
 												end
 											end
@@ -1311,7 +1304,7 @@ if $ARGS[0] = 'hunterstable':
 													*nl
 													'You sleep for 6 hours, waking up barely able to get out of bed. You''ve got a headache and vaguely remember yesterday.'
 
-													act 'Continue': gt 'swamphouse', 'start'
+													act 'Continue': gt 'gad_swamphouse', 'start'
 												end
 											end
 										end
@@ -1336,7 +1329,7 @@ if $ARGS[0] = 'hunterstable':
 											*nl
 											'You sleep for 6 hours, waking up barely able to get out of bed. You''ve got a headache and vaguely remember yesterday.'
 
-											act 'Continue': gt 'swamphouse', 'start'
+											act 'Continue': gt 'gad_swamphouse', 'start'
 										end
 									end
 								end
@@ -1425,7 +1418,7 @@ if $ARGS[0] = 'hunterstable':
 												*nl
 												'You sleep for four hours, waking up in the middle of the night, barely able to get up off the floor. You''ve got a headache and vaguely remember yesterday.'
 
-												act 'Continue': gt 'swamphouse', 'start'
+												act 'Continue': gt 'gad_swamphouse', 'start'
 											end
 										end
 									else
@@ -1478,7 +1471,7 @@ if $ARGS[0] = 'hunterstable':
 						*nl
 						'Three hours later, you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
 
-						act 'Continue': gt 'swamphouse', 'start'
+						act 'Continue': gt 'gad_swamphouse', 'start'
 					end
 				end
 			end
@@ -1502,7 +1495,7 @@ if $ARGS[0] = 'hunterstable':
 						*nl
 						'Four hours later, you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
 
-						act 'Continue': gt 'swamphouse', 'start'
+						act 'Continue': gt 'gad_swamphouse', 'start'
 					end
 				end
 			end
@@ -1526,7 +1519,7 @@ if $ARGS[0] = 'hunterstable':
 						*nl
 						'You sleep for 6 hours, waking up barely able to lift your head from the pillow. You''ve got a headache and vaguely remember yesterday.'
 
-						act 'Continue': gt 'swamphouse', 'start'
+						act 'Continue': gt 'gad_swamphouse', 'start'
 					end
 				end
 			end
@@ -1598,7 +1591,7 @@ if $ARGS[0] = 'hunterstable':
 												*nl
 												'You sleep for four hours, waking up in the middle of the night, barely able to get up off the floor. You''ve got a headache and vaguely remember yesterday.'
 
-												act 'Continue': gt 'swamphouse', 'start'
+												act 'Continue': gt 'gad_swamphouse', 'start'
 											end
 										end
 									else
@@ -1631,7 +1624,7 @@ if $ARGS[0] = 'hunterstable':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/snack1.'+rand(1,2)+'.jpg"></center>'
 			*nl
 			'You sit down and have something to eat with the hunters.'
-			act 'Continue': gs 'swamphouse', 'hunterstable'
+			act 'Continue': gs 'gad_swamphouse', 'hunterstable'
 		end
 		act 'Chat (0:30)':
 			*clr & cla
@@ -1645,9 +1638,9 @@ if $ARGS[0] = 'hunterstable':
 			*nl
 			'You start chatting with the guys about trivial stuff...'
 
-			act 'Continue': gt 'swamphouse', 'hunterstable'
+			act 'Continue': gt 'gad_swamphouse', 'hunterstable'
 		end
-		act 'Move away from the table':hunter_refuse = 1 & gt 'swamphouse', 'start'
+		act 'Move away from the table':hunter_refuse = 1 & gt 'gad_swamphouse', 'start'
 	else
 		act 'Chat (0:30)':
 			*clr & cla
@@ -1661,9 +1654,9 @@ if $ARGS[0] = 'hunterstable':
 			*nl
 			'You start chatting with the guys about trivial stuff...'
 
-			act 'Continue': gt 'swamphouse', 'hunterstable'
+			act 'Continue': gt 'gad_swamphouse', 'hunterstable'
 		end
-		act 'Move away from the table':hunter_refuse = 1 & gt 'swamphouse', 'start'
+		act 'Move away from the table':hunter_refuse = 1 & gt 'gad_swamphouse', 'start'
 	end
 	if huntersKnowSlut > 0 and hunterstableBJ = 0:
 		if hunters_drink = 0:
@@ -1677,8 +1670,8 @@ if $ARGS[0] = 'hunterstable':
 			'"Not so fast, <<$pcs_nickname>>," Andrei says with a smile. "You understand that the only free cheese is the one found in the mousetrap."'
 			'"Want to eat with us? You need to do some work," he mockingly grins and points under the table.'
 
-			act 'Crawl under the table': gs 'swamphouse', 'hunterstableBJ'
-			act 'Refuse': gt 'swamphouse', 'start'
+			act 'Crawl under the table': gs 'gad_swamphouse', 'hunterstableBJ'
+			act 'Refuse': gt 'gad_swamphouse', 'start'
 		else
 			*clr & cla
 			minut += 1
@@ -1689,7 +1682,7 @@ if $ARGS[0] = 'hunterstable':
 			'Noticing you, the men start grinning...'
 			'"About time! Our <<$pcs_nickname>> has arrived. Come here, join us at the table," says Andrei.'
 
-			act 'Sit at the table':hunterstableBJ = 1 & gs 'swamphouse', 'hunterstable'
+			act 'Sit at the table':hunterstableBJ = 1 & gs 'gad_swamphouse', 'hunterstable'
 		end
 	end
 	if ($clothingworntype = 'nude' and arrsize('sparrvol') > 0) or cumloc[11] = 1:
@@ -1703,7 +1696,7 @@ if $ARGS[0] = 'hunterstable':
 		'You sit at the table, wanting to eat with the guys, but before you can begin, you hear...'
 		'"Damn, <<$pcs_nickname>>, I know you like our artistic work on your face, but you must wash up before sitting with us.'
 
-		act 'Go': gt 'swamphouse', 'start'
+		act 'Go': gt 'gad_swamphouse', 'start'
 	end
 end
 
@@ -1720,7 +1713,7 @@ if $ARGS[0] = 'huntersrelax':
 	act 'Speak with Andrei': gt 'andreihunter'
 	act 'Speak with Sergei': gt 'sergeihunter'
 	act 'Speak with Igor': gt 'igorhunter'
-	act 'Move away': gt 'swamphouse', 'start'
+	act 'Move away': gt 'gad_swamphouse', 'start'
 end
 
 if $ARGS[0] = 'huntersmokBJ':
@@ -1738,7 +1731,7 @@ if $ARGS[0] = 'huntersmokBJ':
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
 
-	if temp_sh = 1:act 'Keep sucking':huntersmokBJ = 1 & gs 'swamphouse', 'huntersmokBJ'
+	if temp_sh = 1:act 'Keep sucking':huntersmokBJ = 1 & gs 'gad_swamphouse', 'huntersmokBJ'
 	if temp_sh = 2:
 		act 'Keep sucking':
 			*clr & cla
@@ -1755,7 +1748,7 @@ if $ARGS[0] = 'huntersmokBJ':
 
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Return to the table': gs 'swamphouse', 'hunterstable'
+			act 'Return to the table': gs 'gad_swamphouse', 'hunterstable'
 		end
 	end
 end
@@ -1777,7 +1770,7 @@ if $ARGS[0] = 'dirty_swamphouse':
 	'Visiting the hut, you notice that it has gotten pretty dirty. "I need to do something about this," you think. So you grab a broom and a rag and begin cleaning.'
 	'After a while, you finish cleaning and put everything back in order again. Finally, you''re pretty pleased with yourself.'
 
-	act 'Continue':dirty_swamphouse = 0 & gt 'swamphouse', 'start'
+	act 'Continue':dirty_swamphouse = 0 & gt 'gad_swamphouse', 'start'
 end
 
 if $ARGS[0] = 'get_dressed':
@@ -1818,7 +1811,7 @@ if $ARGS[0] = 'get_dressed':
 				*clr & cla
 				minut += 5
 				gs 'underwear', 'wear'
-				gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
+				gs 'clothing', 'recover_lost_clothes', 'gad_swamphouse', 1
 				!tkan_cloth = 0
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude1.jpg"></center>'
@@ -1830,7 +1823,7 @@ if $ARGS[0] = 'get_dressed':
 			act 'Cover yourself':
 				*clr & cla
 				minut+=5
-				gs 'clothing', 'swamp_clothes', 1
+				gs 'clothing', 'gad_swamp_clothes', 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
 				*nl
@@ -1853,5 +1846,5 @@ if $ARGS[0] = 'get_dressed':
 end
 
 
---- swamphouse ---------------------------------
+--- gad_swamphouse ---------------------------------
 

+ 7 - 7
locations/swampspring.qsrc → locations/gad_swampspring.qsrc

@@ -1,8 +1,8 @@
-# swampspring
+# gad_swampspring
 
-$loc = 'swampspring'
+$loc = 'gad_swampspring'
 $loc_arg = ''
-$menu_loc = 'swamp_yard'
+$menu_loc = 'gad_swamp_yard'
 $menu_arg = ''
 menu_off = 0
 $location_type = 'secluded'
@@ -19,7 +19,7 @@ end
 'You come across a natural spring with pure natural water.'
 gs 'stat'
 
-act 'Go back to the hut':minut += 5 & gt 'swamp_yard', 'start'
+act 'Go back to the hut': minut += 5 & gt 'gad_swamp_yard', 'start'
 
 if pcs_hydra < 150:
 	act 'Drink the water':
@@ -33,7 +33,7 @@ if pcs_hydra < 150:
 		gs 'cum_cleanup'
 		gs 'stat'
 
-		act 'Finish':gt 'swampspring'
+		act 'Finish': gt 'gad_swampspring'
 	end
 end
 
@@ -46,9 +46,9 @@ if bucket < 10:
 		bucket += 10
 		gs 'stat'
 
-		act 'Finish':gt 'swampspring'
+		act 'Finish': gt 'gad_swampspring'
 	end
 end
 
---- swampspring ---------------------------------
+--- gad_swampspring ---------------------------------
 

+ 0 - 240
locations/gadgarden.qsrc

@@ -1,240 +0,0 @@
-# gadgarden
-
-if $ARGS[0] = 'garden':
-	$location_type = 'secluded'
-	$loc_arg = 'garden'
-	$loc = 'gadgarden'
-	$menu_loc = 'gadgarden'
-	$menu_arg = 'garden'
-	menu_off = 0
-	gs 'gadukino_event', 'sound'
-	cls
-	gs'stat'
-	!gs'time'
-
-	if month >= 4 and month <= 10:
-		if hour >= 6 and hour < 21:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/garden.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/garden_night.jpg"></center>'
-		end
-	else
-		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/garden_winter.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/garden_winter_night.jpg"></center>'
-		end
-	end
-
-	'A large vegetable garden that your grandparents are very proud of.'
-	if month >= 4 and month <= 10:
-		'There is also a small land plot is dedicated to growing <a href="exec: gt ''gadgarden'',''strawberry'' ">strawberries</a> and a <a href="exec: gt ''gadgarden'',''fruit_garden'' ">fruit tree orchard</a>.'
-	else
-		'There is also a small plot of land dedicated to growing strawberries and a small fruit tree orchard, but they are not in season right now.'
-	end
-
-	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
-
-	!job Granny
-	if grandmaQW['chore_work_in_garden'] = 1:
-		act 'Work in the garden (3:00)':
-			cla
-			*clr
-			menu_off = 1
-			minut += 180
-			gs 'sweat', 'add', 10
-			grandmaQW['chore_work_in_garden'] = 2
-			gs 'exp_gain', 'stren', 1
-			fat -= rand(1,5)
-			gs 'exp_gain', 'hndiwrk', rand(3,9)
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/work_garden'+rand(1,5)+'.jpg"></center>'
-			'You spend some time doing some gardening.'
-			act 'Finish':gt'gadgarden','garden'
-			act 'Return back to your grandmother': minut += 2 & gt 'gadhouse', 'grandma'
-		end
-	end
-	!job Granny
-	if grandmaQW['chore_water_garden'] = 1:
-		act 'Water the plants (1:00)':
-			cla
-			*clr
-			menu_off = 1
-			gs 'sweat', 'add', 10
-			minut += 60
-			grandmaQW['chore_water_garden'] = 2
-			gs 'exp_gain', 'vital', 1
-			fat -= rand(1,2)
-			gs 'exp_gain', 'hndiwrk', rand(0,3)
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/water_garden.jpg"></center>'
-			'You spend an hour watering the garden.'
-			act 'Finish':gt'gadgarden','garden'
-			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
-		end
-	end
-	!job Granny
-	if grandmaQW['chore_harvest_garden'] = 1:
-		act 'Harvest (3:00)':
-			cla
-			*clr
-			menu_off = 1
-			minut += 180
-			gs 'sweat', 'add', 10
-			grandmaQW['chore_harvest_garden'] = 2
-			gs 'exp_gain', 'stren', 1
-			fat -= rand(1,3)
-			gs 'exp_gain', 'hndiwrk', rand(3,9)
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/harvest_garden'+rand(1,5)+'.jpg"></center>'
-			'You spend a few hours harvesting vegetables in the garden.'
-			act 'Finish':gt'gadgarden','garden'
-			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
-		end
-	end
-end
-
-if $ARGS[0] = 'strawberry':
-	$loc_arg = 'strawberry'
-	$loc = 'gadgarden'
-	$menu_loc = 'gadgarden'
-	$menu_arg = 'strawberry'
-	menu_off = 0
-	gs 'gadukino_event', 'sound'
-	cls
-	gs'stat'
-	!gs'time'
-
-	if month = 6 or month = 7:
-		if hour >= 6 and hour < 21:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/strawberry1.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/strawberry_night.jpg"></center>'
-		end
-	else
-		if hour >= 6 and hour < 21:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/strawberry2.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/strawberry_night.jpg"></center>'
-		end
-	end
-
-	'It''s strawberry season, you approach the field where the strawberries grow, searching for some ripe strawberries.'
-
-	act 'Go back to the garden':minut += 1 & gt'gadgarden','garden'
-
-	if month >= 7 and month <= 9 and strawberriesday ! daystart:
-		act 'Eat some strawberries (1:00)':
-			cla
-			*clr
-			menu_off = 1
-			strawberriesday = daystart
-			minut += 60
-			pcs_mood += 10
-			pcs_hydra += 40
-			pcs_energy += 15
-			cumspclnt = 2 & gs 'cum_cleanup' & pcs_breath = 0
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/eat_strawberries.jpg"></center>'
-			'You spend some time wandering through the plot searching for ripe strawberries. You walk along, picking off the ones that you find and popping them in your mouth.'
-
-			act 'Finish':gt'gadgarden','strawberry'
-		end
-	end
-	!job Granny
-	if grandmaQW['chore_collect_strawberries'] = 1:
-		act 'Collect strawberries (3:00)':
-			cla
-			*clr
-			menu_off = 1
-			minut += 180
-			gs 'sweat', 'add', 10
-			grandmaQW['chore_collect_strawberries'] = 2
-			gs 'exp_gain', 'agil', 1
-			fat -= 1
-			gs 'exp_gain', 'hndiwrk', rand(3,9)
-			gs 'stat'
-
-			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries.jpg"></center>'
-			if PCloSkirt > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_ski.jpg"></center>'
-			if PCloSkirt > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_tanga.jpg"></center>'
-			'You wander through the plot for several hours, collecting ripe strawberries and placing them in the basket.'
-
-			act 'Finish':gt'gadgarden','strawberry'
-			act 'Return back to your grandmother': minut += 3 & gt 'gadhouse', 'grandma'
-		end
-	end
-end
-
-
-if $ARGS[0] = 'fruit_garden':
-	$loc_arg = 'fruit_garden'
-	$loc = 'gadgarden'
-	$menu_loc = 'gadgarden'
-	$menu_arg = 'fruit_garden'
-	menu_off = 0
-	gs 'gadukino_event', 'sound'
-	cls
-	gs'stat'
-	!gs'time'
-
-	if hour >= 6 and hour < 21:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_garden.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_garden_night.jpg"></center>'
-	end
-
-	'There are apples and pears growing in the fruit orchard.'
-
-	act 'Go back to the garden':minut += 1 & gt'gadgarden','garden'
-
-	if month >= 7 and month <= 9 and fruitday ! daystart:
-		act 'Eat the fruit (1:00)':
-			cla
-			*clr
-			menu_off = 1
-			fruitday = daystart
-			minut += 60
-			pcs_mood += 10
-			pcs_hydra += 20
-			pcs_energy += 30
-			cumspclnt = 2 & gs 'cum_cleanup' & pcs_breath = 0
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/eat_fruit.jpg"></center>'
-			'You spend some time wandering around the orchard munching on the ripe fruit.'
-
-			act 'Finish':gt 'gadgarden','fruit_garden'
-		end
-	end
-	!job Granny
-	if grandmaQW['chore_collect_fruit'] = 1:
-		act 'Collect fruit (3:00)':
-			cla
-			*clr
-			menu_off = 1
-			minut += 180
-			gs 'sweat', 'add', 10
-			grandmaQW['chore_collect_fruit'] = 2
-			gs 'exp_gain', 'agil', 1
-			fat -= rand(1,3)
-			gs 'exp_gain', 'hndiwrk', rand(3,9)
-			gs 'stat'
-
-			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect.jpg"></center>'
-			if PCloSkirt > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect_ski.jpg"></center>'
-			if PCloSkirt > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect_tanga.jpg"></center>'
-			'You walk around the orchard and pick the ripe fruit hanging from the trees.'
-
-			act 'Finish':gt 'gadgarden','fruit_garden'
-			act 'Return back to your grandmother': minut += 3 & gt 'gadhouse', 'grandma'
-		end
-	end
-end
-
---- gadgarden ---------------------------------
-

+ 0 - 1278
locations/gadriver.qsrc

@@ -1,1278 +0,0 @@
-# gadriver
-!!2022/05/02
-
-if $ARGS[0] = 'start':
-	$loc_arg = 'start'
-	$loc = 'gadriver'
-	menu_off = 0
-	$menu_loc = 'gadriver'
-	$menu_arg = 'start'
-	$location_type = 'public_outdoors'
-
-	gs 'stat'
-
-	'<center><H2>Slavka River</H2></center>'
-
-	if month >= 5 and month <= 9:
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver_night.jpg"></center>'
-		end
-	else
-		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver_winter.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver_winter_night.jpg"></center>'
-		end
-	end
-
-	'A large river flows lazily for a few hundred meters on the northern outskirts of Gadukino.'
-
-	if hour >= 6 and hour < 21 and sunWeather = 1: 'You see the local <a href="exec:gt ''gadriver'', ''fishers''">fishermen</a> fishing with their rods on the riverbank.'
-
-	temp_gr = rand(0,20)
-
-	if temp_gr = 1 and hour < 5 and month >= 5 and month <= 9 and npc_QW['A60'] >= 20: 'Right next to the path leading to the river, you see <a href="exec: gt ''gadriver'', ''mirapunish'' ">Mira</a> naked, bound with ropes between two trees...'
-
-	if temp_gr = 4 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5:
-		if mitkaguysriver ! daystart:
-			mitkaguysriver = daystart
-			'While going to the river, you meet Kolyamba and Vasyan. They first invite you to join them, then insist you go with them.'
-
-			act 'Go with them':
-				*clr & cla
-				menu_off = 1
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex17.jpg"></center>'
-				'The boys take you to Vasyan''s house, where they rudely keep pushing you until you are bent over the kitchen table. They then take turns fucking you...'
-				gs 'boyStat', 'A61'
-				npc_sex[$boy] += 1
-				pose = 1
-				if mesec = 0:
-					gs 'dinsex', 'boy_puts_condom'
-					gs 'dinsex','vaginal_sex',20,'sub','gangbang'
-					gs 'dinsex','sexcum'
-				else
-					gs 'dinSex','boy_wants_anal','','lubri'
-					gs 'dinsex','analsex',20,'sub','gangbang'
-				end
-				gs 'boyStat', 'A62'
-				npc_sex[$boy] += 1
-				if mesec = 0:
-					gs 'dinsex', 'boy_puts_condom'
-					gs 'dinsex','vaginal_sex',20,'sub','gangbang'
-					gs 'dinsex','sexcum'
-				else
-					gs 'dinSex','boy_wants_anal','','lubri'
-					gs 'dinsex','analsex',20,'sub','gangbang'
-				end
-				gs 'stat'
-
-				act 'Finish':minut += 10 & gt'gadukino'
-			end
-		else
-			act 'Walk to Gadukino (0:20)':minut += 20 & gt 'gadukino'
-			act 'Walk to the road (0:10)':minut += 10 & gt 'gadroad'
-			act 'Walk to the beach (0:05)':minut += 5 & gt 'gadriver', 'gadbitch'
-		end
-	elseif temp_gr = 5 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5:
-		if mitkaguysriver ! daystart:
-			mitkaguysriver = daystart
-			'While walking towards the river, you meet the village boys you''ve been drinking with recently. They ask you to go with them.'
-
-			act 'Go with them':
-				*clr & cla
-				menu_off = 1
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex18.jpg"></center>'
-				'The boys lead you to Vasyan''s house and start undressing; following their lead, you strip off, too, "We''re going to fuck your ass. I hope you can enjoy it, but I''m not going to be upset if you don''t."'
-				gs 'arousal', 'auto_lube', 'anal'
-				'They don''t say anything more before they spend the next hour fucking you in the ass...'
-				gs 'arousal', 'anal', 20, 'gangbang', 'sub'
-				gs 'arousal', 'anal', 20, 'gangbang', 'sub'
-				gs 'arousal', 'anal', 20, 'gangbang', 'sub'
-				gs 'arousal', 'end'
-				gs 'boyStat', 'A63'
-				npc_sex[$boy] += 1
-				gs 'cum_call','butt',$boy,1
-				gs 'boyStat', 'A61'
-				npc_sex[$boy] += 1
-				gs 'cum_call','butt',$boy,1
-				gs 'boyStat', 'A62'
-				npc_sex[$boy] += 1
-				gs 'cum_call','butt',$boy,1
-				pcs_ass += 3
-				gs 'stat'
-
-				act 'Leave': gt'gadukino'
-			end
-		else
-			act 'Walk to Gadukino (0:20)':minut += 20 & gt 'gadukino'
-			act 'Walk to the road (0:10)':minut += 10 & gt 'gadroad'
-			act 'Walk to the beach (0:05)':minut += 5 & gt 'gadriver', 'gadbitch'
-		end
-	elseif temp_gr = 6 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5:
-		if mitkaguysriver ! daystart:
-			mitkaguysriver = daystart
-			'On your way to the river, you meet Vasyan. But, unfortunately, he insists you follow him home...'
-
-			act 'Go with him':
-				*clr & cla
-				menu_off = 1
-				gs 'boyStat', 'A62'
-				npc_sex[$boy] += 1
-				pose = 1
-
-				if mesec = 0:
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex20.jpg"></center>'
-					'As soon as you open the door, Vasyan pushes you inside and pulls your clothes off crudely. Once you are naked, he moves you towards the sofa and forces you to your knees...'
-					gs 'arousal', 'vaginal', 20, 'sub'
-					gs 'cum_call','butt',$boy,1
-				else
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex21.jpg"></center>'
-					'As soon as you open the door, Vasyan pushes you inside and pulls your clothes off crudely. He then throws you onto his bed. Noticing that you are slightly bleeding, he asks if it is that time of the month. You whimper, "Yes." He curses angrily, turns you over and begins roughly fucking your ass...'
-					gs 'arousal', 'anal', 20, 'sub'
-					gs 'cum_call','butt',$boy,1
-				end
-				gs 'arousal', 'end'
-				gs 'stat'
-
-				act 'Finish': gt'gadukino'
-			end
-		else
-			act 'Walk to Gadukino (0:20)':minut += 20 & gt 'gadukino'
-			act 'Walk to the road (0:10)':minut += 10 & gt 'gadroad'
-			act 'Walk to the beach (0:05)':minut += 5 & gt 'gadriver', 'gadbitch'
-		end
-	else
-		act 'Walk to Gadukino (0:20)':minut += 20 & gt 'gadukino'
-		act 'Walk to the road (0:10)':minut += 10 & gt 'gadroad'
-		act 'Walk to the beach (0:05)':minut += 5 & gt 'gadriver', 'gadbitch'
-	end
-end
-
-if $ARGS[0] = 'gadbitch':
-	PC_arrive = iif($loc_arg ! 'gadbitch', 1 , 0)
-	$location_type = 'public_outdoors'
-	$loc_arg = 'gadbitch'
-	$loc = 'gadriver'
-	killvar '$locclass'
-	menu_off = 1
-	gs 'stat'
-
-	'<center><H4>Village Beach</H4></center>'
-	!125e
-	if hour >= 6 and hour < 22:
-		if sunWeather = 1:
-			if month>=4 and month<=10:
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadbitch_summer.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadbitch_winter.jpg"></center>'
-			end
-		else
-			if month>=4 and month<=10:
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadbitch_soft.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadbitch_cold.jpg"></center>'
-			end
-		end
-	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadbitch_night.jpg"></center>'
-	end
-
-	'A small country beach, where you can sunbathe and swim.'
-
-	if MiraLoc = 1:temp_gr = rand(0,20)
-
-	if sunWeather = 1 and MiraLoc = 1:
-		if rand(0,10) < 5:
-			'<a href="exec:sun = 1 & gt ''gadriver'', ''Mira'' ">Mira</a> is laying on the beach sunbathing.'
-			if npc_rel['A60'] < 15:npc_rel['A60'] += 1
-		else
-			'<a href="exec:sun = 0 & gt ''gadriver'', ''Mira'' ">Mira</a> is in the river splashing water around and having fun.'
-			if npc_rel['A60'] < 15:npc_rel['A60'] += 1
-		end
-	end
-
-	if MiraLoc ! 1 and npc_QW['A63'] >= 13 and rand(0,10) = 0 and hour >= 8 and hour < 20 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1:'<a href="exec: gt ''gadriver'', ''GuysRiver'' ">Kolyamba and Vasyan</a> are resting on the riverbank.'
-
-	act 'Walk to the river (0:05)':
-		cla
-		if PCloswimwear = 1:
-			cla
-			'You need to dress in regular clothes first.'
-			act'Return':gt'gadriver', 'gadbitch'
-		elseif $clothingworntype = 'nude':
-			'You need to put some clothes on first.'
-			act'Return':gt'gadriver', 'gadbitch'
-		else
-			minut += 5
-			gt 'gadriver', 'start'
-		end
-	end
-
-	if func('changingroom','count_swim_item') > 0: act 'Get changed':gt 'changingroom', 'view_swim_list'
-
-	if $clothingworntype = 'nude':
-		act 'Get dressed':
-			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
-			cla
-			minut += 5
-			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
-			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
-			if clothesAtLocation = 1: gs 'clothing', 'recover_lost_clothes', 'VillageRiver', 1
-			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):
-			act 'Strip naked':
-				cla
-				minut += 5
-				$lastwornclothingtype['swim'] = $clothingworntype
-				lastwornclothingnumber['swim'] = clothingwornnumber
-				$lastwornpantytype['swim'] = $pantyworntype
-				lastwornpantynumber['swim'] = pantywornnumber
-				$lastwornbratype['swim'] = $braworntype
-				lastwornbranumber['swim'] = brawornnumber
-				gs 'clothing', 'strip_all', 'VillageRiver'
-				'Without hesitation, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the river or lie down in the sand and sunbathe.'
-				act 'Continue': gt 'gadriver', 'gadbitch'
-			end
-		end
-		if PCloswimwear = 1 and pcs_stam >= (5 * (10 - sport_clothes_exercise_bonus)) / 2:
-			act 'Go for a swim':
-				cla
-				*clr
-				cumspclnt = 4
-				gs 'cum_cleanup'
-
-				minut += 29
-				gs 'exercise', 'tier1', 1, 'stren', 'vital'
-
-				if pcs_inhib < 50:inhib_exp += rand(1,3)
-				pcs_sweat = 10 + rand(0,4)
-				if hour >= 22 or hour <= 6:
-					if rand(0,10) < 5 and MiraLoc = 1:
-						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/rivertwogirls.jpg"></center>'
-						'You and Mira take a nighttime swim in the river, splashing water at each other and having fun.'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverswim.jpg"></center>'
-						'You take a nighttime swim in the river, feeling the refreshing and invigorating water flowing across your body.'
-					end
-				else
-					if rand(0,10) < 5 and MiraLoc = 1:
-						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/rivertwogirls.jpg"></center>'
-						'You and Mira swim in the river, splashing water at each other and having fun.'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverswim.jpg"></center>'
-						'You swim in the river, feeling the refreshing and invigorating water across your body.'
-					end
-				end
-				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-
-				act 'Get out of the water':
-					if MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 0 and hour >= 8 and hour < 20:
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex13.jpg"></center>'
-						'When you decide it''s time to get out of the river, you hear the sound of men laughing as they walk on the river bank approaching you. As they get closer, you see the village boys'' smirking faces, led by Mitya, headed towards the river bank while you are still in the shallow waters.'
-						'They quickly undress and jump in the water. Within a few seconds, you are surrounded by the grinning boys. Then, without a word, they reach for you and roughly take turns forcing you to suck their cocks.'
-						gs 'arousal', 'bj', 15, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 15, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'end'
-						gs 'boyStat', 'A63'
-						npc_sex[$boy] += 1
-						gs 'cum_call','face',$boy, 1,'','',20
-						gs 'cum_call','hair',$boy, 1,'','',20
-						gs 'boyStat', 'A61'
-						npc_sex[$boy] += 1
-						gs 'cum_call','face',$boy, 1,'','',20
-						gs 'cum_call', 'mouth_swallow', $boy, 1,'','',20
-						gs 'boyStat', 'A62'
-						npc_sex[$boy] += 1
-						minut -= 10
-						gs 'cum_call','face',$boy, 1,'','',20
-						gs 'cum_call', 'mouth_swallow', $boy, 1,'','',20
-						gang +=1
-						gs 'stat'
-
-						act 'Finish':gt'gadriver', 'gadbitch'
-					elseif MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 1 and hour >= 8 and hour < 20:
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex19.jpg"></center>'
-						'As soon as you get out of the river, you meet a grinning Kolyamba. He smiles wickedly and commands you to get down on your hands and knees so he can fuck you in the ass...'
-						gs 'arousal', 'auto_lube', 'anal'
-						gs 'boyStat', 'A61'
-						npc_sex[$boy] += 1
-						pose = 1
-						gs 'dinSex','boy_wants_anal'
-						gs 'arousal', 'anal', 20, 'sub'
-						gs 'cum_call','anus',$boy, 1,'','',20
-						gs 'cum_call','butt',$boy, 1,'','',20
-						gs 'arousal', 'end'
-						gs 'stat'
-
-						act 'Finish':gt'gadriver', 'gadbitch'
-					else
-						gt'gadriver', 'gadbitch'
-					end
-				end
-			end
-		else
-			if $clothingworntype = 'nude':
-				act 'Go skinny dipping':
-					cla
-					*clr
-					temp_gr = rand(0,15)
-					cumspclnt = 4
-					gs 'cum_cleanup'
-					minut = minut + 20
-					pcs_sweat = 10 + rand(0,4)
-					pcs_mood += 5
-					inhib_exp += rand(1,3)
-					if pcs_stren < 30: gs 'exp_gain', 'stren', 1
-					if hour >= 22 and hour <= 6:
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls1.jpg"></center>'
-						'You strip your clothes off and slowly step into the cold river, knowing that the darkness hides your nudity. You swim around, feeling the refreshing and invigorating water caressing your body.'
-					else
-						if temp_gr >= 10 and MiraLoc = 1:
-							pcs_horny += rand(5,15)
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
-							'You step into the river with Mira and have a good old-fashioned water fight, splashing each other until one of you finally surrenders.'
-						else
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls.jpg"></center>'
-							'You take your clothes off and swiftly step into the river. You sigh, feeling the cold, refreshing and tonic water.'
-						end
-					end
-					if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-					act 'Get out of the water':
-						if MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 0 and hour >= 8 and hour < 20:
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex12.jpg"></center>'
-							'As soon as you step out of the water, you find your naked self in front of three boys here to do some fishing.'
-							'Seeing you skinny dipping, they start to talk amongst themselves about how much of a shameless slut you are and that the only good thing you are for is serving men. You tell them to fuck off, but they are too worked up and not listening to you at all.'
-							'One of the boys flips you over and starts penetrating your pussy as the other boy shoves his hardened cock into your protesting mouth. They have started to fuck you in an earnest and lust-filled frenzy.'
-							'Your muffled moans and the sound of your wet pussy getting pounded fill the air. The boys soon orgasm and decide to ejaculate all over your body to show dominance.'
-							gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
-							gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
-							gs 'arousal', 'hj', 10, 'gangbang', 'sub', 'rough'
-							gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
-							gs 'arousal', 'end'
-							gs 'boyStat', 'A63'
-							npc_sex[$boy] += 1
-							gs 'cum_call','butt',$boy, 1
-							gs 'boyStat', 'A61'
-							npc_sex[$boy] += 1
-							gs 'cum_call','anus',$boy, 1,'','',20
-							gs 'boyStat', 'A62'
-							npc_sex[$boy] += 1
-							gs 'cum_call', 'mouth_swallow', $boy
-							gs 'stat'
-							gang +=1
-
-							act 'Finish': gt'gadriver', 'gadbitch'
-						else
-							gt'gadriver', 'gadbitch'
-						end
-					end
-				end
-			end
-		end
-		if hour >= 8 and hour < 20 and sunWeather = 1:
-			if PCloswimwear = 1 or $clothingworntype = 'nude':
-				act 'Sunbathe (1:00)':
-					if Mira_no = 0 and npc_rel['A60'] > 0 and MiraLoc ! 1 and rand(1,10) > 7 and hour > 8 and hour < 20 and sunWeather = 1 and temper >= 15 and npc_known['A60'] = 1:
-						cla
-						*clr
-						MiraLoc = 1
-						mira_go_river = 1
-						minut += 5
-						mira_go_blok = 1
-						if pcs_inhib < 50:inhib_exp += rand(1,3)
-						gs 'stat'
-						if $clothingworntype = 'nude':
-							'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_go_river_nude.jpg"></center>'
-						else
-							'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_go_river.jpg"></center>'
-						end
-						'You are sunbathing by the river when Mira comes along. You smile, and she undresses and lays her towel next to yours.'
-
-						act 'Continue': gt'gadriver', 'gadbitch'
-					elseif $clothingworntype = 'nude':
-						*clr & cla
-						minut += 60
-						inhib_exp += rand(1,3)
-						if pcs_sweat < 35 : gs 'sweat', 'add', 5
-						pcs_mood += 5
-						if temp_gr < 10 and MiraLoc = 1:
-							'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/beachtwogirlsnude.jpg"></center>'
-							'You lie next to Mira and gossip about the villagers, enjoying the sun.'
-						else
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadrivernude.jpg"></center>'
-							'You lie down on your towel and start sunbathing.'
-						end
-						if mc_inventory['suncream'] =  0:
-							pcs_tan += 1
-						elseif  mc_inventory['suncream'] > 0:
-							mc_inventory['suncream'] -=  1
-							'You smear the suntan lotion all over your body to help prevent sunburn.'
-							pcs_tan += 3
-						end
-						act 'Finish sunbathing':
-							if MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 0 and hour >= 8 and hour < 20:
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex14.jpg"></center>'
-								'You hear several men''s voices rapidly approaching. Suddenly, a couple of the village boys emerge in front of you. Noticing that you are nude, they brighten up considerably. In a few minutes, despite you protesting lively, they have you on all fours and are roughly fucking you...'
-								gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'hj', 10, 'gangbang', 'sub', 'rough'
-								gs 'boyStat', 'A62'
-								npc_sex[$boy] += 1
-								gs 'cum_call','butt',$boy, 1
-								gs 'boyStat', 'A63'
-								npc_sex[$boy] += 1
-								gs 'cum_call','anus',$boy, 1,'','',20
-								gs 'boyStat', 'A61'
-								npc_sex[$boy] += 1
-								gs 'cum_call','mouth_swallow',$boy
-								gs 'arousal', 'end'
-								gs 'stat'
-
-								act 'Get dressed':gt'gadriver', 'gadbitch'
-							else
-								gt'gadriver', 'gadbitch'
-							end
-						end
-					else
-						*clr & cla
-						minut += 60
-						if pcs_sweat < 35 : gs 'sweat', 'add', 5
-						pcs_mood += 5
-
-						if temp_gr < 10 and MiraLoc = 1:
-							'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/beachtwogirls.jpg"></center>'
-							'You lie next to Mira and gossip about trivial things, enjoying the sun.'
-						else
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadrivergirl.jpg"></center>'
-							'You sunbathe alone on the riverbank.'
-						end
-						if mc_inventory['suncream'] =  0:
-							pcs_tan += 1
-						elseif  mc_inventory['suncream'] > 0:
-							mc_inventory['suncream'] -=  1
-							pcs_tan += 3
-							'You smear suntan lotion all over your body to prevent sunburn. Then, you''re all lathered up and sunbathing a few minutes later.'
-						end
-						act 'Finish':
-
-							if MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 0 and hour >= 8 and hour < 20:
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex15.jpg"></center>'
-								'After a while, you hear some familiar voices quickly approaching you. A couple of minutes later, the village boys emerge from the bushes. Noticing you sunbathing, they brighten up considerably. But, in a short time, despite you protesting lively, all of your holes have been violated...'
-								gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'hj', 10, 'gangbang', 'sub', 'rough'
-								gs 'arousal', 'end'
-								gs 'boyStat', 'A61'
-								npc_sex[$boy] += 1
-								gs 'cum_call','butt',$boy, 1
-								gs 'boyStat', 'A62'
-								npc_sex[$boy] += 1
-								gs 'cum_call','anus',$boy, 1,'','',20
-								gs 'boyStat', 'A63'
-								npc_sex[$boy] += 1
-								gs 'cum_call','mouth_swallow',$boy
-								gang +=1
-								gs 'stat'
-
-								act 'Finish':gt'gadriver', 'gadbitch'
-							elseif MiraLoc = 1 and npc_QW['A60'] >= 15 and temp_gr = 1 and hour >= 8 and hour < 20:
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex16.jpg"></center>'
-								'After a while, you hear voices rapidly approaching from the village. You see the village boys emerge from the bushes in a couple of minutes. Seeing Mira, they smile obscenely, and without hesitation, they quickly surround her as she lies on the sand. You sit up and watch as they fuck her in all her holes...'
-
-								gs 'arousal', 'voyeur_sex', 30, 'gangbang', 'dom'
-								gs 'arousal', 'end'
-								gs 'stat'
-
-								act 'Finish': gt'gadriver', 'gadbitch'
-							else
-								gt'gadriver', 'gadbitch'
-							end
-						end
-					end
-				end
-			end
-		end
-		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 PCloswimwear = 1 or $clothingworntype = 'nude':
-					act 'Wash Desperado':
-						*clr & cla
-
-						cumspclnt = 4
-						gs 'cum_cleanup'
-						minut += 30
-						pcs_sweat = 10 + rand(0,4)
-						pcs_mood += 5
-						if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
-						gs 'exp_gain', 'hndiwrk', 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 PCloswimwear = 1:
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/wash_horse_swim.jpg"></center>'
-						end
-						'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'
-						end
-					end
-					if Mira_Loc = 1 and npc_rel['A60'] > 0:
-						act 'Wash Desperado with Mira':
-							*clr & cla
-
-							cumspclnt = 4
-							gs 'cum_cleanup'
-							minut += 30
-							npc_rel['A60'] += 1
-							pcs_sweat = 10 + rand(0,4)
-							pcs_mood += 5
-							if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
-							gs 'exp_gain', 'hndiwrk', rand(1,3)
-							grandpaQW['chore_bathe_horse_prog'] = 2
-							gs 'stat'
-
-							if $clothingworntype = 'nude':
-								'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/wash_horse_mira_nude.jpg"></center>'
-							elseif PCloswimwear = 1:
-								'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/wash_horse_mira_swim.jpg"></center>'
-							end
-							'You invite Mira to wash Desperado with you; she agrees with nothing better to do.'
-							'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'
-				end
-			end
-		end
-		if grandpaQW['chore_bathe_horse_prog'] = 2:
-			act 'Lead Desperado back home (0:30)':
-				if PCloswimwear = 1:
-					cla
-					'You need to dress in regular clothes first.'
-					act'Return':gt'gadriver', 'gadbitch'
-				elseif $clothingworntype = 'nude':
-					cla
-					'You need to put some clothes on first.'
-					act'Return':gt'gadriver', 'gadbitch'
-				else
-					minut += 30
-					gs 'exp_gain', 'hndiwrk', rand(0,3)
-					grandpaQW['chore_bathe_horse'] = 2
-					grandpaQW['chore_bathe_horse_prog'] = 0
-					gs 'stat'
-
-					gt'gadsarai','horse'
-				end
-			end
-		end
-	end
-
-!! extraordinary events at the river beach. Be aware, this part has to be at the end because it removes actions, which were set before.
-	if (mira_go_blok = 0 and MiraLoc = 1 and rand(1,10) = 5) or (MiraLoc = 1 and hour >= 20):
-		*clr & cla
-		minut += 5
-		mira_go_blok = 1
-		mira_no_home = 0
-		MiraLoc = 0
-		gs 'stat'
-		if $clothingworntype = 'nude':
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_go_home_nude.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_go_home.jpg"></center>'
-		end
-		*nl
-		'"<<$pcs_nickname>>, I have to go home, " Mira said and began gathering her stuff.'
-
-		act 'Continue': gt'gadriver', 'gadbitch'
-	elseif Mira_no = 0 and MiraLoc = 1 and hour > 8 and hour < 20 and sunWeather = 1 and temper >= 15 and PC_arrive = 1:
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_in_river.jpg"></center>'
-		*nl
-		'Arriving at the beach, you see Mira lying down, sunbathing on a towel.'
-		MiraLoc = 1
-		minut += 5
-		mira_go_blok = 1
-		gs 'stat'
-
-		act 'Continue':
-			if Miraswimday ! daystart:
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirariver.jpg"></center>'
-				*nl
-				'"<<$pcs_nickname>>, why are you moping about on the shore? Get in the water and swim with me?" - Mira called out to you as she waded into the river.'
-				minut += 1
-				Miraswimday = daystart
-				gs 'stat'
-				act 'Agree and get changed':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/undressbch1.jpg"></center>'
-					*nl
-					'"Wait, Mira, I have to change out of my clothes!" you cry in response, although she can hardly hear you as she is already splashing around in the river.'
-					'You start to take off your clothes.'
-					if func('changingroom','count_swim_item') > 0:
-						act 'Change into swimwear':
-							gs 'gadriver','get_changed','start'
-						end
-					end
-					if pcs_inhib >= 25 or exhibitionist_lvl > 1:
-						act 'Strip naked':
-							cla
-							minut += 5
-							$lastwornclothingtype['swim'] = $clothingworntype
-							lastwornclothingnumber['swim'] = clothingwornnumber
-							$lastwornpantytype['swim'] = $pantyworntype
-							lastwornpantynumber['swim'] = pantywornnumber
-							$lastwornbratype['swim'] = $braworntype
-							lastwornbranumber['swim'] = brawornnumber
-							gs 'clothing', 'strip_all', 'VillageRiver'
-							inhib_exp += rand(1,3)
-							'Without hesitation, you take off all your clothes and neatly fold them before putting them down in a pile. Without your clothes holding you back, you can go for a nice swim in the river or lie down in the sand and sunbathe.'
-
-							act 'Swim':
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
-								*nl
-								'You wade into the river and have fun with Mira spraying each other with water.'
-								if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-								temp_gr = rand(0,15)
-								cumspclnt = 4 & gs 'cum_cleanup'
-
-								minut += 20
-								gs 'exercise', 'tier1', 10, 'stren', 'vital'
-
-								pcs_sweat = 10 + rand(0,4)
-								gs'stat'
-
-								act 'Get out of the water':gt'gadriver', 'gadbitch'
-							end
-						end
-					end
-					act'Second thoughts': gt 'gadriver', 'second_thoughts'
-				end
-				act'Refuse': gt 'gadriver', 'second_thoughts'
-			else
-				gt'gadriver', 'gadbitch'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'get_changed':
-	menu_off = 1
-	$loc_arg = 'get_changed'
-	if $ARGS[1] = 'start':
-		gt 'changingroom', 'view_swim_list'
-	else
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/river/undressbch.jpg"></center>'
-		*nl
-		'You put on your swimwear and neatly fold your clothes before putting them down in a pile. Now you can go for a nice swim in the river or just lie down in the sand and sunbathe.'
-		if PCloswimwear = 1:
-			act 'Swim':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/rivertwogirls.jpg"></center>'
-				*nl
-				'You wade into the river and have fun with Mira spraying each other with water.'
-				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-				temp_gr = rand(0,15)
-				cumspclnt = 4 & gs 'cum_cleanup'
-
-				minut += 29
-				if pcs_inhib < 50:inhib_exp += rand(1,2)
-				gs 'exercise', 'tier1', 1, 'stren', 'vital'
-
-
-				pcs_sweat = 10 + rand(0,4)
-				gs'stat'
-
-				act 'Get out of the water':gt'gadriver', 'gadbitch'
-			end
-		else
-			act'Second thoughts': gt 'gadriver', 'second_thoughts'
-		end
-	end
-end
-
-if $ARGS[0] = 'second_thoughts':
-	*clr & cla
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirariver.jpg"></center>'
-	*nl
-	if func('changingroom','count_swim_item') = 0:
-		'"Actually, Mira, I can''t come in right now, as I didn''t bring a swimsuit", you replied you here. "I''m going to stay on the shore for a bit."'
-		*nl
-		'You should probably buy some swimwear if you intend to spend time at the beach.'
-		*nl
-	else
-		'"Actually, Mira, I''ve changed my mind. I don''t feel like swimming just now," you replied to her. "I''m going to stay on the shore for a bit."'
-	end
-	minut += 1
-	npc_rel['A60'] -= 1
-	gs 'stat'
-
-	act 'Continue': gt'gadriver', 'gadbitch'
-end
-
-if $ARGS[0] = 'Mira':
-	*clr & cla
-	menu_off = 1
-	minut += 2
-	gs 'stat'
-
-	if sun = 1:
-		if npc_QW['A60'] < 12:
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirabeach.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirabeachnude.jpg"></center>'
-		end
-	else
-		if npc_QW['A60'] < 12:
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirariver.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirarivernude.jpg"></center>'
-		end
-	end
-	act 'Leave':gt 'gadriver', 'gadbitch'
-
-	act 'Chat':
-		*clr & cla
-		minut += 10
-		pcs_mood += 10
-		gs 'stat'
-		if sun = 1:
-			if npc_QW['A60'] < 12:
-				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirabeach.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirabeachnude.jpg"></center>'
-			end
-		else
-			if npc_QW['A60'] < 12:
-				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirariver.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirarivernude.jpg"></center>'
-			end
-		end
-		if npc_QW['A60'] >= 0:
-			if npc_QW['A60'] >= 30 and miraprost > 0 and sunWeather = 1:
-				'You and Mira talk about her being the village prostitute and how she can improve her performance.'
-			elseif npc_QW['A60'] >= 20 and sunWeather = 1:
-				'It is always lovely to talk with Mira, and you gossip about boys.'
-			elseif npc_QW['A60'] >= 15 and sunWeather = 1:
-				'You and Mira talk about clothes and shopping, she has a thing for shoes but can''t wear pretty heels because of all the mud.'
-			elseif npc_QW['A60'] >= 11 and sunWeather = 1:
-				'Mira asks you about Pavlovsk, and you tell her all about it.'
-			elseif npc_QW['A60'] >= 9 and sunWeather = 1:
-				'You talk to Mira about what it is like living in the village.'
-			elseif npc_QW['A60'] >= 8 and sunWeather = 1:
-				'Mira breaks the silence, "What brings you here to the village?"'
-				'"My granma-ma and Pop-pop live here. My folks like to come here over the summer. They think the country air will be good for me."'
-			elseif npc_QW['A60'] = 7 and sunWeather = 1:
-				'You decide to speak with Mira, "So what is there to do here in the village?"'
-				'"It''s a lot quieter than a town, but we have a shop, this lovely beach, and some beautiful walks. Other than that, there are only the Gopnik guys, but they are just after one thing, and I don''t want that. Plus, dad would kill me."'
-			elseif npc_QW['A60'] < 7 and sunWeather = 1:
-				if npc_rel['A60'] < 15:npc_rel['A60'] += 1
-				'You and Mira are chatting about trivial things.'
-			end
-		end
-		act 'Leave':gt 'gadriver', 'gadbitch'
-	end
-end
-
-if $ARGS[0] = 'mirapunish':
-	*clr & cla
-	menu_off = 1
-	minut += 10
-	pcs_horny += rand(25,75)
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirapunish.jpg"></center>'
-	'You approach Mira. She looks distressed and embarrassingly smiles as you start asking what happened. She pleads with you to release her. As you untie her, she explains that Kolyamba punished her for barely biting his cock as she sucked it...'
-	'"Thank God you showed up," she says with a sigh of relief as you untie her. "I''m glad you found me and not one of those old hags from the village. They would call me a whore, and I would get scolded for being promiscuous. Those old hags hate us, you know. We''re young and beautiful, and they are just mean old wretches." said the naked Mira, revealing her true feelings about the villagers. She continues quietly, "Or it could have been even worse. Someone could have abused me, raped me or even killed m..." Then, she suddenly stops and lunges in your arms, weeping. "Thank you," she tells you. "You saved my life!"'
-
-	act 'Leave':gt 'gadriver', 'gadbitch'
-end
-
-if $ARGS[0] = 'GuysRiver':
-	*clr & cla
-	menu_off = 1
-	minut += 5
-	pcs_horny += 10
-	gs 'stat'
-	temp_gr = rand(0,10)
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/river/mitkaguysriver.jpg"></center>'
-	'"Oh, hi, <<$pcs_nickname>>. So it''s just you today?" Kolyamba grinned.'
-	if temp_gr <= 4:
-		'"There doesn''t seem to be anyone else around, and all of us are as horny as bullfrogs. Do you want to have a little fun with us? Come on, spread your legs, show us your pussy and start playing with yourself..."'
-	elseif temp_gr > 4 and temp_gr <= 8:
-		'"There doesn''t seem to be anyone around, and we are as horny as bullfrogs. Do you want to have a little fun with us? How about you give us a blowjob? We''ll be really grateful, ha-ha!"'
-	else
-		'"Ah, no, Mira, it''s just our other hot babe. Come here, lovely. We have something exceptional for you."'
-	end
-	if temp_gr < 4:
-		act 'Pleasure Kolyamba':
-			*clr & cla
-			gs 'boyStat', 'A61'
-			pose = 0
-			temp_gr = rand(0,2)
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex.jpg"></center>'
-			'You quickly take off your pants and climb onto Kolyamba, grabbing his cock, and leading it inside you.'
-
-			gs 'arousal', 'vaginal', 10, 'sub', 'group'
-			gs 'stat'
-
-			act 'Pleasure Vasyan':
-				*clr & cla
-				gs 'boyStat', 'A62'
-				pose = 0
-				gs 'stat'
-				temp_gr = rand(0,2)
-				if temp_gr = 0:
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex1.jpg"></center>'
-					'Vasyan rolls you onto your back, sticking his cock into your wet pussy.'
-					gs 'arousal', 'vaginal', 10, 'sub', 'group'
-					gs 'arousal', 'end'
-					gs 'stat'
-				elseif temp_gr = 1:
-					gs 'boyStat', 'A62'
-					spafinloc = 12
-					gs 'cum_manage'
-					gs'stat'
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex2.jpg"></center>'
-					'Vasya steps up to you and slaps you in the face while pulling out his cock, forcing you on your knees so he can beat you with his dick.'
-					'He forcefully shoves the cock into your mouth and cums lavishly in your mouth...'
-					gs 'arousal', 'bj', 5, 'sub', 'group', 'rough'
-					gs 'arousal', 'end'
-					gs 'stat'
-				else
-					gs 'boyStat', 'A62'
-					pcs_ass += 1
-					spafinloc = 3
-					gs 'cum_manage'
-					gs'stat'
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex3.jpg"></center>'
-					'Vasyan forces you on all four and starts pumping his dick into your ass.'
-					gs 'arousal', 'anal', 10, 'sub', 'group', 'rough'
-					gs 'arousal', 'end'
-					gs 'stat'
-				end
-				act 'Leave':gt'gadriver', 'gadbitch'
-			end
-		end
-	elseif temp_gr < 8:
-		act 'Pleasure Kolyamba':
-			*clr & cla
-			gs 'boyStat', 'A61'
-			spafinloc = 12
-			gs 'cum_manage'
-			gs'stat'
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex4.jpg"></center>'
-			'You get down on your knees and start licking Kolyamba''s dick. Then, after a while, you start sucking it like a popsicle...'
-			'He only manages to hold out for a short time finishing in your mouth...'
-			gs 'arousal', 'bj', 5, 'sub', 'group', 'rough'
-			gs 'stat'
-			act 'Pleasure Vasyan':
-				*clr & cla
-				gs 'boyStat', 'A62'
-				pose = 0
-				gs 'stat'
-				temp_gr = rand(0,2)
-				if temp_gr = 0:
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex5.jpg"></center>'
-					'Vasyan lays you onto your back, using his fingers to stimulate your vaginal lips while sticking his cock into your wet pussy.'
-					gs 'arousal', 'vaginal', 10, 'sub', 'group', 'rough'
-					gs 'arousal', 'end'
-					gs 'stat'
-				elseif temp_gr = 1:
-					gs 'boyStat', 'A62'
-					spafinloc = 12
-					gs 'cum_manage'
-					gs'stat'
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex6.jpg"></center>'
-					'Vasyan roughs you up with his hands and then takes out his dick, forcing you to suck him off.'
-					'He shoves the cock into your mouth and soon cums violently...'
-					gs 'arousal', 'bj', 5, 'sub', 'group', 'rough'
-					gs 'arousal', 'end'
-					gs 'stat'
-				else
-					gs 'boyStat', 'A62'
-					pcs_ass += 1
-					spafinloc = 3
-					gs 'cum_manage'
-					gs'stat'
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex7.jpg"></center>'
-					'Vasyan forces you on all fours, telling you that you will enjoy this. Then, he pulls out his dick and starts fucking you in the ass.'
-					gs 'arousal', 'anal', 10, 'sub', 'group', 'rough'
-					gs 'arousal', 'end'
-					gs 'stat'
-				end
-				act 'Leave':gt'gadriver', 'gadbitch'
-			end
-		end
-	else
-		act 'Pleasure Kolyamba':
-			*clr & cla
-			gs 'boyStat', 'A61'
-			pcs_ass += 1
-			spafinloc = 3
-			gs 'cum_manage'
-
-			gs'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex8.jpg"></center>'
-			'Kolyamba looks you in the eyes and asks if you trust him. You gulp and reply, "Yes." He takes out a blindfold and places it over your eyes so you can''t see what''s happening next. Kolyamba then proceeds to take both of your clothes off. You stand in front of him, blindfolded, naked, and full of anticipation.'
-			'He orders you to get down on your knees. He grabs your head and tells you to open your mouth. While pleasuring him, he orders you to stop and moves the cock away from the mouth. He then lies down on the ground and tells you to mount him. You move on top of him while he grabs his cock and leads it inside your ass. He frantically starts thrusting his cock inside your ass, cumming after a short while.'
-
-			gs 'arousal', 'bj', 10, 'sub', 'group', 'rough'
-			gs 'arousal', 'anal', 10, 'sub', 'group', 'rough'
-			minut -= 10
-			gs 'stat'
-
-			act 'Pleasure Vasyan':
-				*clr & cla
-				gs 'boyStat', 'A62'
-				pose = 1
-				gs 'stat'
-				temp_gr = rand(0,2)
-
-				if temp_gr = 0:
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex9.jpg"></center>'
-					'Vasyan tells you he heard about a sex position where both of you will reach ecstasy. Intrigued by this, you take your clothes off and start caressing his cock. He removes your hand from his cock and tells you to get down on your hands and knees. Vasya walks behind you, grabs his cock and enters you from behind. You gasp as he mounts you. Soon enough, you both cry out in ecstasy cumming at the same time.'
-
-					$orgasm_or = 'yes'
-					gs 'arousal', 'bj', 10, 'sub', 'group', 'rough'
-					gs 'arousal', 'vaginal', 10, 'sub', 'group', 'rough'
-					minut -= 10
-					gs 'arousal', 'end'
-					gs 'stat'
-
-				elseif temp_gr = 1:
-					gs 'boyStat', 'A62'
-					spafinloc = 12
-					gs 'cum_manage'
-					gs'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex10.jpg"></center>'
-					'Vasyan steps closer to you and tells you he wants his cock sucked. You drop down on your knees and start sucking his glans.'
-					'Feeling dissatisfied by your performance, he grabs you by the head. He forces his cock deep down your throat, mumbling something about teaching you how to do it properly. Finally, he finishes inside your mouth...'
-					gs 'arousal', 'bj', 5, 'sub', 'group', 'rough', 'deepthroat'
-					gs 'arousal', 'end'
-					gs 'stat'
-				else
-					gs 'boyStat', 'A62'
-					pcs_ass += 1
-					spafinloc = 3
-					gs 'cum_manage'
-					gs'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex11.jpg"></center>'
-					'Vasyan forces you to your hands and knees and starts thrusting his dick into your anus.'
-					gs 'arousal', 'anal', 10, 'sub', 'group', 'rough'
-					gs 'arousal', 'end'
-					gs 'stat'
-				end
-				act 'Leave':gt'gadriver', 'gadbitch'
-			end
-		end
-	end
-	act 'Leave':gt'gadriver', 'gadbitch'
-end
-
-if $ARGS[0] = 'fishers':
-	*clr & cla
-	menu_off = 1
-	minut += 2
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverfishers.jpg"></center>'
-
-	if fishersday ! daystart:
-		act 'Greet':
-			cla
-			*clr
-			fishersday = daystart
-			minut += 3
-			if fishersQW < 3:fishersQW += 1
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/hifishers.jpg"></center>'
-			'You politely greet the fishermen, but they are too focused on fishing. One of them absently waves in your general direction in response.'
-
-			if fishersQW >= 3:
-				act 'Chat':
-					cla
-					*clr
-					minut += 10
-					if fishersQW = 3:fishersQW = 4
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
-					'You keep watching as the fishermen throw out their lures. One catches a fish and shows off his trophy before putting it into the fish bail. The two of you chat about fishing.'
-
-					act 'Leave':gt 'gadriver', 'start'
-				end
-			end
-			if fishersQW = 4:
-				act 'Ask to borrow a fishing rod':
-					cla
-					*clr
-					minut += 10
-					fishersQW = 5
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
-					'You decide to try your luck at fishing and ask the fishermen if they could lend you a fishing rod. Uncle Stepan, a friend of the family, points to a pile of spare rods and tells you to pick one.'
-
-					act 'Fishing':gt 'gadriver', 'fishing'
-				end
-			end
-			if fishersQW = 5:
-				act 'Fishing with them':
-					cla
-					*clr
-					minut += 10
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
-					'You decide to join your new friends. Uncle Stepan tells you he has plenty of spare rods and hands you a rod while his eyes travel up and down your body.'
-
-					act 'Fishing':gt 'gadriver', 'fishing'
-				end
-			end
-
-			act 'Leave':gt 'gadriver', 'start'
-		end
-	else
-		act 'Leave':gt 'gadriver', 'start'
-	end
-end
-
-if $ARGS[0] = 'fishing':
-	cla
-	*clr
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver.jpg"></center>'
-	'The stream quietly flows over the rocks, pleasantly tickling your ears. You gaze at the village that''s entirely peaceful. There is a sense of serenity about it today.'
-	'You caught <<fish>> fish.'
-	if hour < 22:
-		act 'Throw the bait':
-			*clr & cla
-			minut += rand(5,10)
-			if hour < 12:
-				temp_gr = rand(5,20)
-			elseif hour >= 12 and hour < 18:
-				temp_gr = rand(0,20)
-			else
-				temp_gr = rand(10,20)
-			end
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/fishingriver.jpg"></center>'
-			'You throw out the lure and watch the bobber for signs of a nibble.'
-
-			if temp_gr > rand(15,19):
-				cla
-				*clr
-				minut += 1
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/nofishingriver.jpg"></center>'
-				'Suddenly the bobber dives under the water dramatically. You got one!'
-
-				act 'Pull':
-					cla
-					*clr
-					minut += 1
-					temp_gr = rand(0,120)
-					if temp_gr < 50:gs 'exp_gain', 'react', 1
-					gs 'stat'
-
-					if pcs_react > temp_gr:
-						pcs_mood += rand(5,10)
-						minut += 1
-						gs 'exp_gain', 'react', 1
-						fish += 1
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/fishyes.jpg"></center>'
-						'You skillfully strike, pulling the rod up sharply. You feel the rod straining slightly, and after a few moments, you excitedly pull a small fish out of the water.'
-					else
-						pcs_mood -= rand(5,10)
-						minut += 1
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver.jpg"></center>'
-						'You strike, but the lack of tension makes the fish escape from the hook.'
-
-					end
-					act 'Throw another bait':gt 'gadriver', 'fishing'
-				end
-			else
-				'The bobber remains perfectly still. Eventually, you decide to try a different lure.'
-				act 'Retrieve bait':gt 'gadriver', 'fishing'
-			end
-		end
-		act 'Finish':
-			cla
-			*clr
-			minut += 5
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
-			'You''re tired, so you return the fishing rod to uncle Stepan.'
-			if fish > 0:
-				act 'Release your catch':
-					cla
-					*clr
-					minut += 5
-					fish = 0
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
-					'You decide to release all the fish you caught today. The other fishermen shake their heads disapprovingly, throwing sidelong glances at your body as you dump the fish back into the river.'
-
-					act 'Leave':gt $loc, $loc_arg
-				end
-				act 'Give the fish to Uncle Stepan':
-					cla
-					*clr
-					minut += 5
-					fish = 0
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
-					'You give all the fish you caught to uncle Stepan, and he makes a show out of reluctantly accepting them. Still, you can see that he is pretty happy with this arrangement.'
-
-					act 'Leave':gt $loc, $loc_arg
-				end
-				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 to the floor and twines around your feet. Then, the furry beast starts loudly yowling 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 points 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 points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
-
-					act 'Finish': gt 'gadhouse', 'start'
-				end
-			else
-				act 'Leave':gt $loc, $loc_arg
-			end
-		end
-	else
-		cla
-		*clr
-		minut += 5
-		pcs_mood -= rand(5,10)
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
-		'Uncle Stepan says, "It''s time to head home, young lady." You reluctantly return his fishing rod, knowing that''s it for today.'
-
-		if fish > 0:
-			act 'Release your catch':
-				cla
-				*clr
-				minut += 5
-				fish = 0
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
-				'You decide to release all the fish you caught today. The other fishermen shake their heads disapprovingly, throwing sidelong glances at your body as you dump the fish back into the river.'
-
-				act 'Leave':gt $loc, $loc_arg
-			end
-			act 'Give to Uncle Stepan':
-				cla
-				*clr
-				minut += 5
-				fish = 0
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
-				'You give all the fish caught to uncle Stepan, who reluctantly accepts them. You can see he is pretty happy with this arrangement.'
-
-				act 'Leave':gt $loc, $loc_arg
-			end
-			if 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 to the floor and twines around your feet. Then, the furry beast starts loudly yowling 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 points 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 points at your grandfather. He sighs heavily, then takes the fish outside to clean them.'
-
-					act 'Finish': gt 'gadhouse', 'start'
-				end
-			end
-		else
-			act 'Leave':gt $loc, $loc_arg
-		end
-	end
-end
---- gadriver ---------------------------------
-

+ 47 - 50
locations/gadukino.qsrc

@@ -1,23 +1,22 @@
 # gadukino
 !!2022/05/02
+!2024/05/05 - Mira schedule introduced.
+!locat['A60'] = Mira''s location. See 'miroslava_schedule'
 
 if $ARGS[0] = '':
-	$loc = 'gadukino'
-	$loc_arg = ''
+	gs 'shortgs', 'setloc', 'gadukino', ''
 	$region = 'gad'
 	$location_type = 'public_outdoors'
+	gs 'miroslava_schedule'
+	menu_off = 0
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
 
-	$menu_loc = 'gadukino'
-	$menu_arg = ''
-	menu_off = 0
-
 	!exec before everything
 	!lower chance (1/3 to 1/12) and once per day by illume
 	! 10% chance of meeting Mitka once per day in the village when Sveta is not the village boys slut or whole villages whore
-	mitkarand = rand(1,10)
-	if mitkaday ! daystart and hour >= 7 and hour < 20 and mitkarand = 1 and (npc_QW['A63'] < 11 or gadriver_gang > 2):
+	temp_rand = rand(1,10)
+	if temp_rand = 1 and GadBoy['mitka_day'] ! daystart and hour >= 7 and hour < 20 and (npc_QW['A63'] < 11 or GadBoy['river_gang'] > 2):
 		*clr & cla
 		menu_off = 1
 		minut += 5
@@ -30,49 +29,50 @@ if $ARGS[0] = '':
 	else
 		! checks for events first before showing regular street actions
 		! Sveta is the boys slut and not the whole villages whore yet
-		if npc_QW['A63'] = 20 and hour >= 7 and hour < 20 and month >= 4 and month <= 10 and gadboyday ! daystart and week > 5 and gadriver_gang < 1: gt 'gadukino_event', 'gadriver_gang'
+		if npc_QW['A63'] = 20 and hour >= 7 and hour < 20 and month >= 4 and month <= 10 and gadboyday ! daystart and week > 5 and GadBoy['river_gang'] < 1: gt 'gadukino_event', 'gadriver_gang'
 		! Sveta decision on whether to be the whole villages whore or not
-		if gadriver_gang = 1 and hour >= 7 and hour < 20 and gadboyday ! daystart: gt 'gadukino_event', 'gang_apologise'
+		if GadBoy['river_gang'] = 1 and hour >= 7 and hour < 20 and gadboyday ! daystart: gt 'gadukino_event', 'gang_apologise'
 		! Sveta decided not to be the whole villages whore
-		if gadriver_gang = 3 and hour >= 7 and hour < 20 and gadboyday ! daystart: gt 'gadukino_event', 'mitka_apologise'
-		if gadriver_gang = 4 and mirasex = 1 and miralick = 0 and hour >= 8 and hour <= 20 and gadboyday ! daystart: gt 'gadukino_event', 'mira_apologise'
+		if GadBoy['river_gang'] = 3 and hour >= 7 and hour < 20 and gadboyday ! daystart: gt 'gadukino_event', 'mitka_apologise'
+		if GadBoy['river_gang'] = 4 and MiraVars['had_sex'] = 1 and MiraVars['cuni_given'] = 0 and hour >= 8 and hour <= 20 and gadboyday ! daystart: gt 'gadukino_event', 'mira_apologise'
 		! Sveta decided to be the whole villages whore - each boy will only fuck Sveta once per day
-		if gadriver_gang = 2 and hour >= 7 and hour < 20 and month >= 4 and month <= 10 and gadboyday ! daystart:
-			mitkarand = rand(1,12)
+		if GadBoy['river_gang'] = 2 and hour >= 7 and hour < 20 and month >= 4 and month <= 10 and gadboyday ! daystart:
+			temp_rand = rand(1,12)
 			! 33% chance one of the village boys will demand sex from Sveta
-			if mitkarand <= 4:
+			if temp_rand <= 4:
 				! 25% chance for more than 1 boy
-				if mitkarand = 4:
-					if mitkaday ! daystart and kolyambaday ! daystart:
+				if temp_rand = 4:
+					if GadBoy['mitka_day'] ! daystart and GadBoy['kolyamba_day'] ! daystart:
 						gt 'gadukino_event', 'gadukino_2boys', '1'
-					elseif mitkaday ! daystart and vasyanday ! daystart:
+					elseif GadBoy['mitka_day'] ! daystart and GadBoy['vasyan_day'] ! daystart:
 						gt 'gadukino_event', 'gadukino_2boys', '2'
-					elseif kolyambaday ! daystart and vasyanday ! daystart:
+					elseif GadBoy['kolyamba_day'] ! daystart and GadBoy['vasyan_day'] ! daystart:
 						gt 'gadukino_event', 'gadukino_2boys', '3'
-					elseif mitkaday ! daystart:
+					elseif GadBoy['mitka_day'] ! daystart:
 						gt 'gadukino_event', 'gadukino_mitka'
-					elseif kolyambaday ! daystart:
+					elseif GadBoy['kolyamba_day'] ! daystart:
 						gt 'gadukino_event', 'gadukino_kolyamba'
-					elseif vasyanday ! daystart:
+					elseif GadBoy['vasyan_day'] ! daystart:
 						gt 'gadukino_event', 'gadukino_vasyan'
 					end
 				! 75% chance for only 1 boy
 				else
-					if mitkaday ! daystart:
+					if GadBoy['mitka_day'] ! daystart:
 						gt 'gadukino_event', 'gadukino_mitka'
-					elseif kolyambaday ! daystart:
+					elseif GadBoy['kolyamba_day'] ! daystart:
 						gt 'gadukino_event', 'gadukino_kolyamba'
-					elseif vasyanday ! daystart:
+					elseif GadBoy['vasyan_day'] ! daystart:
 						gt 'gadukino_event', 'gadukino_vasyan'
 					end
 				end
 			! 17% chance for Mira to demand sex from Sveta
- 			elseif mitkarand <= 6:
+ 			elseif temp_rand <= 6:
 				! 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'
+				if npc_QW['A63'] >= 11 and MiraVars['had_sex'] = 1 and MiraVars['QW'] < 11 and MiraVars['event_day'] ! daystart: gt 'gad_meadow','mira_lesb_talk4'
 			end
 		end
 		gs 'stat'
+		killvar 'temp_rand'
 
 		'<center><h2>Gadukino</h2></center>'
 		if month >= 4 and month <= 10:
@@ -91,8 +91,8 @@ if $ARGS[0] = '':
 		*nl
 		'A small village with many old wooden houses and even more in various states of disrepair. It has certainly seen better times.'
 		if car > 0 and cardrive = 23: '<a href="exec:GS ''carF'',''start''">Your <<$car>></a> is close by.'
-		'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'
+		'Several small farms are scattered around the outskirts of the village, one of which belongs to <a href="exec:minut += 5 & gt ''gad_gpyard'', ''start''">your grandparents</a>.'
+		act 'Go to your grandparent''s house': minut += 5 & gt 'gad_gpyard', 'start'
 		if $home['current'] = 'hunters_lodge' or $home['current'] = 'grandparents_house':
 			if vladimirQW['day'] = daystart and vladimirQW['stage'] = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''2''">There''s an Audi parked in the street, and standing beside it, you notice Vladimir</a>.'
 			if vladimirQW['day'] = daystart and vladimirQW['stage'] = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''3''">There''s an Audi parked in the street, and standing beside it, you notice Vladimir</a>.'
@@ -108,8 +108,8 @@ if $ARGS[0] = '':
 			end
 		end
 		if npc_rel['A60'] > 0 and npc_known['A60'] = 1:
-			'Just down the road from your grandparents'' house is <a href="exec:minut += 5 & gt ''miroslavahome'', ''start''">Mira''s house</a>.'
-			act 'Go to Mira''s house': minut += 5 & gt 'miroslavahome', 'start'
+			'Just down the road from your grandparents'' house is <a href="exec:minut += 5 & gt ''gad_miroslava_home'', ''start''">Mira''s house</a>.'
+			act 'Go to Mira''s house': minut += 5 & gt 'gad_miroslava_home', 'start'
 		end
 		*nl
 
@@ -123,19 +123,18 @@ if $ARGS[0] = '':
 			'During the summer, a truck usually comes into town from the city to buy fresh mushrooms and berries from the locals. It''s not the right season for it right now, though.'
 		end
 
-		!Looks like no reference to Gadmarket exists. Adding it...FinnMacha
 		*nl
 		'In the center of the village is a small grass-covered square where villagers gather to meet and discuss or argue about politics or village life.'
 		'Near the square sits the old <a href="exec: minut += 3 & gt ''gad_church'',''start''">chapel</a>, it is not in the best shape, but it appears well-loved.'
 		if hour >= 8 and hour < 20:
-			'One of the buildings facing the square has a sign saying, <a href="exec: minut += 5 & gt ''gadmarket''">General Store</a>. A sign on the door proclaims it "OPEN". It looks like the only place in the village to buy goods.'
-			act 'Go to the general store': minut += 5 & gt 'gadmarket'
+			'One of the buildings facing the square has a sign saying, <a href="exec: minut += 5 & gt ''gad_market''">General Store</a>. A sign on the door proclaims it "OPEN". It looks like the only place in the village to buy goods.'
+			act 'Go to the general store': minut += 5 & gt 'gad_market'
 		else
 			'One of the buildings facing the square has a sign saying, General Store. A sign on the door proclaims it "CLOSED". It looks like the only place in the village to buy goods.'
 		end
 
-		act 'Walk to the forest road (0:10)':minut += 10 & gt 'gadroad'
-		act 'Walk to the highway (0:15)':minut += 15 & nroad = 10 & gt 'road'
+		act 'Walk to the forest road (0:10)': minut += 10 & gt 'gad_road', 'start'
+		act 'Walk to the highway (0:15)': minut += 15 & nroad = 10 & gt 'road'
 		if hour >= 6 and hour < 20:
 			act 'Walk around the village (0:15)':
 				*clr & cla
@@ -145,7 +144,7 @@ if $ARGS[0] = '':
 
 				temp = rand(1,100)
 				! 50% chance of mira events if you already found the meadow and are still friends with mira
-				if temp >= 50 and Mira_no = 0 and MiraLoc = 0:
+				if temp >= 50 and locat['A60'] = 30:
 					gt 'gadukino', 'mira_events'
 				! 50% chance of other random 1 picture flavour events
 				else
@@ -324,7 +323,7 @@ if $ARGS[0] = 'mira_events':
 	else
 		*clr & cla
 		! mira 2nd wish - pose as prostitute - one time event to fire so check for this first before repeatable mira events
-		if npc_QW['A60'] = 15 and temper >= 10 and sunWeather = 1 and miraprost = 0:
+		if MiraVars['QW'] = 15 and temper >= 10 and sunWeather = 1 and MiraVars['prostitute'] = 0:
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/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...'
 
@@ -360,8 +359,8 @@ if $ARGS[0] = 'mira_events':
 								*clr & cla
 								minut += 30
 								pcs_horny += 20
-								miraprost += 1
-								npc_QW['A60'] = 16
+								MiraVars['prostitute'] += 1
+								MiraVars['QW'] = 16
 								'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miraprost.jpg"></center>'
 								'It isn''t long before Mira''s first customer pulls up in an excellent vehicle. She takes a deep breath, looks you in the eyes, winks, approaches the car, 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.'
@@ -393,7 +392,6 @@ if $ARGS[0] = 'mira_events':
 												act 'Walk back to the village together':
 													*clr & cla
 													minut += 10
-													miraloc = 0
 													gs 'arousal', 'end'
 													gs 'stat'
 
@@ -426,7 +424,6 @@ if $ARGS[0] = 'mira_events':
 												act 'Walk back to the village together':
 													*clr & cla
 													minut += 10
-													miraloc = 0
 													gs 'arousal', 'end'
 													gs 'stat'
 
@@ -445,8 +442,8 @@ if $ARGS[0] = 'mira_events':
 			end
 
 		! mira slut events
-		elseif npc_QW['A60'] >= 11 and temper >= 10 and sunWeather = 1 and miraday ! daystart:
-			miraday = daystart
+		elseif MiraVars['QW'] >= 11 and temper >= 10 and sunWeather = 1 and MiraVars['event_day'] ! daystart:
+			MiraVars['event_day'] = daystart
 
 			if pcs_horny > 50 and rand(0,1) = 0:
 				gs 'miroslava', 'miraclothes'
@@ -458,7 +455,7 @@ if $ARGS[0] = 'mira_events':
 				if will_cost <= pcs_willpwr:
 					act 'You''re feeling naughty (<<will_cost>> Willpower)':
 						*clr & cla
-						if mirasextimes < 50:
+						if MiraVars['Mitka_fucks'] < 50:
 							temp = rand(0,3)
 							if temp = 0:
 								'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirasp.jpg"></center>'
@@ -554,10 +551,10 @@ if $ARGS[0] = 'mira_events':
 				act 'Finish your walk': gt 'gadukino'
 			end
 		! mira owes sveta wishes already
-		elseif npc_QW['A60'] >= 4 and npc_QW['A60'] < 11 and temper >= 10 and sunWeather = 1 and miraday ! daystart:
-			miraday = daystart
+		elseif MiraVars['QW'] >= 4 and MiraVars['QW'] < 11 and temper >= 10 and sunWeather = 1 and MiraVars['event_day'] ! daystart:
+			MiraVars['event_day'] = daystart
 			! mira first wish done
-			if npc_QW['A60'] >= 6:
+			if MiraVars['QW'] >= 6:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirasexgad2.jpg"></center>'
 				'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 climaxes. She moaned and raked his back with her fingernails as she squirted and continued to cum. Mitka increased his pace and roughly hammered his cock into her dripping pussy. With his left hand, he reached for Mira''s right tit and squeezed it without mercy; Mira just squealed and laughed.'
@@ -588,7 +585,7 @@ if $ARGS[0] = 'mira_events':
 				end
 
 			! mira first wish not done
-			elseif npc_QW['A60'] >= 4:
+			elseif MiraVars['QW'] >= 4:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirasexgad.jpg"></center>'
 				'Walking through the village, you notice Mira sucking Mitka''s cock in the backyard. She wraps her lips around it, almost entirely taking the dick into her mouth. Sometimes she glances to the side...'
@@ -636,7 +633,7 @@ if $ARGS[0] = 'mira_events':
 				npc_rel['A60'] += 1
 				minut += 10
 				gs 'stat'
-				if npc_QW['A60'] = 0:
+				if MiraVars['QW'] = 0:
 					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira1.jpg"></center>'
 				else
 					gs 'miroslava','miraclothes'

+ 31 - 31
locations/gadukino_event.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0] = 'mira_apologise':
 			*clr & cla
 			minut += 5
 			pcs_horny += 5
-			mirasex = 2
+			MiraVars['had_sex'] = 2
 			gs 'stat'
 			gs 'miroslava', 'miraclothes'
 
@@ -40,7 +40,7 @@ if $ARGS[0] = 'mira_apologise':
 		act 'Refuse':
 			*clr & cla
 			minut += 30
-			mirasex = 3
+			MiraVars['had_sex'] = 3
 			gs 'stat'
 			gs 'miroslava', 'miraclothes'
 
@@ -59,7 +59,7 @@ if $ARGS[0] = 'mitka_apologise':
 	menu_off = 1
 	minut += 5
 	gadboyday = daystart
-	gadriver_gang = 4
+	GadBoy['river_gang'] = 4
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/turn_back.jpg"></center>'
@@ -76,13 +76,13 @@ if $ARGS[0] = 'mitka_apologise':
 		'"Listen, <<$pcs_nickname>>. I beat up the other guys," he said with a smirk, seeing the fear on your face. "I told them not to touch you anymore, and if they want anything to do with you, they have to come and speak to me first."'
 		'You stood silently and waited to see what more he had to say.'
 		'"In short, I remember you as one of my best childhood friends, so I don''t want to argue anymore about Mira," he said with a grin. "Friends?"'
-		if npc_QW['A60'] >= 12:
+		if MiraVars['QW'] >= 12:
 			'"So you won''t have sex with Mira anymore?" you ask, relieved.'
 			'"Don''t worry, Mira won''t mind." Mitka snickered.'
 			'"You must stop having sex with her." you look at Mitka with distrust.'
 			'"Well, what can I do. If she begs me to do it, I can''t promise I''ll say no." he laughed. "Well, I think we''re all set. I''ll try to avoid Mira... But I won''t say no if she begs me to fuck her."'
 			'Mitka starts walking towards Kolyamba''s house. You watch him for a while until he disappears behind a corner.'
-		elseif npc_QW['A60'] >= 3:
+		elseif MiraVars['QW'] >= 3:
 			'"And you must stop having sex with Mira." you look at Mitka with distrust.'
 			'"Well, what can I do. If she begs me to do it, I can''t promise I''ll say no." he laughed. "Well, I think we''re all set. I''ll try to avoid Mira... But I won''t say no if she begs me to fuck her."'
 			'Mitka starts walking towards Kolyamba''s house. You watch him for a while until he disappears behind a corner.'
@@ -109,7 +109,7 @@ if $ARGS[0] = 'gang_apologise':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/girl_escapes.jpg"></center>'
 		'You started running away from the road, not stopping before you felt you were in the clear.'
 		'"Good thing I ran away from that pervy bastard. I cannot believe how much I''ve looked up to him." you thought, looking around.'
-		act 'Continue':gt'meadow'
+		act 'Continue': gt 'gad_meadow', 'start'
 	end
 
 	act 'Wait and see':
@@ -139,7 +139,7 @@ if $ARGS[0] = 'gang_apologise':
 			act 'Take the money':
 				*clr & cla
 				minut += 5
-				gadriver_gang = 2
+				GadBoy['river_gang'] = 2
 				gs 'prostitution_functions', 'set_gadukion_prostitute'
 				money += 10000
 				gs 'stat'
@@ -160,7 +160,7 @@ if $ARGS[0] = 'gang_apologise':
 				act 'Refuse (<<will_cost>> Willpower)':
 					*clr & cla
 					minut += 5
-					gadriver_gang = 3
+					GadBoy['river_gang'] = 3
 					gs 'willpower', 'prostitution', 'resist', 'hard'
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
@@ -185,7 +185,7 @@ end
 if $ARGS[0] = 'gadriver_gang':
 	minut += 5
 	menu_off = 1
-	gadriver_gang = 1
+	GadBoy['river_gang'] = 1
 	gadboyday = daystart
 	npc_QW['A63'] = 21
 	if pcs_health <= 100:pcs_health += 100
@@ -711,7 +711,7 @@ if $ARGS[0] = 'gadriver_gang5':
 					'"Best to clean up first and deal with the consequences later." You think to yourself.'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 5 & gt'gadriver', 'gadbitch'
+					act 'Leave': minut += 5 & gt 'gad_beach', 'start'
 				end
 			end
 		end
@@ -721,7 +721,7 @@ end
 if $ARGS[0] = 'gadukino_mitka':
 	menu_off = 1
 	minut += 5
-	mitkaday = daystart
+	GadBoy['mitka_day'] = daystart
 	gs 'stat'
 
 	'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
@@ -752,7 +752,7 @@ end
 if $ARGS[0] = 'gadukino_kolyamba':
 	menu_off = 1
 	minut += 5
-	kolyambaday = daystart
+	GadBoy['kolyamba_day'] = daystart
 	gs 'stat'
 
 	'<center><b><font color = maroon>Kolyamba Pyut</font></b></center>'
@@ -782,7 +782,7 @@ end
 if $ARGS[0] = 'gadukino_vasyan':
 	menu_off = 1
 	minut += 5
-	vasyanday = daystart
+	GadBoy['vasyan_day'] = daystart
 	gs 'stat'
 
 	'<center><b><font color = maroon>Vasyan Paket</font></b></center>'
@@ -820,16 +820,16 @@ if $ARGS[0] = 'gadukino_2boys':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/2boys.2.jpg"></center>'
 	end
 	if $ARGS[1] = '1':
-		mitkaday = daystart
-		kolyambaday = daystart
+		GadBoy['mitka_day'] = daystart
+		GadBoy['kolyamba_day'] = daystart
 		'Walking through the village, you meet Mitka and Kolyamba. Seeing you, they grin, grab you by the arms and drag you into the bushes.'
 	elseif $ARGS[1] = '2':
-		mitkaday = daystart
-		vasyanday = daystart
+		GadBoy['mitka_day'] = daystart
+		GadBoy['vasyan_day'] = daystart
 		'Walking through the village, you meet Mitka and Vasyan. Seeing you, they grin, grab you by the arms and drag you into the bushes.'
 	elseif $ARGS[1] = '3':
-		kolyambaday = daystart
-		vasyanday = daystart
+		GadBoy['kolyamba_day'] = daystart
+		GadBoy['vasyan_day'] = daystart
 		'Walking through the village, you meet Kolyamba and Vasyan. Seeing you, they grin, grab you by the arms and drag you into the bushes.'
 	end
 	gs 'willpower', 'sex', 'resist', 'hard'
@@ -864,7 +864,7 @@ end
 if $ARGS[0] = 'mira_mitka':
 	menu_off = 1
 	minut += 5
-	mitkaday = daystart
+	GadBoy['mitka_day'] = daystart
 	gs 'stat'
 
 	'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
@@ -895,7 +895,7 @@ end
 if $ARGS[0] = 'mira_kolyamba':
 	menu_off = 1
 	minut += 5
-	kolyambaday = daystart
+	GadBoy['kolyamba_day'] = daystart
 	gs 'stat'
 
 	'<center><b><font color = maroon>Kolyamba Pyut</font></b></center>'
@@ -925,7 +925,7 @@ end
 if $ARGS[0] = 'mira_vasyan':
 	menu_off = 1
 	minut += 5
-	vasyanday = daystart
+	GadBoy['vasyan_day'] = daystart
 	gs 'stat'
 
 	'<center><b><font color = maroon>Vasyan Paket</font></b></center>'
@@ -962,16 +962,16 @@ if $ARGS[0] = 'mira_2boys':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/2boys.2.jpg"></center>'
 	end
 	if ARGS[1] = 1:
-		mitkaday = daystart
-		kolyambaday = daystart
+		GadBoy['mitka_day'] = daystart
+		GadBoy['kolyamba_day'] = daystart
 		'Walking with Mira in the village, you meet Mitka and Kolyamba. Seeing you both, they smile at each other and drag you both into the bushes.'
 	elseif ARGS[1] = 2:
-		mitkaday = daystart
-		vasyanday = daystart
+		GadBoy['mitka_day'] = daystart
+		GadBoy['vasyan_day'] = daystart
 		'Walking with Mira in the village, you meet Mitka and Vasyan. Seeing you both, they smile at each other and drag you both into the bushes.'
 	elseif ARGS[1] = 3:
-		kolyambaday = daystart
-		vasyanday = daystart
+		GadBoy['kolyamba_day'] = daystart
+		GadBoy['vasyan_day'] = daystart
 		'Walking with Mira in the village, you meet Kolyamba and Vasyan. Seeing you both, they smile at each other and drag you both into the bushes.'
 	end
 	gs 'willpower', 'sex', 'resist', 'hard'
@@ -1006,9 +1006,9 @@ end
 if $ARGS[0] = 'mira_3boys':
 	menu_off = 1
 	minut += 5
-	mitkaday = daystart
-	kolyambaday = daystart
-	vasyanday = daystart
+	GadBoy['mitka_day'] = daystart
+	GadBoy['kolyamba_day'] = daystart
+	GadBoy['vasyan_day'] = daystart
 	gs 'stat'
 
 	if month >= 6 and month <= 8:

+ 14 - 14
locations/gargazel.qsrc

@@ -32,22 +32,22 @@ end
 act 'Leave the garage':minut += 5 & gt 'pav_complex', 'garages'
 
 if YouCanGar > 0:
-	'You have stored <<GarTorgItem>> trinkets in the garage currently. Your stepfather allowed you to store some things in his garage but doesn''t want you taking up all his space, he has allowed you to store up to 100 trinkets here. The garage is not very easily accessible; if you want to sell the trinkets at the station, you will have to bring them back home first.'
+	'You have stored <<mc_inventory[''trinkets_garage'']>> trinkets in the garage currently. Your stepfather allowed you to store some things in his garage but doesn''t want you taking up all his space, he has allowed you to store up to 100 trinkets here. The garage is not very easily accessible; if you want to sell the trinkets at the station, you will have to bring them back home first.'
 
-	if tovarL >= 30:
+	if mc_inventory['trinkets_home'] >= 30:
 		'You already have too much stored at home and do not have any more space.'
-	elseif tovarL < 30:
-		perenGarTov = 30 - tovarL
-		'You can bring <<perenGarTov>> trinkets home and store them somewhere, until you have time to collect and sell them at the train station.'
+	elseif mc_inventory['trinkets_home'] < 30:
+		trinkets_can_take = 30 - mc_inventory['trinkets_home']
+		'You can bring <<trinkets_can_take>> trinkets home and store them somewhere, until you have time to collect and sell them at the train station.'
 
-		if GarTorgItem > 0:
-			if GarTorgItem >= perenGarTov:
-				act 'Move <<perenGarTov>> trinkets to your home':
+		if mc_inventory['trinkets_garage'] > 0:
+			if mc_inventory['trinkets_garage'] >= trinkets_can_take:
+				act 'Move <<trinkets_can_take>> trinkets to your home':
 					cls
 					menu_off = 1
 					minut += 60
-					tovarL += perenGarTov
-					GarTorgItem -= perenGarTov
+					mc_inventory['trinkets_home'] += trinkets_can_take
+					mc_inventory['trinkets_garage'] -= trinkets_can_take
 					gs 'stat'
 					'You spend an hour gathering your trinkets from various places, bringing them home and hiding them there.'
 
@@ -55,13 +55,13 @@ if YouCanGar > 0:
 				end
 			end
 
-			if GarTorgItem < perenGarTov:
-				act 'Collect <<GarTorgItem>> trinkets to take with you':
+			if mc_inventory['trinkets_garage'] < trinkets_can_take:
+				act 'Collect <<mc_inventory[''trinkets_garage'']>> trinkets to take with you':
 					cls
 					menu_off = 1
 					minut += 30
-					tovarL += GarTorgItem
-					GarTorgItem = 0
+					mc_inventory['trinkets_home'] += mc_inventory['trinkets_garage']
+					mc_inventory['trinkets_garage'] = 0
 					gs 'stat'
 					'You spend half an hour gathering your trinkets from various places in the garage, putting them in a bag so you can go sell them at the station.'
 

+ 35 - 35
locations/grandmahelp.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'start':
 		gt 'grandmahelp', 'pickforest_both'
 	else
 		'"There is nothing to do today, <<$pcs_nickname>>. take the day off.'
-		act 'Continue':gt 'gadhouse', 'grandma'
+		act 'Continue': gt 'gad_gphouse', 'grandma'
 	end
 end
 
@@ -56,7 +56,7 @@ if $ARGS[0] = 'cleanfloor':
 	'"There is always something to do, <<$pcs_nickname>>. I''ve gotten quite old, and my strength is not what it used to be. Could you help me out by cleaning the floor?"'
 
 	grandmaQW['chore_clean_floor'] = 1
-	act 'Tell her you will do it soon':gt 'gadhouse', 'grandma'
+	act 'Tell her you will do it soon': gt 'gad_gphouse', 'grandma'
 	act 'Agree and start cleaning (1:00)':
 		*clr & cla
 		minut += 60
@@ -67,8 +67,8 @@ if $ARGS[0] = 'cleanfloor':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
 		'You grab a bucket and a rag, get down on your knees and begin scrubbing the floor. Within the hour, the floor shines, and you are satisfied with your work. You put the cleaning supplies into a corner and continue your day.'
 
-		act 'Continue':gt 'gadhouse', 'start'
-		act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
+		act 'Continue': gt 'gad_gphouse', 'start'
+		act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
 	end
 end
 
@@ -76,7 +76,7 @@ if $ARGS[0] = 'washclothes':
 	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfather''s dirty clothes?"'
 
 	grandmaQW['chore_wash_clothes'] = 1
-	act 'Tell her you will wash them in a little bit':gt 'gadhouse', 'grandma'
+	act 'Tell her you will wash them in a little bit': gt 'gad_gphouse', 'grandma'
 	act 'Agree and start washing (1:00)':
 		*clr & cla
 		minut += 60
@@ -93,8 +93,8 @@ if $ARGS[0] = 'washclothes':
 		    '<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
 		    'Once done with the washing, you walk to the clothesline, where you carefully hang the clothes to dry.'
 
-		    act 'Continue':gt'gaddvor'
-			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
+		    act 'Continue': gt 'gad_gpyard', 'start'
+			act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
 		end
 	end
 end
@@ -103,7 +103,7 @@ if $ARGS[0] = 'milkcows':
 	'"<<$pcs_nickname>>, go to the barn and milk the cows."'
 
 	grandmaQW['chore_milk_cow'] = 1
-	act 'Tell her you will do it in a bit':gt 'gadhouse', 'grandma'
+	act 'Tell her you will do it in a bit': gt 'gad_gphouse', 'grandma'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		minut += 10
@@ -112,7 +112,7 @@ if $ARGS[0] = 'milkcows':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 		'You walk over to the barn where the cows are kept.'
 
-		act 'Continue':gt'gadsarai','cow'
+		act 'Continue': gt 'gad_gpbarn', 'cow'
 	end
 end
 
@@ -120,7 +120,7 @@ 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 'Tell her you will go to the store later': gt 'gad_gphouse', 'grandma'
 	act 'Agree and go to the store (0:15)':
 		*clr & cla
 		minut += 15
@@ -128,7 +128,7 @@ if $ARGS[0] = 'groceries':
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
 		'Your grandmother shuffles around, looking for her list for a few minutes, finally finding it and giving it to you. You grab a basket and set out for the store.'
-		act 'Continue':gt 'gadmarket'
+		act 'Continue': gt 'gad_market'
 	end
 end
 
@@ -136,7 +136,7 @@ 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 'Tell her you will help her in a little while': gt 'gad_gphouse', 'grandma'
 	act 'Agree to help her right now (2:00)':
 		*clr & cla
 		minut += 45
@@ -162,7 +162,7 @@ if $ARGS[0] = 'can_mushrooms':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_mushrooms.jpg"></center>'
 				'Finally, you help Grandma take them out of the canner and set them aside to cool.'
 				'"Thank you, <<$pcs_nickname>>," she says. "It is important to save food up for the hard winter months. Sure, now you can walk to the store and get whatever you want, but it wasn''t always that way!"'
-				act 'Finish':gt 'gadhouse','start'
+				act 'Finish': gt 'gad_gphouse','start'
 			end
 		end
 	end
@@ -172,7 +172,7 @@ 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 'Tell her you will help her in a little while': gt 'gad_gphouse', 'grandma'
 	act 'Agree to help her right now (2:00)':
 		*clr & cla
 		minut += 45
@@ -198,7 +198,7 @@ if $ARGS[0] = 'can_berries':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_berries.jpg"></center>'
 				'Finally, you help Grandma take them out of the canner and set them aside to cool.'
 				'"There, now we will have berries for the winter," she says. "I think your grandfather could live off of these berries alone! He will be very grateful that you helped me."'
-				act 'Finish':gt 'gadhouse','start'
+				act 'Finish': gt 'gad_gphouse','start'
 			end
 		end
 	end
@@ -208,7 +208,7 @@ 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 'Tell her you will help her in a little while': gt 'gad_gphouse', 'grandma'
 	act 'Agree to help her right now (3:00)':
 		*clr & cla
 		minut += 75
@@ -235,7 +235,7 @@ if $ARGS[0] = 'can_veggies':
 				'Finally, you help Grandma take the last jars out of the canner and set them aside to cool.'
 				'"You know <<$pcs_nickname>>, if you know how to can your own food, you can survive years of poor harvests," she says.'
 				'"Your grandfather and I had many hard times when we were younger, but saving our crops during the good times kept us from starving to death in the bad times. You would do well to remember that, young lady!"'
-				act 'Finish':gt 'gadhouse','start'
+				act 'Finish': gt 'gad_gphouse','start'
 			end
 		end
 	end
@@ -245,7 +245,7 @@ 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 'Tell her you will do it in a little while': gt 'gad_gphouse', 'grandma'
 	act 'Agree and go to the yard (0:10)':
 		*clr & cla
 		minut += 10
@@ -254,7 +254,7 @@ if $ARGS[0] = 'feedchickens':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_chickens.jpg"></center>'
 		'You take the grain mix for the chickens and walk to the yard.'
 
-		act 'Continue':gt'gaddvor','chickens'
+		act 'Continue': gt 'gad_gpyard','chickens'
 		
 	end
 end
@@ -263,7 +263,7 @@ if $ARGS[0] = 'checkplants':
 	'"<<$pcs_nickname>>, can you please go work in the garden?"'
 
 	grandmaQW['chore_work_in_garden'] = 1
-	act 'Tell her you will get to it later':gt 'gadhouse', 'grandma'
+	act 'Tell her you will get to it later': gt 'gad_gphouse', 'grandma'
 	act 'Agree and go to the garden (0:10)':
 		*clr & cla
 		minut += 10
@@ -272,7 +272,7 @@ if $ARGS[0] = 'checkplants':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 		'You go to the garden.'
 
-		act 'Continue':gt'gadgarden','garden'
+		act 'Continue': gt 'gad_gpyard', 'garden'
 	end
 end
 
@@ -280,7 +280,7 @@ if $ARGS[0] = 'waterplants':
 	'"Dear <<$pcs_nickname>>, could you go and water the plants in the garden?"'
 
 	grandmaQW['chore_water_garden'] = 1
-	act 'Tell her you will do it after a while':gt 'gadhouse', 'grandma'
+	act 'Tell her you will do it after a while': gt 'gad_gphouse', 'grandma'
 	act 'Agree and go to the garden (0:10)':
 		*clr & cla
 		minut += 10
@@ -289,7 +289,7 @@ if $ARGS[0] = 'waterplants':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 		'You bring a watering can along with you to the garden.'
 
-		act 'Continue':gt'gadgarden','garden'
+		act 'Continue': gt 'gad_gpyard', 'garden'
 	end
 end
 
@@ -298,7 +298,7 @@ if $ARGS[0] = 'harvest':
 		'"<<$pcs_nickname>> dear, the strawberries are ripe for picking. Could you go over to the plot and pick them today?"'
 
 		grandmaQW['chore_collect_strawberries'] = 1
-		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
+		act 'Tell her you will do it in a little bit': gt 'gad_gphouse', 'grandma'
 		act 'Agree and go to the strawberry plot (0:10)':
 			*clr & cla
 			minut += 10
@@ -307,13 +307,13 @@ if $ARGS[0] = 'harvest':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			'You bring a basket with you and walk to the strawberry plot in the garden.'
 
-			act 'Continue':gt'gadgarden','strawberry'
+			act 'Continue': gt 'gad_gpyard', 'strawberry'
 		end
 	elseif month = 8 or month = 9:
 		'"<<$pcs_nickname>> dear, the fruits are ripe, and it is time to start collecting them. Could you go and do it today?"'
 
 		grandmaQW['chore_collect_fruit'] = 1
-		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
+		act 'Tell her you will do it in a little bit': gt 'gad_gphouse', 'grandma'
 		act 'Agree and go to the orchard (0:10)':
 			*clr & cla
 			minut += 10
@@ -322,13 +322,13 @@ if $ARGS[0] = 'harvest':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			'You bring a basket with you and walk to the fruit garden.'
 
-			act 'Continue':gt'gadgarden','fruit_garden'
+			act 'Continue': gt 'gad_gpyard', 'fruit_garden'
 		end
 	elseif month = 6:
 		'"<<$pcs_nickname>> dear, could you go to the garden today? It''s time to collect the harvest."'
 
 		grandmaQW['chore_harvest_garden'] = 1
-		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
+		act 'Tell her you will do it in a little bit': gt 'gad_gphouse', 'grandma'
 		act 'Agree and go to the garden (0:10)':
 			*clr & cla
 			minut += 10
@@ -337,7 +337,7 @@ if $ARGS[0] = 'harvest':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			'You bring the harvest tools with you and go over to the garden.'
 
-			act 'Continue':gt'gadgarden','garden'
+			act 'Continue': gt 'gad_gpyard', 'garden'
 		end
 	end
 end
@@ -349,7 +349,7 @@ if $ARGS[0] = 'pickforest_mushrooms':
 	'"How much do we need, Grandma?" you ask.'
 	'"Oh, I would say you should be able to find at least <<grandmaQW[''chore_mushroom_quantity'']>> kilos," Grandma replies.'
 
-	act 'Tell her you will go get some soon':gt 'gadhouse', 'grandma'
+	act 'Tell her you will go get some soon': gt 'gad_gphouse', 'grandma'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
 		if hour >= 6 and hour < 22:
@@ -359,7 +359,7 @@ 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', 'forest_edge'
+		act 'Continue': gt 'gad_forest', 'forest_edge'
 	end
 end
 
@@ -370,7 +370,7 @@ if $ARGS[0] = 'pickforest_berries':
 	'"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 'Tell her you will go get some soon': gt 'gad_gphouse', 'grandma'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
 		if hour >= 6 and hour < 22:
@@ -380,7 +380,7 @@ if $ARGS[0] = 'pickforest_berries':
 		end
 		'You decide now is as good a time as any to do it. So you grab a basket and head out, walking to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', 'forest_edge'
+		act 'Continue': gt 'gad_forest', 'forest_edge'
 	end
 end
 
@@ -392,7 +392,7 @@ if $ARGS[0] = 'pickforest_both':
 	'"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 'Tell her you will go get some soon': gt 'gad_gphouse', 'grandma'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
 		if hour >= 6 and hour < 22:
@@ -402,7 +402,7 @@ if $ARGS[0] = 'pickforest_both':
 		end
 		'You decide now is as good a time as any to do it. So you grab a basket and head out, walking to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', 'forest_edge'
+		act 'Continue': gt 'gad_forest', 'forest_edge'
 	end
 end
 

+ 30 - 30
locations/grandpahelp.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 		'"<<$pcs_nickname>>, could you run out to the barn and bring firewood for the stove?"'
 
 		grandpaQW['chore_fetch_firewood'] = 1
-		act 'Tell him you will go get some in just a bit':gt 'gadhouse', 'grandpa'
+		act 'Tell him you will go get some in just a bit': gt 'gad_gphouse', 'grandpa'
 		act 'Agree and go to fetch firewood (0:20)':
 			*clr & cla
 			if month >= 4 and month <= 10:
@@ -36,13 +36,13 @@ if $ARGS[0] = 'start':
 			grandmaQW['help_amount'] += 1
 			gs'stat'
 
-			act 'Continue':gt 'gadhouse', 'start'
+			act 'Continue': gt 'gad_gphouse', 'start'
 		end
 	elseif grandpaQW['chore_type'] = 1:
 		'"<<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
 
 		grandpaQW['chore_feed_horse'] = 1
-		act 'Tell him that you will get to it in a little bit':gt 'gadhouse', 'grandpa'
+		act 'Tell him that you will get to it in a little bit': gt 'gad_gphouse', 'grandpa'
 		act 'Agree and go to the barn (0:10)':
 			*clr & cla
 			if month >= 4 and month <= 10:
@@ -54,13 +54,13 @@ if $ARGS[0] = 'start':
 			minut += 10
 			gs'stat'
 
-			act 'Continue':gt'gadsarai','horse'
+			act 'Continue': gt 'gad_gpbarn', 'horse'
 		end
 	elseif grandpaQW['chore_type'] = 2:
 		'"<<$pcs_nickname>>, go to the barn and feed the cow."'
 
 		grandpaQW['chore_feed_cow'] = 1
-		act 'Tell him that you will do it in a little while':gt 'gadhouse', 'grandpa'
+		act 'Tell him that you will do it in a little while': gt 'gad_gphouse', 'grandpa'
 		act 'Agree and go to the barn (0:10)':
 			*clr & cla
 			if month >= 4 and month <= 10:
@@ -72,7 +72,7 @@ if $ARGS[0] = 'start':
 			minut += 10
 			gs'stat'
 
-			act 'Continue':gt'gadsarai','cow'
+			act 'Continue': gt 'gad_gpbarn', 'cow'
 		end
 	elseif grandpaQW['chore_type'] = 3:
 		gt 'grandpahelp', 'cleanyard'
@@ -99,7 +99,7 @@ if $ARGS[0] = 'start':
 		'"Okay, grandfather," you replied.'
 
 		grandpaQW['chore_bale_hay'] = 1
-		act 'Tell him you will head over there soon':gt 'gadhouse', 'grandpa'
+		act 'Tell him you will head over there soon': gt 'gad_gphouse', 'grandpa'
 		act 'Grab a rake and head to the field (0:40)':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_gadfield.jpg"></center>'
@@ -107,7 +107,7 @@ if $ARGS[0] = 'start':
 			minut += 40
 			gs'stat'
 
-			act 'Continue':gt'gadfield','field'
+			act 'Continue': gt'gad_field', 'field'
 		end
 	else
 		if hour >= 9:
@@ -133,7 +133,7 @@ if $ARGS[0] = 'start':
 				'"You can take the day off."'
 			end
 		end
-		act 'Continue':gt 'gadhouse', 'grandpa'
+		act 'Continue': gt 'gad_gphouse', 'grandpa'
 	end
 end
 
@@ -141,7 +141,7 @@ if $ARGS[0] = 'cleanyard':
 	'"Of course, <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
 
 	grandpaQW['chore_clean_yard'] = 1
-	act 'Tell him that you''ll do it in a minute':gt 'gadhouse', 'grandpa'
+	act 'Tell him that you''ll do it in a minute': gt 'gad_gphouse', 'grandpa'
 	act 'Agree and go clean up the yard (1:00)':
 		*clr & cla
 		if month >= 4 and month <= 10:
@@ -161,8 +161,8 @@ if $ARGS[0] = 'cleanyard':
 		end
 		gs'stat'
 
-		act 'Continue':gt'gaddvor'
-		act 'Return back to your grandfather': minut += 1 & gt 'gadhouse', 'grandpa'
+		act 'Continue': gt 'gad_gpyard'
+		act 'Return back to your grandfather': minut += 1 & gt 'gad_gphouse', 'grandpa'
 	end
 end
 
@@ -170,7 +170,7 @@ if $ARGS[0] = 'feedhogs':
 	'"<<$pcs_nickname>>, could you go to the barn and feed the hog?"'
 
 	grandpaQW['chore_feed_boar'] = 1
-	act 'Tell him you will get to it soon':gt 'gadhouse', 'grandpa'
+	act 'Tell him you will get to it soon':gt 'gad_gphouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		if month >= 4 and month <= 10:
@@ -182,7 +182,7 @@ if $ARGS[0] = 'feedhogs':
 		minut += 10
 		gs'stat'
 
-		act 'Continue':gt'gadsarai','boar'
+		act 'Continue': gt 'gad_gpbarn', 'boar'
 	end
 end
 
@@ -190,7 +190,7 @@ if $ARGS[0] = 'washhorse':
 	'"It''s good weather today. Take Desperado to the river and give him a bath."'
 
 	grandpaQW['chore_bathe_horse'] = 1
-	act 'Tell him you will do it in a little while':gt 'gadhouse', 'grandpa'
+	act 'Tell him you will do it in a little while': gt 'gad_gphouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
@@ -198,7 +198,7 @@ if $ARGS[0] = 'washhorse':
 		minut += 10
 		gs'stat'
 
-		act 'Continue':gt'gadsarai','horse'
+		act 'Continue': gt 'gad_gpbarn', 'horse'
 	end
 end
 
@@ -206,7 +206,7 @@ if $ARGS[0] = 'groomhorse':
 	'"Of course, <<$pcs_nickname>>, I need your help to groom Desperado."'
 
 	grandpaQW['chore_brush_horse'] = 1
-	act 'Tell him you will do it in a bit':gt 'gadhouse', 'grandpa'
+	act 'Tell him you will do it in a bit': gt 'gad_gphouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		if month >= 4 and month <= 10:
@@ -218,7 +218,7 @@ if $ARGS[0] = 'groomhorse':
 		minut += 10
 		gs'stat'
 
-		act 'Continue':gt'gadsarai','horse'
+		act 'Continue': gt 'gad_gpbarn', 'horse'
 	end
 end
 
@@ -226,7 +226,7 @@ if $ARGS[0] = 'grazehorse':
 	'"<<$pcs_nickname>>, take Desperado to the field. My legs hurt, so I need to rest for a bit. I''ll retrieve the horse in the evening."'
 
 	grandpaQW['chore_lead_horse_to_field'] = 1
-	act 'Tell him you will do it soon':gt 'gadhouse', 'grandpa'
+	act 'Tell him you will do it soon': gt 'gad_gphouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
@@ -234,7 +234,7 @@ if $ARGS[0] = 'grazehorse':
 		minut += 10
 		gs'stat'
 
-		act 'Continue':& gt'gadsarai','horse'
+		act 'Continue': gt 'gad_gpbarn','horse'
 	end
 end
 
@@ -246,7 +246,7 @@ if $ARGS[0] = 'grazecows':
 	end
 
 	grandpaQW['chore_herd_cattle'] = 1
-	act 'Tell him you will meet him there':gt 'gadhouse', 'grandpa'
+	act 'Tell him you will meet him there': gt 'gad_gphouse', 'grandpa'
 	act 'Agree and go to the field (0:40)':
 		*clr & cla
 		if grandpaQW['chore_herd_cattle_experience'] = 0:
@@ -263,7 +263,7 @@ if $ARGS[0] = 'grazecows':
 		if mc_inventory['food_sandwich'] = 0: mc_inventory['food_sandwich'] = 1
 		gs'stat'
 
-		act 'Continue':gt'gadfield','cow'
+		act 'Continue': gt'gad_field', 'cow'
 	end
 end
 
@@ -271,7 +271,7 @@ if $ARGS[0] = 'leadcows':
 	'"I have sore feet today, <<$pcs_nickname>>. My dear granddaughter, could you lead the cow to the field and tell the herders to drive her home at the end of the day?"'
 
 	grandpaQW['chore_lead_cow_to_field'] = 1
-	act 'Tell him you will soon':gt 'gadhouse', 'grandpa'
+	act 'Tell him you will soon': gt 'gad_gphouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
@@ -279,7 +279,7 @@ if $ARGS[0] = 'leadcows':
 		minut += 10
 		gs'stat'
 
-		act 'Continue':gt'gadsarai','cow'
+		act 'Continue': gt 'gad_gpbarn', 'cow'
 	end
 end
 
@@ -290,7 +290,7 @@ if $ARGS[0] = 'pickforest_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 'Tell him you will go get some soon': gt 'gad_gphouse', 'grandpa'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
 		if hour >= 6 and hour < 22:
@@ -300,7 +300,7 @@ 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', 'forest_edge'
+		act 'Continue': gt 'gad_forest', 'forest_edge'
 	end
 end
 
@@ -311,7 +311,7 @@ if $ARGS[0] = 'pickforest_berries':
 	'"How much should I pick, grandpa?" you ask.'
 	'"<<grandpaQW[''chore_berry_quantity'']>> kilos will be enough," grandfather replies. "Just be careful so you don''t get lost."'
 
-	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
+	act 'Tell him you will go get some soon': gt 'gad_gphouse', 'grandpa'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
 		if hour >= 6 and hour < 22:
@@ -321,7 +321,7 @@ 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', 'forest_edge'
+		act 'Continue': gt 'gad_forest', 'forest_edge'
 	end
 end
 
@@ -333,7 +333,7 @@ if $ARGS[0] = 'pickforest_both':
 	'"How much should I pick, grandpa?"'
 	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kilos of berries will be enough," grandfather replies. "Just don''t get lost."'
 
-	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
+	act 'Tell him you will go get some soon': gt 'gad_gphouse', 'grandpa'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
 		if hour >= 6 and hour < 22:
@@ -343,7 +343,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', 'forest_edge'
+		act 'Continue': gt 'gad_forest', 'forest_edge'
 	end
 end
 

+ 25 - 25
locations/grigory.qsrc

@@ -8,7 +8,7 @@ menu_off = 1
 if $ARGS[0] = 'dummy':
 	*nl
 	'It is a shortcut out - because this event is not finished, be patient !!!'
-	act 'Return to village': gt 'gadfield','field'
+	act 'Return to village': gt 'gad_field','field'
 end
 
 if $ARGS[0] = 'meet':
@@ -60,7 +60,7 @@ if $ARGS[0] = 'meet':
 				'"I enjoyed getting to talk to you again," You admit, "I''ll be sure to say hi the next time I see you." With a smile, you wave and start to make your exit.'
 				'Grigory smiles broadly, waving goodbye as you leave.'
 
-				act 'Return': gt 'gadfield', 'field'
+				act 'Return': gt 'gad_field', 'field'
 			end
 			
 			gs 'willpower', 'misc', 'self', 'easy'
@@ -79,7 +79,7 @@ if $ARGS[0] = 'meet':
 					'You can see that he has a big grin on his face, one that you suspect matches your own, "I''ll be around."'
 					'With a friendly wave, the two of you part ways.'
 
-					act 'Return': gt 'gadfield', 'field'
+					act 'Return': gt 'gad_field', 'field'
 				end
 			else
 				act 'Hug him goodbye (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -97,7 +97,7 @@ if $ARGS[0] = 'barn':
 	'When you start to enter the barn behind your grandparents'' place, you can hear someone or something moving about inside.'
 	'You cautiously lean in to see what is happening. Inside you see Grigory rummaging through the garage.'
 
-	act 'Leave him be': gt 'gadsarai'
+	act 'Leave him be': gt 'gad_gpbarn'
 	!!Ends scene, returns to barn exterior
 
 	act 'Say hi':
@@ -186,7 +186,7 @@ if $ARGS[0] = 'barn_closer':
 					gs 'arousal', 'vaginal', 10
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Continue': gt 'gadsarai'
+					act 'Continue': gt 'gad_gpbarn'
 				end
 			end
 		elseif npc_sex['A221'] ! 0 :
@@ -204,7 +204,7 @@ if $ARGS[0] = 'barn_closer':
 			gs 'arousal', 'vaginal', 10
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Continue': gt 'gadsarai'
+			act 'Continue': gt 'gad_gpbarn'
 		elseif npc_sex['A221'] = 0:
 			*clr
 			cla
@@ -223,7 +223,7 @@ if $ARGS[0] = 'barn_closer':
 			gs 'arousal', 'vaginal', 10
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Continue': gt 'gadsarai'
+			act 'Continue': gt 'gad_gpbarn'
 		end
 	end
 	
@@ -250,7 +250,7 @@ end
 if $ARGS[0] = 'barn_stand':
 	'For several minutes the two of you talk, but eventually he stops and gives a disappointed little smile, "Well little lady, I really need to get back to work."'
 	'You say your goodbyes and he exits the barn.'
-	act 'Continue': gt 'gadsarai'
+	act 'Continue': gt 'gad_gpbarn'
 end
 
 if $ARGS[0] = 'garden':
@@ -482,7 +482,7 @@ if $ARGS[0] = 'flower3':
 	'"But how do I find out who did it? Did you maybe see someone in the yard this morning?"'
 	'Grandfather barks a little laugh, "Even if I knew, and I don''t, I wouldn''t tell you." He shakes his head, "Got to make the man work for it."'
 	'Waving dismissively, you know grandfather is done talking about it.'
-	act 'Continue':gt 'gadhouse', 'start'
+	act 'Continue': gt 'gad_gphouse', 'start'
 end
 
 if $ARGS[0] = 'flower4':
@@ -494,7 +494,7 @@ if $ARGS[0] = 'flower4':
 	'"But I don''t know who it is," You say, feeling a little overwhelmed.'
 	'"But that is the magic of it!" Grandmother says, clearly overjoyed by the situation. She leans forward, kissing your cheek, "Whoever this boy is, he will reveal himself if you just let him."'
 	'Not feeling much better, you thank her.'
-	act 'Continue':gt 'gadhouse', 'start'
+	act 'Continue': gt 'gad_gphouse', 'start'
 end
 
 if $ARGS[0] = 'flower5':
@@ -510,7 +510,7 @@ if $ARGS[0] = 'flower5':
 			'You can feel my blood run cold as you look at the flowers. There is a deep sinking feeling in the pit of your stomach. Grigory, Grigory is the one who is leaving the flowers.'
 			'Opening the passanger side door of the truck, you open the bag further, revealing that it is indeed full of the little purple flowers.'
 			'Glancing at Grigory in the field again, you quickly leave, trying to make sense of it all.'
-			act 'Continue':gt'gadfield','field'
+			act 'Continue': gt 'gad_field', 'field'
 		end
 	elseif grigory_flower = 2:
 		act 'Cute':
@@ -529,7 +529,7 @@ if $ARGS[0] = 'flower5':
 				'You bite your lip, smiling. I can''t believe that he''s been leaving flowers for me!'
 				'Not wanting to spoil the anything, you slip away. A spring in your step as you go.'
 	!!		end
-			act 'Continue':gt'gadfield','field'
+			act 'Continue': gt 'gad_field', 'field'
 		end
 	end
 end
@@ -545,7 +545,7 @@ if $ARGS[0] = 'flower6':
 		'With a sudden expression of concern, he just starts to open his mouth when you jab a finger into his chest, "What the hell is wrong with you?" You shout into his face.'
 		'He jerks back, shock on his face almost as if you had physically hit him. You don''t give him time to reply before you continue, "What did I ever do to you except talk with you sometimes? You''ve been stalking me? Leaving flowers where I might find them? How long did you stare through my window when you put those flowers there? Did you get your rocks off watching me sleep?" Your anger starting to subside slightly, you shudder.'
 		'"Just stay away from me you freak." Turning, you storm away from him.'
-		act 'Continue':gt'gadfield','field'
+		act 'Continue': gt 'gad_field', 'field'
 
 	!!This is the end of Grigory content down this path. Grigory scenes would become considerably less common after this, maybe even causing many of them to stop playing out at your discression.
 
@@ -729,14 +729,14 @@ if $ARGS[0] = 'field1':
 !!	If relationship has NOT progressed to romance:
 		'Eventually he looks your way, smiling when he notices you. He gives you a little wave that you quickly return.'
 		'As he goes back to work, you continue on your way.'
-		act 'Continue':gt'gadfield','field'
+		act 'Continue': gt 'gad_field', 'field'
 
 !!	elseif relationship is romantic/sexual:
 		'When he finally looks your way you find yourself pleased as a smile spreads across his face.'
 		'Raising two fingers to his lips, he kisses them then holds them out in your direction across the field.'
 		'When he does, you put both hands over your heart and smile back at him.'
 		'Feeling unexpectedly happy, you give him a little wave then continue on your way.'
-		act 'Continue':gt'gadfield','field'
+		act 'Continue': gt 'gad_field', 'field'
 !!	end
 end
 
@@ -752,7 +752,7 @@ end
 if $ARGS[0] = 'field_weird':
 	'Quietly, you make your exit before Grigory can notice that you are there.'
 
-	act 'Continue':gt'gadfield','field'
+	act 'Continue': gt 'gad_field', 'field'
 end
 
 if $ARGS[0] = 'field_tease':
@@ -792,7 +792,7 @@ if $ARGS[0] = 'field_tease':
 			'"don''t let me stop you," You say with a grin. Waving, you watch as he gets in his truck and drives off.'
 		end
 
-		act 'Continue':gt'gadfield','field'
+		act 'Continue': gt 'gad_field', 'field'
 	end
 end
 
@@ -814,7 +814,7 @@ if $ARGS[0] = 'field_watch':
 		'You put one arm around him in a little hug. In return, he sweeps you up in a big hug, your feet coming off the ground as he does so.'
 		'You''re still thinking about what you saw as he leaves.'
 
-		act 'Continue':gt'gadfield','field'
+		act 'Continue': gt 'gad_field', 'field'
 	end
 
 	act 'Masturbate':
@@ -833,7 +833,7 @@ if $ARGS[0] = 'field_watch':
 			'You barely take two steps before he closes the distance between you, sweeping you up in his arms in a hug that is just a little too tight. Sitting you back down, "Uh, yeah, " He fidgets suddenly, "See you around Kotenok."'
 			'Without another word the two of you part ways.'
 
-			act 'Continue':gt'gadfield','field'
+			act 'Continue': gt 'gad_field', 'field'
 
 !!		If Intimate:
 			'"Sorry,"  You mumble.'
@@ -845,7 +845,7 @@ if $ARGS[0] = 'field_watch':
 			'Taking hold of your hips, he picks you up again, this time pulling you close to give you a firm kiss before sitting you back down, "Later then."'
 			'A minute later, Grigory''s truck is disappearing down the road.'
 
-			act 'Continue':gt'gadfield','field'
+			act 'Continue': gt 'gad_field', 'field'
 !!		end
 	end
 
@@ -867,7 +867,7 @@ if $ARGS[0] = 'field_watch':
 			'After an affectionate goodbye, the two of you part ways.'
 !!		end
 
-		act 'Continue':gt'gadfield','field'
+		act 'Continue': gt 'gad_field', 'field'
 	end
 end
 
@@ -901,7 +901,7 @@ if $ARGS[0] = 'field3':
 			'"I enjoyed getting to talk to you again," You admit, "I''ll be looking forward to the next time I see you." With a smile, you wave and start to make your exit.'
 			'Grigory smiles broadly, waving goodby as you leave.'
 
-			act 'Continue':gt'gadfield','field'
+			act 'Continue': gt 'gad_field', 'field'
 		end
 
 		act 'Hug him goodbye':
@@ -921,7 +921,7 @@ if $ARGS[0] = 'field3':
 			'You can see that he has a big grin on his face, one that you suspect matches your own, "I''ll be around."'
 			'With a friendly wave, the two of you part ways.'
 
-			act 'Continue':gt'gadfield','field'
+			act 'Continue': gt 'gad_field', 'field'
 		end
 	end
 
@@ -930,7 +930,7 @@ if $ARGS[0] = 'field3':
 		'When he notices you, he raises a hand in greeting. In return, you wink and blow him a kiss.'
 		'He seems stunned for several seconds, and you''re barely able to suppress a giggle. As you continue walking, you see him reach for his flask as you pass him without a word.'
 
-		act 'Continue':gt'gadfield','field'
+		act 'Continue': gt 'gad_field', 'field'
 	end
 end
 
@@ -1055,7 +1055,7 @@ if $ARGS[0] = 'romantic_event':
 					'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'
+					act 'Continue': gt 'gad_gphouse', 'start'
 				end
 			end
 

+ 1 - 1
locations/gschool_chats.qsrc

@@ -160,7 +160,7 @@ if $ARGS[0] = 'gopniks':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/gopnik.jpg"></center>'
 		if PCloStyle2 = 4:
-			if PCloInhibit <= 10:
+			if PCloInhibit <= 5:
 				'<font color="blue">This uniform is very conservative. Only the nerds would approve of you wearing it.</font>'
 				if grupTipe = 4:
 					grupvalue[4] -= 10

+ 1 - 1
locations/gschool_lessons.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'morning':
 end
 
 if $ARGS[0] = 'uniform_check':
-	if PCloInhibit <= 10:
+	if PCloInhibit <= 5:
 		grupvalue[3] += 1
 		grupvalue[5] += 1
 		grupvalue[1] -= 1

+ 18 - 20
locations/homes_properties_attr.qsrc

@@ -121,8 +121,8 @@ if ARRSIZE('home_name') < 4:
 	!! HUNTERS LODGE
 	$home_name['hunters_lodge'] = 'hunters_lodge'
 	$home_name['12'] = 'hunters_lodge'
-	$home_name['swamphouse'] = 'hunters_lodge'
-	$home_name['swamp_yard'] = 'hunters_lodge'
+	$home_name['gad_swamphouse'] = 'hunters_lodge'
+	$home_name['gad_swamp_yard'] = 'hunters_lodge'
 
 
 	!! SHARED APARTMENT - PAVLOVSK
@@ -133,12 +133,10 @@ if ARRSIZE('home_name') < 4:
 	!! GRANDPARENTS HOUSE
 	$home_name['grandparents_house'] = 'grandparents_house'
 	$home_name['14'] = 'grandparents_house'
-	$home_name['gaddvor'] = 'grandparents_house'
-	$home_name['gadgarden'] = 'grandparents_house'
-	$home_name['gadbana'] = 'grandparents_house'
-	$home_name['gadgarden'] = 'grandparents_house'
-	$home_name['gadhouse'] = 'grandparents_house'
-	$home_name['gadsarai'] = 'grandparents_house'
+	$home_name['gad_gpyard'] = 'grandparents_house'
+	$home_name['gad_gpbath'] = 'grandparents_house'
+	$home_name['gad_gphouse'] = 'grandparents_house'
+	$home_name['gad_gpbarn'] = 'grandparents_house'
 
 
 	!! CITY HOUSE
@@ -450,13 +448,13 @@ if $ARGS[0] = 'get_property_attr':
 		$property['display'] = 'hunter''s lodge in Gadukino'
 		$property['region'] = 'gad_forest'
 		$property['town'] = 'gadukino'
-		$property['location'] = 'swamp_yard'
+		$property['location'] = 'gad_swamp_yard'
 		$property['location_arg'] = 'start'
-		$property['entrance'] = 'swamphouse'
+		$property['entrance'] = 'gad_swamphouse'
 		$property['entrance_arg'] = 'start'
-		$property['bathroom'] = 'swamphouse'
+		$property['bathroom'] = 'gad_swamphouse'
 		$property['bathroom_arg'] = 'washstand'
-		$property['bedroom'] = 'swamphouse'
+		$property['bedroom'] = 'gad_swamphouse'
 		$property['bedroom_arg'] = 'start'
 		$property['type'] = 'temporary_residence'
 
@@ -486,14 +484,14 @@ if $ARGS[0] = 'get_property_attr':
 		$property['display'] = 'grandparent''s house in Gadukino'
 		$property['region'] = 'gad'
 		$property['town'] = 'gadukino'
-		$property['location'] = 'gaddvor'
-		$property['location_arg'] = ''
-		$property['entrance'] = 'gaddvor'
-		$property['entrance_arg'] = ''
-		$property['bathroom'] = 'gadbana'
-		$property['bathroom_arg'] = ''
-		$property['bedroom'] = 'gadhouse'
-		$property['bedroom_arg'] = 'main'
+		$property['location'] = 'gad_gpyard'
+		$property['location_arg'] = 'start'
+		$property['entrance'] = 'gad_gpyard'
+		$property['entrance_arg'] = 'start'
+		$property['bathroom'] = 'gad_gpbath'
+		$property['bathroom_arg'] = 'start'
+		$property['bedroom'] = 'gad_gpbarn'
+		$property['bedroom_arg'] = 'barn_room'
 		$property['type'] = 'temporary_residence'
 
 	elseif $ARGS[1] = 'city_house':

+ 9 - 6
locations/hourly_events.qsrc

@@ -312,12 +312,15 @@ if lashair ! 1:
 end
 
 ! vovan edition, from 1.2.5
-if huntersAndreisex > 0: huntersAndreisex -= 1
-if huntersSergeisex > 0: huntersSergeisex -= 1
-if huntersIgorsex > 0:   huntersIgorsex -= 1
-if huntslutsex > 0:      huntslutsex -= 1
-if mira_go_blok > 0:     mira_go_blok -= 1
-if mira_no_home > 0:     mira_no_home -= 1
+if huntersAndreisex > 0:			huntersAndreisex -= 1
+if huntersSergeisex > 0:			huntersSergeisex -= 1
+if huntersIgorsex > 0:				huntersIgorsex -= 1
+if huntslutsex > 0:					huntslutsex -= 1
+if MiraVars['follow_time'] > 0:
+	MiraVars['follow_time'] -= 1
+end
+
+if npc_drunk['A60'] > 0 and locat['A60'] ! 42: npc_drunk['A60'] -= 1
 
 gs 'traits', 'hourly'
 

+ 4 - 4
locations/hunter_ambient.qsrc

@@ -218,14 +218,14 @@ if $ARGS[0] = 'yard_convo':
 	elseif convo_rng_roll = 3:
 		if film > 0 and huntersknowfilm = 0: gs 'hunter_ambient', 'pornstar_convo'
 	elseif convo_rng_roll = 4:
-		if gadriver_gang > 0 and huntersRape = 0: gs 'hunter_ambient', 'river_rape_convo'
+		if GadBoy['river_gang'] > 0 and huntersRape = 0: gs 'hunter_ambient', 'river_rape_convo'
 	else
 		gs 'hunter_ambient', 'generic_convo'
 	end
 	minut += 5
 	gs 'stat'
 
-	act 'Further':gt 'swamp_yard', 'start'
+	act 'Further':gt 'gad_swamp_yard', 'start'
 end
 
 !Behavior events
@@ -292,9 +292,9 @@ if $ARGS[0] = 'bring_food':
 		'You see one of the hunters returning with a rabbit he shot. He proceeds to skin and butchers the animal.'
 		raw_meat += 1
 
-		act 'Further': gt 'swamp_yard', 'start'
+		act 'Further': gt 'gad_swamp_yard', 'start'
 	else
-		gt 'swamp_yard', 'start'
+		gt 'gad_swamp_yard', 'start'
 	end
 end
 

+ 16 - 16
locations/hunter_favors.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'housekeeping_request':
 			if campfire = 0:
 				if hunter_collective_opinion >= 15: '"<<$pcs_nickname>>," he says. "The fire is out. Can you please ensure it keeps going while we are outside?"'
 				if hunter_collective_opinion < 15:'"<<$pcs_nickname>>," he uses his stern voice. "The fire is out. You can at least keep the fire going. No way you are that much of a whiny princess."'
-				act 'Further':hunter_collective_opinion -= 3 & gt 'swamp_yard', 'campfire'
+				act 'Further':hunter_collective_opinion -= 3 & gt 'gad_swamp_yard', 'campfire'
 			!Clean up the hut
 			elseif dirty_swamphouse > 5:
 				if hunter_collective_opinion >= 15: '"<<$pcs_nickname>>," he says. "The hut is a mess. Could you take care of it, please?"'
@@ -49,14 +49,14 @@ if $ARGS[0] = 'housekeeping_request':
 					act 'Cook some meat stew (1:00)':hunter_collective_opinion += 3 & gs 'hunter_favors', 'meat_stew'
 				else
 					!TODO: Add mechanic for hunters to ask Sveta to find food
-					act '"There is nothing to cook though..."': gt 'swamp_yard', 'start'
+					act '"There is nothing to cook though..."': gt 'gad_swamp_yard', 'start'
 				end
 			else
 				if hunter_collective_opinion >= 15:'"Actually, never mind. I got this, thanks, though."'
 				if hunter_collective_opinion < 15:'"Actually, never mind. I do not have anything you are useful for."'
 				act 'Okay':
 					hunter_collective_opinion += 5
-					gt 'swamp_yard', 'start'
+					gt 'gad_swamp_yard', 'start'
 				end
 			end
 		end
@@ -72,7 +72,7 @@ if $ARGS[0] = 'housekeeping_request':
 				gs 'stat'
 
 				!TODO: Find new image
-				gt 'swamp_yard', 'start'
+				gt 'gad_swamp_yard', 'start'
 			end
 		else
 			act '"I''ll help later, busy right now" (<font color="red"><<will_cost>> Willpower)':'<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -82,10 +82,10 @@ if $ARGS[0] = 'housekeeping_request':
 			'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
 			'You walk away from <<$boydesc>>'
 			hunter_collective_opinion -= 10
-			act 'Continue': gt 'swamp_yard', 'start'
+			act 'Continue': gt 'gad_swamp_yard', 'start'
 		end
 	else
-		gt 'swamp_yard', 'start'
+		gt 'gad_swamp_yard', 'start'
 	end
 end
 
@@ -106,7 +106,7 @@ if $ARGS[0] = 'yard_cleanup':
 	hunter_collective_opinion += 2
 	gs 'stat'
 
-	act 'Done': gt 'swamp_yard', 'start'
+	act 'Done': gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0] = 'dirty_swamphouse':
@@ -133,7 +133,7 @@ if $ARGS[0] = 'dirty_swamphouse':
 	dirty_swamphouse = 0
 	gs 'stat'
 
-	act 'Continue': gt 'swamphouse', 'start'
+	act 'Continue': gt 'gad_swamphouse', 'start'
 end
 
 if $ARGS[0] = 'meat_stew':
@@ -215,7 +215,7 @@ if $ARGS[0] = 'creekside_gangbang_request':
 			hunter_sexual_comfort -= 10
 
 			gs 'stat'
-			gt 'backwater'
+			gt 'gad_backwater'
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)':
@@ -245,7 +245,7 @@ if $ARGS[0] = 'yard_bondage':
 			'Finally, with the hour getting so late, Igor comes to free you from your bounds. You are so drained you almost stumble down as you feel the blood rushing back to your hands.'
 			'Even though you are glad to be able to move around again, part of you aches to be tied back and used as a naked and ready sex toy.'
 
-			act 'Further': gt 'swamp_yard', 'start'
+			act 'Further': gt 'gad_swamp_yard', 'start'
 		end
 
 		cla & *clr
@@ -483,7 +483,7 @@ if $ARGS[0] = 'yard_bondage':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/released_from_bondage.jpg"></center>'
 						'"Well, alright, you are no fun," says Andrei before releasing you from your bonds.'
 						'You rub your sore breasts for a few seconds before shooing Andrei away, staring at you, giving him a final show.'
-						act 'Further': gt 'swamp_yard', 'start'
+						act 'Further': gt 'gad_swamp_yard', 'start'
 					end
 				else
 					act 'Seriousy, please let me go! (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -510,7 +510,7 @@ if $ARGS[0] = 'yard_bondage':
 
 					*nl
 					'After catching his breath, Andrei releases you from your bonds. "We should do this again," he says before walking away.'
-					act 'Further': gt 'swamp_yard', 'start'
+					act 'Further': gt 'gad_swamp_yard', 'start'
 				end
 			end
 		end
@@ -580,12 +580,12 @@ if $ARGS[0] = 'yard_bondage':
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 
-							forced_naked_day = 999999999999999
+							forced_naked_day = 9999
 							gs 'stat'
 
 							'"Well," you respond. "At this point, we are well past the point of being shy about a bit of nudity. So sure, why not?" you reply.'
 							'"Thanks, <<$pcs_nickname>>," he says before walking away'
-							act 'Further': gt 'swamp_yard', 'start'
+							act 'Further': gt 'gad_swamp_yard', 'start'
 						end
 					else
 						act 'Agree (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -599,7 +599,7 @@ if $ARGS[0] = 'yard_bondage':
 
 						'"Well," you respond. "Do I look like some sex toy to you?" you reply. "What is next? You just randomly fuck me whenever?"'
 						'"You are not exactly all pure and innocent, <<$pcs_firstname>>," he says. "I think you are just being a bitchy cocktease", and walks away'
-						act 'Further': gt 'swamp_yard', 'start'
+						act 'Further': gt 'gad_swamp_yard', 'start'
 					end
 				end
 			end
@@ -731,7 +731,7 @@ if $ARGS[0] = 'nighttime_entertainment':
 									'Seeing this, Sergei makes his way right next to you and picks up his pace for a hot moment before also jizzing all over the other side of your face, a couple drops finding their way to your exposed chest.'
 									gs	'cum_call', 'mouth', 'A174', 1
 
-									act 'Further': gt 'swamp_yard', 'campfire'
+									act 'Further': gt 'gad_swamp_yard', 'campfire'
 								end
 							end
 						end

+ 67 - 67
locations/hunter_interactions.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 			minut += 15
 			gs 'drugs', 'smoke', 1
 
-			act 'Return to the table': gs 'swamphouse', 'meal_table'
+			act 'Return to the table': gs 'gad_swamphouse', 'meal_table'
 		end
 	elseif temp_sh = 2:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big172.jpg"></center>'
@@ -38,7 +38,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 				*nl
 				'The two of you walk outside, Andrei hands you a cigarette. You start talking about your feelings for each other.'
 
-				act 'Return to the table': gs 'swamphouse', 'meal_table'
+				act 'Return to the table': gs 'gad_swamphouse', 'meal_table'
 			else
 				if huntersAndreiQw >= 15 and huntersKnowSlut = 0:
 					if smokbj = 0:
@@ -73,7 +73,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 							huntersAndreiQw += 1
 							gs 'stat'
 
-							act 'Go': gs 'swamphouse', 'huntersmokBJ'
+							act 'Go': gs 'gad_swamphouse', 'huntersmokBJ'
 						end
 						if alko < 6:
 							act 'Refuse':
@@ -88,7 +88,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 								huntersAndreiQw += 1
 								gs 'stat'
 
-								act 'Return to the table': gs 'swamphouse', 'meal_table'
+								act 'Return to the table': gs 'gad_swamphouse', 'meal_table'
 							end
 						end
 					else
@@ -102,7 +102,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 						huntersAndreiQw += 1
 						gs 'stat'
 
-						act 'Go': gs 'swamphouse', 'huntersmokBJ'
+						act 'Go': gs 'gad_swamphouse', 'huntersmokBJ'
 
 						if alko < 6:
 							act 'Refuse':
@@ -116,7 +116,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 								huntersAndreiQw -= 50
 								gs 'stat'
 
-								act 'Return to the table': gs 'swamphouse', 'meal_table'
+								act 'Return to the table': gs 'gad_swamphouse', 'meal_table'
 							end
 						end
 					end
@@ -129,7 +129,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 					pcs_horny += 5
 					gs 'stat'
 
-					act 'Go': gs 'swamphouse', 'huntersmokBJ'
+					act 'Go': gs 'gad_swamphouse', 'huntersmokBJ'
 				end
 			end
 		end
@@ -149,7 +149,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 			if huntersKnowSlut = 0:huntersSergeiQw += 1
 			gs 'stat'
 
-			act 'Return to the table': gs 'swamphouse', 'meal_table'
+			act 'Return to the table': gs 'gad_swamphouse', 'meal_table'
 		end
 	elseif temp_sh = 4:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big173.jpg"></center>'
@@ -166,10 +166,10 @@ if $ARGS[0] = 'smoke_with_hunters':
 			if huntersKnowSlut = 0:huntersIgorQw += 1
 			gs 'stat'
 
-			act 'Return to the table': gs 'swamphouse', 'meal_table'
+			act 'Return to the table': gs 'gad_swamphouse', 'meal_table'
 		end
 	end
-	act 'Refuse': gs 'swamphouse', 'meal_table'
+	act 'Refuse': gs 'gad_swamphouse', 'meal_table'
 end
 
 if $ARGS[0] = 'chat_with_hunters':
@@ -221,7 +221,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Further': gt 'swamp_yard', 'campfire'
+		act 'Further': gt 'gad_swamp_yard', 'campfire'
 
 	elseif $ARGS[1] = 'boy_talk':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
@@ -231,7 +231,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 
 		act 'Yes, actually':
 			cla
-			act 'Finish chatting': gt 'swamp_yard', 'campfire'
+			act 'Finish chatting': gt 'gad_swamp_yard', 'campfire'
 			hunter_sexual_comfort -= 5
 			hunter_collective_opinion += 3
 			'"Yeah I have been seeing someone for a while", you answer'
@@ -243,7 +243,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 				if will_cost <= pcs_willpwr:
 					act 'Maybe another time boys (<<will_cost>> Willpower)':
 						gs 'willpower', 'pay', 'resist'
-						gt 'swamp_yard', 'campfire'
+						gt 'gad_swamp_yard', 'campfire'
 					end
 				else
 					act 'Maybe another time boys (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -265,7 +265,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 			end
 			gs 'stat'
 
-			act 'Finish chatting': gt 'swamp_yard', 'campfire'
+			act 'Finish chatting': gt 'gad_swamp_yard', 'campfire'
 		end
 	elseif $ARGS[1] = 'virginity_talk':
 		!TODO: Add event branch with no panties and short skirt or nude
@@ -279,14 +279,14 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 			'"Huh... what? No I have not!" you answer, blushing to your ears'
 			if hunter_sexual_comfort < 35 and hunter_collective_opinion > 40:
 				'"Stop embarrassing the little lady" says Sergey. "She is our guest, we have to be polite"'
-				act 'Continue': gt 'swamp_yard', 'campfire'
+				act 'Continue': gt 'gad_swamp_yard', 'campfire'
 			else
 				'"Wow so you really are a full on tease." says Igor'
 				'"Since you are such an innocent young lady why don''t you give us a little show without clothes blocking your innocence'
 				!TODO: Implement event
-				!if hunter_collective_opinion > 30 and alko < 4: act 'Maybe another time boys, not feeling it now': gt 'swamp_yard', 'start'
+				!if hunter_collective_opinion > 30 and alko < 4: act 'Maybe another time boys, not feeling it now': gt 'gad_swamp_yard', 'start'
 				!act 'You get up and start getting into rhythm with some imaginary music': gt 'hunter_interactions', 'dance_show', 'nude'
-				act 'Maybe another time boys, not feeling it now': gt 'swamp_yard', 'start'
+				act 'Maybe another time boys, not feeling it now': gt 'gad_swamp_yard', 'start'
 			end
 		end
 		act 'Uhh... kinda...':
@@ -295,12 +295,12 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 			'You blurt out a small "yeah!" before going all red in the face. Why are you even telling these men that you have had sex? You look down embarrassed.'
 			if hunter_sexual_comfort < 35 or hunter_collective_opinion > 40:
 				'"Well uhhh... it is normal at your age. You are not a little kid anymore" says Sergey'
-				act 'Continue': gt 'swamp_yard', 'campfire'
+				act 'Continue': gt 'gad_swamp_yard', 'campfire'
 			else
 				'"That means you know how to have fun. Say, how about we play together a bit?" says Andrei before the hunters get up and start approaching you'
 				!TODO: Implement event
 				!if hunter_collective_opinion > 30 or alko < 4:
-					 act 'Maybe another time boys, not feeling it now': gt 'swamp_yard', 'start'
+					 act 'Maybe another time boys, not feeling it now': gt 'gad_swamp_yard', 'start'
 				!end
 
 				!act 'You oblige, feeling your pussy already getting wet': gs 'hunter_interactions', 'nighttime_entertainment'
@@ -321,7 +321,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Continue': gt 'swamp_yard', 'campfire'
+		act 'Continue': gt 'gad_swamp_yard', 'campfire'
 	elseif $ARGS[1] = 'entertainment':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
@@ -341,12 +341,12 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 					hunter_collective_opinion -= 3
 					hunter_sexual_comfort -= 5
 				end
-				act 'Continue': gt 'swamp_yard', 'campfire'
+				act 'Continue': gt 'gad_swamp_yard', 'campfire'
 			end
 		end
 	else
 		MSG 'Please report dead end for this arguments: hunter_interactions - <<$ARGS[0]>> - <<$ARGS[1]>>'
-		act 'Continue': gt 'swamp_yard', 'campfire'
+		act 'Continue': gt 'gad_swamp_yard', 'campfire'
 	end
 end
 
@@ -386,7 +386,7 @@ if $ARGS[0] = 'join_drinking':
 				gt 'hunter_interactions', 'drink_with_hunters'
 			else
 				'"No <<$pcs_nickname>>, go away" says Sergei. "It is not good for you to get blackout drunk so young. You have had enough for now"'
-				act 'Further': gt 'swamp_yard', 'campfire'
+				act 'Further': gt 'gad_swamp_yard', 'campfire'
 			end
 		end
 	!Not friendly enough for free booze
@@ -417,7 +417,7 @@ if $ARGS[0] = 'join_drinking':
 		else
 			gs 'willpower', 'voyeur', 'exhib'
 			'"Go away <<$pcs_nickname>>" says Igor. "We do not want you to join us, got better things to do than babysit a drunk teen"'
-			act 'Walk away': gt 'swamp_yard', 'start'
+			act 'Walk away': gt 'gad_swamp_yard', 'start'
 			if will_cost <= pcs_willpwr:
 				act 'Ask again and flash your tits (<<will_cost>> Willpower)': gt 'hunter_interactions', 'booze_dare', 'flash_tits'
 			else
@@ -441,7 +441,7 @@ if $ARGS[0] = 'drink_with_hunters':
 		*nl
 		'You take a shot of vodka. The men laugh at the funny face you''re making after the shot.'
 
-		act 'Continue': gt 'swamp_yard', 'campfire'
+		act 'Continue': gt 'gad_swamp_yard', 'campfire'
 	end
 	act 'Drink beer':
 		*clr & cla
@@ -452,13 +452,13 @@ if $ARGS[0] = 'drink_with_hunters':
 		*nl
 		'You take a bottle of beer, open it and start drinking.'
 
-		act 'Continue': gt 'swamp_yard', 'campfire'
+		act 'Continue': gt 'gad_swamp_yard', 'campfire'
 	end
 end
 
 if $ARGS[0] = 'booze_dare':
 	if $ARGS[1] = '' or $ARGS[1] = 'pick':
-		act 'Walk away': gt 'swamphouse', 'start'
+		act 'Walk away': gt 'gad_swamphouse', 'start'
 		if $ARGS[2] = 'innocent':
 			minut += 5
 			gs 'willpower', 'voyeur', 'exhib'
@@ -620,7 +620,7 @@ if $ARGS[0] = 'booze_dare':
 			'"That''s a nice pair you got there" says Andrei. "Ask us nicely like that enough times and we might work something out"'
 			hunter_sexual_comfort += 4
 			hunter_collective_opinion -= 2
-			act 'Further': gt 'swamp_yard', 'campfire'
+			act 'Further': gt 'gad_swamp_yard', 'campfire'
 		end
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/flash_tits_2.jpg"></center>'
@@ -676,7 +676,7 @@ if $ARGS[0] = 'booze_dare':
 			gt 'hunter_interactions', 'drink_with_hunters'
 		end
 
-		gs 'clothing', 'strip', 'swamphouse'
+		gs 'clothing', 'strip', 'gad_swamphouse'
 		clothesAtLocation = 1
 		gs 'arousal', 'flash', 12, 'exhibitionism'
 		minut -= 10
@@ -987,7 +987,7 @@ if $ARGS[0] = 'drunken_blackout':
 			*nl
 			'Three hours later you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
 
-			act 'Further': gt 'swamp_yard', 'campfire'
+			act 'Further': gt 'gad_swamp_yard', 'campfire'
 		end
 	end
 end
@@ -1018,11 +1018,11 @@ if $ARGS[0] = 'meet_hunters':
 			'"Is there somewhere I can clean myself up?"'
 			'"Well, it''s still warm outside, so you can wash up in the creek, just follow the path behind the hut, you can''t miss it."'
 			'"There is also a basin with some soap and a clothesline with a fresh towel you can use to wash and hang your clothes to dry."'
-			act 'Walk to the creek': gt 'backwater'
-			act '"Actually I am fine for now, I think"': gt 'swamp_yard', 'start'
+			act 'Walk to the creek': gt 'gad_backwater'
+			act '"Actually I am fine for now, I think"': gt 'gad_swamp_yard', 'start'
 		else
 			'"Here, come have a seat" said Sergei, the overweight one, freeing up a place for you by the campfire.'
-			act '"Sit down"': hunter_collective_opinion += 2 & gt 'swamp_yard', 'campfire'
+			act '"Sit down"': hunter_collective_opinion += 2 & gt 'gad_swamp_yard', 'campfire'
 		end
 	end
 end
@@ -1052,7 +1052,7 @@ if $ARGS[0] = 'meet_hunters_after_rescue':
 		'Shortest of the men starts ogling you while the overweight one freezes up like a deer in the headlights.'
 		'The third man turns his head away and hands you a burlap sack'
 		'"Here, you can have this to cover up, you have nothing to be embarrassed about. Sorry we do not have any change of clothes for you."'
-		act 'Cover up with the burlap sack': gs 'clothing', 'swamp_clothes', 1
+		act 'Cover up with the burlap sack': gs 'clothing', 'gad_swamp_clothes', 1
 		!TODO: Add exhibitionist option
 		!if exhibitionist > 1: act 'I think I am fine, thank you'
 	else
@@ -1073,11 +1073,11 @@ if $ARGS[0] = 'meet_hunters_after_rescue':
 		'"Is there somewhere I can clean myself up?"'
 		'"Well, it''s still warm outside, so you can wash up in the creek, just follow the path behind the hut, you can''t miss it."'
 		'"There is also a basin with some soap and a clothesline with a fresh towel you can use to wash and hang your clothes to dry."'
-		act 'Walk too the creek': gt 'backwater'
-		act '"Actually I am fine for now, I think"': gt 'swamp_yard', 'start'
+		act 'Walk too the creek': gt 'gad_backwater'
+		act '"Actually I am fine for now, I think"': gt 'gad_swamp_yard', 'start'
 	else
 		'"Here, come have a seat" said Sergei, the overweight one, freeing up a place for you by the campfire.'
-		act '"Sit down"': hunter_collective_opinion += 2 & gt 'swamp_yard', 'start'
+		act '"Sit down"': hunter_collective_opinion += 2 & gt 'gad_swamp_yard', 'start'
 	end
 end
 
@@ -1108,7 +1108,7 @@ if $ARGS[0] = 'shooting_bet':
 		'Andrei is nowhere to be seen. That bastard ran away!'
 
 		hunter_collective_opinion += 15
-		act 'Further': gt 'swamp_woods', 'start'
+		act 'Further': gt 'gad_swamp_woods', 'start'
 	end
 
 	if $ARGS[1] = 'lose':
@@ -1132,7 +1132,7 @@ if $ARGS[0] = 'shooting_bet':
 
 					'"No fucking way! You really are getting ahead of yourself now." you angrily respond.'
 					'"Damn you are such a cocktease. You are all fine walking around displaying yourself like that but the moment someone wants some fun you turn into an absolute prude." he says, somewhat annoyed.'
-					act 'Walk away': gt 'swamp_woods', 'start'
+					act 'Walk away': gt 'gad_swamp_woods', 'start'
 				end
 
 				act 'Let him lead you to the trees': gt 'hunter_favors', 'yard_bondage', 'lost_bet'
@@ -1147,14 +1147,14 @@ if $ARGS[0] = 'shooting_bet':
 
 					forced_naked_day = daystart + 1
 
-					gs 'clothing', 'strip', 'swamphouse'
+					gs 'clothing', 'strip', 'gad_swamphouse'
 					gs 'underwear', 'remove'
 
 					gs 'arousal', 'flash', 10, 'exhibitionism', 'sub'
 					gs 'arousal', 'end'
 
 					gs 'stat'
-					gt 'swamp_woods', 'start'
+					gt 'gad_swamp_woods', 'start'
 				end
 
 				act 'Refuse':
@@ -1167,7 +1167,7 @@ if $ARGS[0] = 'shooting_bet':
 					'"Three men you barely know? <<$pcs_nickname>>, I thought we were your friends. It is nothing more than just having some silly fun together" he responds.'
 					'"Besides, it is not fair to just back down from a bet like that." he adds.'
 					'"Sorry, but I will not just prance around naked for your viewing pleasure." you firmly respond.'
-					act 'Walk away': gt 'swamp_woods', 'start'
+					act 'Walk away': gt 'gad_swamp_woods', 'start'
 				end
 			end
 
@@ -1222,10 +1222,10 @@ if $ARGS[0] = 'andrei_quick_fuck':
 				minut -= 10
 
 				act 'Further':
-					if $loc = 'swamp_woods':
-						gt 'swamp_woods', 'shooting_practice', 'practice'
+					if $loc = 'gad_swamp_woods':
+						gt 'gad_swamp_woods', 'shooting_practice', 'practice'
 					else
-						if $loc = 'swamp_yard': gt 'swamp_yard', 'start'
+						if $loc = 'gad_swamp_yard': gt 'gad_swamp_yard', 'start'
 					end
 				end
 			end
@@ -1250,7 +1250,7 @@ if $ARGS[0] = 'igor_demonstration':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Further': gt 'swamp_yard', 'start'
+		act 'Further': gt 'gad_swamp_yard', 'start'
 	end
 
 	act 'Give him a hands on demonstration':
@@ -1268,7 +1268,7 @@ if $ARGS[0] = 'igor_demonstration':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Further': gt 'swamp_yard', 'start'
+		act 'Further': gt 'gad_swamp_yard', 'start'
 	end
 end
 
@@ -1284,22 +1284,22 @@ if $ARGS[0] = 'naked_encounter':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude.jpg"></center>'
 		'You notice the hunters ogling your body while you are walking around naked. You subconsciously cover up your private parts'
 
-		if FUNC('lost_clothes_here','swamphouse') = 1 and $lastwornclothingtype ! 'nude' and forced_naked_day < daystart:
+		if FUNC('lost_clothes_here','gad_swamphouse') = 1 and $lastwornclothingtype ! 'nude' and forced_naked_day < daystart:
 			act 'Run and get dressed':
 				*clr & cla
 				minut += 5
 				gs 'underwear', 'wear'
-				gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
+				gs 'clothing', 'recover_lost_clothes', 'gad_swamphouse', 1
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude1.jpg"></center>'
 				'You rush to get your stuff in the hut so you can get dressed.'
-				act'Further': gt 'swamphouse', 'start'
+				act'Further': gt 'gad_swamphouse', 'start'
 			end
 		elseif forced_naked_day < daystart:
 			act 'Cover up with a burlap sack you found':
 				*clr & cla
 				minut+=5
-				gs 'clothing', 'swamp_clothes', 1
+				gs 'clothing', 'gad_swamp_clothes', 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
 				'You look around and put on a piece of burlap sack you see... It''s not much, but at least it''s better than nothing.'
@@ -1317,7 +1317,7 @@ if $ARGS[0] = 'naked_encounter':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude2.jpg"></center>'
 			'You decide you do not mind the men seeing you naked. You drop your hands and let the men stare at your naked tits and pussy all they want.'
 
-			act 'Further': gt 'swamp_yard', 'start'
+			act 'Further': gt 'gad_swamp_yard', 'start'
 			!Nudity reactions. Might need to split into more  events if it gets too massive
 			if hunter_sexual_comfort < 40:
 				if hunter_collective_opinion > 45:
@@ -1339,7 +1339,7 @@ if $ARGS[0] = 'naked_encounter':
 				end
 			else
 				*clr & cla
-				act 'Further': gt 'swamp_yard', 'start'
+				act 'Further': gt 'gad_swamp_yard', 'start'
 				if hunter_collective_opinion > 45:
 					hunter_sexual_comfort += 5
 					hunter_collective_opinion += 5
@@ -1353,7 +1353,7 @@ if $ARGS[0] = 'naked_encounter':
 					act 'Return the kiss':
 						*clr & cla
 
-						act 'Further': gt 'swamp_yard', 'start'
+						act 'Further': gt 'gad_swamp_yard', 'start'
 
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/igor_naked_encounter_finger.jpg"></center>'
 						'You happily return the kiss, not caring if you are making out completely naked outside with the other men watching you'
@@ -1369,7 +1369,7 @@ if $ARGS[0] = 'naked_encounter':
 					act 'Lightly push him away':
 						*clr & cla
 
-						act 'Further': gt 'swamp_yard', 'start'
+						act 'Further': gt 'gad_swamp_yard', 'start'
 
 						hunter_sexual_comfort -= 3
 						hunter_collective_opinion += 3
@@ -1402,7 +1402,7 @@ if $ARGS[0] = 'naked_encounter':
 			end
 		end
 	else
-		gt 'swamp_yard', 'start'
+		gt 'gad_swamp_yard', 'start'
 	end
 end
 
@@ -1545,7 +1545,7 @@ if $ARGS[0] = 'nighttime_gangbang':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/gangbang_night/gangbang_buk_2.jpg"></center>'
 			'After a moment, he cums on your face with a grunt, covering it with his spunk.'
 
-			act 'Further': gt 'swamp_yard', 'campfire'
+			act 'Further': gt 'gad_swamp_yard', 'campfire'
 		end
 	end
 end
@@ -1578,7 +1578,7 @@ if $ARGS[0] = 'striptease':
 					*nl
 					'Three hours later you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
 
-					act 'Continue': gt 'swamphouse', 'start'
+					act 'Continue': gt 'gad_swamphouse', 'start'
 				end
 			end
 		end
@@ -1601,7 +1601,7 @@ if $ARGS[0] = 'striptease':
 					*nl
 					'Four hours later you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
 
-					act 'Continue': gt 'swamphouse', 'start'
+					act 'Continue': gt 'gad_swamphouse', 'start'
 				end
 			end
 		end
@@ -1624,7 +1624,7 @@ if $ARGS[0] = 'striptease':
 					*nl
 					'You sleep for awhile, waking up barely able to lift your head from the pillow. You''ve got a headache and vaguely remember yesterday.'
 
-					act 'Continue': gt 'swamphouse', 'start'
+					act 'Continue': gt 'gad_swamphouse', 'start'
 				end
 			end
 		end
@@ -1697,7 +1697,7 @@ if $ARGS[0] = 'striptease':
 											*nl
 											'You sleep for four hours, waking up in the middle night, barely able to get up off the floor. You''ve got a headache and vaguely remember yesterday.'
 
-											act 'Continue': gt 'swamphouse', 'start'
+											act 'Continue': gt 'gad_swamphouse', 'start'
 										end
 									end
 								else
@@ -1738,7 +1738,7 @@ if $ARGS[0] = 'huntersmokBJ':
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
 
-	if temp_sh = 1:act 'Keep sucking':huntersmokBJ = 1 & gs 'swamphouse', 'huntersmokBJ'
+	if temp_sh = 1:act 'Keep sucking':huntersmokBJ = 1 & gs 'gad_swamphouse', 'huntersmokBJ'
 	if temp_sh = 2:
 		act 'Keep sucking':
 			*clr & cla
@@ -1755,7 +1755,7 @@ if $ARGS[0] = 'huntersmokBJ':
 
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Return to the table': gs 'swamphouse', 'meal_table'
+			act 'Return to the table': gs 'gad_swamphouse', 'meal_table'
 		end
 	end
 end
@@ -1879,7 +1879,7 @@ if $ARGS[0] = 'creekside_rape':
 											hunter_collective_opinion -=20
 											hunter_sexual_comfort -= 10
 
-											gt 'swamp_yard', 'swamp_escape'
+											gt 'gad_swamp_yard', 'swamp_escape'
 										end
 									end
 								end
@@ -1906,9 +1906,9 @@ if $ARGS[0] = 'skirt_breeze':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Further':gt 'swamp_yard','start'
+		act 'Further':gt 'gad_swamp_yard','start'
 	else
-		gt 'swamp_yard', 'start'
+		gt 'gad_swamp_yard', 'start'
 	end
 end
 
@@ -1987,7 +1987,7 @@ if $ARGS[0] = 'creekside_gangbang':
 				'After a few minutes of <<$boydesc>> vigorously fucking your pussy, you feel him cumming inside you'
 				gs 'cum_call', 'vagina', $boy, 1
 
-				act 'The men finish up and leave you': gt 'swamp_yard', 'start'
+				act 'The men finish up and leave you': gt 'gad_swamp_yard', 'start'
 			end
 		end
 	end

+ 78 - 78
locations/hunters.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 
 	!disabled - maybe hook into enema realism?
-	!$textsexhunter = 'From a member of the unpleasant smells and remains in the mouth tastes foul feces. "-Damn, I had to do an enema." - belatedly dumaeete you.'
+	!$textsexhunter[1] = 'From a member of the unpleasant smells and remains in the mouth tastes foul feces. "-Damn, I had to do an enema." - belatedly dumaeete you.'
 
 	if hunters_were_met > 0:
 		if hunters_chattime = 1:
@@ -28,7 +28,7 @@ if $ARGS[0] = 'start':
 		'You see three strangers talking to each other. Each one of them telling all kinds of hunting stories.'
 	end
 
-	act 'Walk away':gt 'swamp_yard', 'start'
+	act 'Walk away':gt 'gad_swamp_yard', 'start'
 	if hunters_were_met = 0:
 		act 'Greet them':
 			*clr & cla
@@ -44,7 +44,7 @@ if $ARGS[0] = 'start':
 			if pcs_apprnc >= 60:'"What''s your name, beautiful?" one of them asked.'
 			if pcs_apprnc < 60:'"What should we call you?" one of them asked.'
 				'"<<$pcs_nickname>>", you answer.'
-			if gadriver_gang <= 0:
+			if GadBoy['river_gang'] <= 0:
 				'"I''m Andrei, replied the oldest man, and these are my friends Igor and Sergei."'
 				'"Could your surname be <<$pcs_lastname>>?" he asked. You look at him nodding.'
 				'"Don''t act surprised <<$pcs_nickname>>, you look a lot like your mother when she was younger. I... Hmmm... that''s good to know, I''m also from Gadukino." said Andrei.'
@@ -61,7 +61,7 @@ if $ARGS[0] = 'start':
 			$npc_usedname['A173'] = 'Igor'
 			$npc_usedname['A174'] = 'Sergei'
 			act 'Sit down': gt 'hunters', 'start'
-			act 'Move away': gt 'swamp_yard', 'start'
+			act 'Move away': gt 'gad_swamp_yard', 'start'
 		end
 	elseif hunters_chattime = 1:
 		if huntersKnowSlut > 0 and pcs_horny > 50 and mesec <= 0:
@@ -126,7 +126,7 @@ if $ARGS[0] = 'start':
 				gs 'hunters', 'hunters_talk'
 				'You get so caught up in the conversation, you don''t even notice how fast the time flies by.'
 			end
-			act 'Move away': gt 'swamp_yard', 'start'
+			act 'Move away': gt 'gad_swamp_yard', 'start'
 		end
 		if huntersAndreiQw >= 10 and huntersSergeiQw >= 10 and huntersIgorQw >= 10 and shootingday ! daystart:
 			if huntersKnowSlut = 0:
@@ -175,7 +175,7 @@ if $ARGS[0] = 'start':
 								end
 							end
 						else
-							act'Go':gt 'swamp_yard', 'start'
+							act'Go':gt 'gad_swamp_yard', 'start'
 						end
 					end
 				else
@@ -206,7 +206,7 @@ if $ARGS[0] = 'start':
 										'<center><video autoplay loop src="images/locations/gadukino/hunters/shooting2.mp4"></video></center>'
 										'You fire the rifle for an hour under the hunters watchful eyes.'
 
-										act'Further':gt 'swamp_yard', 'start'
+										act'Further':gt 'gad_swamp_yard', 'start'
 									else
 										*clr & cla
 										minut += 5
@@ -225,7 +225,7 @@ if $ARGS[0] = 'start':
 											'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tongue.jpg"></center>'
 											'"I''m not Rambo, I''m Lara Croft," you reply. Andrei, stands there looking confused not understanding the reference.'
 
-											act'Further':gt 'swamp_yard', 'start'
+											act'Further':gt 'gad_swamp_yard', 'start'
 										end
 									end
 								end
@@ -238,7 +238,7 @@ if $ARGS[0] = 'start':
 									'<center><video autoplay loop src="images/locations/gadukino/hunters/shooting2.mp4"></video></center>'
 									'You fire the rifle for an hour under the hunters watchful eyes.'
 
-									act'Further':gt 'swamp_yard', 'start'
+									act'Further':gt 'gad_swamp_yard', 'start'
 								end
 							end
 						else
@@ -250,7 +250,7 @@ if $ARGS[0] = 'start':
 							'You approach the hunters sitting in a clearing. "Guys, could you give me the rifle? I want to try it out again." You ask the hunters.'
 							'"You need to heal your forehead first." Andrei says smiling. "You have the spirit of an Amazon, you need to relax."'
 
-							act'Further':gt 'swamp_yard', 'start'
+							act'Further':gt 'gad_swamp_yard', 'start'
 						end
 					end
 				end
@@ -277,7 +277,7 @@ if $ARGS[0] = 'start':
 					'"Don''t you worry <<$pcs_nickname>>, you have other talents that are more needed." Andrei replied.'
 					'He scoffs, pleased with the joke.'
 
-					act'Move away':gt 'swamp_yard', 'start'
+					act'Move away':gt 'gad_swamp_yard', 'start'
 				end
 			end
 		end
@@ -566,7 +566,7 @@ if $ARGS[0] = 'start':
 
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Further':gt $loc, $loc_arg
+					act 'Further': gt $loc, $loc_arg
 				end
 			end
 		end
@@ -725,7 +725,7 @@ if $ARGS[0] = 'start':
 		if forest_gopsex = 1:
 			gs 'clothing', 'strip_all', 'forest_edge'
 		elseif slutgosex = 1 or forest_huntersex = 1 :
-			gs 'clothing', 'strip_all', 'backwater'
+			gs 'clothing', 'strip_all', 'gad_backwater'
 		else
 			gs 'clothing', 'strip_all'
 		end
@@ -860,7 +860,7 @@ if $ARGS[0]='huntersgroupORALi1end':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupORALa1end':
@@ -879,7 +879,7 @@ if $ARGS[0]='huntersgroupORALa1end':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupORALi':
@@ -932,7 +932,7 @@ if $ARGS[0]='huntersgroupORALend1':
 	gs 'arousal', 'end'
 	gs 'stat'
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupORALai':
@@ -1060,12 +1060,12 @@ if $ARGS[0]='huntersgroupVias':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
@@ -1089,12 +1089,12 @@ if $ARGS[0]='huntersgroupVas':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and andrhuntanal > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and andrhuntanal > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
@@ -1117,7 +1117,7 @@ if $ARGS[0]='huntersgroupVas1':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
@@ -1140,7 +1140,7 @@ if $ARGS[0]='huntersgroupVa':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
@@ -1170,7 +1170,7 @@ if $ARGS[0]='huntersgroupVs':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
@@ -1197,12 +1197,12 @@ if $ARGS[0]='huntersgroupVi':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
@@ -1240,12 +1240,12 @@ if $ARGS[0]='huntersgroupVis':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
@@ -1276,7 +1276,7 @@ if $ARGS[0]='huntersgroupVis1':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
@@ -1299,7 +1299,7 @@ if $ARGS[0]='huntersgroupVi1':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
@@ -1326,7 +1326,7 @@ if $ARGS[0]='huntersgroupVs1':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
@@ -1357,12 +1357,12 @@ if $ARGS[0]='huntersgroupVia':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
@@ -1394,7 +1394,7 @@ if $ARGS[0]='huntersgroupVia1':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
@@ -1417,7 +1417,7 @@ if $ARGS[0]='huntersgroupVi2':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
@@ -1448,7 +1448,7 @@ if $ARGS[0]='huntersgroupVa1':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
@@ -1477,7 +1477,7 @@ if $ARGS[0]='huntersgroupVaOsHi':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
@@ -1501,7 +1501,7 @@ if $ARGS[0]='huntersgroupVOsHi':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
@@ -1525,7 +1525,7 @@ if $ARGS[0]='huntersgroupVaOHi':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
@@ -1557,7 +1557,7 @@ if $ARGS[0]='huntersgroupDPasi':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
@@ -1586,7 +1586,7 @@ if $ARGS[0]='huntersgroupDPsi':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172','a'
 	if forest_gopsex = 3:gs 'boyStat', 'A63','a'
@@ -1616,7 +1616,7 @@ if $ARGS[0]='huntersgroupDPas':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172','a'
 	if forest_gopsex = 3:gs 'boyStat', 'A63','a'
@@ -1647,7 +1647,7 @@ if $ARGS[0]='huntersgroupDPai':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63','a'
@@ -1686,7 +1686,7 @@ if $ARGS[0]='huntersgroupVsOaHi':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
@@ -1715,7 +1715,7 @@ if $ARGS[0]='huntersgroupVsOHi':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
@@ -1748,7 +1748,7 @@ if $ARGS[0]='huntersgroupVsOi':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
@@ -1772,7 +1772,7 @@ if $ARGS[0]='huntersgroupVOi':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
@@ -1796,7 +1796,7 @@ if $ARGS[0]='huntersgroupVsO':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
@@ -1829,7 +1829,7 @@ if $ARGS[0]='huntersgroupVOaHi':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
@@ -1854,7 +1854,7 @@ if $ARGS[0]='huntersgroupViOa':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
@@ -1878,7 +1878,7 @@ if $ARGS[0]='huntersgroupViO':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A173'
 	if forest_gopsex = 3:gs 'boyStat', 'A62'
@@ -1909,7 +1909,7 @@ if $ARGS[0]='huntersgroupVaOs':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
@@ -1933,7 +1933,7 @@ if $ARGS[0]='huntersgroupVOs':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
@@ -1957,7 +1957,7 @@ if $ARGS[0]='huntersgroupVaO':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
@@ -1989,7 +1989,7 @@ if $ARGS[0]='huntersgroupAsOa':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
@@ -2014,7 +2014,7 @@ if $ARGS[0]='huntersgroupAsO':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
@@ -2047,7 +2047,7 @@ if $ARGS[0]='huntersgroupAOa':
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A172'
 	if forest_gopsex = 3:gs 'boyStat', 'A63'
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	if huntersexnude = 1 or forest_huntersex = 3:gs 'boyStat', 'A174'
 	if forest_gopsex = 3:gs 'boyStat', 'A61'
@@ -2122,7 +2122,7 @@ if $ARGS[0]='huntersgroupOis':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupOia':
@@ -2138,7 +2138,7 @@ if $ARGS[0]='huntersgroupOia':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupOsa':
@@ -2157,7 +2157,7 @@ if $ARGS[0]='huntersgroupOsa':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupAa':
@@ -2192,7 +2192,7 @@ if $ARGS[0]='huntersgroupAaEnd1':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupAaEnd2':
@@ -2210,7 +2210,7 @@ if $ARGS[0]='huntersgroupAaEnd2':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupAs':
@@ -2243,7 +2243,7 @@ if $ARGS[0]='huntersgroupAsEnd1':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupAsEnd2':
@@ -2261,7 +2261,7 @@ if $ARGS[0]='huntersgroupAsEnd2':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupAi':
@@ -2294,7 +2294,7 @@ if $ARGS[0]='huntersgroupAiEnd1':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupAiEnd2':
@@ -2312,7 +2312,7 @@ if $ARGS[0]='huntersgroupAiEnd2':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupVa2':
@@ -2344,7 +2344,7 @@ if $ARGS[0]='huntersgroupVa2end':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupVs2':
@@ -2376,7 +2376,7 @@ if $ARGS[0]='huntersgroupVs2end':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupVi3':
@@ -2409,7 +2409,7 @@ if $ARGS[0]='huntersgroupVi3end':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupOsend':
@@ -2424,7 +2424,7 @@ if $ARGS[0]='huntersgroupOsend':
 	'Not wanting to get you pregnant, <<$boydesc>> starts jerking off his cock in front of you...'
 
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickB > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	'You watch as <<$boydesc>> is trying hard to finish. All of a sudden he screams out that he''s edging and you should get ready to get covered in this spunk. Hot sperm hits your face, most of it hitting your face and chin. The sperm drips down on your chest...'
 
@@ -2432,7 +2432,7 @@ if $ARGS[0]='huntersgroupOsend':
 	gs 'stat'
 
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupOaend':
@@ -2447,14 +2447,14 @@ if $ARGS[0]='huntersgroupOaend':
 	'Making you kneel down, <<$boydesc>> starts masturbating in front of your face...'
 
 	gs 'oral', 'start', 5, 'gangbang'
-	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	!if klismaday ! daystart and dirty_dickA > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	'<<$boydesc>> tells you he''s edging and that you should get ready. He lets out a grunt and a hot jet of sperm hits you in the face. It runs down your chin, dripping down on your chest...'
 
 	gs 'arousal', 'end'
 	gs 'stat'
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='huntersgroupOiend':
@@ -2469,14 +2469,14 @@ if $ARGS[0]='huntersgroupOiend':
 	'<<$boydesc>> tells you that he wants you kneeling down, cause he wants to cover your face with his spunk...'
 
 	gs 'oral', 'start', 5, 'gangbang'
-	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter>>' & pcs_mood -= 5 & pcs_horny -= 20
+	if klismaday ! daystart and dirty_dickC > 0:'<<$textsexhunter[1]>>' & pcs_mood -= 5 & pcs_horny -= 20
 
 	'You noticed <<$boydesc>>''s facial expression getting tense, nearing the edge. A stream of hot sperm hits you in the face, then another stream and it keeps on going not letting up. It runs down your chin, dripping down on your chest...'
 
 	gs 'arousal', 'end'
 	gs 'stat'
 	if forest_huntersex = 0:act 'Further':huntersexnude = 0 & forest_gopsex = 0 & gt $loc, $loc_arg
-	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
+	if forest_huntersex > 0:act 'Further':forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
 end
 
 if $ARGS[0]='hunterslutSTART':
@@ -2530,9 +2530,9 @@ if $ARGS[0]='hunterslutEND':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		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','forest_edge'
+		if slutgosex = 1:act 'Go to the river': slutgosex = 0 & gt 'gad_backwater'
+		if forest_huntersex = 1:act 'Go to the hut': forest_huntersex = 0 & minut += 60 & gt 'gad_swamp_yard', 'start'
+		if forest_gopsex = 1:act 'Go to forest': forest_gopsex = 0 & gt 'gad_forest', 'forest_edge'
 	end
 end
 
@@ -2888,7 +2888,7 @@ if $ARGS[0] = 'huntersgroupfaint':
 			'You weakly nod your head.'
 			'"You really scared us, and to be frank, you really fucked up. Go to the hut and rest."'
 
-			act 'Further': gt'swamphouse', 'start'
+			act 'Further': gt'gad_swamphouse', 'start'
 		end
 	end
 end

Diff do ficheiro suprimidas por serem muito extensas
+ 147 - 130
locations/huntersex.qsrc


+ 1 - 1
locations/intro_sg.qsrc

@@ -56,7 +56,7 @@ if $ARGS[0] = 'five':
 	act 'Start':
 		close all
 		if start_location = 2:
-			gt 'gadhouse', 'intro'
+			gt 'gad_gphouse', 'intro'
 		elseif start_location = 1:
 			gt 'bedrPar', 'intro'
 		end

+ 1 - 1
locations/intro_sg_m.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = 'six':
 	'Welcome to the Cursed Schoolgirl version! Guide <<$pcs_nickname>> through her school life, relationships and myriad of other issues that might pop up, all with the added spice of magic to keep things interesting!'
 	act '<center><b>Begin!</b></center>':
 		if start_location = 2:
-			gt 'gadhouse', 'intro'
+			gt 'gad_gphouse', 'intro'
 		elseif start_location = 1:
 			gt 'bedrPar', 'intro'
 		end

+ 1 - 1
locations/intro_sg_tg.qsrc

@@ -666,7 +666,7 @@ if $ARGS[0] = 'game_start':
 				act 'Start your new life':
 					music_loop = 0
 					if $starting_location = 'pavlovsk': gt 'bedrPar'
-					if $starting_location = 'gadukino': gt 'gadhouse', 'start'
+					if $starting_location = 'gadukino': gt 'gad_gphouse', 'start'
 				end
 			end
 		end

+ 11 - 0
locations/item_stock_db.qsrc

@@ -326,6 +326,17 @@ if $ARGS[0] = 'hardware':
 	max_curr_aisle['<<item_idx>>'] = 1
 	cost_curr_aisle['<<item_idx>>'] = 1000
 	$img_curr_aisle['<<item_idx>>'] = ''
+
+!{	
+	item_idx = 7
+	$item_curr_aisle['<<item_idx>>'] = 'Desk' 
+	$var_curr_aisle['<<item_idx>>'] = 'desk'
+	$desc_curr_aisle['<<item_idx>>'] = 'A shiny new desk.'
+	quantity_curr_aisle['<<item_idx>>'] = 1
+	max_curr_aisle['<<item_idx>>'] = 1
+	cost_curr_aisle['<<item_idx>>'] = 10000
+	$img_curr_aisle['<<item_idx>>'] = ''
+}
 end
 
 !!Added

+ 2 - 2
locations/journal.qsrc

@@ -882,12 +882,12 @@ elseif $ARGS[0] = 'gad_res':
 	gs 'journal_NPC_information', 'A63'
 	*nl
 	!!Kolyamba
-	if mitka_first_drink > 1:
+	if GadBoy['first_drink'] > 1:
 		gs 'journal_NPC_information', 'A61'
 		*nl
 	end
 	!!Vasyan
-	if mitka_first_drink > 1:
+	if GadBoy['first_drink'] > 1:
 		gs 'journal_NPC_information', 'A62'
 		*nl
 	end

+ 35 - 35
locations/journal_quests.qsrc

@@ -20,44 +20,44 @@ if $ARGS[0] = 'start':
 	'<center><h2>Quests</h2></center>'
 	
 	if npc_known['A60'] = 1:
-		if meadow > 0:
+		if gad_meadow_found = 1:
 			'<center><h3>Miroslava Maximova</h3></center>'
 			*nl
-		end
-		if meadow = 1 or meadow = 2:
-			'You have found a Secret Meadow. Maybe Mira would like to see it.'
-		elseif meadow = 3:
-			if npc_QW['A60'] = 0:
-				'You have shown Mira your Secret Meadow and told her she could visit it on her own. You did make her promise not to show anyone else, but maybe you should keep an eye on her, in case she breaks that promise.'
-				'You could show Mira around, maybe introduce her to some of the local boys...'
-			elseif npc_QW['A60'] = 1:
-				'You have shown Mira your Secret Meadow and told her she could visit it on her own. You did make her promise not to show anyone else, but maybe you should keep an eye on her, in case she breaks that promise.'
-				'You introduced Mira to Mitka and the boys. Maybe you should ask her what she thinks about them.'
-			elseif npc_QW['A60'] = 2:
-				'You have shown Mira your Secret Meadow and told her she could visit it on her own. You did make her promise not to show anyone else, but maybe you should keep an eye on her, in case she breaks that promise.'
-				'Mira admitted she likes Mitka. Only time will tell what will come from that. In the meantime, you could visit your meadow, from time to time, while you wait to see what happens.'
-			elseif npc_QW['A60'] = 3:
-				'You caught Mira having sex with Mitka, in your meadow after she promised not to show anyone else. You really need to talk to her, and confront her about it.'
-			elseif npc_QW['A60'] = 4:
-				'Next time you talk to Mira, you should remind her of her promise. You should wait a day or so to give her time to worry about it.'
-			elseif npc_QW['A60'] = 5:
-				'After a lengthy discussion, Mira agrees to fulfill 3 Wishes. Wish #1, is for you to watch Mitka have anal sex with Mira. Mira might need some help setting it up... try getting her drunk with the boys, in the evening.'
-			elseif npc_QW['A60'] < 15:
-				'You have watched Mira having anal sex with Mitka and she sucessfully fulfilled her First Wish. You are still thinking on what you want her to do for your Second Wish. You should keep getting her drunk with the boys for now, until something comes to mind.'
-			elseif npc_QW['A60'] = 15 and miraprost = 0:
-				'You have watched Mira having anal sex with Mitka and she sucessfully fulfilled her First Wish. You are still thinking on what you want her to do for your second wish. Maybe a walk through the village will give you some ideas.'
-			elseif (npc_QW['A60'] = 16 or npc_QW['A60'] < 20) and miraprost > 0:
-				!! Sveta can make her third wish. Can be raised by either prostitution or having sex with the boys when drunk.
-				'Congratulations, you are now Mira''s pimp, thus fulfilling your Second Wish. You should check up on her at the road in the evenings and make sure she is working for you, until you come up with an idea for your third and Final Wish.'
-			elseif npc_QW['A60'] = 21 and Mira_no > 0:
-				'You have convinced her to walk through town naked, to fufill your Third Wish. She is red with shame and has stayed home. Maybe if you talk to her you can convince her to come out of the house again. It may take a few tries though.'
-			elseif npc_QW['A60'] = 21 and Mira_no = 0:
-				'You have convinced her to walk through town naked, to fufill your Third Wish. She came out of her house and you can continue to pimp her out during the evenings. <b>This is the end of Mira and the Three Wishes</b>'
-			elseif npc_QW['A60'] = 22:
-				'In the end, you couldn''t force Mira to walk through town naked, and let her off the hook and forgave her for breaking her promise. She is happy with your decision and you grow even closer. You are still able to pimp her out in the evenings. <b>This is the end of Mira and the Three Wishes</b>'
+			if MiraVars['meadow'] = 0 or MiraVars['meadow'] = 1:
+				'You have found a Secret Meadow. Maybe Mira would like to see it.'
+			elseif MiraVars['meadow'] = 2:
+				if MiraVars['QW'] = 0:
+					'You have shown Mira your Secret Meadow and told her she could visit it on her own. You did make her promise not to show anyone else, but maybe you should keep an eye on her, in case she breaks that promise.'
+					'You could show Mira around, maybe introduce her to some of the local boys...'
+				elseif MiraVars['QW'] = 1:
+					'You have shown Mira your Secret Meadow and told her she could visit it on her own. You did make her promise not to show anyone else, but maybe you should keep an eye on her, in case she breaks that promise.'
+					'You introduced Mira to Mitka and the boys. Maybe you should ask her what she thinks about them.'
+				elseif MiraVars['QW'] = 2:
+					'You have shown Mira your Secret Meadow and told her she could visit it on her own. You did make her promise not to show anyone else, but maybe you should keep an eye on her, in case she breaks that promise.'
+					'Mira admitted she likes Mitka. Only time will tell what will come from that. In the meantime, you could visit your meadow, from time to time, while you wait to see what happens.'
+				elseif MiraVars['QW'] = 3:
+					'You caught Mira having sex with Mitka, in your meadow after she promised not to show anyone else. You really need to talk to her, and confront her about it.'
+				elseif MiraVars['QW'] = 4:
+					'Next time you talk to Mira, you should remind her of her promise. You should wait a day or so to give her time to worry about it.'
+				elseif MiraVars['QW'] = 5:
+					'After a lengthy discussion, Mira agrees to fulfill 3 Wishes. Wish #1, is for you to watch Mitka have anal sex with Mira. Mira might need some help setting it up... try getting her drunk with the boys, in the evening.'
+				elseif MiraVars['QW'] < 15:
+					'You have watched Mira having anal sex with Mitka and she sucessfully fulfilled her First Wish. You are still thinking on what you want her to do for your Second Wish. You should keep getting her drunk with the boys for now, until something comes to mind.'
+				elseif MiraVars['QW'] = 15 and MiraVars['prostitute'] = 0:
+					'You have watched Mira having anal sex with Mitka and she sucessfully fulfilled her First Wish. You are still thinking on what you want her to do for your second wish. Maybe a walk through the village will give you some ideas.'
+				elseif MiraVars['QW'] < 20 and MiraVars['prostitute'] > 0:
+					!! Sveta can make her third wish. Can be raised by either prostitution or having sex with the boys when drunk.
+					'Congratulations, you are now Mira''s pimp, thus fulfilling your Second Wish. You should check up on her at the road in the evenings and make sure she is working for you, until you come up with an idea for your third and Final Wish.'
+				elseif MiraVars['QW'] = 21 and daystart < MiraVars['emb_day']:
+					'You have convinced her to walk through town naked, to fufill your Third Wish. She is red with shame and has stayed home. Maybe if you talk to her you can convince her to come out of the house again. It may take a few tries though.'
+				elseif MiraVars['QW'] = 21 and daystart >= MiraVars['emb_day']:
+					'You have convinced her to walk through town naked, to fufill your Third Wish. She came out of her house and you can continue to pimp her out during the evenings. <b>This is the end of Mira and the Three Wishes</b>'
+				elseif MiraVars['QW'] = 22:
+					'In the end, you couldn''t force Mira to walk through town naked, and let her off the hook and forgave her for breaking her promise. She is happy with your decision and you grow even closer. You are still able to pimp her out in the evenings. <b>This is the end of Mira and the Three Wishes</b>'
+				end
+			elseif MiraVars['meadow'] = 3:
+				'You have found a Secret Meadow and shown Mira, but told her she could not go there without you. <b>This choice blocked Mira and the Three Wishes</b>'
 			end
-		elseif meadow = 4:
-			'You have found a Secret Meadow and shown Mira, but told her she could not go there without you. <b>This choice blocked Mira and the Three Wishes</b>'
 		end
 	end
 

+ 11 - 3
locations/katja_chat.qsrc

@@ -194,7 +194,7 @@ end
 
 if $ARGS[0] = 'chat1':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	!! If you had a threesome with Katja at th nightclub before you started her quest.
+	!! If you had a threesome or foursome with Katja at the nightclub before you started her quest.
 	if katjaQW['first_time_in_nightclub'] > 0 and npc_sex['A14'] = 0: gt 'katja_chat', 'nightclub_sex_follow_up'
 	
 	!! Reaction on the first time you meet Sofia, Katja''s roommate.
@@ -340,6 +340,9 @@ if $ARGS[0] = 'brunch':
 		'After a while, a heavily tattooed waitress with short blond hair shaved on one side comes over to your table. "Welcome to the Coffee Hole, what can I get you?" she asks in a bored and monotone voice.'
 	end
 	act 'Order from the menu (0:05)': katjaQW['brunch_bought'] = 1 & gs 'food_menu'
+	if pcs_traits['commando_lvl'] > 0 and $pantyworntype = 'none' and npc_sex['A14'] > 0 and katjaQW['no_panties_day'] ! daystart:
+		act 'Show Katja that you''re not wearing panties': gt 'katja_pantyquest', 'coffee_hole'
+	end
 	act 'Say you don''t need anything': gt 'katja_chat', 'coffee_hole_event'
 end
 
@@ -1138,12 +1141,17 @@ end
 
 if $ARGS[0] = 'nightclub_sex_follow_up':
 	npc_sex['A14'] = 1
-	katjaQW['QWstage'] = 6
+	if katjaQW['first_time_in_nightclub'] < 3: katjaQW['QWstage'] = 6
+	if katjaQW['QWstage'] < 3: katjaQW['QWstage'] = 3
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'"So the other night at the club was fun," Katja says, blushing slightly.'
 	'"Yes, it was," you agree.'
-	iif(katjaQW['first_time_in_nightclub'] = 2, '"I really loved the way you made me feel, I don''t think I have come so hard before..."', '"I''m normally not that naughty, but watching his dick glide in and out of your wet va...."')+' Katja suddenly stops, realizing how openly she talks about sex and her face becomes as red as a ripe tomato.'
+	if katjaQW['first_time_in_nightclub'] < 3:
+		iif(katjaQW['first_time_in_nightclub'] = 2, '"I really loved the way you made me feel, I don''t think I have come so hard before..."', '"I''m normally not that naughty, but watching his dick glide in and out of your wet va...."')+' Katja suddenly stops, realizing how openly she talks about sex and her face becomes as red as a ripe tomato.'
+	elseif katjaQW['first_time_in_nightclub'] = 3:
+		'"it was some wild girls we met. I had '+iif(fame['pav_sex'] < 100 and fame['city_sex'] < 100, 'no ide that you also where so wild.', ' hear rumors about about you escapades but it was something else to experience it.')+' The way you used....." Katja suddenly stops, realizing how openly she talks about sex and her face becomes as red as a ripe tomato.'
+	end
 	if katjaQW['simultanous_girls'] = 0:
 		katjaQW['simultanous_girls'] = 1
 		'You give her a moment before you ask her, "Was this the first time you were with a girl?"'

+ 36 - 36
locations/katja_meynold_schedule.qsrc

@@ -21,9 +21,9 @@
 !! locat['katja'] = 18
 !! locat['katja'] = 19
 !! locat['katja'] = 20 Dormroom - Asleep
-!! locat['katja'] = 21 Sheared Dorm Shower - Taking A shower.
+!! locat['katja'] = 21 Shared Dorm Shower - Taking A shower.
 !! locat['katja'] = 22 Dormroom - Getting Dressed and Doing Makeup
-!! locat['katja'] = 23 Shered Kitchen - Eating Breakfast
+!! locat['katja'] = 23 Shared Kitchen - Eating Breakfast
 !! locat['katja'] = 24 Dormroom - Getting ready to leave
 !! locat['katja'] = 25 University grounds - waiting for class/to go to the library.
 !! locat['katja'] = 26 University classroom  - attending lecture
@@ -48,11 +48,11 @@
 !! locat['katja'] = 45 restaurant - having dinner
 !! locat['katja'] = 46 Pav streets - walks to the train station/waiting at the platform
 !! locat['katja'] = 47 Train - traveling from Pav to the city.
-!! locat['katja'] = 48 Metro - traveling from the trainstation to the dorm
+!! locat['katja'] = 48 Metro - traveling from the train station to the dorm
 !! locat['katja'] = 49 Classroom - taking a exam
 !! locat['katja'] = 50 Bar - celebrating that exams are over
 !! locat['katja'] = 51 Dormroom - Getting ready to see a movie
-!! locat['katja'] = 52 Domroom - watching a movie
+!! locat['katja'] = 52 Dormroom - watching a movie
 !! locat['katja'] = 53 At city nightclub.
 !! locat['katja'] = 54 Gone home with a guy and/girl (possible together with the player character), used to make sure she wont return to the location she left.
 
@@ -84,7 +84,7 @@ if yearstart = 1:
 				locat['katja'] = 7
 			else
 				if week = 5:
-					!!At the comunity center disco
+					!!At the community center disco
 					locat['katja'] = 8
 				else
 					!!In her room with not having visitors over
@@ -105,7 +105,7 @@ if yearstart = 1:
 				!!At home in her room
 				locat['katja'] = 7
 			else
-				!!At the comunity center disco
+				!!At the community center disco
 				locat['katja'] = 8
 			end
 		else
@@ -164,7 +164,7 @@ if yearstart = 1:
 				locat['katja'] = 7
 			else
 				if week = 5:
-					!!At the comunity center disco
+					!!At the community center disco
 					locat['katja'] = 8
 				else
 					!!In her room with not having visitors over
@@ -196,7 +196,7 @@ if yearstart = 1:
 				!!At home in her room
 				locat['katja'] = 7
 			else
-				!!At the comunity center disco
+				!!At the community center disco
 				locat['katja'] = 8
 			end
 		else
@@ -236,13 +236,13 @@ else
 				!!Dormroom - Asleep
 				locat['katja'] = 20
 			elseif hour = 7 and minut < 15:
-				!!Shered Dorm Shower - Taking A shower.
+				!!Shared Dorm Shower - Taking A shower.
 				locat['katja'] = 21
 			elseif hour = 7 and minut < 45:
 				!!Dormroom - Getting Dressed and Doing Makeup
 				locat['katja'] = 22
 			elseif hour = 7 or (hour = 8 and minut < 15):
-				!!Shered Kitchen - Eating Breakfast
+				!!Shared Kitchen - Eating Breakfast
 				locat['katja'] = 23
 			elseif hour = 8 and minut < 30:
 				!!Dormroom - Getting ready to leave
@@ -280,7 +280,7 @@ else
 						locat['katja'] = 27
 					end
 				else
-					!!University classsroom  - attending lecture
+					!!University classroom  - attending lecture
 					locat['katja'] = 26
 				end
 			elseif hour < 13:
@@ -292,7 +292,7 @@ else
 						locat['katja'] = locat['katja_save1']
 					end
 				elseif minut < 30:
-					!!University classsroom  - attending lecture
+					!!University classroom  - attending lecture
 					locat['katja'] = 26
 				else
 					!!University cafe - eating lunch
@@ -309,7 +309,7 @@ else
 							locat['katja'] = 27
 						end
 					else
-						!!University classsroom  - attending lecture
+						!!University classroom  - attending lecture
 						locat['katja'] = 26				
 					end
 				else
@@ -331,7 +331,7 @@ else
 							locat['katja'] = 31
 						end
 					else
-						!!University classsroom  - attending lecture
+						!!University classroom  - attending lecture
 						locat['katja'] = 26				
 					end
 				else
@@ -463,13 +463,13 @@ else
 					!!Dormroom - Asleep
 					locat['katja'] = 20
 				elseif hour < 8 and minut < 15:
-					!!Shered Dorm Shower - Taking A shower.
+					!!Shared Dorm Shower - Taking A shower.
 					locat['katja'] = 21
 				elseif hour = 8 and minut < 45:
 					!!Dormroom - Getting Dressed and Doing Makeup
 					locat['katja'] = 22
 				elseif hour = 8 or (hour = 9 and minut < 15):
-					!!Shered Kitchen - Eating Breakfast
+					!!Shared Kitchen - Eating Breakfast
 					locat['katja'] = 23
 				elseif hour = 9 and minut < 30:
 					!!Dormroom - Getting ready to leave
@@ -498,7 +498,7 @@ else
 					!!At home in her room
 					locat['katja'] = 7
 				else
-					!!At the comunity center disco
+					!!At the community center disco
 					locat['katja'] = 8
 				end
 			else
@@ -516,7 +516,7 @@ else
 					!!Dormroom - Asleep
 					locat['katja'] = 20
 				elseif hour < 9 and minut < 15:
-					!!Shered Dorm Shower - Taking A shower.
+					!!Shared Dorm Shower - Taking A shower.
 					locat['katja'] = 21
 				elseif hour = 9:
 					!!Dormroom - Getting Dressed and Doing Makeup
@@ -624,13 +624,13 @@ else
 					!!Dormroom - Asleep
 					locat['katja'] = 20
 				elseif hour < 8 and minut < 15:
-					!!Shered Dorm Shower - Taking A shower.
+					!!Shared Dorm Shower - Taking A shower.
 					locat['katja'] = 21
 				elseif hour = 8 and minut < 45:
 					!!Dormroom - Getting Dressed and Doing Makeup
 					locat['katja'] = 22
 				elseif hour = 8 or (hour = 9 and minut < 15):
-					!!Shered Kitchen - Eating Breakfast
+					!!Shared Kitchen - Eating Breakfast
 					locat['katja'] = 23
 				elseif hour = 9 and minut < 30:
 					!!Dormroom - Getting ready to leave
@@ -682,13 +682,13 @@ else
 				!!Dormroom - Asleep
 				locat['katja'] = 20
 			elseif hour < 7 and minut < 15:
-				!!Shered Dorm Shower - Taking A shower.
+				!!Shared Dorm Shower - Taking A shower.
 				locat['katja'] = 21
 			elseif hour = 7 and minut < 45:
 				!!Dormroom - Getting Dressed and Doing Makeup
 				locat['katja'] = 22
 			elseif hour = 7 or (hour = 8 and minut < 15):
-				!!Shered Kitchen - Eating Breakfast
+				!!Shared Kitchen - Eating Breakfast
 				locat['katja'] = 23
 			elseif hour = 8 and minut < 30:
 				!!Dormroom - Getting ready to leave
@@ -835,13 +835,13 @@ else
 					!!Dormroom - Asleep
 					locat['katja'] = 20
 				elseif hour < 8 and minut < 15:
-					!!Shered Dorm Shower - Taking A shower.
+					!!Shared Dorm Shower - Taking A shower.
 					locat['katja'] = 21
 				elseif hour = 8 and minut < 45:
 					!!Dormroom - Getting Dressed and Doing Makeup
 					locat['katja'] = 22
 				elseif hour = 8 or (hour = 9 and minut < 15):
-					!!Shered Kitchen - Eating Breakfast
+					!!Shared Kitchen - Eating Breakfast
 					locat['katja'] = 23
 				elseif hour = 9 and minut < 30:
 					!!Dormroom - Getting ready to leave
@@ -870,7 +870,7 @@ else
 					!!At home in her room
 					locat['katja'] = 7
 				else
-					!!At the comunity center disco
+					!!At the community center disco
 					locat['katja'] = 8
 				end
 			else
@@ -888,7 +888,7 @@ else
 					!!Dormroom - Asleep
 					locat['katja'] = 20
 				elseif hour < 9 and minut < 15:
-					!!Shered Dorm Shower - Taking A shower.
+					!!Shared Dorm Shower - Taking A shower.
 					locat['katja'] = 21
 				elseif hour = 9:
 					!!Dormroom - Getting Dressed and Doing Makeup
@@ -1016,13 +1016,13 @@ else
 					!!Dormroom - Asleep
 					locat['katja'] = 20
 				elseif hour < 8 and minut < 15:
-					!!Shered Dorm Shower - Taking A shower.
+					!!Shared Dorm Shower - Taking A shower.
 					locat['katja'] = 21
 				elseif hour = 8 and minut < 45:
 					!!Dormroom - Getting Dressed and Doing Makeup
 					locat['katja'] = 22
 				elseif hour = 8 or (hour = 9 and minut < 15):
-					!!Shered Kitchen - Eating Breakfast
+					!!Shared Kitchen - Eating Breakfast
 					locat['katja'] = 23
 				elseif hour = 9 and minut < 30:
 					!!Dormroom - Getting ready to leave
@@ -1121,13 +1121,13 @@ else
 				!!Dormroom - Asleep
 				locat['katja'] = 20
 			elseif hour < 8:
-				!!Shered Dorm Shower - Taking A shower.
+				!!Shared Dorm Shower - Taking A shower.
 				locat['katja'] = 21
 			elseif hour = 8 and minut < 30:
 				!!Dormroom - Getting Dressed and Doing Makeup
 				locat['katja'] = 22
 			elseif hour = 8:
-				!!Shered Kitchen - Eating Breakfast
+				!!Shared Kitchen - Eating Breakfast
 				locat['katja'] = 23
 			elseif hour = 9 and minut < 15:
 				!!Dormroom - Getting ready to leave
@@ -1285,13 +1285,13 @@ else
 					!!Dormroom - Asleep
 					locat['katja'] = 20
 				elseif hour < 8 and minut < 15:
-					!!Shered Dorm Shower - Taking A shower.
+					!!Shared Dorm Shower - Taking A shower.
 					locat['katja'] = 21
 				elseif hour = 8 and minut < 45:
 				!!Dormroom - Getting Dressed and Doing Makeup
 					locat['katja'] = 22
 				elseif hour = 8 or (hour = 9 and minut < 15):
-					!!Shered Kitchen - Eating Breakfast
+					!!Shared Kitchen - Eating Breakfast
 					locat['katja'] = 23
 				elseif hour = 9 and minut < 30:
 					!!Dormroom - Getting ready to leave
@@ -1320,7 +1320,7 @@ else
 					!!At home in her room
 					locat['katja'] = 7
 				else
-					!!At the comunity center disco
+					!!At the community center disco
 					locat['katja'] = 8
 				end
 			else
@@ -1338,7 +1338,7 @@ else
 					!!Dormroom - Asleep
 					locat['katja'] = 20
 				elseif hour < 9 and minut < 15:
-					!!Shered Dorm Shower - Taking A shower.
+					!!Shared Dorm Shower - Taking A shower.
 					locat['katja'] = 21
 				elseif hour = 9:
 					!!Dormroom - Getting Dressed and Doing Makeup
@@ -1446,13 +1446,13 @@ else
 					!!Dormroom - Asleep
 					locat['katja'] = 20
 				elseif hour < 8 and minut < 15:
-					!!Shered Dorm Shower - Taking A shower.
+					!!Shared Dorm Shower - Taking A shower.
 					locat['katja'] = 21
 				elseif hour = 8 and minut < 45:
 					!!Dormroom - Getting Dressed and Doing Makeup
 					locat['katja'] = 22
 				elseif hour = 8 or (hour = 9 and minut < 15):
-					!!Shered Kitchen - Eating Breakfast
+					!!Shared Kitchen - Eating Breakfast
 					locat['katja'] = 23
 				elseif hour = 9 and minut < 30:
 					!!Dormroom - Getting ready to leave

+ 391 - 153
locations/katja_pantyquest.qsrc

@@ -3,11 +3,11 @@
 
 !! The quest lines goes as follows for the university
 !! Until KatjaQW['slut'] is above 30 she wont show you anything. 
-!! At katjaQW['pantiesQWstage'] = 1 she will be wearing panties and show that.
-!! At katjaQW['pantiesQWstage'] = 2 she will be wearing panties but not bra, and show that she isn''t wearing a bra.
-!! At katjaQW['pantiesQWstage'] = 3 she will be wearing panties, show that and move them so you can see her pussy.
-!! At katjaQW['pantiesQWstage'] = 4 she will be wearing panties and show that and take them of for the rest of the day.
-!! At katjaQW['pantiesQWstage'] = 5 she wont be wearing panties and show that.
+!! At katjaQW['pantiesQWstage'] = 1 she will wear panties and show you.
+!! At katjaQW['pantiesQWstage'] = 2 she will wear panties but not a bra, and show you.
+!! At katjaQW['pantiesQWstage'] = 3 she will wear panties but pull them aside so you can see her pussy.
+!! At katjaQW['pantiesQWstage'] = 4 she will wear panties but take them off for the rest of the day.
+!! At katjaQW['pantiesQWstage'] = 5 she wont be wearing panties and will show you.
 
 if $ARGS[0] = 'kitchen':
 	katjaQW['kitchen_day'] = daystart
@@ -15,10 +15,11 @@ if $ARGS[0] = 'kitchen':
 	gs 'npc_relationship', 'modify', 'A14', 'like', 'kitchen', 1
 	if (katjaQW['pantiesQWstage'] < 3 or (katjaQW['pantiesQWstage'] = 3 and katjaQW['slut'] < 65)) and katjaQW['take_of_panties_day'] ! daystart:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_sitting1.jpg"></center>'
-		'You find Katja sitting alone in a chair. "Hi '+iif( katjaQW['couple'] = 0, '<<pcs_nickname>>', 'my love')+' what are you doing here?" Katja asks when she sees you.'
-		'"I '+iif($ARGS[1] = 'from_room', 'came looking for you', 'I was just looking around')+' , what are you doing?" you ask back. "I''m just waiting for my meal to finish cooking," she answers and points at the oven where some food is cooking.'
+		'You find Katja sitting alone in a chair. "Hi, '+iif( katjaQW['couple'] = 0, '<<pcs_nickname>>', 'my love')+'! What are you doing here?" Katja asks when she sees you.'
+		'"I '+iif($ARGS[1] = 'from_room', 'came looking for you', 'was just looking around')+' , what are you doing?" you ask in return.'
+		'"I''m just waiting for my food to finish cooking," she says, pointing at the oven.'
 		if pcs_traits['commando_lvl'] > 0 and $pantyworntype = 'none' and npc_sex['A14'] > 0 and katjaQW['no_panties_day'] ! daystart:
-			act 'Show her you are not wearing panties':
+			act 'Show her you''re not wearing panties':
 				*clr & cla
 				gs 'arousal', 'flash', 2
 				gs 'stat'
@@ -31,23 +32,23 @@ if $ARGS[0] = 'kitchen':
 					else
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga1_<<rand(1,6)>>.jpg"></center>'
 					end
-						'You look around to see if others are coming and then pull up your skirt to show Katja your bare pussy from behind.' 
+						'You look around to see if anyone is coming before pulling up your skirt and showing off your pussy from behind.'
 				else
 					'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
-					'You look around to see if others are coming and then pull down your pants to show Katja your bare pussy.' 
+					'You look around to see if anyone is coming before pulling down your pants and showing Katja your pussy.'
 				end
 				if katjaQW['slut'] < 30 and katjaQW['pantiesQWstage'] = 0:
-					'"<<$pcs_nickname>>! You can''t just go around flashing your pus... You aren''t wearing panties. What are you doing?! Put some panties on!" Katja exclaims in shock.'
-					'"I flash who I want to, and I don''t wear panties since it''s much nicer not to wear them. Now show me if you wear panties or not," you respond as you cover your pussy again.'
+					'"<<$pcs_nickname>>! You can''t just go around flashing your pu... You aren''t wearing panties! What are you doing?! Put some on!" Katja exclaims in shock.'
+					'"I flash who I want to, and I don''t wear panties since it''s much nicer not to. Now show me if you''re wearing panties or not," you respond as you cover your pussy again.'
 				elseif katjaQW['slut'] < 50 and katjaQW['pantiesQWstage'] < 2:
-					'"<<$pcs_nickname>>! You can''t just go around flashing your naked pussy. Put some panties on!" Katja says, though she''s clearly not really angry.'
-					'"I flash who I want to, and I don''t wear panties since it is much nicer not to wear them. Now show me if you wear panties or not," you respond as you cover your pussy again.'
+					'"<<$pcs_nickname>>! You can''t just go around flashing your pussy. Put some panties on!" Katja says, though she''s clearly not really angry.'
+					'"I flash who I want to, and I don''t wear panties since it''s much nicer not to. Now, show me if you''re wearing panties or not," you respond as you cover your pussy again.'
 				elseif KatjaQW['slut'] < 100 and katjaQW['pantiesQWstage'] < 4:
-					'"Stop it <<$pcs_nickname>>, you should really put some panties on," Katja says, but she can''t seem to keep her eyes from staring at your pussy.'
-					'"I flash who I want to, and I don''t wear panties since it is much nicer not to wear them. Now show me if you wear panties or not," you respond to her as you cover your pussy again.'
+					'"Stop it, <<$pcs_nickname>>! You should really put some panties on," Katja says, but she can''t seem to keep her eyes from staring at your pussy.'
+					'"I flash who I want to, and I don''t wear panties since it''s much nicer not to. Now, show me if you''re wearing panties or not," you respond to her as you cover your pussy again.'
 				else
-					'"<<$pcs_nickname>> you naughty girl, you should put some panties on," Katja says not at all convincingly while her eyes devour your naked pussy.'
-					'"I don''t wear panties since it is much nicer not to wear them. Now show me if you wear panties or not," you respond to her as you cover your pussy again.'
+					'"<<$pcs_nickname>>, you naughty girl! You should put some panties on," Katja says, not at all convincingly, while her eyes devour your exposed pussy.'
+					'"I don''t wear panties since it''s much nicer not to wear them. Now, show me if you''re wearing panties or not," you respond to her as you cover your pussy again.'
 				end
 				act 'Katja''s turn':
 					*clr & cla
@@ -59,15 +60,16 @@ if $ARGS[0] = 'kitchen':
 						katjaQW['horny'] += rand(0,5)
 						katjaQW['slut'] += rand(0,1)
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_sitting_showing_panties1.jpg"></center>'				
-						'Katja looks around to see if there is anybody else around. "I really shouldn''t be doing this..." she says, clearly indicating that she will do as you asked.'
-						'"Come on I showed you mine, it''s only fair that you do it, too," you reply.'
-						'She pulls up her skirt, spreads her legs, and shows her red panties.'
-						'"See I''m still wearing panties. Happy now?" she says with a sly smile. "Not really. You should NOT be wearing panties, that would make me happy," you reply.'
+						'Katja looks to see if anybody else is around. "I really shouldn''t be doing this..." she says with some hesitation.'
+						'"Come on, I showed you mine; it''s only fair that you do it, too," you reply.'
+						'She pulls up her skirt, spreads her legs, and shows off her red panties.'
+						'"See, I''m still wearing panties. Happy now?" she says with a sly smile.'
+						'"Not really. You should NOT be wearing panties, that would make me happy," you tell her.'
 						'"You wish! Only sluts like you walk around without panties," she shoots back, laughing with a glint in her eye before closing her legs and pulling down her skirt again.'
 					else
 						if katjaQW['slut'] < 30:
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_sitting1.jpg"></center>'
-							'"I''m not some slut that goes around flashing my panties. Which, by the way, I of course am wearing," Katja says in a firm voice, though she does not look like she''s actually angry.'
+							'"I''m not some slut that goes around flashing my panties to everyone! Panties which, by the way, I am wearing," she says with a firm, yet still affectionate, tone.'
 							'"Sorry I asked. But I do think that you could stand to loosen up a little," you reply.'
 						else
 							katjaQW['pantiesQWstage'] = 1
@@ -77,22 +79,23 @@ if $ARGS[0] = 'kitchen':
 							katjaQW['horny'] += rand(5,10)
 							katjaQW['slut'] += 4
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_sitting_showing_panties1.jpg"></center>'
-							'Katja looks around to see if there is anybody else around. "I don''t know. We really shouldn''t be doing such things..." she says.'
+							'Katja looks to see if anybody else is around. "I don''t know. We really shouldn''t be doing such things..." she says.'
 							'"Come on! I showed you mine, now it''s only fair that you do it, too," you reply.'
-							'She looks around one more time to make sure you are alone and then pulls up her skirt, spreads her legs, and shows her red panties.'
+							'She looks around one more time to make sure you are alone and then pulls up her skirt, spreads her legs, and shows off her red panties.'
 							'"See, I''m wearing panties. Happy now?" She smiles slyly before closing her legs and pulling her skirt down again.'
 						end
 					end
-					act 'leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
+					act 'Leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
 				end
 			end
 		end
 	elseif katjaQW['pantiesQWstage'] < 5 and katjaQW['take_of_panties_day'] ! daystart:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_sitting2.jpg"></center>'
-		'You find Katja sitting alone at the dinner table. "Hi '+iif( katjaQW['couple'] = 0, '<<pcs_nickname>>', 'my love')+' what are you doing here?" Katja asks when she sees you.'
-		'"I '+iif($ARGS[1] = 'from_room', 'came looking for you', 'I was just looking around')+', what are you doing?" you ask back. "I''m just waiting for my meal to finish cooking," she answers, pointing at the oven where some food is cooking.'
+		'You find Katja sitting alone at the dinner table. "Hi, '+iif( katjaQW['couple'] = 0, '<<pcs_nickname>>', 'my love')+'! What are you doing here?" she asks when she sees you.'
+		'"I '+iif($ARGS[1] = 'from_room', 'came looking for you', 'was just looking around')+'. What are you doing?" you ask back.'
+		'"I''m just waiting for my food to finish cooking," she answers, pointing at the oven.'
 		if pcs_traits['commando_lvl'] > 0 and $pantyworntype = 'none' and npc_sex['A14'] > 0 and katjaQW['no_panties_day'] ! daystart:
-			act 'Show her you are not wearing panties':
+			act 'Show her you''re not wearing panties':
 				*clr & cla
 				gs 'arousal', 'flash', 2
 				gs 'stat'
@@ -105,28 +108,29 @@ if $ARGS[0] = 'kitchen':
 					else
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga1_<<rand(1,6)>>.jpg"></center>'
 					end
-						'You look around to see if others are coming and then pull up your skirt to show Katja your bare pussy from behind.' 
+						'You look around to see if anyone is coming before pulling up your skirt and showing off your pussy from behind.'
 				else
 					'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
-					'You look around to see if others are coming and then pull down your pants to show Katja your bare pussy.' 
+					'You look around to see if anyone is coming before pulling down your pants and showing Katja your pussy.'
 				end
 				if katjaQW['slut'] < 100 and katjaQW['pantiesQWstage'] < 4:
-					'"Stop it <<$pcs_nickname>>, you should really put some panties on." Katja says, though she can''t seem to keep her eyes from staring at your pussy.'
-					'"I flash who I want to, and I don''t wear panties since it is much nicer not to wear them. Now show me if you wear panties or not," you respond as you cover your pussy again.'
+					'"Stop it, <<$pcs_nickname>>! You should really put some panties on," Katja says, though she can''t seem to keep her eyes from staring at your pussy.'
+					'"I flash who I want to, and I don''t wear panties since it''s much nicer not to. Now, show me if you wear panties or not," you respond as you cover your pussy again.'
 				else
-					'"<<$pcs_nickname>> you naughty girl, you should put some panties on!" Katja says not at all convincingly while her eyes devour your naked pussy.'
-					'"I don''t wear panties since it is much nicer not to wear them. Now show me if you wear panties or not," you respond as you cover your pussy again.'
+					'"<<$pcs_nickname>>, you naughty girl! You should put some panties on!" Katja says, not at all convincingly, while her eyes devour your exposed pussy.'
+					'"I don''t wear panties since it''s much nicer not to. Now, show me if you wear panties or not," you respond as you cover your pussy again.'
 				end
-				act 'Katja''s turn':	
+				act 'Katja''s turn':
 					if katjaQW['pantiesQWstage'] = 4:
 						gs 'arousal', 'erotic', -2
 						gs 'stat'
 						katjaQW['horny'] += rand(0,5)
 						katjaQW['slut'] += rand(0,1)
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_sitting_showing_panties2.jpg"></center>'
-						'Katja spreads her legs and hikes up her skirt showing you her white simple panties. "Why are you wearing panties again?" you ask.'
-						'"Because I''m not walking around without panties out in public. I''m a good girl, not a slut like some others," Katja says with a wink.'
-						act 'Have her take off her panties':
+						'Katja spreads her legs and hikes up her skirt, showing you her simple, white panties.'
+						'"Why are you wearing panties again?" you ask.'
+						'"Because I''m not walking around without panties in public. I''m a good girl, not a slut like some others," Katja says with a wink.'
+						act 'Get her to remove her panties':
 							*clr & cla						
 							gs 'arousal', 'erotic', 2
 							gs 'arousal', 'end'
@@ -135,20 +139,21 @@ if $ARGS[0] = 'kitchen':
 							katjaQW['slut'] += rand(0,1)
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_sitting_taking_of_panties.jpg"></center>'
 							if katjaQW['slut'] < 80:
-								'"Come oooon, Katja. Take those panties off! You''ve done it before," you plead. She looks around for a moment before sighing and saying, "Fine, you pervert."'
-								'She then gets up, turns her butt towards you, and slowly takes off her panties, pausing to look back at you just before her pussy is visible.'
-								'"Happy now?" she says when the panties are completely off.'
+								'"Come oooon, Katja," you plead. "Take those off! You''ve done it before!"'
+								'She looks around for a moment before sighing. "Fine, you pervert."'
+								'Then she gets up, turns her butt towards you, and slowly takes off her panties; pausing to look back at you just before her pussy is visible.'
+								'"Happy now?" she asks after she''s fully taken them off.'
 							else
-								if lazarQW['your_prize_panties_katja'] = 0: lazarQW['your_prize_panties_katja'] = 1
 								katjaQW['pantiesQWstage'] = 5
 								katjaQW['horny'] += rand(5,10)
 								katjaQW['slut'] += 4
-								'"I''m getting annoyed that I have to keep telling you to take off your panties. You have to learn that proper girls like us don''t wear panties to Uni," you say in a fake angry voice.'
-								'She looks around and says, sighing, "Fine, you pervert."'
-								'She then gets up, turns her butt towards you, and slowly takes off her panties, pausing to look back at you just before her pussy is visible.'
-								'Then, she hands you her panties. "Here '+iif(lazarQW['your_prize_panties_katja'] = 0, 'you can have them', 'another pair for your collection')+' since you insist that I have to be a slut, I don''t need them anymore."'								
+								'"I''m getting really annoyed that I have to keep telling you to take off your panties. You have to learn that proper girls like us don''t wear these to Uni," you say in a fake angry voice.'
+								'She looks around and sighs. "Fine, you pervert."'
+								'She gets up, turns her butt towards you, and slowly takes off her panties; pausing to look back at you just before her pussy is visible.'
+								'After, she hands you her panties. "Here, '+iif(lazarQW['your_prize_panties_katja'] = 0, 'you can have them', 'another pair for your collection')+' since you insist that I have to be a slut; I don''t need them anymore."'
+								if lazarQW['your_prize_panties_katja'] = 0: lazarQW['your_prize_panties_katja'] = 1
 							end
-							act 'leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
+							act 'Leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
 						end
 					else
 						gs 'arousal', 'erotic', -2
@@ -156,9 +161,11 @@ if $ARGS[0] = 'kitchen':
 						katjaQW['horny'] += rand(0,5)
 						katjaQW['slut'] += rand(0,1)
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_sitting_showing_panties2.jpg"></center>'
-						'Katja spreads her legs and hikes up her skirt, showing you her white simple panties.'
-						'"Happy now?" she says. "You know I won''t be happy until you take those panties off." you reply.'
-						'"You are relentless!" Katja says. "You know I''m not a quitter," you respond with a smirk.'
+						'Katja spreads her legs and hikes up her skirt, showing you her simple, white panties.'
+						'"Happy now?" she asks.'
+						'"You know I won''t be happy until you take those off," you reply.'
+						'"You are relentless!" Katja says.'
+						'"You know I''m not a quitter," you respond with a smirk.'
 						act 'See what Katja does':
 							*clr & cla
 							gs 'arousal', 'erotic', 2
@@ -166,7 +173,7 @@ if $ARGS[0] = 'kitchen':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_sitting_showing_panties2.jpg"></center>'
 							'She looks around and slowly stands up. "You really want me to follow your slutty example?" she asks.'
-							'"Yes, I do. It is so much nicer without panties, the breeze on your pussy is so liberating! You should really try it," you answer.'
+							'"Yes, I do. It''s so much nicer without panties, the breeze on your pussy is so liberating! You should really try it," you answer.'
 							act 'Katja finally relents':
 								*clr & cla						
 								gs 'arousal', 'erotic', 2
@@ -176,10 +183,10 @@ if $ARGS[0] = 'kitchen':
 								katjaQW['horny'] += rand(5,10)
 								katjaQW['slut'] += 4
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_sitting_taking_of_panties.jpg"></center>'
-								'She then gets up, turns her butt towards you, and slowly takes off her panties, pausing to look back at you just before her pussy is visible.'
-								'"Happy now?" she says when the panties are completely off.'
+								'She gets up, turns her butt towards you, and slowly takes off her panties, pausing to look back at you just before her pussy is visible.'
+								'"Happy now?" she says when they''re completely off.'
 								'"Yes! This is going to be so much fun. Think about how thrilling it will to be careful so you don''t give '+iif(katjaQW['boy_block'] = 1, 'other girls', 'boys')+' a peek of your pussy!" you enthusiastically chirp.'
-								'"I''m already regretting this..." Katja groans. But she does not look upset, nor does she make any move to put her panties back on.'
+								'"I''m already regretting this..." Katja groans. But she doesn''t look upset, nor does she make any move to put her panties back on.'
 								act 'leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
 							end
 						end
@@ -188,25 +195,27 @@ if $ARGS[0] = 'kitchen':
 			end
 		end
 	else
-		if week < 4 and (katjaQW['slut'] < 100 or hour < 18): 
+		if week < 4 and (katjaQW['slut'] < 100 or hour < 18):
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_standing1.jpg"></center>'
-			'You find Katja standing at the kitchen table. "Hi '+iif( katjaQW['couple'] = 0, '<<pcs_nickname>>', 'my love')+' what are you doing here?" Katja ask when she sees you.'
-			'"I '+iif($ARGS[1] = 'from_room', 'came looking for you', 'I was just looking around')+', what are you doing?" you ask back. "I''m staring to cook my dinner," she answers.'
+			'You find Katja standing at the kitchen table. "Hi, '+iif( katjaQW['couple'] = 0, '<<pcs_nickname>>', 'my love')+'! What are you doing here?" Katja asks when she sees you.'
+			'"I '+iif($ARGS[1] = 'from_room', 'came looking for you', 'was just looking around')+'. What are you doing?" you ask back.'
+			'"I''m staring to cook my dinner," she answers.'
 		else
 			katjaQW['drinks'] += 2
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_standing_with_drink.jpg"></center>'
-			'You find Katja standing at the kitchen table drinking a glass of white wine. "Hi '+iif( katjaQW['couple'] = 0, '<<pcs_nickname>>', 'my love')+' what are you doing here?" Katja ask when she sees you.'
-			'"I '+iif($ARGS[1] = 'from_room', 'came looking for you', 'I was just looking around')+', what are you doing?" you ask back. "I''m just having a glass of wine before I start to cook my dinner," she answers.'
+			'You find Katja standing at the kitchen table drinking a glass of white wine. "Hi, '+iif( katjaQW['couple'] = 0, '<<pcs_nickname>>', 'my love')+'. What are you doing here?" Katja asks when she sees you.'
+			'"I '+iif($ARGS[1] = 'from_room', 'came looking for you', 'was just looking around')+'. What are you doing?" you ask back.'
+			'"I''m just having a glass of wine before I start to cook my dinner," she answers.'
 			if katjaQW['QWstage'] > 1:
-				'"Why don''t you have a glass with me?" she asks and looks for another glass.'
+				'"Why don''t you have a glass with me?" she asks before looking for another glass.'
 				act 'Drink a glass with Katja':
 					*clr & cla
 					gs 'drugs', 'alcohol', 'wine', 1				
 					minut += 5
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_standing_with_drink.jpg"></center>'
-					'"I would love a glass of wine" you say, and she purrs one for you, and you spend some mintues drinking it while she continues her preparations for dinner.'
+					'"I would love a glass of wine," you say, and she pours one for you. You spend some minutes drinking it while she continues her preparations for dinner.'
 					if pcs_traits['commando_lvl'] > 0 and $pantyworntype = 'none' and npc_sex['A14'] > 0 and katjaQW['no_panties_day'] ! daystart:
-						act 'Show her you are not wearing panties':
+						act 'Show her you''re not wearing panties':
 							*clr & cla
 							gs 'arousal', 'flash', 2
 							gs 'stat'
@@ -217,15 +226,15 @@ if $ARGS[0] = 'kitchen':
 								else
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga1_<<rand(1,6)>>.jpg"></center>'
 								end
-								'You look around to see if others are coming and then pull up your skirt to show Katja your bare pussy from behind.' 
+								'You look around to see if anyone is coming before pulling up your skirt to show Katja your pussy from behind.' 
 							else
 								'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
-								'You look around to see if others are coming and then pull down your pants to show Katja your bare pussy.' 
+								'You look around to see if anyone is coming before pulling down your pants to show Katja your pussy.' 
 							end
 							act 'Katja''s turn': gt 'katja_pantyquest', 'kitchen_show_pussy'
 						end
 					elseif katjaQW['take_of_panties_day'] = daystart:
-						act 'Try to see if she is still not wearing panties':
+						act 'Try to see if she still isn''t wearing panties':
 							*clr & cla
 							minut += 2
 							gs 'arousal', 'erotic', -5
@@ -234,19 +243,19 @@ if $ARGS[0] = 'kitchen':
 							katjaQW['horny'] += rand(0,10)
 							katjaQW['slut'] += rand(0,1)
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_standing_showing_pussy2.jpg"></center>'
-							'You remember that you got Katja to take off her panties earlier today, and wonder if she still is not wearing them. After all, she has changed her clothes since then.'
+							'You recall that you got Katja to take off her panties earlier today and wonder if she''s still not wearing them. After all, she has changed her clothes since then.'
 							'So you try to discreetly bend down to see up her skirt when she has her back to you.'
-							'But she notices you. "No, I did not put on my panties, just as you asked me. This is what you want to see, isn''t it, you pervert?" she says mockingly as she pulls up her skirt to show you her naked behind.'
-							'After a moment, she lets her skirt fall down and says, "That is enough for voyeurs like you." Then, she continues with her cooking.'
-							act 'Say thanks for the wine and leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
+							'But she notices you. "No, I didn''t put my panties back on, just like you asked. This is what you want to see, isn''t it, you pervert?" she asks mockingly while she pulls up her skirt, showing you her naked behind.'
+							'After a moment, she lets her skirt fall down. "That''s enough for voyeurs like you," she adds before continuing with her cooking.'
+							act 'Thank her for the wine and leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
 						end
 					end
-					act 'Say thanks for the wine and leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
+					act 'Thank her for the wine and leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
 				end
 			end
 		end
 		if pcs_traits['commando_lvl'] > 0 and $pantyworntype = 'none' and npc_sex['A14'] > 0 and katjaQW['no_panties_day'] ! daystart:
-			act 'Show her you are not wearing panties':
+			act 'Show her you''re not wearing panties':
 				*clr & cla
 				gs 'arousal', 'flash', 2
 				gs 'stat'
@@ -257,15 +266,15 @@ if $ARGS[0] = 'kitchen':
 					else
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga1_<<rand(1,6)>>.jpg"></center>'
 					end
-					'You look around to see if others are coming and then pull up your skirt to show Katja your bare pussy from behind.' 
+					'You look around to see if anyone is coming before pulling up your skirt and showing Katja your pussy from behind.' 
 				else
 					'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
-					'You look around to see if others are coming and then pull down your pants to show Katja your bare pussy.' 
+					'You look around to see if anyone is coming before pulling down your pants and showing Katja your bare pussy.' 
 				end
 				act 'Katja''s turn': gt 'katja_pantyquest', 'kitchen_show_pussy'
 			end
 		elseif katjaQW['take_of_panties_day'] = daystart:
-			act 'Try to see if she is still not wearing panties':
+			act 'Try to see if she still isn''t wearing panties':
 				*clr & cla
 				minut += 2
 				gs 'arousal', 'erotic', -2
@@ -274,16 +283,16 @@ if $ARGS[0] = 'kitchen':
 				katjaQW['horny'] += rand(0,10)
 				katjaQW['slut'] += rand(0,1)
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_standing_showing_pussy2.jpg"></center>'
-				'You remember that you got Katja to take off her panties earlier today, and wonder if she still is not wearing them. After all, she has changed her clothes since then.'
+				'You recall that you got Katja to take off her panties earlier today and wonder if she''s still not wearing them. After all, she has changed her clothes since then.'
 				'So you try to discreetly bend down to see up her skirt when she has her back to you.'
-				'But she notices you. "No, I did not put on my panties, just as you asked. This is what you want to see, isn''t it, you pervert," she says mockingly as she pulls up her skirt to show you her naked behind.'
-				'After a moment, she lets her skirt fall down and says, "That''s enough for voyeurs like you." Then, she continues with her cooking.'
-				act 'leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
+				'But she notices you. "No, I didn''t put my panties back on, just like you asked. This is what you want to see, isn''t it, you pervert?" she asks mockingly while she pulls up her skirt, showing you her naked behind.'
+				'After a moment, she lets her skirt fall down. "That''s enough for voyeurs like you," she adds before continuing with her cooking.'
+				act 'Leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
 			end
 		end
-		act 'leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
+		act 'Leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
 	end
-	act 'leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
+	act 'Leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
 end
 
 if $ARGS[0] = 'kitchen_show_pussy':
@@ -294,9 +303,11 @@ if $ARGS[0] = 'kitchen_show_pussy':
 	katjaQW['horny'] += rand(5,15)
 	katjaQW['slut'] += rand(0,1)
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_standing_showing_pussy1.jpg"></center>'
-	'"Your turn. Katja, show me that you are not wearing panties," you demand. "Really <<$pcs_nickname>>! This again? It''s like you don''t trust me," Katja says, rolling her eyes.'
-	'But she does hike up her skirt and shows you her smoothly shaved pussy, not hidden by any panties.'
-	'"I do trust you, it''s just that--" you start saying but are promptly cut off. "You are a pervert that gets off on ogling innocent girls'' naked private parts," she says with a naughty glint in her eyes.'
+	'"Your turn, Katja. Show me that you''re not wearing panties," you demand.'
+	'"Really, <<$pcs_nickname>>! This again? It''s like you don''t trust me," Katja says, rolling her eyes.'
+	'Despite her objection, she hikes up her skirt and shows you her smoothly shaved pussy, not hidden by any panties.'
+	'"I do trust you, it''s just that-" you start saying but are promptly cut off.'
+	'"You are a pervert that gets off on ogling innocent girls'' naked private parts," she says with a naughty glint in her eyes.'
 	'She then lets her skirt fall and turns back to her cooking.'
 	act 'leave': gt 'uni_dorm', 'dorm_kitchen', 'second_floor'
 end
@@ -307,10 +318,11 @@ if $ARGS[0] = 'uni_hallway':
 	minuts += 5
 	gs 'npc_relationship', 'modify', 'A14', 'like', 'hallway', 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway.jpg"></center>'
-	'You walk up to Katja, who is sitting comfortably on a chair. As you approach, she looks to you and smiles.'
-	'"What are you doing Katja?" you ask. "Not much, just relaxing a little before moving on," she answers.'
+	'You walk up to the redhead, who is sitting comfortably on a chair. She notices you and smiles.'
+	'"What are you doing, Katja?" you ask.'
+	'"Not much, just relaxing a little before moving on," she answers.'
 	if pcs_traits['commando_lvl'] > 0 and $pantyworntype = 'none' and npc_sex['A14'] > 0 and katjaQW['no_panties_day'] ! daystart:
-		act 'Show her you are not wearing panties':
+		act 'Show her you''re not wearing panties':
 			*clr & cla
 			gs 'arousal', 'flash', 2
 			gs 'stat'
@@ -323,25 +335,25 @@ if $ARGS[0] = 'uni_hallway':
 				else
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga1_<<rand(1,6)>>.jpg"></center>'
 				end
-					'You look around to see if others are coming, then pull up your skirt to show Katja your bare pussy from behind.' 
+					'You look around to see if anyone is coming, before pulling up your skirt to show Katja your pussy from behind.' 
 			else
 				'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
-				'You look around to see if others are coming and then pull down your pants to show Katja your bare pussy.' 
+				'You look around to see if anyone is coming before pulling down your pants to show Katja your pussy.' 
 			end
 			if katjaQW['slut'] < 30 and katjaQW['pantiesQWstage'] = 0:
-				'"<<$pcs_nickname>>! you can''t just go around flashing your pus... You aren''t wearing panties. What are you doing, put some panties on!" Katja says, very shocked.'
-				'"I flash who I want to, and I don''t wear panties since it is much nicer not to wear them. Now show me if you wear panties or not," you demand as you cover your pussy again.'
+				'"<<$pcs_nickname>>! You can''t just go around flashing your pu... You aren''t wearing panties! What are you doing?! Put some on!" Katja exclaims in shock.'
+				'"I flash who I want to, and I don''t wear panties since it''s much nicer not to. Now show me if you''re wearing panties or not," you respond as you cover your pussy again.'
 			elseif katjaQW['slut'] < 50 and katjaQW['pantiesQWstage'] < 2:
-				'"<<$pcs_nickname>>! you can''t just go around flashing your naked pussy. Put some panties on!" Katja says, not really angry.'
-				'"I flash who I want to, and I don''t wear panties since it is much nicer not to wear them. Now show me if you wear panties or not," you demand as you cover your pussy again.'
+				'"<<$pcs_nickname>>! You can''t just go around flashing your pussy. Put some panties on!" Katja says, though she''s clearly not really angry.'
+				'"I flash who I want to, and I don''t wear panties since it''s much nicer not to. Now, show me if you''re wearing panties or not," you respond as you cover your pussy again.'
 			elseif KatjaQW['slut'] < 100 and katjaQW['pantiesQWstage'] < 4:
-				'"Stop it <<$pcs_nickname>>, you should really put some panties on!" Katja says, though she can''t seem to keep her eyes from staring at your pussy.'
-				'"I flash who I want to, and I don''t wear panties since it is much nicer not to wear them. Now show me if you wear panties or not," you demand as you cover your pussy again.'
+				'"Stop it, <<$pcs_nickname>>! You should really put some panties on," Katja says, but she can''t seem to keep her eyes from staring at your pussy.'
+				'"I flash who I want to, and I don''t wear panties since it''s much nicer not to. Now, show me if you''re wearing panties or not," you respond to her as you cover your pussy again.'
 			elseif katjaQW['pantiesQWstage'] >= 5:
-				'"Very nice <<$pcs_nickname>>. '+iif( pcs_pubes > 3 , 'But you really need to shave that bush off', 'Perfectly smooth, how a pussy should be')+'" Katja says as her eyes devour your naked pussy.'
+				'"Very nice, <<$pcs_nickname>>. '+iif( pcs_pubes > 3 , 'But you really need to shave that bush off', 'Perfectly smooth, how a pussy should be')+'," Katja says as her eyes devour your exposed pussy.'
 			else
-				'"<<$pcs_nickname>> you naughty girl, you should put some panties on!" Katja says not at all convincingly while her eyes devour your naked pussy.'
-				'"I don''t wear panties since it is much nicer not to wear them. Now show me if you wear panties or not," you demand as you cover your pussy again.'
+				'"<<$pcs_nickname>>, you naughty girl! You should put some panties on," Katja says, not at all convincingly, while her eyes devour your exposed pussy.'
+				'"I don''t wear panties since it''s much nicer not to. Now, show me if you''re wearing panties or not," you respond to her as you cover your pussy again.'
 			end
 			act 'Katja''s turn':
 				*clr & cla
@@ -355,17 +367,18 @@ if $ARGS[0] = 'uni_hallway':
 						katjaQW['slut'] += rand(0,1)
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway_naked_pussy.jpg"></center>'
 						'Katja just puts her arms behind her head and spreads her legs without any hesitation, giving you a good look at her smoothly shaven pussy.'
-						'"See? It''s perfectly smooth '+iif( pcs_pubes > 3, 'as yours should also be', 'like yours')+', and not hidden by any unnecessary layers of clothing," Katja says with a wink before closing her legs again.'
+						'"See? It''s perfectly smooth, '+iif( pcs_pubes > 3, 'like yours should be as well', 'like yours')+', and not hidden by any unnecessary layers of clothing," Katja says with a wink before closing her legs again.'
 						gs 'uni_lessons', 'schedule'
-						act 'say goodbye and move on': gt 'uni_grounds', 'main'
+						act 'Say goodbye and move on': gt 'uni_grounds', 'main'
 					elseif katjaQW['pantiesQWstage'] = 4:
 						gs 'arousal', 'erotic', -2
 						gs 'stat'
 						katjaQW['horny'] += rand(0,5)
 						katjaQW['slut'] += rand(0,1)
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway_standing_panties.jpg"></center>'
-						'Katja stands up and moves her skirt away so that you can see her elegant panties. "Why are you wearing panties again?" you ask.'
-						'"Because you should not go to class without panties. I''m a good girl, not a slut like some others," Katja says with a wink.'
+						'Katja stands up and moves her skirt away so that you can see her elegant panties.'
+						'"Why are you wearing those again?" you ask.'
+						'"Because you shouldn''t go to class without panties. I''m a good girl, not a slut like some others," Katja says with a wink.'
 						act 'Have her take off her panties':
 							*clr & cla						
 							gs 'arousal', 'erotic', 2
@@ -375,19 +388,21 @@ if $ARGS[0] = 'uni_hallway':
 							katjaQW['slut'] += rand(0,1)
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway_taking_off_panties.jpg"></center>'
 							if katjaQW['slut'] < 80:
-								'"Come ooooon, Katja. Take those panties off! You done it before," you whine. She looks around, then says, sighing, "Fine, you pervert."'
-								'She then quickly reachs up under her skirt and pulls down her panties. Then, she puts them in her purse. "Happy now?"'
+								'"Come ooooon, Katja," you plead. "Take those off! You done it before!"'
+								'She looks around before sighing, "Fine, you pervert."'
+								'Then she quickly reaches up under her skirt, pulls down her panties and puts them in her purse. "Happy now?"'
 							else
-								if lazarQW['your_prize_panties_katja'] = 0: lazarQW['your_prize_panties_katja'] = 1
 								katjaQW['pantiesQWstage'] = 5
 								katjaQW['horny'] += rand(5,10)
 								katjaQW['slut'] += 4
-								'"I''m getting annoyed that I have to keep telling you to take off your panties. You have to learn that proper girls like us don''t wear panties to Uni," you say in a fake angry voice.'
-								'She looks around, sighs, and says, "Fine you pervert." Then, she quickly reachs up under her skirt and pulls down her panties.'
-								'She then hands you her panties and says, "Here '+iif(lazarQW['your_prize_panties_katja'] = 0, 'you can have them', 'another pair for your collection')+' since you insist that I have to be a slut. I don''t need them anymore."'								
+								'"I''m getting really annoyed that I have to keep telling you to take off your panties. You have to learn that proper girls like us don''t wear these to Uni," you say in a fake angry voice.'
+								'She looks around and sighs. "Fine, you pervert."'
+								'She quick reaches up under her skirt and pulls down her panties.'
+								'After, she hands you her panties. "Here, '+iif(lazarQW['your_prize_panties_katja'] = 0, 'you can have them', 'another pair for your collection')+' since you insist that I have to be a slut; I don''t need them anymore."'
+								if lazarQW['your_prize_panties_katja'] = 0: lazarQW['your_prize_panties_katja'] = 1
 							end
 							gs 'uni_lessons', 'schedule'
-							act 'say goodbye and move on': gt 'uni_grounds', 'main'
+							act 'Say goodbye and move on': gt 'uni_grounds', 'main'
 						end
 					else
 						gs 'arousal', 'erotic', -2
@@ -395,12 +410,15 @@ if $ARGS[0] = 'uni_hallway':
 						katjaQW['horny'] += rand(0,5)
 						katjaQW['slut'] += rand(0,1)
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway_stitting_panties.jpg"></center>'
-						'Katja looks around and when she''s sure that nobody else can see you two, she puts down the leg she has on the chair so her legs are spread, then hikes up her skirt so you can see her elegant panties.'
+						'She looks around and when she''s sure that nobody else can see, she spreads her legs and lifts her skirt so that you can see her elegant panties.'
 						if katjaQW['pantiesQWstage'] = 3:
-							'"Happy now?" she asks. "You know I won''t be happy before you take those panties off!" you reply.'
-							'"I can''t do that. Not here." Katja says. "Well, at least give me a liiiiiittle more," you plead, giving her your best puppy-eyes.'
+							'"Happy now?" she asks.'
+							'"You know I won''t be happy until you take those panties off!" you reply.'
+							'"I can''t do that. Not here," Katja says.'
+							'"Well, at least show me a liiiiiittle more," you plead, giving her your best puppy-eyes.'
 							if katjaQW['slut'] >= 65:
-								'"You are relentless!" Katja says. "You know I''m not a quitter," you chirp excitedly.'
+								'"You are relentless!" Katja says.'
+								'"You know I''m not a quitter," you chirp excitedly.'
 								act 'See what Katja does':
 									*clr & cla
 									gs 'arousal', 'erotic', 2
@@ -408,7 +426,7 @@ if $ARGS[0] = 'uni_hallway':
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway_standing_panties.jpg"></center>'
 									'She looks around and stands up, still holding her skirt so you can see her panties. "You really want me to follow your slutty example?" she asks.'
-									'"Yes, I do. It is so much nicer without panties, the breeze on your pussy is so liberating! You should really try it!" you answer.'
+									'"Yes, I do. It''s so much nicer without panties; the breeze on your pussy is so liberating! You should really try it!" you answer.'
 									act 'Katja finally relents':
 										*clr & cla						
 										gs 'arousal', 'erotic', 2
@@ -418,15 +436,15 @@ if $ARGS[0] = 'uni_hallway':
 										katjaQW['horny'] += rand(5,10)
 										katjaQW['slut'] += 4
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway_taking_off_panties.jpg"></center>'
-										'She looks around once more, then quickly reaches up under her skirt and pulls down her panties. Then, she puts them in her purse. "Happy now?"'
-										'"Yes! This is going to be so much fun. Think about how thrilling it will be being careful so you don''t give '+iif(katjaQW['boy_block'] = 1, 'other girls', 'boys')+' a peek of your pussy!" you say enthusiastically.'
-										'"I''m already regretting this..." Katja groans. But she does not look upset, nor does she make any move to put her panties back on.'
+										'She takes another look around, then quickly reaches up under her skirt and pulls down her panties. She stashes them in her purse. "Happy now?"'
+										'"Yes! This is going to be so much fun! Think about how thrilling it will be, knowing if you''re not careful that you might give '+iif(katjaQW['boy_block'] = 1, 'other girls', 'boys')+' a peek at your pussy!" you say enthusiastically.'
+										'"I''m already regretting this..." Katja groans. But she doesn''t look upset, nor does she make any move to put her panties back on.'
 										gs 'uni_lessons', 'schedule'
-										act 'say goodbye and move on': gt 'uni_grounds', 'main'
+										act 'Say goodbye and move on': gt 'uni_grounds', 'main'
 									end
 								end
 							else
-								'"You know I can''t do that. Not here. But I can give you a little sneak peek again." Katja says.'	
+								'"You know I can''t do that. Not here. But I can give you a little sneak peek again," Katja says.'	
 								act 'See what Katja does':
 									*clr & cla
 									gs 'arousal', 'erotic', 2
@@ -435,16 +453,19 @@ if $ARGS[0] = 'uni_hallway':
 									katjaQW['horny'] += rand(0,5)
 									katjaQW['slut'] += rand(0,1)
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway_showing_pussy.jpg"></center>'
-									'She looks around, then puts her left hand down to pull her panties slightly to the side, allowing you a clear view of her smoothly shaved pussy.'
-									'"Very nice!" you exclaim. "Ah, the sacrifices I have to make so a pervert like you is happy," she says jokingly.'
-									'She then puts them back on completely and lets her skirt fall back into place.'
+									'She looks around again before pulling her panties slightly to the side, giving you a clear view of her smoothly shaved pussy.'
+									'"Very nice!" you exclaim.'
+									'"Ah, the sacrifices I have to make so a pervert like you is happy," she says jokingly.'
+									'She puts them back on completely and lets her skirt fall back into place.'
 									gs 'uni_lessons', 'schedule'
-									act 'say goodbye and move on': gt 'uni_grounds', 'main'
+									act 'Say goodbye and move on': gt 'uni_grounds', 'main'
 								end
 							end
 						elseif katjaQW['pantiesQWstage'] = 2 and katjaQW['slut'] >= 50:
-							'"Happy now?" she says, but she doesn''t look nearly as nervous about someone suddenly turning up as she used to...so you take the chance to push her further.'
-							'"Not really. I would be happy if you took those panties off completely," you reply. "I can''t do that. Not here." Katja says. "Well at least give me a liiiiiittle more," you plead, giving her your best puppy-eyes.'
+							'"Happy now?" she says, but she doesn''t look nearly as nervous about someone suddenly turning up as she used to, so you take the chance to push her further.'
+							'"Not really. I would be happy if you took those panties off completely," you reply.'
+							'"I can''t do that. Not here," Katja says.'
+							'"Well, at least show me a liiiiiittle more," you plead, giving her your best puppy-eyes.'
 							act 'See what Katja does':
 								*clr & cla						
 								gs 'arousal', 'erotic', 2
@@ -454,21 +475,22 @@ if $ARGS[0] = 'uni_hallway':
 								katjaQW['horny'] += rand(5,10)
 								katjaQW['slut'] += 4
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway_showing_pussy.jpg"></center>'
-								'She looks around very carefully, then puts her left hand down and pulls her panties slightly to the side, allowing you a clear view of her smoothly shaved pussy.'
-								'"Very nice!" you exclaim. "Stop acting like such a huge pervert. It''s not like you haven''t seen it before!" she says jokingly. She then puts them back on completely and let her skirt fall back into place.'
+								'She looks around very carefully, then pulls her panties slightly to the side, giving you a clear view of her smoothly shaved pussy.'
+								'"Very nice!" you exclaim.'
+								'"Stop acting like such a huge pervert. It''s not like you haven''t seen it before!" she says jokingly. She then puts them back on completely and lets her skirt fall back into place.'
 								gs 'uni_lessons', 'schedule'
-								act 'say goodbye and move on': gt 'uni_grounds', 'main'
+								act 'Say goodbye and move on': gt 'uni_grounds', 'main'
 							end
 						else
-							'"Happy now?" she says looking, around almost paranoid. You probably can''t push her more for now, so you just nod and Katja gives you a big smile as she closes her legs and let her skirt flutter back down.'
+							'"Happy now?" she says looking, around almost paranoid. You probably can''t push her more for now, so you just nod and Katja gives you a big smile as she closes her legs and lets her skirt flutter back down.'
 							gs 'uni_lessons', 'schedule'
-							act 'say goodbye and move on': gt 'uni_grounds', 'main'
+							act 'Say goodbye and move on': gt 'uni_grounds', 'main'
 						end
 					end
 				else
 					if katjaQW['slut'] < 30:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway.jpg"></center>'
-						'"I''m not some slut that goes around flashing my panties. Which, by the way, I am wearing, of course," Katja says in a firm voice, but she does not look to be really angry.'
+						'"I''m not some slut that goes around flashing my panties to everyone! Panties which, by the way, I am wearing," she says with a firm, yet still affectionate, tone.'
 						'"Sorry I asked. But I do think that you could stand to loosen up a little..." you reply.'
 					else
 						katjaQW['pantiesQWstage'] = 1
@@ -479,18 +501,18 @@ if $ARGS[0] = 'uni_hallway':
 						katjaQW['slut'] += 4
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway_stitting_panties.jpg"></center>'
 						'Katja looks around and when she''s sure that nobody else can see you two, she says, "I don''t know. We really shouldn''t be doing such things..."'
-						'"Come ooooon, I showed you mine.  It''s only fair that you do it, too," you reply.'
+						'"Come ooooon, I showed you mine. It''s only fair that you do it, too," you reply.'
 						'She looks around one more time to make sure you are alone, then puts down the leg she has on the chair so her legs are spread. Then, she hikes up her skirt so you can see her elegant panties.'
 						'"See I''m wearing panties, happy now?" she asks with a sly smile before closing her legs and pulling down her skirt again.'
 					end
 					gs 'uni_lessons', 'schedule'
-					act 'say goodbye and move on': gt 'uni_grounds', 'main'
+					act 'Say goodbye and move on': gt 'uni_grounds', 'main'
 				end
 			end
 		end
 	end
 	gs 'uni_lessons', 'schedule'
-	act 'say goodbye and move on': gt 'uni_grounds', 'main'
+	act 'Say goodbye and move on': gt 'uni_grounds', 'main'
 end
 
 if $ARGS[0] = 'uni_exit':
@@ -498,10 +520,11 @@ if $ARGS[0] = 'uni_exit':
 	minuts += 5
 	gs 'npc_relationship', 'modify', 'A14', 'like', 'hallway', 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_exit.jpg"></center>'
-	'You walk up to Katja who is standing next to one of the side doors to the outside. As you approach, she looks to you and smiles.'
-	'"What are you doing, Katja?" you ask. "Not much, just thinking about what to do next," she answers.'
+	'You walk up to Katja, who is standing next to one of the side doors to the outside. As you approach, she looks to you and smiles.'
+	'"What are you doing, Katja?" you ask.'
+	'"Not much, just thinking about what to do next," she answers.'
 	if pcs_traits['commando_lvl'] > 0 and $pantyworntype = 'none' and npc_sex['A14'] > 0 and katjaQW['no_panties_day'] ! daystart:
-		act 'Show her you are not wearing panties':
+		act 'Show her you''re not wearing panties':
 			*clr & cla
 			gs 'arousal', 'flash', 2
 			gs 'stat'
@@ -514,20 +537,20 @@ if $ARGS[0] = 'uni_exit':
 				else
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga1_<<rand(1,6)>>.jpg"></center>'
 				end
-					'You look around to see if others are coming and then pull up your skirt to show Katja your bare pussy from behind.' 
+					'You look around to see if anyone is coming before pulling up your skirt to show Katja your pussy from behind.' 
 			else
 				'<center><img <<$set_imgh>> src="images/pc/activitirs/flashing/pants/inside/pussy/hairy1>>.jpg"></center>'
-				'You look around to see if others are coming and then pull down your pants to show Katja your bare pussy.' 
+				'You look around to see if anyone is coming before pulling down your pants to show Katja your pussy.' 
 			end
 			if katjaQW['slut'] < 50 and katjaQW['pantiesQWstage'] = 1:
-				'"<<$pcs_nickname>>! you can''t just go around flashing your naked pussy. Put some panties on!" Katja scolds, not really angry.'
-				'"I flash who I want to, and I don''t wear panties since it is much nicer not to wear them. Now show me if you wear panties or not," you demand as you cover your pussy again.'
+				'"<<$pcs_nickname>>! You can''t just go around flashing your pussy; put some panties on!" Katja scolds, not really angry.'
+				'"I flash who I want to, and I don''t wear panties since it''s much nicer not to. Now, show me if you''re wearing panties or not," you demand as you cover your pussy again.'
 			elseif KatjaQW['slut'] < 100:
-				'"Stop it <<$pcs_nickname>>, you should really put some panties on," Katja says, though she can''t seem to keep her eyes from staring at your pussy.'
-				'"I flash who I want to, and I don''t wear panties since it is much nicer not to wear them. Now show me if you wear panties or not," you demand as you cover your pussy again.'
+				'"Stop it, <<$pcs_nickname>>! You should really put some panties on," Katja says, though she can''t seem to keep her eyes from staring at your pussy.'
+				'"I flash who I want to, and I don''t wear panties since it''s much nicer not to. Now, show me if you''re wearing panties or not," you demand as you cover your pussy again.'
 			else
-				'"<<$pcs_nickname>> you naughty girl, you should put some panties on!" Katja says not at all convincingly while her eyes devour your naked pussy.'
-				'"I don''t wear panties since it is much nicer not to wear them. Now show me if you wear panties or not," you demand as you cover your pussy again.'
+				'"<<$pcs_nickname>>, you naughty girl! You should put some panties on!" Katja says not at all convincingly while her eyes devour your exposed pussy.'
+				'"I don''t wear panties since it''s much nicer not to. Now show me if you''re wearing panties or not," you demand as you cover your pussy again.'
 			end
 			act 'Katja''s turn':
 				*clr & cla
@@ -537,7 +560,8 @@ if $ARGS[0] = 'uni_exit':
 				katjaQW['slut'] += rand(0,1)
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_exit_showing_panties.jpg"></center>'
 				'Katja looks around to see if anybody can see the both of you. When she is sure that nobody can, she turns around, pulls up her skirt a little, and bends over to show you her panty clad pussy from behind.'
-				'"See? I''m wearing panties like any good girl should," she says in a mocking tone. "You are boring. There is no fun in being such a good girl," you says as she turns around towards you.'
+				'"See? I''m wearing panties, like any good girl should," she says in a mocking tone.'
+				'"You are boring. There''s no fun in being such a good girl," you say as she turns around towards you.'
 				act 'See how she reacts':
 					*clr & cla
 					gs 'arousal', 'erotic', 2
@@ -552,29 +576,243 @@ if $ARGS[0] = 'uni_exit':
 						katjaQW['slut'] += rand(0,1)
 					end
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_exit_showing_panties.jpg"></center>'
-					'"Well. I''m not a completely good girl. I''m not wearing a bra," Katja says. "Let me see!" you whisper eagerly.'
-					'Katja looks around once more, and when she sees that you are alone, she unbuttons her shirt and pulls it open to give you a look of her firm C-cup breasts, nipples stiffening in the air.'
-					'"Well, that is enough for you! Otherwise, you''ll start drooling on the floor," she says as she closes and buttons up her shirt.'
+					'"Well, I''m not a completely good girl. I''m not wearing a bra," Katja says.'
+					'"Let me see!" you whisper eagerly.'
+					'Katja looks around once more before unbuttoning her shirt and pulling it open to give you a look of her firm C-cup breasts. You notice her nipples stiffening in the air.'
+					'"Well, that''s enough for you! Otherwise, you''ll start drooling on the floor," she says and buttons up her shirt.'
 					gs 'uni_lessons', 'schedule'
-					act 'say goodbye and move on': gt 'uni_grounds', 'main'
+					act 'Say goodbye and move on': gt 'uni_grounds', 'main'
 				end
 			end
 		end
 	end
 	gs 'uni_lessons', 'schedule'
-	act 'say goodbye and move on': gt 'uni_grounds', 'main'
+	act 'Say goodbye and move on': gt 'uni_grounds', 'main'
 end
 
 if $ARGS[0] = 'uni':
 	if katjaQW['uni_hallway_day'] ! daystart and katjaQW['QWstage'] > 0 and katjaQW['know_katja_uni'] = 1:
 		*nl
 		if (katjaQW['pantiesQWstage'] = 2 and katjaQW['slut'] < 50) or (katjaQW['pantiesQWstage'] = 1 and katjaQW['slut'] >= 40):
-			'You see<a href="exec:gt ''katja_pantyquest'', ''uni_exit''">Katja</a> standing next to one of the doors to the outside.'
+			'You see <a href="exec:gt ''katja_pantyquest'', ''uni_exit''">Katja</a> standing next to one of the doors to the outside.'
+		else
+			'You see <a href="exec:gt ''katja_pantyquest'', ''uni_hallway''">Katja</a> sitting on a chair in a hallway.'
+		end
+	end
+end
+
+if $ARGS[0] = 'coffee_hole':
+	gs 'arousal', 'flash', 2
+	gs 'stat'
+	katjaQW['horny'] += rand(5,10)
+	katjaQW['slut'] += 1
+	katjaQW['no_panties_day'] = daystart
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/coffee_hole_player_flashing.jpg"></center>'
+	'You look around to check if anyone is watching you and Katja before spreading your legs so that your short skirt will give Katja a full view of your pussy.'
+	'"Like what you see?" you say to Katja with a sly smile.'
+	if katjaQW['slut'] < 30 and katjaQW['pantiesQWstage'] = 0:
+		'"<<$pcs_nickname>>! You can''t just go around flashing your pu... You aren''t wearing panties! What are you doing, put some panties on!" Katja says, very shocked.'
+		'"I flash who I want to, and I don''t wear panties since it''s much nicer not to. Now, show me if you wear panties or not," you demand as you close your legs, covering your pussy again.'
+	elseif katjaQW['slut'] < 50 and katjaQW['pantiesQWstage'] < 2:
+		'"<<$pcs_nickname>>! You can''t just go around flashing your pussy. Put some panties on!" Katja says, not really angry.'
+		'"I flash who I want to, and I don''t wear panties since it''s much nicer not to. Now, show me if you wear panties or not," you demand as you close your legs, covering your pussy again.'
+	elseif KatjaQW['slut'] < 100 and katjaQW['pantiesQWstage'] < 4:
+		'"Stop it, <<$pcs_nickname>>! You should really put some panties on!" Katja says, though she can''t seem to keep her eyes from staring at your pussy.'
+		'"I flash who I want to, and I don''t wear panties since it''s much nicer not to. Now, show me if you wear panties or not," you demand as you close your legs, covering your pussy again.'
+	elseif katjaQW['pantiesQWstage'] >= 5:
+		'"Very nice, <<$pcs_nickname>>. '+iif( pcs_pubes > 3 , 'But you really need to shave that bush off', 'Perfectly smooth, how a pussy should be')+'," Katja says as her eyes devour your exposed pussy.'
+	else
+		'"<<$pcs_nickname>>, you naughty girl! You should put some panties on!" Katja says not at all convincingly while her eyes devour your exposed pussy.'
+		'"I don''t wear panties since it''s much nicer not to wear them. Now, show me if you wear panties or not," you demand as you close your legs, covering your pussy again.'
+	end
+	act 'Katja''s turn':
+		*clr & cla
+		minut += 2
+		if katjaQW['pantiesQWstage'] > 0:
+			if katjaQW['pantiesQWstage'] >= 5:
+				gs 'arousal', 'erotic', -5
+				gs 'arousal', 'end'
+				gs 'stat'
+				katjaQW['horny'] += rand(5,10)
+				katjaQW['slut'] += rand(0,1)
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/coffee_hole_naked_pussy.jpg"></center>'
+				'She looks around to check if anyone else is looking your way before she gets up from her chair and bends over to hike up her skirt so that you can clearly see her pussy.'
+				'"See? It''s perfectly smooth, '+iif( pcs_pubes > 3, 'like yours should be as well', 'like yours')+', and not hidden by any unnecessary layers of clothing," Katja says while looking back at you. She lets her skirt fall back down and sit downs, taking a sip of her tea.'
+				act 'Continue to chat': gt 'katja_pantyquest', 'coffee_hole_after'
+			elseif katjaQW['pantiesQWstage'] = 4:
+				gs 'arousal', 'erotic', -2
+				gs 'stat'
+				katjaQW['horny'] += rand(0,5)
+				katjaQW['slut'] += rand(0,1)
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/coffee_hole_showing_panties.jpg"></center>'
+				'Katja looks around before lifting up the front of her skirt so you can see her panties.'
+				'"Why are you wearing panties again?" you ask.'
+				'"Because I don''t want to risk some random pervert seeing my privates. I only show it to perverts I like," Katja says with a wink.'
+				act 'Have her take off her panties':
+					*clr & cla						
+					gs 'arousal', 'erotic', 2
+					gs 'arousal', 'end'
+					gs 'stat'
+					katjaQW['horny'] += rand(0,5)
+					katjaQW['slut'] += rand(0,1)
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/coffee_hole_taking_off_panties.jpg"></center>'
+					if katjaQW['slut'] < 80:
+						'"Come ooooon, Katja. Take those panties off! You''ve done it before," you whine.'
+						'She looks around, then sighs. "Fine, you pervert."'
+						'She stands up and quickly reaches up under her skirt and pulls down her panties.'
+						'"Happy now?" she asks as she sits down and places her underwear in her purse.'
+					else
+						katjaQW['pantiesQWstage'] = 5
+						katjaQW['horny'] += rand(5,10)
+						katjaQW['slut'] += 4
+						'"I''m getting annoyed that I have to keep telling you to take off your panties. You have to learn that proper girls like us don''t wear panties when we go out," you say in a fake angry voice.'
+						'She looks around and sighs. "Fine, you pervert."'
+						'She stands up and quickly reaches up under her skirt and pulls down her panties.'
+						'After, she hands you her panties. "Here, '+iif(lazarQW['your_prize_panties_katja'] = 0, 'you can have them', 'another pair for your collection')+' since you insist that I have to be a slut; I don''t need them anymore."'
+						if lazarQW['your_prize_panties_katja'] = 0: lazarQW['your_prize_panties_katja'] = 1
+					end
+					act 'Continue to chat': gt 'katja_pantyquest', 'coffee_hole_after'
+				end
+			else
+				gs 'arousal', 'erotic', -2
+				gs 'stat'
+				katjaQW['horny'] += rand(0,5)
+				katjaQW['slut'] += rand(0,1)
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/coffee_hole_showing_panties.jpg"></center>'
+				'Katja looks around and then lifts up the front of her skirt so you can see her panties.'
+				if katjaQW['pantiesQWstage'] = 3:
+					'"Happy now?" she asks.'
+					'"You know I won''t be happy until you take those panties off!" you reply.'
+					'"I can''t do that. Not here," Katja says.'
+					'"Well, at least show me a liiiiiittle more," you plead, giving her your best puppy-eyes.'
+					if katjaQW['slut'] >= 65:
+						'"You are relentless!" Katja says.'
+						'"You know I''m not a quitter," you chirp excitedly.'
+						act 'See what Katja does':
+							*clr & cla
+							gs 'arousal', 'erotic', 2
+							gs 'arousal', 'end'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/coffee_hole_talking.jpg"></center>'
+							'She lets her skirt fall, and moves her spoon to take another bite of her cake. She then turns to you and asks, "You really want me to follow your slutty example?"'
+							'"Yes, I do. It''s so much nicer without panties, the breeze on your pussy is so liberating! You should really try it!" you answer.'
+							act 'Katja finally relents':
+								*clr & cla						
+								gs 'arousal', 'erotic', 2
+								gs 'arousal', 'end'
+								gs 'stat'
+								katjaQW['pantiesQWstage'] = 4
+								katjaQW['horny'] += rand(5,10)
+								katjaQW['slut'] += 4
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/coffee_hole_taking_off_panties.jpg"></center>'
+								'She looks around once more, then stands up and quickly reaches up under her skirt, which makes it rest on her butt, and pulls down her panties. Then, she puts them in her purse. "Happy now?" she says as she sits down'
+								'"Yes! This is going to be so much fun. Think about how thrilling it will be being careful so you don''t give '+iif(katjaQW['boy_block'] = 1, 'other girls', 'boys')+' a peek of your pussy!" you say enthusiastically.'
+								'"I''m already regretting this..." Katja groans. But she does not look upset, nor does she make any move to put her panties back on as she sits down again.'
+								act 'Continue to chat': gt 'katja_pantyquest', 'coffee_hole_after'
+							end
+						end
+					else
+						'"You know I can''t do that. Not here. But I can give you a little sneak peek again." Katja says.'	
+						act 'See what Katja does':
+							*clr & cla
+							gs 'arousal', 'erotic', 2
+							gs 'arousal', 'end'
+							gs 'stat'
+							katjaQW['horny'] += rand(0,5)
+							katjaQW['slut'] += rand(0,1)
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/coffee_hole_showing_pussy.jpg"></center>'
+							'She looks around again then lets her skirt fall so that you can still see her panties, and puts her right foot on the table, and with her left hand, pulls her panties to the side so you can see her smoothly shaved pussy.'
+							'"Very nice!" you exclaim.'
+							'"Ah, the sacrifices I have to make so a pervert like you is happy," she says jokingly.'
+							'She then lets go of her panties, takes her leg down from the table before '+iif(locat['A144'] = 9, 'Anushka', 'the waitress')+' sees it and adjusts her skirt so that she''s again a proper lady.'
+							act 'Continue to chat': gt 'katja_pantyquest', 'coffee_hole_after'
+						end
+					end
+				elseif katjaQW['pantiesQWstage'] = 2 and katjaQW['slut'] >= 50:
+					'"Happy now?" she says, but she doesn''t look nearly as nervous about someone suddenly turning up as she used to, so you take the chance to push her further.'
+					'"Not really. I would be happy if you took those off completely," you reply.'
+					'"I can''t do that. Not here." Katja says.'
+					'"Well, at least show me a liiiiiittle more," you plead, giving her your best puppy-eyes.'
+					act 'See what Katja does':
+						*clr & cla						
+						gs 'arousal', 'erotic', 2
+						gs 'arousal', 'end'
+						gs 'stat'
+						katjaQW['pantiesQWstage'] = 3
+						katjaQW['horny'] += rand(5,10)
+						katjaQW['slut'] += 4
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/coffee_hole_showing_pussy.jpg"></center>'
+						'She looks around again then lets her skirt fall so that you can still see her panties, and puts her right foot on the table, and with her left hand, pulls her panties to the side so you can see her smoothly shaved pussy.'
+						'"Very nice!" you exclaim.'
+						'"Stop acting like such a huge pervert. It''s not like you haven''t seen it before!" she says jokingly.'
+						'She then lets go of her panties, takes her leg down from the table before '+iif(locat['A144'] = 9, 'Anushka', 'the waitress')+' sees it and adjusts her skirt so that she''s again a proper lady.'
+						act 'Continue to chat': gt 'katja_pantyquest', 'coffee_hole_after'
+					end
+				else
+					'"Happy now?" she says looking, around almost paranoid. You probably can''t push her more for now, so you just nod and Katja gives you a big smile as lets skirt fall down.'
+					act 'Continue to chat': gt 'katja_pantyquest', 'coffee_hole_after'
+				end
+			end
 		else
-			'You see<a href="exec:gt ''katja_pantyquest'', ''uni_hallway''">Katja</a> sitting on a chair in a hallway.'
+			if katjaQW['slut'] < 30:
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/coffee_hole_talking.jpg"></center>'
+				'"I''m not some slut that goes around flashing my panties. Which, by the way, I am wearing, of course," Katja says in a firm voice, but she does not look to be really angry.'
+				'"Sorry I asked. But I do think that you could stand to loosen up a little..." you reply.'
+			else
+				katjaQW['pantiesQWstage'] = 1
+				gs 'arousal', 'erotic', -2
+				gs 'arousal', 'end'
+				gs 'stat'
+				katjaQW['horny'] += rand(5,10)
+				katjaQW['slut'] += 4
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/coffee_hole_showing_panties.jpg"></center>'
+				'Katja looks around and when she''s sure that nobody else can see you two, she says, "I don''t know. We really shouldn''t be doing such things..."'
+				'"Come ooooon, I showed you mine. It''s only fair that you do it, too," you reply.'
+				'She looks around one more time to make sure nobody is looking your way, and then lifts up the front of her skirt so that you can see her panties.'
+				'"See, I''m wearing panties. Happy now?" she asks with a sly smile before letting go of her skirt so it falls down and she is once again a proper lady.'
+			end
+			act 'Continue to chat': gt 'katja_pantyquest', 'coffee_hole_after'
 		end
 	end
 end
 
+if $ARGS[0] = 'coffee_hole_after':
+	minut += 5
+	gs 'katja_meynold_schedule'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/coffee_hole_talking.jpg"></center>'
+	gs 'katja_procedural', 'face_color'
+	func('npc_reactions', 'general', 'A14')
+	'You and Katja return to your coffee and continue to chat for a few minutes.'
+	if locat['katja'] ! 30:
+		if locat['katja'] = 29:
+			'"I need to go study. '+iif($university['enrolled_in'] = 'teaching_studies' or katjaQW['QWstage']> 0, 'Wanna join me?', 'See you later!')+'" she says as she packs her things and gets ready to leave.'
+			act 'Say goodbye and leave': gt 'city_coffee_hole', 'inner'
+			if $university['enrolled_in'] = 'teaching_studies' or katjaQW['QWstage']> 0:
+				act 'Go to the library with Katja': minut += 15 & gt 'katja_uni', 'library2' 
+			end
+			if katjaQW['QWstage'] >= 2:
+				act 'Try to convince her to do something else': gt 'katja_chat', 'coffee_hole_have_fun'
+			end
+		elseif locat['katja'] = 44:
+			'"I''m done here. I want to go to the city mall to look at clothes," Katja says as she packs her things and gets ready to leave.'
+			act 'Say goodbye and Leave': gt 'city_coffee_hole', 'inner'
+			if katjaQW['QWstage']> 0:
+				act 'Go with Katja to the city mall': minut += 15 & gt 'katja_city', 'metro' 
+			end
+			if katjaQW['QWstage'] >= 2:
+				act 'Try to convince her to do something else': gt 'katja_chat', 'coffee_hole_have_fun'
+			end
+		else
+			'"I''m sorry. But I gotta run. I''ll see you later," Katja says as she starts to pack up her books.'
+		end
+	else
+		act 'Order from the menu (0:05)': katjaQW['brunch_bought'] = 1 & gs 'food_menu'
+		act 'Continue talking': gt 'katja_chat', 'coffee_hole_event'
+		act 'Try to convince her to do something else': gt 'katja_chat', 'coffee_hole_have_fun'
+	end
+	act 'Say goodbye and get up': gt 'city_coffee_hole', 'inner'
+end
+
 --- katja_pantyquest ---------------------------------
 

+ 2 - 3
locations/kit_din.qsrc

@@ -397,7 +397,6 @@ $edagotpk = {
 	end
 	edahot += 1
 	mc_inventory['food_basic'] -= 1
-	kuhdrova = 0
 	musor += 1
 	if $loc ! 'uni_dorm': mc_inventory['dish_plates'] -= 1
 	pcs_mood -= 5
@@ -533,12 +532,12 @@ $driwater = {
 
 $fill_bottle = {
 	delact 'Fill your water bottle (0:01)'
-	if mc_inventory['refill_bottle'] > 0 and mc_inventory['refill_bottle'] < 4:
+	if mc_inventory['refill_bottle'] > 0 and mc_inventory['refill_bottle_water'] < 4:
 		*nl
 		'You can fill your sports water bottle with filtrated tap water.'
 		act 'Fill your water bottle (0:01)':
 			minut += 1
-			mc_inventory['refill_bottle'] = 4
+			mc_inventory['refill_bottle_water'] = 4
 			gt $loc, $loc_arg
 		end
 	end

+ 1 - 1
locations/kuhrPar.qsrc

@@ -80,7 +80,7 @@ killvar 'kit_dad'
 if locat['Stepdad'] = 4: '<a href="exec:gt''father'',''kit''">Your stepfather</a> is here reading the paper.'
 if locat['Stepdad'] = 7: '<a href="exec:gt''father'',''kit''">Your stepfather</a> is here setting the table for dinner.'
 
-if week = 6 and locat['Fam_set_month_inGad'] = 1 and grandmaQW['block'] = 0 and hour > 9 and hour < 12 and func('homes_properties', 'can_live_here'):'Your parents are getting ready to go to <a href="exec:gt ''gadhouse'', ''to_gadukino''">Gadukino</a> to visit your great grandparents. You can go with them if you want, or stay home like Anya usually does.'
+if week = 6 and locat['Fam_set_month_inGad'] = 1 and grandmaQW['block'] = 0 and hour > 9 and hour < 12 and func('homes_properties', 'can_live_here'):'Your parents are getting ready to go to <a href="exec:gt ''gad_gphouse'', ''to_gadukino''">Gadukino</a> to visit your great grandparents. You can go with them if you want, or stay home like Anya usually does.'
 
 if func('homes_properties', 'can_live_here'):
 	if ((hour = 6 and minut >= 45) or (hour = 7 and minut < 15)) and breakfast_day ! daystart and locat['Fam_inGad'] = 0:

+ 55 - 35
locations/mirafather.qsrc

@@ -1,5 +1,7 @@
 # mirafather
 !2021/05/02
+!2024/05/05 - Mira schedule introduced.
+!locat['A60'] = Mira''s location. See 'miroslava_schedule'
 
 $menu_loc = 'mirafather'
 $menu_arg = ''
@@ -12,6 +14,7 @@ tempyear = (((npc_dob['A64']) - (npc_dob['A64'] mod 10000)) / 10000)
 !Looks like npc_dob is broken, once fixed revert to boyage = year - tempyear
 boyage = age + 34
 if tempmonth < month or (tempmonth = month and tempday <= day): boyage -= 1
+gs 'miroslava_schedule'
 
 gs 'stat'
 
@@ -21,9 +24,9 @@ if npc_QW['A64'] > 0:'<center><b><font color = maroon>Afanasiy</font></b></cente
 *nl
 'Mira''s father is <<boyage>> years old. After his wife died, he started to drink heavily. As a result, he looks much older than he actually is. However, he is still in good shape for a man his age.'
 
-act 'Leave him be':gt 'MiroslavaHome', 'start'
+act 'Leave him be': gt 'gad_miroslava_home', 'start'
 
-if Mira_no > 0 and mirafathertalk = 0 and miraday ! daystart:
+if daystart < MiraVars['emb_day'] and mirafathertalk = 0 and MiraVars['event_day'] ! daystart:
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big64.jpg"></center>'
 	*nl
@@ -36,7 +39,6 @@ if Mira_no > 0 and mirafathertalk = 0 and miraday ! daystart:
 	'"Oh, ah... I don''t know," you say, trying to make it sound believable and make your eyes look innocent. "Maybe she was hurt by some local boy or had a fight with someone..."'
 	'"Okay, I think it will pass... soon, I hope. But I want you to come and visit us. I think your company would do Mira a lot of good. It might bring her out of this funk faster." Mira''s father says goodbye and leaves to resume working around his house.'
 	'"Close call," you think as you watch his retreating back and exhale with relief.'
-	MiraLoc = 0
 	minut += 10
 	mirafathertalk = 1
 	gs'stat'
@@ -44,55 +46,73 @@ if Mira_no > 0 and mirafathertalk = 0 and miraday ! daystart:
 	act 'Continue':gt 'miroslava', 'Start'
 else
 	act 'Ask if Mira is home':
-		menu_off = 1
-		mira_temp = rand(1,20)
-		if sunWeather = 1:
-			if mira_temp > 15 and npc_QW['A60'] > 15 and hour >= 16 and hour <= 23:
-				*clr & cla
-				minut += 2
-				MiraLoc = 8
-				gs 'stat'
+		if locat['A60'] = 10:
+			gt 'miroslava', 'Start'
+		else
+			*clr & cla
+			menu_off = 1
+			minut += 2
+			gs 'stat'
 
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big64.jpg"></center>'
-				*nl
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big64.jpg"></center>'
+			*nl
+
+			act 'Go back to the village center': gt 'gadukino'
+
+			if (locat['A60'] / 10) = 2:
+				'Mira''s father tells you that she''s not home. She said she was going to visit you.'
+				act 'Go to your grandparents house': gt 'gad_gphouse', 'start'
+
+			elseif locat['A60'] = 30:
+				'Mira''s father tells you that she''s not home. She said she was going to take a walk.'
+
+			elseif locat['A60'] = 31:
+				'Mira''s father tells you that she''s not home. She said she was going to the church.'
+				act 'Go to the church': gt 'gad_church', 'start'
+
+			elseif locat['A60'] = 40 or locat['A60'] = 41:
+				'Mira''s father tells you that she''s not home. She said she was going to take a walk along the forest.'
+				act 'Go to the forest road': gt 'gad_road', 'start'
+
+			elseif locat['A60'] = 42:
+				'Mira''s father tells you that she''s not home. She said she was going visit her friends.'
+				act 'Go to Mitka': gt 'gad_road', 'start'
+
+			elseif (locat['A60'] / 10) = 5:
+				'Mira''s father tells you that she''s not home. She said she was going to the river.'
+				act 'Go to the river': gt 'gad_river', 'start'
+
+			elseif (locat['A60'] / 10) = 6:
+				'Mira''s father tells you that she''s not home. She said she was going to the forest.'
+
+				act 'Go to the forest': gt 'gad_forest', 'forest_edge'
+
+			elseif (locat['A60'] / 10) = 7:
+				'Mira''s father tells you that she''s not home. She said she was going watch the cows.'
+
+				act 'Go to the field': gt 'gad_field', 'field'
+
+			elseif locat['A60'] = 80:
 				'Mira''s father tells you that she''s not home. She left without telling him where she was going.'
 
 				if mirapimp = 1:
 					'Mira is not home, but you know exactly where to find her. She has been working as your prostitute on the highway.'
-				elseif miraprost > 1:
+				elseif MiraVars['prostitute'] > 1:
 					'Mira is not home, but you know exactly where to find her. You have seen her working as a prostitute on the highway.'
-				elseif miraprost = 1:
+				elseif MiraVars['prostitute'] = 1:
 					'Mira is not home, but you think you know where to find her. Ever since granting your second wish, you have heard rumours that Mira has been earning money as a prostitute on the highway.'
 				else
 					'Mira is not home, and you have no idea where she might be. So maybe you should go look around town.'
 				end
-				act 'Go back to the village center':gt 'gadukino'
-				if miraprost > 0: minut += 20 & act 'Go to the highway': gt 'gadprostitutes','start'
-			elseif mira_temp > 10 and month >= 4 and month <= 10 and hour <= 18:
-				*clr & cla
-				minut += 2
-				MiraLoc = 1
-				gs 'stat'
+				if MiraVars['prostitute'] > 0: minut += 20 & act 'Go to the highway': gt 'gad_prostitutes', 'start'
 
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big64.jpg"></center>'
-				*nl
-				'Mira''s father tells you that she''s not home. She said she was going to the river.'
-
-				act 'Go back to the village center':gt 'gadukino'
-				act 'Go to the river':gt 'gadriver','start'
-			else
-				MiraLoc = 0
-				gt 'miroslava', 'Start'
 			end
-		else
-			MiraLoc = 0
-			gt 'miroslava', 'Start'
 		end
 	end
 
 	if MiraFather ! daystart:
 		MiraFather = daystart
-		if npc_QW['A64'] >= 16 and (meadow = 4 or meadow = 5): meadow = 6
+		if npc_QW['A64'] >= 16 and (MiraVars['meadow'] = 3 or MiraVars['meadow'] = 4): MiraVars['meadow'] = 5
 
 		if npc_QW['A64'] < 5:
 			act 'Ask how he''s doing':

+ 44 - 52
locations/mirasex.qsrc

@@ -1,22 +1,15 @@
 # mirasex
 !2021/05/05
+!2024/05/05 - Mira schedule introduced.
+!locat['A60'] = Mira''s location. See 'miroslava_schedule'
 
-!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)
-!---------------------------------------------
 menu_off = 1
 
 !!-------------------------------------------------multi act events---------------------------------------------------
 
 if $ARGS[0] = 'mirakiss':
 	*clr & cla
-	mirahorny += 10
+	MiraVars['arousal'] += 10
 	pcs_horny += 10
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirakiss'+rand(1,4)+'.jpg"></center>'
 	temp = rand(1,4)
@@ -28,13 +21,13 @@ if $ARGS[0] = 'mirakiss':
 	gs 'arousal', 'kiss', 10, 'lesbian'
 	minut -= 5
 	gs 'stat'
-	if pcs_horny < 20 or mirahorny < 20:
+	if pcs_horny < 20 or MiraVars['arousal'] < 20:
 		act 'Continue kissing':gt 'mirasex','mirakiss'
 		act 'stop kissing':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirakiss'+rand(1,4)+'.jpg"></center>'
 			'you give her one last kiss and tell her that you just aren''t in the mood right now and pull back'
-			act 'say goodbye': gt 'meadow', 'start'
+			act 'say goodbye': gt 'gad_meadow', 'start'
 		end
 	else
 		act 'Escalate':gt 'mirasex','foreplay'
@@ -59,12 +52,12 @@ if $ARGS[0] = 'foreplay':
 		if temp = 1:'Mira fondles your <<$titsize>> breasts, gently squeezing them in her hands and kissing them.'
 		if temp = 2:'You feel her hot breath on your chest and her slick tongue caressing your nipples and giving you great pleasure.'
 		if temp = 3:'Mira fondles your breasts, gently squeezing them in her hands. Then, she kisses and teases your nipples with her tongue.'
-		mirahorny += 10
+		MiraVars['arousal'] += 10
 		pcs_horny += 10
 		gs 'arousal', 'foreplay', 5, 'lesbian'
 		gs 'stat'
 		if npc_rel['A60'] < 30:
-			act 'Leave':MiraLoc = 0 & minut += 10 & gt 'gadukino'
+			act 'Leave': minut += 10 & gt 'gadukino'
 		else
 			act 'Lick Mira':gt 'mirasex','lickmira_start'
 		end
@@ -74,7 +67,7 @@ end
 
 if $ARGS[0] = 'horny_talk':
 	*clr & cla
-	mirahorny += 5
+	MiraVars['arousal'] += 5
 	pcs_horny += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/horny_talk.jpg"></center>'
@@ -85,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 must improve your relationship to take things further.'
 		'She walks home alone, singing a song. You watch her for a moment before heading back to the village.'
-		act 'Leave':MiraLoc = 0 & minut += 10 & gt 'gadukino'
+		act 'Leave': minut += 10 & gt 'gadukino'
 	else
 		'Mira moans in enjoyment and then starts to pull at your panties.'
 		'You help her pull them down, and she steps out of them.'
@@ -96,7 +89,7 @@ end
 
 if $ARGS[0] = 'mirafinger':
 	*clr & cla
-	mirahorny += 5
+	MiraVars['arousal'] += 5
 	pcs_horny += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirafinger_dog'+rand(1,4)+'.jpg"></center>'
@@ -115,10 +108,10 @@ end
 
 if $ARGS[0] = 'miralick_dog':
 	*clr & cla
-	mirahorny += 5
+	MiraVars['arousal'] += 5
 	pcs_horny += 10
 	gs 'stat'
-	if pcs_horny >= 50 and rand(0,2) ! 0:
+	if pcs_horny >= 50 and rand(0, 2) ! 0:
 		you_orgasm = 1
 		$orgasm_or = 'yes'
 		$orgasm_txt = 'You cannot hold out anymore from Mira''s stimulation, and you cum in her face with a shudder.'
@@ -126,7 +119,7 @@ if $ARGS[0] = 'miralick_dog':
 	else
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/miralick_dog'+rand(1,2)+'.jpg"></center>'
 	end
-	$textdog[rand(1,3)]+$textlick[iif(miralick < 10,rand(1,3),rand(4,6))]+$text_emotions[iif(pcs_horny < 60,1,iif(pcs_horny < 80,2,4))]
+	$textdog[rand(1, 3)] + $textlick[iif(MiraVars['cuni_given'] < 10, rand(1, 3), rand(4, 6))] + $text_emotions[iif(pcs_horny < 60, 1, iif(pcs_horny < 80, 2, 4))]
 	gs 'arousal', 'cuni', 10, 'lesbian'
 	minut -= 5
 	gs 'stat'
@@ -154,8 +147,8 @@ end
 
 if $ARGS[0] = 'lickmira_start':
 	*clr & cla
-	if mirasex = 0:mirasex = 1 & girl += 1
-	mirahorny += 10
+	if MiraVars['had_sex'] = 0: MiraVars['had_sex'] = 1 & girl += 1
+	MiraVars['arousal'] += 10
 	pcs_horny += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/lickmira_start.jpg"></center>'
@@ -172,10 +165,10 @@ end
 
 if $ARGS[0] = 'lickmira_mis2':
 	*clr & cla
-	mirahorny += 10
+	MiraVars['arousal'] += 10
 	pcs_horny += 5
 	gs 'stat'
-	if mirahorny >= 50 and rand(0,2) ! 0:
+	if MiraVars['arousal'] >= 50 and rand(0,2) ! 0:
 		miraorgasm = 1
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/lickmira_mis_cum.jpg"></center>'
 		$textmis[rand(1,3)]+$textlick[iif(lesbian < 10,rand(7,9),rand(10,12))]+$text_emotions[7]
@@ -184,7 +177,7 @@ if $ARGS[0] = 'lickmira_mis2':
 		minut -= 5
 		gs 'stat'
 		if you_orgasm = 0:'After Mira''s orgasms, you get out between her legs and wipe her juices off your face. Then, you clean yourself up and head home.'
-	elseif mirahorny < 50:
+	elseif MiraVars['arousal'] < 50:
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/lickmira_mis'+rand(1,3)+'.jpg"></center>'
 		$textmis[rand(1,3)]+$textlick[iif(lesbian < 10,rand(7,9),rand(10,12))]+$text_emotions[iif(pcs_horny < 60,5,iif(pcs_horny < 80,6,7))]
 		gs 'arousal', 'cuni_give', 10, 'lesbian'
@@ -215,7 +208,7 @@ end
 
 if $ARGS[0] = 'miralick_start':
 	*clr & cla
-	miralick += 1
+	MiraVars['cuni_given'] += 1
 	if $pantyworntype ! 'none':
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mira_start_tanga1.jpg"></center>'
 		'Mira pulls down your panties with a smile while looking you in the eyes. You lean against the tree, close your eyes, and wait for her to continue...'
@@ -238,35 +231,35 @@ end
 
 if $ARGS[0] = '69_1':
 	*clr & cla
-	mirahorny += 10
+	MiraVars['arousal'] += 10
 	pcs_horny += 10
 
-	if mirahorny >= 50 and pcs_horny >= 50 and rand(0,2) ! 0:
+	if MiraVars['arousal'] >= 50 and pcs_horny >= 50 and rand(0,2) ! 0:
 		miraorgasm = 1
-		mirahorny = 0
+		MiraVars['arousal'] = 0
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/lickmira_69_cum'+rand(1,2)+'.jpg"></center>'
-		$text69[4]+$textlick[iif(lesbian < 10,rand(7,9),rand(10,12))]+$text_emotions[iif(pcs_horny < 60,5,iif(pcs_horny < 80,6,7))]+$text69[5]+$textlick[iif(miralick < 10,rand(1,3),rand(4,6))]+$text_emotions[iif(pcs_horny < 60,1,iif(pcs_horny < 80,2,3))]
+		$text69[4]+$textlick[iif(lesbian < 10,rand(7,9),rand(10,12))]+$text_emotions[iif(pcs_horny < 60,5,iif(pcs_horny < 80,6,7))]+$text69[5]+$textlick[iif(MiraVars['cuni_given'] < 10, rand(1, 3), rand(4, 6))] + $text_emotions[iif(pcs_horny < 60, 1, iif(pcs_horny < 80, 2, 3))]
 		$orgasm_or = 'custom'
 		$orgasm_txt = 'Mira and you cum together. Your mouth filled with her taste, and her scent filled the air. You lie for a minute blissed out before you slowly regain your senses and get ready to go.'
 		gs 'arousal', 'cuni', 10, 'lesbian'
 		gs 'arousal', 'cuni_give', 10, 'lesbian'
 		minut -= 15
 		gs 'stat'
-	elseif mirahorny < 50 and pcs_horny >= 50 and rand(0,2) ! 0:
+	elseif MiraVars['arousal'] < 50 and pcs_horny >= 50 and rand(0,2) ! 0:
 		you_orgasm = 1
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/lickmira_69_cum1.jpg"></center>'
-		$text69[4]+$textlick[iif(lesbian < 10,rand(7,9),rand(10,12))]+$text_emotions[iif(pcs_horny < 60,5,iif(pcs_horny < 80,6,7))]+$text69[5]+$textlick[iif(miralick < 10,rand(1,3),rand(4,6))]+$text_emotions[iif(pcs_horny < 60,1,iif(pcs_horny < 80,2,3))]+$text_cum[1]
+		$text69[4] + $textlick[iif(lesbian < 10,rand(7, 9),rand(10, 12))] + $text_emotions[iif(pcs_horny < 60, 5, iif(pcs_horny < 80, 6, 7))] + $text69[5] + $textlick[iif(MiraVars['cuni_given'] < 10, rand(1, 3), rand(4, 6))] + $text_emotions[iif(pcs_horny < 60, 1, iif(pcs_horny < 80, 2, 3))] + $text_cum[1]
 		$orgasm_or = 'yes'
 		$orgasm_txt = 'The stimulation from Mira''s ministrations and your efforts to get her off hits you hard, and you cum. You take a moment and then decide to focus on Mira.'
 		gs 'arousal', 'cuni', 10, 'lesbian'
 		gs 'arousal', 'cuni_give', 10, 'lesbian'
 		minut -= 15
 		gs 'stat'
-	elseif mirahorny >= 50 and pcs_horny < 50 and rand(0,2) ! 0:
+	elseif MiraVars['arousal'] >= 50 and pcs_horny < 50 and rand(0,2) ! 0:
 		miraorgasm = 1
-		mirahorny = 0
+		MiraVars['arousal'] = 0
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/lickmira_69_cum2.jpg"></center>'
-		$text69[4]+$textlick[iif(lesbian < 10,rand(7,9),rand(10,12))]+$text_emotions[iif(pcs_horny < 60,5,iif(pcs_horny < 80,6,7))]+$text69[5]+$textlick[iif(miralick < 10,rand(1,3),rand(4,6))]+$text_emotions[iif(pcs_horny < 60,1,iif(pcs_horny < 80,2,3))]
+		$text69[4]+$textlick[iif(lesbian < 10,rand(7,9),rand(10,12))]+$text_emotions[iif(pcs_horny < 60,5,iif(pcs_horny < 80,6,7))]+$text69[5]+$textlick[iif(MiraVars['cuni_given'] < 10,rand(1,3),rand(4,6))]+$text_emotions[iif(pcs_horny < 60,1,iif(pcs_horny < 80,2,3))]
 		'After a while, Mira cums, her juices covering your face. For a minute, she rides the wave of pleasure before she turns her attention to you...'
 		gs 'arousal', 'cuni', 10, 'lesbian'
 		gs 'arousal', 'cuni_give', 10, 'lesbian'
@@ -274,7 +267,7 @@ if $ARGS[0] = '69_1':
 		gs 'stat'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/lickmira_69_'+rand(1,3)+'.jpg"></center>'
-		$text69[4]+$textlick[iif(lesbian < 10,rand(7,9),rand(10,12))]+$text_emotions[iif(pcs_horny < 60,5,iif(pcs_horny < 80,6,7))]+$text69[5]+$textlick[iif(miralick < 10,rand(1,3),rand(4,6))]+$text_emotions[iif(pcs_horny < 60,1,iif(pcs_horny < 80,2,3))]
+		$text69[4]+$textlick[iif(lesbian < 10,rand(7,9),rand(10,12))]+$text_emotions[iif(pcs_horny < 60,5,iif(pcs_horny < 80,6,7))]+$text69[5]+$textlick[iif(MiraVars['cuni_given'] < 10,rand(1,3),rand(4,6))]+$text_emotions[iif(pcs_horny < 60,1,iif(pcs_horny < 80,2,3))]
 		gs 'arousal', 'cuni', 10, 'lesbian'
 		gs 'arousal', 'cuni_give', 10, 'lesbian'
 		minut -= 15
@@ -305,16 +298,16 @@ end
 if $ARGS[0] = 'miralick_stand2':
 	*clr & cla
 	pcs_horny += 10
-	mirahorny += 5
+	MiraVars['arousal'] += 5
 	if pcs_horny >= 50:
 		you_orgasm = 1
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/miralick_stand_cum.jpg"></center>'
-		$textstand[rand(1,3)]+$textlick[iif(miralick < 10,rand(1,3),rand(4,6))]+$text_emotions[3]
+		$textstand[rand(1,3)]+$textlick[iif(MiraVars['cuni_given'] < 10,rand(1,3),rand(4,6))]+$text_emotions[3]
 		$orgasm_txt = 'Mira licks your pussy. It feels great. In fact, it feels incredible, you can''t hold back anymore, and a warmth spreads through your abdomen as you cum.'
 		$orgasm_or = 'yes'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/miralick_stand'+rand(1,2)+'.jpg"></center>'
-		$textstand[rand(1,3)]+$textlick[iif(miralick < 10,rand(1,3),rand(4,6))]+$text_emotions[iif(pcs_horny < 60,1,iif(pcs_horny < 80,2,3))]
+		$textstand[rand(1,3)]+$textlick[iif(MiraVars['cuni_given'] < 10,rand(1,3),rand(4,6))]+$text_emotions[iif(pcs_horny < 60,1,iif(pcs_horny < 80,2,3))]
 	end
 	gs 'arousal', 'cuni', 10, 'lesbian'
 	minut -= 5
@@ -346,17 +339,16 @@ if $ARGS[0] = 'end':
 	you_orgasm = 0
 	gs 'arousal', 'end'
 	gs 'stat'
-	MiraLoc = 2
 	minut += 20
-	gt'gadukino'
+	gt 'gadukino'
 end
 
 !!-------------------------------------------------single act events---------------------------------------------------
 
 if $ARGS[0] = 'miralick_first':
 	*clr & cla
-	miralick += 1
-	if mirasex = 0:mirasex = 1 & girl += 1
+	MiraVars['cuni_given'] += 1
+	if MiraVars['had_sex'] = 0: MiraVars['had_sex'] = 1 & girl += 1
 	if $pantyworntype ! 'none':
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mira_start_tanga1.jpg"></center>'
 		'Kneeling down, Mira timidly reaches for your panties. She locks eyes with you and smiles shyly. You relax against the tree, close your eyes and tremble in anticipation.'
@@ -372,12 +364,12 @@ end
 
 if $ARGS[0] = 'miralick_stand1':
 	*clr & cla
-	mirahorny += rand(0,5)
+	MiraVars['arousal'] += rand(0, 5)
 	mira_counter += 1
 	gs 'stat'
 	if mira_counter < rand(3,5):
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/miralick_stand'+rand(1,2)+'.jpg"></center>'
-		$textstand[rand(1,3)]+$textlick[iif(miralick < 10,rand(1,3),rand(4,6))]+$text_emotions[iif(pcs_horny < 60,1,iif(pcs_horny < 80,2,3))]
+		$textstand[rand(1,3)]+$textlick[iif(MiraVars['cuni_given'] < 10,rand(1,3),rand(4,6))]+$text_emotions[iif(pcs_horny < 60,1,iif(pcs_horny < 80,2,3))]
 		gs 'arousal', 'cuni', 10, 'lesbian'
 		minut -= 5
 		gs 'stat'
@@ -385,13 +377,13 @@ if $ARGS[0] = 'miralick_stand1':
 	else
 		killvar 'mira_counter'
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/miralick_stand_cum.jpg"></center>'
-		$textstand[rand(1,3)]+$textlick[iif(miralick < 10,rand(1,3),rand(4,6))]+$text_emotions[3]+$text_cum[1]
+		$textstand[rand(1,3)]+$textlick[iif(MiraVars['cuni_given'] < 10,rand(1,3),rand(4,6))]+$text_emotions[3]+$text_cum[1]
 		$orgasm_or = 'custom'
 		$orgasm_txt = 'Mira continues to lick you until you cum. Then, after some time, you head back to the village together.'
 		gs 'arousal', 'cuni', 10, 'lesbian'
 		minut -= 5
 		gs 'stat'
-		act 'Leave':MiraLoc = 0 & minut += 20 & gt 'gadukino'
+		act 'Leave': minut += 20 & gt 'gadukino'
 	end
 	killvar '$textstand'
 	killvar '$textlick'
@@ -401,7 +393,7 @@ end
 
 if $ARGS[0] = 'lickmira_first':
 	*clr & cla
-	if mirasex = 0:mirasex = 1 & girl += 1
+	if MiraVars['had_sex'] = 0: MiraVars['had_sex'] = 1 & girl += 1
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/lickmira_start.jpg"></center>'
 	if lesbian < 10:
 		'You gently touch Mira''s panties and begin pulling them down. She is excitedly hot and wiggles her ass to help you get them off faster...'
@@ -417,8 +409,8 @@ end
 if $ARGS[0] = 'lickmira_mis1':
 	*clr & cla
 	gs 'stat'
-	if mirahorny < 50 and rand(0,1) = 0:
-		mirahorny += 20
+	if MiraVars['arousal'] < 50 and rand(0,1) = 0:
+		MiraVars['arousal'] += 20
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/lickmira_mis'+rand(1,3)+'.jpg"></center>'
 		$textmis[rand(1,3)]+$textlick[iif(lesbian < 10,rand(7,9),rand(10,12))]+$text_emotions[iif(pcs_horny < 60,5,iif(pcs_horny < 80,6,7))]
 		gs 'arousal', 'cuni_give', 10, 'lesbian'
@@ -427,7 +419,7 @@ if $ARGS[0] = 'lickmira_mis1':
 		act 'Continue licking Mira':gt 'mirasex','lickmira_mis1'
 	else
 		miraorgasm = 1
-		mirahorny = 0
+		MiraVars['arousal'] = 0
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/lickmira_mis_cum.jpg"></center>'
 		$textmis[rand(1,3)]+$textlick[iif(lesbian < 10,rand(7,9),rand(10,12))]+$text_emotions[7]+$text_cum[2]
 		gs 'mirasex','miralick_orgasm'
@@ -439,7 +431,7 @@ if $ARGS[0] = 'lickmira_mis1':
 		else
 			'After Mira''s orgasms, you get out between her legs and wipe her juices off your face. Then, you clean yourself up and smile at Mira before returning to the village with her.'
 		end
-		act 'Leave':MiraLoc = 0 & minut += 10 & gt 'gadukino'
+		act 'Leave': minut += 10 & gt 'gadukino'
 	end
 	*nl
 	killvar '$textmis'

Diff do ficheiro suprimidas por serem muito extensas
+ 734 - 661
locations/miroslava.qsrc


+ 411 - 0
locations/miroslava_schedule.qsrc

@@ -0,0 +1,411 @@
+# miroslava_schedule
+!2024/05/05
+
+	!locat['A60'] tells us where Mira is Located
+	!----------------------------------------------
+	!locat['A60'] = 10		In front of her home
+	!locat['A60'] = 11		Home
+
+	!locat['A60'] = 20		Grandparents yard		<- gad_gpyard
+	!locat['A60'] = 21		Grandparents house		<- gad_gphouse
+	!locat['A60'] = 22		Grandparents banya		<- gad_gpbath
+	!locat['A60'] = 23		Grandparents barn		<- gad_gpbarn
+
+	!locat['A60'] = 30		Gadukino
+	!locat['A60'] = 31		Church
+
+	!locat['A60'] = 40		Forest road
+	!locat['A60'] = 41		Bus station
+	!locat['A60'] = 42		With the Gopniks
+
+	!locat['A60'] = 50		River
+	!locat['A60'] = 51		Beach
+
+	!locat['A60'] = 60		Forest-edge
+	!locat['A60'] = 61		Meadow
+	!locat['A60'] = 62		Forest-outskirts
+	!locat['A60'] = 63		Forest-center
+	!locat['A60'] = 64		Forest-swamp
+
+	!locat['A60'] = 70		Field
+
+	!locat['A60'] = 80		Highway
+	!locat['A60'] = 81		Train station
+	!locat['A60'] = 82		Lorry
+
+
+if $ARGS[0] = 'get_locat_from_loc':
+	if $loc = 'gad_miroslava_home':
+		result = 10
+
+	elseif $loc = 'gad_gpyard':
+		result = 20
+	elseif $loc = 'gad_gphouse':
+		result = 21
+	elseif $loc = 'gad_gpbath':
+		result = 22
+	elseif $loc = 'gad_gpbarn':
+		result = 23
+
+	elseif $loc = 'gadukino':
+		result = 30
+	elseif $loc = 'gad_church':
+		result = 31
+
+	elseif $loc = 'gad_road':
+		result = 40
+	elseif $loc = 'bus' and strpos('gadukino|gadukino_tickets|gadukino_busses', $loc_arg) > 0:
+		result = 41
+	elseif $loc = 'mitkabuh' or $loc = 'mitkabuh_group':
+		result = 42
+
+	elseif $loc = 'gad_river':
+		result = 50
+	elseif $loc = 'gad_beach':
+		result = 51
+
+	elseif $loc = 'gad_forest' and $loc_arg = 'forest_edge':
+		result = 60
+	elseif $loc = 'gad_meadow':
+		result = 61
+	elseif $loc = 'gad_forest' and $loc_arg = 'forest_outskirts':
+		result = 62
+	elseif $loc = 'gad_forest' and $loc_arg = 'forest_center':
+		result = 63
+	elseif $loc = 'gad_swamp':
+		result = 64
+
+	elseif $loc = 'field':
+		result = 70
+
+	elseif $loc = 'road' and nroad = 10:
+		result = 80
+	elseif $loc = 'train' and $loc_arg = 'gadukino':
+		result = 81
+	elseif $loc = 'furi' and nroad = 10:
+		result = 82
+	end
+end
+
+if $ARGS[0] = 'cikl':
+	MiraVars['sched'] = rand(0, 5)
+	MiraVars['prost_today'] = (rand(0, 2) > 0)
+end
+
+if $ARGS[0] = 'force_change':
+	temp_start_loc = locat['A60']
+	gs 'miroslava_schedule'
+	i = 0
+	:mira_loop_start
+	if locat['A60'] = temp_start_loc:
+		gs 'miroslava_schedule', 'cikl'
+		gs 'miroslava_schedule'
+		i += 1
+		if i < 10: jump 'mira_loop_start'
+	end
+	killvar 'i'
+	killvar 'temp_start_loc'
+end
+
+
+if $ARGS[0] = '':
+	locat['A60_prev'] = locat['A60']
+	gs 'miroslava_schedule', 'update_locat'
+end
+
+if $ARGS[0] = 'update_locat':
+	if daystart < MiraVars['emb_day']:
+		! Embarrassed Mira is at Home
+		locat['A60'] = 10
+		exit
+	end
+	if MiraVars['follower'] = 1:
+		MiraVars['follower'] = 0
+		! Mira is your follower, so set her location to your location.
+		locat['A60'] = func('miroslava_schedule', 'get_locat_from_loc')
+		exit
+	elseif Miravars['follow_time'] > 0:
+		locat['A60'] = locat['A60_prev']
+	end
+
+	if MiraVars['guest'] = 1:
+		!! check if mira and sveta are in the same location.
+		!! if so: locat['A60'] remains the same
+		!! else: MiraVars['guest'] = 0
+		if $loc = 'gad_gpyard':
+			locat['A60'] = 20
+		elseif $loc = 'gad_gphouse':
+			locat['A60'] = 21
+		elseif $loc = 'gad_gpbath':
+			locat['A60'] = 22
+		elseif $loc = 'gad_gpbarn':
+			locat['A60'] = 23
+		elseif $loc = 'gad_field':
+			MiraVars['guest'] = 0
+			locat['A60'] = 70
+		else
+			MiraVars['guest'] = 0
+			gs 'miroslava_schedule', ''
+		end
+		exit
+	end
+
+	gs 'miroslava_schedule', 'get_base_schedule'
+
+
+	if npc_known['A60'] = 0 and locat['A60'] ! 10 and locat['A60'] ! 30:				locat['A60'] = 30		& ! Sveta and Mira aren''t friends yet.
+	if MiraVars['QW'] > 15 and MiraVars['prost_today'] and hour >= 16 and hour < 20:	locat['A60'] = 80		& ! Prostitution 
+	if locat['A60'] = 61 and (MiraVars['meadow'] = 2 or MiraVars['meadow'] = 5):		locat['A60'] = 60		& ! If meadow not unlocked -> Forest edge
+	if locat['A60'] = 51 and (sunweather = 0 or temper < 15 or month < 5 or month > 9):	locat['A60'] = 10		& ! Winter = No Beach
+	if locat['A60'] = 42 and (MiraVars['QW'] = 0 or npc_drunk['A60'] > 0):				locat['A60'] = 10		& ! drunk or doesn''t know the guys
+	if (locat['A60'] / 10) = 2 and grandpaQW['chore_herd_cattle'] = 1 and $loc = 'gad_field' and npc_rel['A60'] >= 15 and (npc_QW['A63'] < 13 or MiraVars['QW'] >= 10 or MiraVars['had_sex'] > 1): locat['A60'] = 70		& ! Mira visits in the field if she was planning to visit you either way.
+
+	if sunWeather = 0:
+		if locat['A60'] >= 30 and locat['A60'] ! 42:
+			if MiraVars['guestday'] >= daystart or npc_known['A60'] = 0 or hour < 8 or hour >= 20 or npc_rel['A60'] < 15 or (npc_QW['A63'] >= 11 and MiraVars['QW'] < 11 and MiraVars['had_sex'] <= 1):
+				locat['A60'] = 10
+			else
+				MiraVars['invite_rand'] = rand(0, 1)
+				MiraVars['guestday'] = daystart
+				if MiraVars['invite_rand'] = 0:
+					locat['A60'] = 21
+				else
+					locat['A60'] = 10
+				end
+			end
+		end
+	end
+end
+
+
+if $ARGS[0] = 'get_base_schedule':
+	!! Mira does not naturally show up in the Forest after 11:00
+	!! Mira leaves beach after 20:00 and isn''t there before 9:00
+	!!npc_rel['A60'] >= 15 and sunWeather = 1 and hour >= 10 and temp = 1 and daystart >= MiraVars['emb_day'] and (npc_QW['A63'] < 13 or MiraVars['QW'] >= 10 or MiraVars['had_sex'] > 1) and npc_known['A60'] = 1
+
+
+	!{
+	elseif MiraVars['sched'] = 10:
+		!!				0-8,	8-10,	10-12,	12-14,	14-16,	16-18,	18-20,	20-22,	22-00
+		!! Sched0:		Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home
+		if hour < 8:
+			locat['A60'] = 10
+		elseif hour < 10:
+			locat['A60'] = 10
+		elseif hour < 12:
+			locat['A60'] = 10
+		elseif hour < 14:
+			locat['A60'] = 10
+		elseif hour < 16:
+			locat['A60'] = 10
+		elseif hour < 18:
+			locat['A60'] = 10
+		elseif hour < 20:
+			locat['A60'] = 10
+		elseif hour < 22:
+			locat['A60'] = 10
+		else
+			locat['A60'] = 10
+		end
+	}
+
+
+
+	if MiraVars['sched'] = 0:
+		!!				0-8,	8-10,	10-14,	14-16,	16-18,	18-20,	20-00
+		!! Sched0:		Home,	Forest,	Beach,	Gad,	Meadow,	Gad,	gopn
+		if hour <= 7:
+			locat['A60'] = 10
+		elseif hour <= 9:
+			locat['A60'] = 60
+		elseif hour <= 13:
+			locat['A60'] = 51
+		elseif hour <= 15:
+			locat['A60'] = 30
+		elseif hour <= 17:
+			locat['A60'] = 61
+		elseif hour <= 19:
+			locat['A60'] = 30
+		else
+			locat['A60'] = 42
+		end
+
+	elseif MiraVars['sched'] = 1:
+		!!				0-10,	10-16,	16-20,	20-00
+		!! Sched1:		Home,	Beach	grandp,	home
+		if hour <= 9:
+			locat['A60'] = 10
+		elseif hour <= 15:
+			locat['A60'] = 51
+		elseif hour <= 19:
+			locat['A60'] = 20
+		else
+			locat['A60'] = 10
+		end
+
+	elseif MiraVars['sched'] = 2:
+		!!				0-8,	8-10,	10-14,	14-16,	16-18,	18-20,	20-00
+		!! Sched2:		Home,	Forest,	Meadow,	Beach,	Meadow,	Forest,	gopn
+		if hour <= 7:
+			locat['A60'] = 10
+		elseif hour <= 9:
+			locat['A60'] = 60
+		elseif hour <= 13:
+			locat['A60'] = 61
+		elseif hour <= 15:
+			locat['A60'] = 51
+		elseif hour <= 17:
+			locat['A60'] = 61
+		elseif hour <= 19:
+			locat['A60'] = 60
+		else
+			locat['A60'] = 42
+		end
+
+	elseif MiraVars['sched'] = 3:
+		!!				0-8,	8-10,	10-12,	12-14,	14-16,	16-18,	18-20,	20-22,	22-00
+		!! Sched3:		Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home
+		if hour < 8:
+			locat['A60'] = 10
+		elseif hour < 14:
+			locat['A60'] = 20
+		elseif hour < 18:
+			locat['A60'] = 51
+		else
+			locat['A60'] = 10
+		end
+
+	elseif MiraVars['sched'] = 4:
+		!!				0-8,	8-10,	10-12,	12-14,	14-16,	16-18,	18-20,	20-22,	22-00
+		!! Sched4:		Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home
+		if hour < 8:
+			locat['A60'] = 10
+		elseif hour < 10:
+			locat['A60'] = 60
+		elseif hour < 14:
+			locat['A60'] = 61
+		elseif hour < 20:
+			locat['A60'] = 51
+		else
+			locat['A60'] = 10
+		end
+
+	elseif MiraVars['sched'] = 5:
+		!!				0-8,	8-10,	10-12,	12-14,	14-16,	16-18,	18-20,	20-22,	22-00
+		!! Sched5:		Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home,	Home
+		if hour < 8:
+			locat['A60'] = 10
+		elseif hour < 10:
+			locat['A60'] = 61
+		elseif hour < 12:
+			locat['A60'] = 60
+		elseif hour < 14:
+			locat['A60'] = 60
+		elseif hour < 16:
+			locat['A60'] = 30
+		elseif hour < 18:
+			locat['A60'] = 30
+		elseif hour < 20:
+			locat['A60'] = 20
+		elseif hour < 22:
+			locat['A60'] = 20
+		else
+			locat['A60'] = 20
+		end
+	end
+end
+
+
+
+!New
+if $ARGS[0] = 'getLocation':
+	gs 'miroslava_schedule', 'update_locat'
+
+	if locat['A60'] = 10:
+		$npcLocation['A60'] = 'Mira is at home'
+
+	elseif locat['A60'] = 20:
+		$npcLocation['A60'] = 'Mira is in your Grandparents yard'
+	elseif locat['A60'] = 21:
+		$npcLocation['A60'] = 'Mira is at your Grandparents house'
+
+	elseif locat['A60'] = 30:
+		$npcLocation['A60'] = 'Mira is walking around Gad'
+	elseif locat['A60'] = 31:
+		$npcLocation['A60'] = 'Mira is at the church'
+
+	elseif locat['A60'] = 40:
+		$npcLocation['A60'] = 'Mira at the forest road'
+	elseif locat['A60'] = 41:
+		$npcLocation['A60'] = 'Mira is at the bus station'
+	elseif locat['A60'] = 42:
+		$npcLocation['A60'] = 'Mira is with the gopniks'
+
+	elseif locat['A60'] = 50:
+		$npcLocation['A60'] = 'Mira is at the river'
+	elseif locat['A60'] = 51:
+		$npcLocation['A60'] = 'Mira is at the beach'
+
+	elseif locat['A60'] = 60:
+		$npcLocation['A60'] = 'Mira is at the forest edge'
+	elseif locat['A60'] = 61:
+		$npcLocation['A60'] = 'Mira is at the meadow'
+	elseif locat['A60'] = 62:
+		$npcLocation['A60'] = 'Mira is in the forest outskirts'
+	elseif locat['A60'] = 63:
+		$npcLocation['A60'] = 'Mira is in the center of the forest'
+	elseif locat['A60'] = 64:
+		$npcLocation['A60'] = 'Mira is at the swamps'
+
+	elseif locat['A60'] = 70:
+		$npcLocation['A60'] = 'Mira is at field'
+
+	elseif locat['A60'] = 80:
+		$npcLocation['A60'] = 'Mira is at the highway'
+	elseif locat['A60'] = 81:
+		$npcLocation['A60'] = 'Mira is at the train station'
+	elseif locat['A60'] = 82:
+		$npcLocation['A60'] = 'Mira is at the lorry'
+
+	!{
+	elseif locat['A60'] = 90:
+		$npcLocation['A60'] = 'Mira is with you'
+	}
+
+	end
+end
+
+
+!{!OLD
+if $ARGS[0] = 'getLocation':
+	if locat['A60'] = 0:
+		$npcLocation['A60'] = 'Mira is at home'
+	elseif locat['A60'] = 1:
+		$npcLocation['A60'] = 'Mira is at river'
+	elseif locat['A60'] = 2:
+		$npcLocation['A60'] = 'Mira is at meadow'
+	elseif locat['A60'] = 3:
+		$npcLocation['A60'] = 'Mira is at forest'
+	elseif locat['A60'] = 4:
+		$npcLocation['A60'] = 'Mira is at field'
+	elseif locat['A60'] = 41:
+		$npcLocation['A60'] = 'Mira is at field'
+	elseif locat['A60'] = 42:
+		$npcLocation['A60'] = 'Mira is at field'
+	elseif locat['A60'] = 43:
+		$npcLocation['A60'] = 'Mira is at field'
+	elseif locat['A60'] = 5:
+		$npcLocation['A60'] = 'Mira is at gop'
+	elseif locat['A60'] = 6:
+		$npcLocation['A60'] = 'Mira is at gad_gphouse'
+	elseif locat['A60'] = 7:
+		$npcLocation['A60'] = 'Mira is at gad_gpyard'
+	elseif locat['A60'] = 8:
+		$npcLocation['A60'] = 'Mira is at the highway'
+	elseif locat['A60'] = 9:
+		$npcLocation['A60'] = 'Mira is with you'
+	end
+end
+}
+
+--- miroslava_schedule ---------------------------------

+ 0 - 173
locations/miroslave_schedule.qsrc

@@ -1,173 +0,0 @@
-# miroslave_schedule
-
-	!MiraLoc tells us where Mira is Located
-	!----------------------------------------------
-	!MiraLoc = 0	(Mira at home)		-> locat['A60'] = 0
-	!MiraLoc = 1	(Mira at river)		-> locat['A60'] = 1
-	!MiraLoc = 2	(Mira at meadow)	-> locat['A60'] = 2
-	!MiraLoc = 3	(Mira at forest)	-> locat['A60'] = 3
-	!MiraLoc = 4	(Mira at field)		-> locat['A60'] = 4
-	!MiraLoc = 41	(Mira at field)		-> locat['A60'] = 41
-	!MiraLoc = 42	(Mira at field)		-> locat['A60'] = 42
-	!MiraLoc = 43	(Mira at field)		-> locat['A60'] = 43
-	!MiraLoc = 5	(Mira with gop)		-> locat['A60'] = 5
-	!MiraLoc = 6	(Mira at Gadhouse)	-> locat['A60'] = 6
-	!MiraLoc = 7	(Mira at Gaddvor)	-> locat['A60'] = 7
-	!MiraLoc = 8	(Mira at highway)	-> locat['A60'] = 8
-	!MiraLoc = 9	(Mira with Sveta)	-> locat['A60'] = 9
-	
-	!! NEW
-	!locat['A60'] = 0	Home
-	!locat['A60'] = 1	Gad
-	!locat['A60'] = 2	River
-	!locat['A60'] = 3	Forest
-	!locat['A60'] = 31	Meadow
-	!locat['A60'] = 4	Field
-	!locat['A60'] = 41	Field
-	!locat['A60'] = 42	Field
-	!locat['A60'] = 43	Field
-	!locat['A60'] = 5	Gopniks
-	!locat['A60'] = 6	Grandparents house
-	!locat['A60'] = 61	Grandparents yard
-	!locat['A60'] = 7	Highway
-	!locat['A60'] = 9	With Sveta
-
-
-
-!! Cikl: mira_sched = rand(0, 3)
-
-if MiraLoc = 9:
-	!! If Mira is with you, she''ll stick with you.
-	MiraLoc = 9
-else
-	!! From mirafather and miroslavahome
-	if mira_no > 0:
-		locat['A60'] = 0
-	else
-		if sunWeather = 0:
-			if npc_rel['A60'] >= 15:
-				if mira_sched = 1:
-					locat['A60'] = 6
-				else
-					locat['A60'] = 0
-				end
-			else
-				MiraLoc = 0
-			end
-			!!Or MiraLoc = 6?
-		else
-			if hour < 8:
-				locat['A60'] = 0
-			elseif hour >= 20:
-				if npc_rel['A60'] >= "SOMETHING":
-					locat['A60'] = 5
-				else
-					locat['A60'] = 0
-				end
-			else
-				if mira_shed = 1:
-					!!			8-10,	10-12,	12-14,	14-16,	16-18,	18-20
-					!! Sched0: 	River,	River,	Forest,	Meadow,	River,	home
-					if hour < 10:
-						locat['A60'] = 2
-					elseif hour < 12:
-						locat['A60'] = 2
-					elseif hour < 14:
-						locat['A60'] = 3
-					elseif hour < 16:
-						locat['A60'] = 31
-					elseif hour < 18:
-						locat['A60'] = 2
-					else
-						locat['A60'] = 0
-					end
-				elseif mira_shed = 2:
-				
-				end
-			end
-		end
-
-		if npc_QW['A60'] > 15 and hour >= 16 and hour <= 19:
-			locat['A60'] = 8
-		elseif locat['A60'] ! 0:
-			if npc_rel['A60'] = 0:
-				locat['A60'] = 1
-			else
-				if month >= 4 and month <= 10 and hour >= 8 and hour <= 18:
-					locat['A60'] = 1
-				elseif hour >= 8 and hour <= 22:
-					locat['A60'] = 0
-				end
-			end
-		end
-	end
-end
-
-
-!New
-if $ARGS[0] = 'getLocation':
-	if locat['A60'] = 0:
-		$npcLocation['A60'] = 'Mira is at home'
-	elseif locat['A60'] = 1:
-		$npcLocation['A60'] = 'Mira is walking around Gad'
-	elseif locat['A60'] = 2:
-		$npcLocation['A60'] = 'Mira is at the river'
-	elseif locat['A60'] = 3:
-		$npcLocation['A60'] = 'Mira is at forest'
-	elseif locat['A60'] = 31:
-		$npcLocation['A60'] = 'Mira is at the meadow'
-	elseif locat['A60'] = 4:
-		$npcLocation['A60'] = 'Mira is at field'
-	elseif locat['A60'] = 41:
-		$npcLocation['A60'] = 'Mira is at field'
-	elseif locat['A60'] = 42:
-		$npcLocation['A60'] = 'Mira is at field'
-	elseif locat['A60'] = 43:
-		$npcLocation['A60'] = 'Mira is at field'
-	elseif locat['A60'] = 5:
-		$npcLocation['A60'] = 'Mira is with gopniks'
-	elseif locat['A60'] = 6:
-		$npcLocation['A60'] = 'Mira is at your Grandparents house'
-	elseif locat['A60'] = 61:
-		$npcLocation['A60'] = 'Mira is in your Grandparents yard'
-	elseif locat['A60'] = 7:
-		$npcLocation['A60'] = 'Mira is at the highway'
-	elseif locat['A60'] = 9:
-		$npcLocation['A60'] = 'Mira is with you'
-	end
-end
-
-
-!{!OLD
-if $ARGS[0] = 'getLocation':
-	if locat['A60'] = 0:
-		$npcLocation['A60'] = 'Mira is at home'
-	elseif locat['A60'] = 1:
-		$npcLocation['A60'] = 'Mira is at river'
-	elseif locat['A60'] = 2:
-		$npcLocation['A60'] = 'Mira is at meadow'
-	elseif locat['A60'] = 3:
-		$npcLocation['A60'] = 'Mira is at forest'
-	elseif locat['A60'] = 4:
-		$npcLocation['A60'] = 'Mira is at field'
-	elseif locat['A60'] = 41:
-		$npcLocation['A60'] = 'Mira is at field'
-	elseif locat['A60'] = 42:
-		$npcLocation['A60'] = 'Mira is at field'
-	elseif locat['A60'] = 43:
-		$npcLocation['A60'] = 'Mira is at field'
-	elseif locat['A60'] = 5:
-		$npcLocation['A60'] = 'Mira is at gop'
-	elseif locat['A60'] = 6:
-		$npcLocation['A60'] = 'Mira is at gadhouse'
-	elseif locat['A60'] = 7:
-		$npcLocation['A60'] = 'Mira is at gaddvor'
-	elseif locat['A60'] = 8:
-		$npcLocation['A60'] = 'Mira is at the highway'
-	elseif locat['A60'] = 9:
-		$npcLocation['A60'] = 'Mira is with you'
-	end
-end
-}
-
---- miroslave_schedule ---------------------------------

+ 29 - 26
locations/mitka.qsrc

@@ -1,9 +1,9 @@
 # mitka
 !2021/05/02
 !---------------------------------------------
-! mitka_first_drink = 0 Sveta has never been invited to drink with Mitka
-! mitka_first_drink = 1 Sveta has been invited by Mitka to her first drink with him
-! mitka_first_drink = 2 Sveta has already been drinking with Mitka before
+! GadBoy['first_drink'] = 0 Sveta has never been invited to drink with Mitka
+! GadBoy['first_drink'] = 1 Sveta has been invited by Mitka to her first drink with him
+! GadBoy['first_drink'] = 2 Sveta has already been drinking with Mitka before
 !---------------------------------------------
 ! npc_QW['A63'] = 0 Sveta has never had sex with Mitka
 ! npc_QW['A63'] = 1 Sveta has either had any sex with Mitka or Mitka has seen Sveta nude multiple times in the forest
@@ -12,11 +12,11 @@
 ! npc_QW['A63'] = 11 to 20 Sveta continues to have sex with Mitka and Kolyamba and Vasyan in the forest and when she is drunk with them
 ! npc_QW['A63'] = 21 Sveta gangbanged by all the drunk village men
 !---------------------------------------------
-! gadriver_gang = 0 Sveta has not been gangbanged by all the village men
-! gadriver_gang = 1 Sveta has been gangbanged by all the village men
-! gadriver_gang = 2 Sveta accepted the mens money for being gangbanged - she will now be treated like a whore throughout the village and can prostitute herself by the highway in Gadukino
-! gadriver_gang = 3 Sveta refused the mens money after being gangbanged - the men/boys will no longer randomly fuck her but the hunters still will in the woods
-! gadriver_gang = 4 Sveta accepted Mitkas apology - just normal relationship between Mitka and the village boys and Sveta now
+! GadBoy['river_gang'] = 0 Sveta has not been gangbanged by all the village men
+! GadBoy['river_gang'] = 1 Sveta has been gangbanged by all the village men
+! GadBoy['river_gang'] = 2 Sveta accepted the mens money for being gangbanged - she will now be treated like a whore throughout the village and can prostitute herself by the highway in Gadukino
+! GadBoy['river_gang'] = 3 Sveta refused the mens money after being gangbanged - the men/boys will no longer randomly fuck her but the hunters still will in the woods
+! GadBoy['river_gang'] = 4 Sveta accepted Mitkas apology - just normal relationship between Mitka and the village boys and Sveta now
 !---------------------------------------------
 
 if $ARGS[0] = '':
@@ -24,8 +24,8 @@ if $ARGS[0] = '':
 	$menu_arg = ''
 	menu_off = 1
 	
-	mitkaday = daystart
-	if mitka_first_drink = 0: mitka_first_drink = 1
+	GadBoy['mitka_day'] = daystart
+	if GadBoy['first_drink'] = 0: GadBoy['first_drink'] = 1
 	gs 'stat'
 	
 	'<center><b><font color="maroon">Mitka Shkvoryen</font></b></center>'
@@ -54,7 +54,7 @@ if $ARGS[0] = '':
 	'"Hey <<$pcs_nickname>>, how are you doing?"'
 	
 	! Mitka will ask Sveta for sex once relationship gets high enough or Mitka has already had sex with Sveta or Mitka has seen Sveta naked in the woods too many times and Sveta has not chosen to no longer be the village whore after the gadriver_gang event
-	if (npc_rel['A63'] >= 60 or npc_QW['A63'] > 0) and gadriver_gang < 3:
+	if (npc_rel['A63'] >= 60 or npc_QW['A63'] > 0) and GadBoy['river_gang'] < 3:
 		act '"I''m doing fine, thanks."': xgt 'mitka', 'sex_chat'
 	else
 		act '"I''m doing fine, thanks."': xgt 'mitka', 'normal_chat'
@@ -141,7 +141,7 @@ if $ARGS[0] = 'sex_chat':
 			
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkabjhome.jpg"></center>'
 			*nl
-			'Mitka takes you to '+iif(mitka_first_drink > 1, 'the familiar old trailer','an old trailer')+' in the woods.'
+			'Mitka takes you to '+iif(GadBoy['first_drink'] > 1, 'the familiar old trailer','an old trailer')+' in the woods.'
 			'Mitka sits down on a couch as you kneel in front of him. You take his cock out of his pants and start to suck...'
 			
 			npc_rel['A63'] += 5
@@ -153,8 +153,8 @@ if $ARGS[0] = 'sex_chat':
 			
 			act 'Swallow':
 				*clr & cla
-				mitkarand = rand(0,5)
-				if mitkarand = 5:
+				temp_rand = rand(0, 5)
+				if temp_rand = 0:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkabjhomecum2.jpg"></center>'
 					*nl
 					'Mitka stands up and begins to furiously stroke his cock right in your face.'
@@ -162,7 +162,7 @@ if $ARGS[0] = 'sex_chat':
 					'You smile up at him and lick your lips, pleased with your efforts.'
 					
 					gs 'cum_call','face','A63',1
-				elseif mitkarand >= 3:
+				elseif temp_rand <= 2:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkabjhomecum3.jpg"></center>'
 					*nl
 					'You bob your head up and down on his cock, trying to cram as much of his cock deep into your mouth. Sometimes you gag as it enters your throat.'
@@ -181,16 +181,17 @@ if $ARGS[0] = 'sex_chat':
 				end
 				gs 'arousal', 'end'
 				gs 'stat'
+				killvar 'temp_rand'
 
 				act 'Leave': gt $loc
 			end
 		end
 	! Sveta is not the boys slut but has had sex with Mitka and she does not know Mira likes Mitka or Mira is the boys slut
-	elseif (npc_QW['A63'] > 0 and npc_QW['A63'] < 11) and (npc_QW['A60'] < 2 or npc_QW['A60'] >= 11):
+	elseif (npc_QW['A63'] > 0 and npc_QW['A63'] < 11) and (MiraVars['QW'] < 2 or MiraVars['QW'] >= 11):
 		*nl
 		'Mitka scratches his balls and adds with a grin: "Hey <<$pcs_nickname>>, do you want to have some fun?"'
-		mitkarand = rand(1,10)
-		if (mitkarand = 1 or (mitkarand < 5 and stat['think_virgin'] = 0)) and mesec = 0:
+		temp_rand = rand(1, 10)
+		if (temp_rand = 1 or (temp_rand < 5 and stat['think_virgin'] = 0)) and mesec = 0:
 			'"How about you let me fuck you today?" Mitka asks.'
 			if stat['think_virgin'] = 1: 
 				gs 'willpower', 'sex', 'resist'
@@ -238,7 +239,7 @@ if $ARGS[0] = 'sex_chat':
 				end
 				
 				*nl
-				'Mitka takes you to '+iif(mitka_first_drink > 1, 'the familiar old trailer','an old trailer')+' in the woods.'
+				'Mitka takes you to ' + iif(GadBoy['first_drink'] > 1, 'the familiar old trailer','an old trailer') + ' in the woods.'
 				'He has you lie down on the bed and begins removing your clothes.'
 				if pcs_vag = 0:
 					'You feel your hymen break as Mitka penetrates you. Mitka looks down at you and says, "Wow, how were you still a virgin? I should have savoured this moment longer!"'
@@ -258,7 +259,7 @@ if $ARGS[0] = 'sex_chat':
 				
 				act 'Leave': gt $loc
 			end
-		elseif mitkarand < 9:
+		elseif temp_rand < 9:
 			'Can you give me a blowjob today?" Mitka asks.'
 			gs 'willpower', 'bj', 'resist'
 			if will_cost <= pcs_willpwr:
@@ -282,7 +283,7 @@ if $ARGS[0] = 'sex_chat':
 				
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkabjhome.jpg"></center>'
 				*nl
-				'Mitka takes you to '+iif(mitka_first_drink > 1, 'the familiar old trailer','an old trailer')+' in the woods.'
+				'Mitka takes you to ' + iif(GadBoy['first_drink'] > 1, 'the familiar old trailer','an old trailer') + ' in the woods.'
 				'Mitka sits down on a couch as you kneel in front of him. You take his cock out of his pants and start to suck...'
 				
 				npc_rel['A63'] += 1
@@ -294,8 +295,8 @@ if $ARGS[0] = 'sex_chat':
 				
 				act 'Make him cum':
 					*clr & cla
-					mitkarand = rand(0,5)
-					if mitkarand = 5:
+					temp_rand = rand(0, 5)
+					if Mtemp_rand = 5:
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkabjhomecum2.jpg"></center>'
 						*nl
 						'Mitka stands up and begins to furiously stroke his cock right in your face.'
@@ -304,7 +305,7 @@ if $ARGS[0] = 'sex_chat':
 						
 						gs 'cum_call','face','A63',1
 						gs 'cum_call','mouth','A63',1
-					elseif mitkarand >= 3:
+					elseif temp_rand >= 3:
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkabjhomecum3.jpg"></center>'
 						*nl
 						'You bob your head up and down on his cock, trying to cram as much of his cock deep into your mouth. Sometimes you gag as it enters your throat.'
@@ -323,6 +324,7 @@ if $ARGS[0] = 'sex_chat':
 					end
 					gs 'arousal', 'end'
 					gs 'stat'
+					killvar 'temp_rand'
 
 					act 'Leave': gt $loc
 				end
@@ -376,7 +378,7 @@ if $ARGS[0] = 'sex_chat':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaanalhome2.jpg"></center>'
 				end
 				*nl
-				'Mitka takes you to '+iif(mitka_first_drink > 1, 'the familiar old trailer','an old trailer')+' in the woods.'
+				'Mitka takes you to ' + iif(GadBoy['first_drink'] > 1, 'the familiar old trailer','an old trailer') + ' in the woods.'
 				'He has you lie down on the bed and begins removing your clothes. Once undressed, he bends you over prepares to penetrate your ass.'
 				if pcs_ass = 0:
 					'"An anal virgin, huh? Well your ass will never be the same after this!" Mitka says as he pushes his cock inside your ass.'
@@ -397,8 +399,9 @@ if $ARGS[0] = 'sex_chat':
 				act 'Leave':gt 'gadukino'
 			end
 		end
+		killvar 'temp_rand'
 	! Sveta is not the boys slut and Sveta knows Mira likes Mitka and Mira is not the boys slut yet
-	elseif npc_QW['A63'] > 0 and npc_QW['A63'] < 11 and npc_QW['A60'] >= 2 and npc_QW['A60'] < 11:
+	elseif npc_QW['A63'] > 0 and npc_QW['A63'] < 11 and MiraVars['QW'] >= 2 and MiraVars['QW'] < 11:
 		*nl
 		'Mitka scratches his balls and adds with a grin: "Hey <<$pcs_nickname>>, do you want to have some fun?"'
 

Diff do ficheiro suprimidas por serem muito extensas
+ 204 - 280
locations/mitkabuh.qsrc


+ 42 - 44
locations/mitkabuh_group.qsrc

@@ -1,6 +1,12 @@
 # mitkabuh_group
 !2021/05/05
+!2021/05/05 - Mira schedule update
+
 if $ARGS[0] = '':
+	npc_drunk['A60'] = 0
+	GadBoy['drunk_event'] = 0
+	MiraVars['drunk_event'] = 0
+	GadBoy['drinkday'] = daystart
 	menu_off = 1
 	CLOSE ALL
 	gs 'stat'
@@ -15,82 +21,77 @@ if $ARGS[0] = '':
 		'You quickly head over to the bench and sit down before anyone else can claim it.'
 		
 		act 'Sit down outside':
-			gt 'mitkabuh_group','partywithMira'
+			gt 'mitkabuh_group', 'partywithMira'
 		end
 	else
 		'The weather is poor outside today so you all decide to drink inside tonight.'
 		'The inside of the trailer looks like last time, just with maybe a few more empty bottles and cups strewn about. You quickly head over to the best couch and sit down before anyone else can claim it.'
 		
 		act 'Go inside the trailer':
-			gt 'mitkabuh_group','partywithMira'
+			gt 'mitkabuh_group', 'partywithMira'
 		end
 	end
 end
 
 if $ARGS[0] = 'partywithMira':
-	$loc = 'mitkabuh_group'
-	$loc_arg = 'partywithMira'
+	gs 'shortgs', 'setloc', 'mitkabuh_group', partywithMira
 	$location_type = 'indoors'
-	
-	$menu_loc = 'mitkabuh_group'
-	$menu_arg = 'partywithMira'
 	menu_off = 0
-		
+
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drunk.jpg"></center>'
 	*nl
 	'You, Mira, Mitka, Kolyamba and Vasyan are sitting on some '+iif(sunWeather=1,'logs outside','couches inside')+' the trailer. There is plenty of moonshine to go around but no snacks.'
 	
 	! prevent drinking events from repeating after sex is done because the passage of time in the sex events allowed alko to decrease again
-	if mitkabuhday = 1 and alko < 10: alko = 10
-	if mitkabuhmiraday = 1 and npc_drunk['A60'] < 10: npc_drunk['A60'] = 10
-	mitkadrinkday = daystart
+	if GadBoy['drunk_event'] = 1 and alko < 10: alko = 10
+	if MiraVars['drunk_event'] = 1 and npc_drunk['A60'] < 10: npc_drunk['A60'] = 10
 	
 	! Sveta is drunk and Mira is drunk and boys fucked both already tonight
-	if npc_drunk['A60'] >= 10 and alko >= 10 and mitkabuhday = 1 and mitkabuhmiraday = 1:
+	if npc_drunk['A60'] >= 10 and alko >= 10 and GadBoy['drunk_event'] = 1 and MiraVars['drunk_event'] = 1:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/girls_go.jpg"></center>'
 		*nl
 		'You and Mira are both way too drunk and can barely stand. The guys tell you to leave, they already fucked you tonight, but to make sure to come back tomorrow for another round.'
 		'As you are leaving the guys call after you both "Hey whores, come drink with us again, we love fucking you both!! Ha-ha!" They laugh as you make your way out. You are too drunk to come up with a response and just walk away with Mira.'
 		
-		act 'Leave': MiraLoc = 0 & npc_drunk['A60'] = 0 & mitkabuhmiraday = 0 & mitkabuhday = 0 & minut += 15 & gt 'gadroad'
+		act 'Leave': minut += 15 & gt 'gad_road', 'start'
 	! Sveta is drunk and Mira is drunk and both not had sex with the boys 
-	elseif npc_drunk['A60'] >= 10 and alko >= 10 and mitkabuhday = 0 and mitkabuhmiraday = 0:
+	elseif npc_drunk['A60'] >= 10 and alko >= 10 and GadBoy['drunk_event'] = 0 and MiraVars['drunk_event'] = 0:
 		*clr & cla
-		mitkabuhday = 1
-		mitkabuhmiraday = 1
-		mitkarand = rand(1,10)
-		mitkabuhrand = rand(1,6)
-		if mitkabuhrand = 1:
+		GadBoy['drunk_event'] = 1
+		MiraVars['drunk_event'] = 1
+		temp_rand = rand(1,6)
+		if temp_rand = 1:
 			gs 'boyStat','A61','0'
 			gs 'boyStat','A62','1'
 			gs 'boyStat','A63','2'
-		elseif mitkabuhrand = 2:
+		elseif temp_rand = 2:
 			gs 'boyStat','A61','0'
 			gs 'boyStat','A63','1'
 			gs 'boyStat','A62','2'
-		elseif mitkabuhrand = 3:
+		elseif temp_rand = 3:
 			gs 'boyStat','A62','0'
 			gs 'boyStat','A61','1'
 			gs 'boyStat','A63','2'
-		elseif mitkabuhrand = 4:
+		elseif temp_rand = 4:
 			gs 'boyStat','A62','0'
 			gs 'boyStat','A63','1'
 			gs 'boyStat','A61','2'
-		elseif mitkabuhrand = 5:
+		elseif temp_rand = 5:
 			gs 'boyStat','A63','0'
 			gs 'boyStat','A62','1'
 			gs 'boyStat','A61','2'
-		elseif mitkabuhrand = 6:
+		elseif temp_rand = 6:
 			gs 'boyStat','A63','0'
 			gs 'boyStat','A61','1'
 			gs 'boyStat','A62','2'
-		end	
-		if mitkarand <= 4 and mesec = 0:
+		end
+		temp_rand = rand(1,10)
+		if temp_rand <= 4 and mesec = 0:
 			gt 'mitkabuh_group','group_sex'
-		elseif mitkarand  <= 7:
+		elseif temp_rand  <= 7:
 			gt 'mitkabuh_group', 'group_bj'
-		elseif mitkarand <= 9:
+		elseif temp_rand <= 9:
 			gt 'mitkabuh_group', 'group_show'
 		else
 			gt 'mitkabuh_group', 'group_anal'
@@ -100,16 +101,12 @@ if $ARGS[0] = 'partywithMira':
 		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Leave (<<will_cost>> Willpower)':
-				MiraLoc = 0
-				npc_drunk['A60'] = 0
-				mitkabuhmiraday = 0
-				mitkabuhday = 0
 				minut += 15
 				gs 'willpower', 'drink', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				
-				gt 'gadroad'
+
+				gt 'gad_road', 'start'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -154,7 +151,7 @@ if $ARGS[0] = 'group_sex':
 		npc_rel[$boy[1]] += 1
 		npc_rel['A60'] += 1
 		if npc_QW['A63'] < 20: npc_QW['A63'] += 1
-		if npc_QW['A60'] < 15: npc_QW['A60'] += 1
+		if MiraVars['QW'] < 15: MiraVars['QW'] += 1
 		npc_sex[$boy[0]] += 1
 		npc_sex[$boy[1]] += 1
 		gang += 1
@@ -238,8 +235,7 @@ if $ARGS[0] = 'group_bj':
 	*clr & cla
 	menu_off = 1
 	
-	mitkarand = rand(0,1)
-	if mitkarand = 0:
+	if rand(0, 1) = 0:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitka_group/drunk1.jpg"></center>'
 		*nl
 		'While you are drinking with Mira, <<$boydesc[0]>> jokingly says that you both look incredible, but would look even better with cocks in your mouths.'
@@ -252,7 +248,7 @@ if $ARGS[0] = 'group_bj':
 			npc_rel[$boy[1]] += 1
 			npc_rel['A60'] += 1
 			if npc_QW['A63'] < 20: npc_QW['A63'] += 1
-			if npc_QW['A60'] < 15: npc_QW['A60'] += 1
+			if MiraVars['QW'] < 15: MiraVars['QW'] += 1
 			npc_sex[$boy[0]] += 1
 			npc_sex[$boy[1]] += 1
 			gang += 1
@@ -381,7 +377,7 @@ if $ARGS[0] = 'group_bj':
 				npc_rel[$boy[2]] += 1
 				npc_rel['A60'] += 1
 				if npc_QW['A63'] < 20: npc_QW['A63'] += 1
-				if npc_QW['A60'] < 15: npc_QW['A60'] += 1
+				if MiraVars['QW'] < 15: MiraVars['QW'] += 1
 				npc_sex[$boy[1]] += 1
 				npc_sex[$boy[2]] += 1
 				gang += 1
@@ -449,8 +445,7 @@ if $ARGS[0] = 'group_show':
 	*clr & cla
 	menu_off = 1
 	
-	mitkarand = rand(0,1)
-	if mitkarand = 0 and sunWeather = 1 and temper >= 10:
+	if rand(0,1) = 0 and sunWeather = 1 and temper >= 10:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitka_group/drunk1.jpg"></center>'
 		*nl
 		'While drinking with Mira, <<$boydesc[0]>> yells at you, "I''m bored!, get your asses over here and dance for us!"'
@@ -465,7 +460,7 @@ if $ARGS[0] = 'group_show':
 			npc_rel[$boy[2]] += 1
 			npc_rel['A60'] += 1
 			if npc_QW['A63'] < 20: npc_QW['A63'] += 1
-			if npc_QW['A60'] < 15: npc_QW['A60'] += 1
+			if MiraVars['QW'] < 15: MiraVars['QW'] += 1
 			gs 'stat'
 			
 			mitkapicrand = rand(0,3)
@@ -508,7 +503,7 @@ if $ARGS[0] = 'group_show':
 			npc_rel[$boy[2]] += 1
 			npc_rel['A60'] += 1
 			if npc_QW['A63'] < 20: npc_QW['A63'] += 1
-			if npc_QW['A60'] < 15: npc_QW['A60'] += 1
+			if MiraVars['QW'] < 15: MiraVars['QW'] += 1
 			gs 'stat'
 			
 			if sunWeather = 1:
@@ -628,7 +623,7 @@ if $ARGS[0] = 'group_anal':
 		
 		npc_rel[$boy[0]] += 1
 		if npc_QW['A63'] < 20: npc_QW['A63'] += 1
-		if npc_QW['A60'] < 15: npc_QW['A60'] += 1
+		if MiraVars['QW'] < 15: MiraVars['QW'] += 1
 		npc_sex[$boy[0]] += 1
 		gs 'cum_call','anus',$boy[0],1
 		gs 'arousal', 'anal', 10, 'sub', 'rough', 'deepthroat'
@@ -660,5 +655,8 @@ if $ARGS[0] = 'group_anal':
 	end
 end
 
+
+killvar 'temp_rand'
+
 --- mitkabuh_group ---------------------------------
 

Diff do ficheiro suprimidas por serem muito extensas
+ 147 - 152
locations/mitkasex.qsrc


+ 3 - 3
locations/mother.qsrc

@@ -686,7 +686,7 @@ if $ARGS[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. ""ell? Do you want to come with us to Gadukino or would you rather stay home with Anya?"'
 				
-				act 'Go to Gadukino': gt 'gadhouse', 'to_gadukino'
+				act 'Go to Gadukino': gt 'gad_gphouse', 'to_gadukino'
 				act 'Stay at home': gt 'korrPar'
 			end
 		end
@@ -705,7 +705,7 @@ if $ARGS[0] = '':
 	end
 end
 
-!!Called from mother and gadhouse, injects options for asking about workout sessions or starting a session
+!!Called from mother and gad_gphouse, injects options for asking about workout sessions or starting a session
 if $ARGS[0] = 'check_workout':
 	if motherQW['workout'] ! 1:
 		act 'Ask <<$npc_nickname[''A29'']>> to workout sometime': gt 'mother', 'ask_mother_workout'
@@ -714,7 +714,7 @@ if $ARGS[0] = 'check_workout':
 	if (CloStyle = 5 or $clothingworntype = 'danilovich_outfits') and hour >= 6 and hour < 12 and motherQW['workout'] = 1 and motherQW['workout_day'] ! daystart and pcs_energy >= 10:
 		if $loc = 'kuhrPar' or $loc = 'sitrPar':
 			act 'Ask <<$npc_nickname[''A29'']>> to workout': gt 'mother', 'mother_workout_pav'
-		elseif $loc = 'gadhouse':
+		elseif $loc = 'gad_gphouse':
 			act 'Ask <<$npc_nickname[''A29'']>> to workout': gt 'mother', 'mother_workout_gad'
 		end
 	elseif (CloStyle = 5 or $clothingworntype = 'danilovich_outfits') and hour >= 6 and hour < 12 and motherQW['workout'] = 1 and motherQW['workout_day'] ! daystart:

+ 3 - 3
locations/outdoors.qsrc

@@ -336,7 +336,7 @@ if $ARGS[0] = 'main':
 !!15 minute check to stop refreshes causing early gameover and cheating at exhibitionism
 		if outdoors_checks + 15 < totminut:
 			outdoors_checks = totminut
-			if isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0 and $loc ! 'gaddvor' and (isprok_lastday = 0 or (hour > 4 and isprok_lastday = 1)):
+			if isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0 and $loc ! 'gad_gpyard' and (isprok_lastday = 0 or (hour > 4 and isprok_lastday = 1)):
 				'<b><font color="red">You have blood flowing down your legs and staining your clothes.</font></b>'
 
 				if $pantyworntype ! 'none':gs 'panties', 'dispose' & '<b><font color="red">Your panties have been ruined and you discreetly remove and dispose of them.</font></b>'
@@ -348,12 +348,12 @@ if $ARGS[0] = 'main':
 
 !!Exhibitionism
 
-			if PCloInhibit >= pcs_inhib - 10 and $loc ! 'gaddvor':
+			if PCloInhibit >= pcs_inhib - 10 and $loc ! 'gad_gpyard':
 				exhibition_outdoors += 1
 				if pcs_inhib < 45 and PCloPanties = 1: exhibition_outdoors += 1
 			end
 
-			if $pantyworntype = 'none' and $loc ! 'gaddvor':
+			if $pantyworntype = 'none' and $loc ! 'gad_gpyard':
 				if PCloSkirt = 3:
 					exhibition_outdoors += 1
 				elseif PCloSkirt = 4:

+ 3 - 3
locations/pav_complex.qsrc

@@ -123,14 +123,14 @@ if $ARGS[0] = 'start':
 		if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 	end
 
-	if seenAD = 1 and pavSharedAptEnabled = 0: '<br>Some guys in one of the <a href="exec:minut += 5 & gt ''pav_shared_apt'',''doorNo30''">apartments</a> are looking for a roommate.'
+	if shared_apt['seenAd'] = 1 and shared_apt['enabled'] = 0: '<br>Some guys in one of the <a href="exec:minut += 5 & gt ''pav_shared_apt'',''doorNo30''">apartments</a> are looking for a roommate.'
 	
 	if rolanmeet = 8 and rolanblockhome ! 1: '<br>Mr. Matveev''s is living in an <a href="exec:minut += 5 & gt ''rolanapt'',''home''">apartment</a> in the Five Eight Estate.'
 	
 !!	if mid($start_type,1,2) = 'sg': '<br>Nearby, in another block of apartments, there''s an <a href="exec:minut += 3 & gt ''pavComplexOld'',''etaj_1''">old apartment building</a> that looks quite rundown and possibly abandoned.'
 	
 	if func('homes_properties', 'has_access', 'parents_home'): act '<b>Go Home</b> (Parents'' Apartment)': minut += 4 & pavhome_enter = 1 & gt 'korrPar'
-	if pavSharedAptEnabled = 1: act '<b>Go Home</b> (Shared Apartment)': minut += 5 & gt 'pav_shared_apt', 'start'
+	if shared_apt['enabled'] = 1: act '<b>Go Home</b> (Shared Apartment)': minut += 5 & gt 'pav_shared_apt', 'start'
 	act 'Walk to the Residential area (0:02)':minut += 2 & gt 'pav_residential'
 	act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
 	act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
@@ -139,7 +139,7 @@ if $ARGS[0] = 'start':
 	act 'Walk to Pushkin (0:30)':minut += 30 & gt 'pushkin'
 	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
-	elseif mid($start_type,1,2) = 'sg' and (func('homes_properties', 'has_access', 'parents_home') = 0 or pavSharedAptEnabled = 1):
+	elseif mid($start_type,1,2) = 'sg' and (func('homes_properties', 'has_access', 'parents_home') = 0 or shared_apt['enabled'] = 1):
 		act 'Go to your parent''s apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	end
 !!	if mid($start_type,1,2) = 'sg': act 'Go to the old apartment building':minut += 1 & gt 'pavComplexOld', 'etaj_1'

+ 1 - 1
locations/pav_complexb3.qsrc

@@ -93,7 +93,7 @@ if $ARGS[0] = 'etaj_4':
 	'<center>The fourth floor stairwell was renovated not long ago, but some hoodlums have already sprayed graffiti on the walls.</center>'
 	act 'Go down to the third floor': minut +=1 & gt 'pav_complexb3','etaj_3'
 	act 'Go up to the fifth floor': minut +=1 & gt 'pav_complexb3','etaj_5'
-	if seenAd = 0:
+	if shared_apt['seenAd'] = 0:
 		gt 'pav_shared_apt', 'advertNo30'
 	else
 		act 'Apartment 30: Shared apartment': gt 'pav_shared_apt', 'doorNo30'

+ 265 - 289
locations/pav_shared_apt.qsrc

@@ -4,18 +4,18 @@ gs 'themes', 'indoors'
 close all
 
 if $ARGS[0] = 'update':
-	rentWeekly = 2000
-	if rentLeft <= 0:rentLeft = 0
+	shared_apt['rentWeekly']= 2000
+	if shared_apt['rentLeft'] <= 0:shared_apt['rentLeft'] = 0
 	!how much of the unpaid weekly rent is left
 	if orgB > 100:orgB = 100
 
-	price_cook = 50
-	price_clean = 50
-	price_handjob = 50
-	price_blowjob = 100
-	price_vaginal = 150
-	price_anal = 200
-	price_special = 250
+	shared_apt['price_cook'] = 50
+	shared_apt['price_clean'] = 50
+	shared_apt['price_handjob'] = 50
+	shared_apt['price_blowjob'] = 100
+	shared_apt['price_vaginal'] = 150
+	shared_apt['price_anal'] = 200
+	shared_apt['price_special'] = 250
 
 	! time calculations
 	weekNum = (daystart - (daystart mod 7)) / 7
@@ -24,72 +24,70 @@ if $ARGS[0] = 'update':
 	$pcs_font = '990099'
 		!pink
 
-	! servitudeLvl = 0 - no service, pays rent
-	! servitudeLvl = 1 - nonsexual service
-	! servitudeLvl = 2 - sexual and nonsexual service
+	! shared_apt['servitudeLvl'] = 0 - no service, pays rent
+	! shared_apt['servitudeLvl'] = 1 - nonsexual service
+	! shared_apt['servitudeLvl'] = 2 - sexual and nonsexual service
 
 
-	$oleg_font = '0096FF'
-		!blue
-	oleg_leaves = 9
-	oleg_comes = 18
-	oleg_sleeps = 23
-	oleg_wakes = 8
+	$Oleg['font'] = '007bff'		&!blue
+	Oleg['leaves'] = 9
+	Oleg['comes'] = 18
+	Oleg['sleeps'] = 23
+	Oleg['wakes'] = 8
 
 
-	$nestor_font = 'CC0000'
-		!red
-	nestor_leaves = 11
-	nestor_comes = 19
-	nestor_sleeps = 23
-	nestor_wakes = 9
+	$Nestor['font'] = '8a0000'		&!red
+	Nestor['leaves'] = 11
+	Nestor['comes'] = 19
+	Nestor['sleeps'] = 23
+	Nestor['wakes'] = 9
 
 
-	$yakov_font = '009900'
-		!green
-	yakov_leaves = 7
-	yakov_comes = 16
-	yakov_sleeps = 22
-	yakov_wakes = 5
+	$Yakov['font'] = '017a01'		&!green
+	Yakov['leaves'] = 7
+	Yakov['comes'] = 16
+	Yakov['sleeps'] = 22
+	Yakov['wakes'] = 5
 		!flag if there was already a sex between him and Sveta
-		!yakov_bj ; yakov_bjDeep ; yakov_swall ; yakov_vag ; yakov_vagCumInside ; yakov_vagCumInsideUnwanted ; yakov_anal ; yakov_analCumInside ; yakov_analCumInsideUnwanted
+		!Yakov['bj'] ; Yakov['bjDeep'] ; Yakov['swall'] ; Yakov['vag'] ; Yakov['vagCumInside'] ; Yakov['vagCumInsideUnwanted'] ; Yakov['anal'] ; Yakov['analCumInside'] ; Yakov['analCumInsideUnwanted']
 
 	!mood setup
-	$oleg_mood = iif(oleg_mood = 1, 'great', '') + iif(oleg_mood = 2, 'good', '') + iif(oleg_mood = 3, 'nice', '') + iif(oleg_mood = 4, 'fine', '') + iif(oleg_mood = 5, 'neutral', '') + iif(oleg_mood = 6, 'okay', '') + iif(oleg_mood = 7, 'bad', '') + iif(oleg_mood = 8, 'terrible', '') + iif(oleg_mood = 9, 'awful', '') + iif(oleg_mood = 10, 'horrible', '')
-	$nestor_mood = iif(nestor_mood = 1, 'great', '') + iif(nestor_mood = 2, 'good', '') + iif(nestor_mood = 3, 'nice', '') + iif(nestor_mood = 4, 'fine', '') + iif(nestor_mood = 5, 'neutral', '') + iif(nestor_mood = 6, 'okay', '') + iif(nestor_mood = 7, 'bad', '') + iif(nestor_mood = 8, 'terrible', '') + iif(nestor_mood = 9, 'awful', '') + iif(nestor_mood = 10, 'horrible', '')
-	$yakov_mood = iif(yakov_mood = 1, 'great', '') + iif(yakov_mood = 2, 'good', '') + iif(yakov_mood = 3, 'nice', '') + iif(yakov_mood = 4, 'fine', '') + iif(yakov_mood = 5, 'neutral', '') + iif(yakov_mood = 6, 'okay', '') + iif(yakov_mood = 7, 'bad', '') + iif(yakov_mood = 8, 'terrible', '') + iif(yakov_mood = 9, 'awful', '') + iif(yakov_mood = 10, 'horrible', '')
+	$Oleg['mood'] = iif(Oleg['mood'] = 1, 'great', '') + iif(Oleg['mood'] = 2, 'good', '') + iif(Oleg['mood'] = 3, 'nice', '') + iif(Oleg['mood'] = 4, 'fine', '') + iif(Oleg['mood'] = 5, 'neutral', '') + iif(Oleg['mood'] = 6, 'okay', '') + iif(Oleg['mood'] = 7, 'bad', '') + iif(Oleg['mood'] = 8, 'terrible', '') + iif(Oleg['mood'] = 9, 'awful', '') + iif(Oleg['mood'] = 10, 'horrible', '')
+	$Nestor['mood'] = iif(Nestor['mood'] = 1, 'great', '') + iif(Nestor['mood'] = 2, 'good', '') + iif(Nestor['mood'] = 3, 'nice', '') + iif(Nestor['mood'] = 4, 'fine', '') + iif(Nestor['mood'] = 5, 'neutral', '') + iif(Nestor['mood'] = 6, 'okay', '') + iif(Nestor['mood'] = 7, 'bad', '') + iif(Nestor['mood'] = 8, 'terrible', '') + iif(Nestor['mood'] = 9, 'awful', '') + iif(Nestor['mood'] = 10, 'horrible', '')
+	$Yakov['mood'] = iif(Yakov['mood'] = 1, 'great', '') + iif(Yakov['mood'] = 2, 'good', '') + iif(Yakov['mood'] = 3, 'nice', '') + iif(Yakov['mood'] = 4, 'fine', '') + iif(Yakov['mood'] = 5, 'neutral', '') + iif(Yakov['mood'] = 6, 'okay', '') + iif(Yakov['mood'] = 7, 'bad', '') + iif(Yakov['mood'] = 8, 'terrible', '') + iif(Yakov['mood'] = 9, 'awful', '') + iif(Yakov['mood'] = 10, 'horrible', '')
 	
 
 	gs 'stat'
 
-	if pavSharedAptDebug = 0:
-	elseif pavSharedAptDebug = 1:
-		'<a href="exec:pavSharedAptDebug=2">Debug</a>'
-	elseif pavSharedAptDebug = 2:
-		'<a href="exec:pavSharedAptDebug=1">Debug Close</a>'
-		'<a href="exec:pavSharedAptDebug=0">Debug Disable</a>'
-		$npc_firstname['A266']+' relationship: '+npc_rel['A266']
-		$npc_firstname['A265']+' relationship: '+npc_rel['A265']
-		$npc_firstname['A264']+' relationship: '+npc_rel['A264']
-		'rentLeft: ' + rentLeft
-		'weekNum: ' + weekNum
-		'rentWeekNum: ' + rentWeekNum
-		'servitudeLvl: ' + servitudeLvl
-		'servicePaid: ' + servicePaid
-		'cashPaid: ' + cashPaid
-		'step: ' + step
-		'subStep: ' + subStep
-		'nestor_mood: ' + nestor_mood
-		'oleg_mood: ' + oleg_mood
-		'yakov_mood: ' + yakov_mood
+	if shared_apt['debug'] = 0:
+	elseif shared_apt['debug'] = 1:
+		'<a href="exec:shared_apt[''debug'']=2">Debug</a>'
+	elseif shared_apt['debug'] = 2:
+		'<a href="exec:shared_apt[''debug'']=1">Debug Close</a>'
+		'<a href="exec:shared_apt[''debug'']=0">Debug Disable</a>'
+		'<<$npc_firstname[''A266'']>> relationship: <<$npc_rel[''A266'']>>'
+		'<<$npc_firstname[''A265'']>> relationship: <<$npc_rel[''A265'']>>'
+		'<<$npc_firstname[''A264'']>> relationship: <<$npc_rel[''A264'']>>'
+		'rentLeft: '	 + shared_apt['rentLeft']
+		'weekNum: '		 + shared_apt['weekNum']
+		'rentWeekNum: '  + shared_apt['rentWeekNum']
+		'servitudeLvl: ' + shared_apt['servitudeLvl']
+		'servicePaid: '  + shared_apt['servicePaid']
+		'cashPaid: ' 	 + shared_apt['cashPaid']
+		'step: ' 		 + shared_apt['step']
+		'subStep: ' 	 + shared_apt['subStep']
+		'Nestor mood: '  + Nestor['mood']
+		'Oleg mood: ' 	 + Oleg['mood']
+		'Yakov mood: '	 + Yakov['mood']
 		''
-		oleg_served = 0
-		oleg_mood = 1
-		nestor_served = 0
-		nestor_mood = 1
-		yakov_mood = 1
-		yakov_served = 0
+		Oleg['served'] = 0
+		Oleg['mood'] = 1
+		Nestor['served'] = 0
+		Nestor['mood'] = 1
+		Yakov['mood'] = 1
+		Yakov['served'] = 0
 	end
+
 end
 
 ! accomodation advert
@@ -98,7 +96,7 @@ if $ARGS[0] = 'advertNo30':
 	$menu_arg = 'advertNo30'
 	menu_off = 1
 	minut += 2
-	seenAd = 1
+	shared_apt['seenAd'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/pod_ob'+rand(1,2)+'.jpg"></center>'
 	'<br>As you pass by the advertisements, you notice a sign - "сдаeтся в аренду комната" (Room for rent!). Some guys are looking for a roommate. They live in an apartment in one of the other buildings in the apartment complex.'
@@ -112,7 +110,7 @@ if $ARGS[0] = 'doorNo30':
 	$menu_arg = 'doorNo30'
 	menu_off = 1
 	act 'Go back outside':gt 'pav_complex', 'start'
-	if pavSharedAptEnabled = 1:
+	if shared_apt['enabled'] = 1:
 		'<center><img <<$set_imgh>> src="images/locations/shared/apartment/podezdhr.jpg"></center>'
 		'<br>You stand before the entry door to apartment No 30, the apartment you share with three others'
 		act 'Go inside':gt 'pav_shared_apt', 'start'
@@ -133,11 +131,10 @@ if $ARGS[0] = 'start':
 	$locM_arg = 'start'
 	$loc = 'pav_shared_apt'
 	$loc_arg = 'start'
-	$goBack = $loc_arg
 	$location_type = 'private'
 	killvar '$locclass'
 	gs 'pav_shared_apt', 'update'
-	if introDone = 0:gt 'pav_shared_apt', 'intro'
+	if shared_apt['introDone'] = 0:gt 'pav_shared_apt', 'intro'
 	minut += 2
 	gs 'stat'
 	
@@ -147,27 +144,27 @@ if $ARGS[0] = 'start':
 	if daystart >= tomorrow:
 		tomorrow = daystart + 1
 
-		oleg_mood = rand(1, 10)
-		oleg_cleaned = 0
+		Oleg['mood'] = rand(1, 10)
+		Oleg['cleaned'] = 0
 
-		nestor_mood = rand(1, 10)
-		nestor_cleaned = 0
+		Nestor['mood'] = rand(1, 10)
+		Nestor['cleaned'] = 0
 
-		yakov_mood = rand(1, 10)
-		yakov_cleaned = 0
+		Yakov['mood'] = rand(1, 10)
+		Yakov['cleaned'] = 0
 	end
 
 	! do this every time
-	rentLeft = rentWeekly - servicePaid - cashPaid
+	shared_apt['rentLeft'] = shared_apt['rentWeekly'] - shared_apt['servicePaid'] - shared_apt['cashPaid']
 
 	'<center><h3>Hallway</h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/hallway.jpg"></center>'
-	'It is week number <<weekNum>>.'
+	'It is week number <<shared_apt[''weekNum'']>>.'
 
-	if weekNum < rentWeekNum:
-		if rentLeft > 0:
-			'You have <<rentLeft>> <b>₽</b> of rent left to pay for the next week.'
-			if servitudeLvl >= 1:
+	if shared_apt['weekNum']  <  shared_apt['rentWeekNum']:
+		if shared_apt['rentLeft'] > 0:
+			'You have <<shared_apt[''rentLeft'']>> <b>₽</b> of rent left to pay for the next week.'
+			if shared_apt['servitudeLvl'] >= 1:
 				'You may still pay it in <a href="exec:gt ''pav_shared_apt'', ''payCash''">cash</a>, if you want.'
 			else
 				'Pay it in <a href="exec:gt ''pav_shared_apt'', ''payCash''">cash</a>.'
@@ -176,24 +173,24 @@ if $ARGS[0] = 'start':
 			'You have already paid the whole rent for the next week.'
 			'You can end your rental agreement and leave the apartment if you don''t want to stay here anymore.'
 		end
-	elseif weekNum >= rentWeekNum:
-		if rentLeft = 0:
+	elseif shared_apt['weekNum']  >=  shared_apt['rentWeekNum']:
+		if shared_apt['rentLeft'] = 0:
 			!rent was forepaid, everything OK, proceed to next week
-			rentLeft += 2000
-			cashPaid = 0
-			servicePaid = 0			
-			rentWeekNum = weekNum + 1
-		elseif rentLeft > 0:
+			shared_apt['rentLeft'] += 2000
+			shared_apt['cashPaid'] = 0
+			shared_apt['servicePaid'] = 0			
+			shared_apt['rentWeekNum'] = shared_apt['weekNum']  + 1
+		elseif shared_apt['rentLeft'] > 0:
 			!rent was not fully paid
-			'You did not pay the whole rent for this week. You still have to pay <<rentLeft>> <b>₽</b>.'
-			if money >= rentLeft:
+			'You did not pay the whole rent for this week. You still have to pay <<shared_apt[''rentLeft'']>> <b>₽</b>.'
+			if money >= shared_apt['rentLeft']:
 				!not enough cash to pay it manually
 				'You still can pay it in <a href="exec:gt ''pav_shared_apt'', ''payCash''">cash</a>, otwerwise you''ll be kicked out!'
 			else
 				!in future add some way to serve your way out
 				'You do not have enough money to pay the rest of the rent in cash, even if you wanted to. Guess you''ll have to find a new living place...'
-				rentPaid = 0
-				pavSharedAptEnabled = 0
+				shared_apt['rentPaid'] = 0
+				shared_apt['enabled'] = 0
 				gs 'homes_properties', 'block_access', 'shared_apartment', 0
 			end
 		end
@@ -212,25 +209,25 @@ if $ARGS[0] = 'start':
 		act 'Go pick up Natasha before school': gt 'natbelEv', 'carrybooks'
 	end
 	
-	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 ''pav_shared_oleg'', ''oleg_dick''"><font color=#<<$oleg_font>>><<$npc_firstname[''A266'']>></font></a>, <a href="exec: gt ''pav_shared_nestor'', ''nestor_Dick''"><font color=#<<$nestor_font>>><<$npc_firstname[''A265'']>></font></a>, <a href="exec: gt ''pav_shared_yakov'', ''yakov_Dick''"><font color=#<<$yakov_font>>><<$npc_firstname[''A264'']>></font></a>.'
+	if shared_apt['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 ''pav_shared_oleg'', ''Oleg_dick''"><font color=#<<$Oleg[''font'']>>><<$npc_firstname[''A266'']>></font></a>, <a href="exec: gt ''pav_shared_nestor'', ''Nestor_Dick''"><font color=#<<$Nestor[''font'']>>><<$npc_firstname[''A265'']>></font></a>, <a href="exec: gt ''pav_shared_yakov'', ''Yakov_Dick''"><font color=#<<$Yakov[''font'']>>><<$npc_firstname[''A264'']>></font></a>.'
 		'You stand in the hallway.'
 		*nl
-		'From the hallway, several doors lead to <a href="exec:gt ''pav_shared_apt'', ''oleg_Room''"><<$npc_firstname[''A266'']>>''s</a>, <a href="exec:gt ''pav_shared_apt'', ''nestor_Room''"><<$npc_firstname[''A265'']>>''s</a>, and <a href="exec:gt ''pav_shared_apt'', ''yakov_Room''"><<$npc_firstname[''A264'']>>''s</a> rooms.'
+		'From the hallway, several doors lead to <a href="exec:gt ''pav_shared_apt'', ''Oleg_Room''"><<$npc_firstname[''A266'']>>''s</a>, <a href="exec:gt ''pav_shared_apt'', ''Nestor_Room''"><<$npc_firstname[''A265'']>>''s</a>, and <a href="exec:gt ''pav_shared_apt'', ''Yakov_Room''"><<$npc_firstname[''A264'']>>''s</a> rooms.'
 		'The last doors lead to the <a href="exec:gt ''pav_shared_apt'', ''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 living room 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.'
 		*nl
-		if servitudeLvl >= 1:'A computer-printed <a href="exec:gt ''pav_shared_apt'', ''list''">list</a> hangs on the exit door.' & *nl
+		if shared_apt['servitudeLvl'] >= 1:'A computer-printed <a href="exec:gt ''pav_shared_apt'', ''list''">list</a> hangs on the exit door.' & *nl
 		act 'Go to your room':gt 'pav_shared_apt', 'pcsRoom'
 		act 'Go to the bathroom':gt 'pav_shared_apt', 'bathroom'
 		act 'Go to the kitchen':gt 'pav_shared_apt', 'kitchen'
-		act '<font color=#<<$oleg_font>>><<$npc_firstname[''A266'']>>''s room</font>':gt 'pav_shared_apt', 'oleg_Room'
-		act '<font color=#<<$nestor_font>>><<$npc_firstname[''A265'']>>''s room</font>':gt 'pav_shared_apt', 'nestor_Room'
-		act '<font color=#<<$yakov_font>>><<$npc_firstname[''A264'']>>''s room</font>':gt 'pav_shared_apt', 'yakov_Room'
+		act '<font color=#<<$Oleg[''font'']>>><<$npc_firstname[''A266'']>>''s room</font>':gt 'pav_shared_apt', 'Oleg_Room'
+		act '<font color=#<<$Nestor[''font'']>>><<$npc_firstname[''A265'']>>''s room</font>':gt 'pav_shared_apt', 'Nestor_Room'
+		act '<font color=#<<$Yakov[''font'']>>><<$npc_firstname[''A264'']>>''s room</font>':gt 'pav_shared_apt', 'Yakov_Room'
 		gs 'wardrobe', 'default_clothing_options'
-		if rentLeft = 0:
+		if shared_apt['rentLeft'] = 0:
 			act '<font color=red>End your rental agreement and move out</font>':gt 'pav_shared_apt', 'eoleg_agreement'
 		end
 
@@ -242,29 +239,28 @@ if $ARGS[0] = 'start':
 	!! NOTE:If Sveta has access to her parents home then she leaves the kids there
 	if func('homes_properties', 'has_access', 'parents_home') = 0 and kid > 0:
 		*clr & cla
-		pavIntroStep = 0
-		introDone = 0
+		shared_apt['pavIntroStep'] = 0
+		shared_apt['introDone'] = 0
 		minut += 5
 		!Need to have some actual story to this with NPC reactions.
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/revenge/crying.jpg"></center>'
 		'You''ve been kicked out of the apartment for having children.'
-		pavSharedAptEnabled = 0
+		shared_apt['enabled'] = 0
 		gs 'homes_properties', 'block_access'
 		act 'Leave':gt 'pav_complex', 'start'
 	end
-	if $clothingworntype = 'nude' and pavSharedAptEnabled = 0: gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & gs 'shoes', 'wear', 'last_worn' & gs 'stat'
+	if $clothingworntype = 'nude' and shared_apt['enabled'] = 0: gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & gs 'shoes', 'wear', 'last_worn' & gs 'stat'
 end
 
 if $ARGS[0] = 'payCash':
 	menu_off = 1
 	minut += 2
-	cash = rentLeft
-	if money >= cash:
-		'You have decided to pay the remainder of the weekly rent ('+cash+'<b>₽</b>) with cash.'
-		cashPaid += cash
-		money -= cash
-		rentPaid = 1
-		pavSharedAptEnabled = 1
+	if money >= shared_apt['rentLeft']:
+		'You have decided to pay the remainder of the weekly rent ('+shared_apt['rentLeft']+'<b>₽</b>) with cash.'
+		shared_apt['cashPaid'] += shared_apt['rentLeft']
+		money -= shared_apt['rentLeft']
+		shared_apt['rentPaid'] = 1
+		shared_apt['enabled'] = 1
 		gs 'homes_properties', 'give_access'
 	else
 		'You do not have enough cash to pay for the rest of your rent.'
@@ -275,42 +271,42 @@ end
 if $ARGS[0] = 'payService':
 	menu_off = 1
 	minut += 1
-	'The amount '+price+' <b>₽</b> was taken off of your weekly rent.'
-	servicePaid += price
+	'The amount '+shared_apt['price']+' <b>₽</b> was taken off of your weekly rent.'
+	shared_apt['servicePaid'] += shared_apt['price']
 	act 'Continue':gt 'pav_shared_apt', 'start'
 end
 
 if $ARGS[0] = 'rentSetup':
 	menu_off = 1
 	minut += 2
-	'You get a list of paper, saying the weekly rent is <<rentWeekly>> rubles.'
-	rentPaid = 1
-	introDone = 1
-	rentWeekNum = (daystart - (daystart mod 7)) / 7 + 1
+	'You get a list of paper, saying the weekly rent is <<shared_apt[''rentWeekly'']>> <b>₽</b>.'
+	shared_apt['rentPaid'] = 1
+	shared_apt['introDone'] = 1
+	 shared_apt['rentWeekNum'] = (daystart - (daystart mod 7)) / 7 + 1
 	act 'Continue':gt 'pav_shared_apt', 'start'
 end
 
 if $ARGS[0] = 'intro':
 	menu_off = 1
 	gs 'pav_shared_apt', 'update'
-	if step > 0:
-		'<center><img border="5" bordercolor="<<$yakov_font>>" height="150" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
+	if shared_apt['step'] > 0:
+		'<center><img border="5" bordercolor="<<$Yakov[''font'']>>" height="150" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
 		''
 	end
 
-	if pavIntroStep = 0:
+	if shared_apt['pavIntroStep'] = 0:
 		minut += 2
-		pavIntroStep = 1
+		shared_apt['pavIntroStep'] = 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"></center>'
 		''
 		'The door is opened by a young, nice-looking athletic man.'
-		'<font color=#<<$yakov_font>>>"Hi sweetie! What do you need?"</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Hi sweetie! What do you need?"</font>'
 		'<font color=#<<$pcs_font>>>"Hello, my name is <<$pcs_firstname>> <<$pcs_lastname>>. I''ve seen the advert that someone here have a spare room for rent?"</font>'
-		'<font color=#<<$yakov_font>>>"Yeah, that''s true. Come in, I''ll call the guys and we can talk about it. I''m <<$npc_firstname[''A264'']>> by the way."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Yeah, that''s true. Come in, I''ll call the guys and we can talk about it. I''m <<$npc_firstname[''A264'']>> by the way."</font>'
 		act 'Go in':gt 'pav_shared_apt', 'intro'
-	elseif pavIntroStep = 1:
+	elseif shared_apt['pavIntroStep'] = 1:
 		minut += 3
-		pavIntroStep = 2
+		shared_apt['pavIntroStep'] = 2
 		'You enter a hallway filled with coats and shoes, indicating that 3 or 4 people live here.'
 		'The guy disappears into one of the rooms, and you overhear him talking to someone.'
 		'They attempt to speak quietly, but you catch a sentence or two...:'
@@ -318,17 +314,17 @@ if $ARGS[0] = 'intro':
 		'"...a girl, I tell you..." "...nice one, really, with nice round features, man..." "...better than another guy, idiot..." "...ok, ok, just be done with it..."'
 		''
 		'After a while, three young men emerge in the hallway.'
-		'<font color=#<<$yakov_font>>>"So, that''s her, guys. <<$pcs_firstname>>, could you introduce yourself to these guys?"</font>'
+		'<font color=#<<$Yakov[''font'']>>>"So, that''s her, guys. <<$pcs_firstname>>, could you introduce yourself to these guys?"</font>'
 		'<font color=#<<$pcs_font>>>"Hello, I''m <<$pcs_firstname>> <<$pcs_lastname>>. I''d like to rent the empty room in your apartment."</font>'
-		'<font color=#<<$nestor_font>>>"Well, now that''s what I like! Finally, this won''t be such a dull party!"</font>'
-		'<font color=#<<$oleg_font>>>"<<$pcs_firstname>>, please excuse my friend, <<$npc_firstname[''A265'']>>. He can be quite rude. I''m <<$npc_firstname[''A266'']>>."</font>'
-		'<font color=#<<$nestor_font>>>"Yup, I''m <<$npc_firstname[''A265'']>>."</font>'
-		'<font color=#<<$oleg_font>>>"So, you want to live here with us?"</font>'
+		'<font color=#<<$Nestor[''font'']>>>"Well, now that''s what I like! Finally, this won''t be such a dull party!"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"<<$pcs_firstname>>, please excuse my friend, <<$npc_firstname[''A265'']>>. He can be quite rude. I''m <<$npc_firstname[''A266'']>>."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"Yup, I''m <<$npc_firstname[''A265'']>>."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"So, you want to live here with us?"</font>'
 		'<font color=#<<$pcs_font>>>"Yes, I need a new place to stay."</font>'
-		'<font color=#<<$nestor_font>>>"How old are you, girl?"</font>'
-		'<font color=#<<$oleg_font>>>"<<$npc_firstname[''A265'']>>, not this again!"</font>'
+		'<font color=#<<$Nestor[''font'']>>>"How old are you, girl?"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"<<$npc_firstname[''A265'']>>, not this again!"</font>'
 		'<font color=#<<$pcs_font>>>"It''s okay. I''m actually <<age>> years old. Why do you ask?"</font>'
-		'<font color=#<<$oleg_font>>>"He''s just an idiot; don''t listen to him."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"He''s just an idiot; don''t listen to him."</font>'
 			
 		if age < 18:
 			'(You can see <<$npc_firstname[''A265'']>> rub his crotch just a brief moment after you told him your age. What''s he up to?)'
@@ -336,129 +332,129 @@ if $ARGS[0] = 'intro':
 		if knowpreg = 1:
 			act 'Ask about children':
 				cla
-				pavIntroStep = 50
+				shared_apt['pavIntroStep'] = 50
 				'<font color=#<<$pcs_font>>>"I thought I should tell you, I''m currently pregnant. How do you feel about having children in the apartment, will this be a problem?"</font>'
 				act 'continue':gt 'pav_shared_apt', 'intro'
 			end
 		elseif kid > 0:
 			act 'Ask about children':
 				cla
-				pavIntroStep = 50
+				shared_apt['pavIntroStep'] = 50
 				'<font color=#<<$pcs_font>>>"I thought I should tell, I''m a mother. How do you feel about having children in the apartment, will this be a problem?"</font>'
 				act 'continue':gt 'pav_shared_apt', 'intro'
 			end
 		else
 			act 'Continue':gt 'pav_shared_apt', 'intro'
 		end
-	elseif pavIntroStep = 2:
+	elseif shared_apt['pavIntroStep'] = 2:
 		minut += 3
-		pavIntroStep = 3
+		shared_apt['pavIntroStep'] = 3
 		'<font color=#<<$pcs_font>>>"So what do you guys say, will you take me in?"</font>'
-		'<font color=#<<$oleg_font>>>"We may. But first, do you have the money to pay the rent?"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"We may. But first, do you have the money to pay the rent?"</font>'
 		'<font color=#<<$pcs_font>>>"Well, of course I don''t expect to let me live here for free. But I hope the rent is reasonable..."</font>'
-		'<font color=#<<$oleg_font>>>"It is indeed."</font>'
-		'<font color=#<<$yakov_font>>>"<<rentWeekly>> rubles. Per week."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"It is indeed."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"<<shared_apt[''rentWeekly'']>> rubles. Per week."</font>'
 		'<font color=#<<$pcs_font>>>"Uhm. That''s quite a lot. I''m not sure if I''ll be able to afford this..."</font>'
-		'<font color=#<<$nestor_font>>>"You can pay other ways if you''d like!"</font>'
-		'<font color=#<<$oleg_font>>>"<<$npc_firstname[''A265'']>>!"</font>'
+		'<font color=#<<$Nestor[''font'']>>>"You can pay other ways if you''d like!"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"<<$npc_firstname[''A265'']>>!"</font>'
 		'<font color=#<<$pcs_font>>>"What do you mean by other ways?"</font>'
-		'<font color=#<<$yakov_font>>>"Well <<$pcs_firstname>>, since we are just guys here, and since we suck at these things, we could use someone as you, a girl I mean, to be something like our, let''s say, handmaiden. If you know what I mean."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Well <<$pcs_firstname>>, since we are just guys here, and since we suck at these things, we could use someone as you, a girl I mean, to be something like our, let''s say, handmaiden. If you know what I mean."</font>'
 		'<font color=#<<$pcs_font>>>"Like cooking and cleaning?"</font>'
-		'<font color=#<<$yakov_font>>>"Yes, exactly."</font>'
-		'<font color=#<<$nestor_font>>>"And more."</font>'
-		'<font color=#<<$oleg_font>>>"Oh my... I give up."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Yes, exactly."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"And more."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"Oh my... I give up."</font>'
 		act 'More what?':gt 'pav_shared_apt', 'intro'
-	elseif pavIntroStep = 3:
+	elseif shared_apt['pavIntroStep'] = 3:
 		minut += 3
-		'<font color=#<<$nestor_font>>>"More services."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"More services."</font>'
 		'<font color=#<<$pcs_font>>>"What kind of "services"?"</font>'
-		'<font color=#<<$yakov_font>>>"the adult kind of services."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"the adult kind of services."</font>'
 		'<font color=#<<$pcs_font>>>"You mean to be a whore for you? Instead of paying the rent???"</font>'
-		'<font color=#<<$oleg_font>>>"Please <<$pcs_firstname>>, don''t get mad. <<$npc_firstname[''A265'']>> is not just an idiot, he is a rude idiot. We are definitely not asking you to be our whore or something like that."</font>'
-		'<font color=#<<$oleg_font>>>" As <<$npc_firstname[''A264'']>> told you, we could decrease your rent if you would do some housekeeping stuff we really suck at. But only if you want, of course."</font>'
-		'<font color=#<<$yakov_font>>>"So what do you say <<$pcs_firstname>>?"</font>'
-		act 'Say that you changed your mind about this':pavIntroStep = 40 & gt 'pav_shared_apt', 'intro'
-		act 'Say you will pay the rent the normal way':pavSharedAptEnabled = 1 & gs 'homes_properties', 'give_access' & pavIntroStep = 10 & gt 'pav_shared_apt', 'intro'
-		act 'Say you don''t mind doing the homekeeping stuff':pavSharedAptEnabled = 1 & gs 'homes_properties', 'give_access' & pavIntroStep = 20 & gt 'pav_shared_apt', 'intro'
-		act 'Say you don''t mind anything':pavSharedAptEnabled = 1 & gs 'homes_properties', 'give_access' & pavIntroStep = 30 & gt 'pav_shared_apt', 'intro'
-	elseif pavIntroStep = 10:
+		'<font color=#<<$Oleg[''font'']>>>"Please <<$pcs_firstname>>, don''t get mad. <<$npc_firstname[''A265'']>> is not just an idiot, he is a rude idiot. We are definitely not asking you to be our whore or something like that."</font>'
+		'<font color=#<<$Oleg[''font'']>>>" As <<$npc_firstname[''A264'']>> told you, we could decrease your rent if you would do some housekeeping stuff we really suck at. But only if you want, of course."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"So what do you say <<$pcs_firstname>>?"</font>'
+		act 'Say that you changed your mind about this':shared_apt['pavIntroStep'] = 40 & gt 'pav_shared_apt', 'intro'
+		act 'Say you will pay the rent the normal way':shared_apt['enabled'] = 1 & gs 'homes_properties', 'give_access' & shared_apt['pavIntroStep'] = 10 & gt 'pav_shared_apt', 'intro'
+		act 'Say you don''t mind doing the homekeeping stuff':shared_apt['enabled'] = 1 & gs 'homes_properties', 'give_access' & shared_apt['pavIntroStep'] = 20 & gt 'pav_shared_apt', 'intro'
+		act 'Say you don''t mind anything':shared_apt['enabled'] = 1 & gs 'homes_properties', 'give_access' & shared_apt['pavIntroStep'] = 30 & gt 'pav_shared_apt', 'intro'
+	elseif shared_apt['pavIntroStep'] = 10:
 		minut += 2
-		'<font color=#<<$yakov_font>>>"Fine. So the rest of this week you have free, but you need to prepay the next week. OK?"</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Fine. So the rest of this week you have free, but you need to prepay the next week. OK?"</font>'
 		'<font color=#<<$pcs_font>>>"Yes, OK, I understand."</font>'
-		'<font color=#<<$yakov_font>>>"So the room is over there.</font>'
+		'<font color=#<<$Yakov[''font'']>>>"So the room is over there.</font>'
 		'<font color=#<<$pcs_font>>>"Wait, Isn''t that the living room?"</font>'
-		'<font color=#<<$yakov_font>>>""Yes, it''s available, but we''re not using it, so we''re renting it out. It''s fully furnished with a bed, a table, and a chair. We''ve even added a curtain to separate the space. Feel free to move in whenever you''d like. See you later, <<$pcs_firstname>>!"'
-		'<font color=#<<$oleg_font>>>"Have a nice day <<$pcs_firstname>>."</font>'
-		'<font color=#<<$nestor_font>>>"See ya later girlie..."</font>'
+		'<font color=#<<$Yakov[''font'']>>>""Yes, it''s available, but we''re not using it, so we''re renting it out. It''s fully furnished with a bed, a table, and a chair. We''ve even added a curtain to separate the space. Feel free to move in whenever you''d like. See you later, <<$pcs_firstname>>!"'
+		'<font color=#<<$Oleg[''font'']>>>"Have a nice day <<$pcs_firstname>>."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"See ya later girlie..."</font>'
 		'<font color=#<<$pcs_font>>>"Later guys!"</font>'
-		servitudeLvl = 0
-		act 'Continue':pavIntroStep = 0 & gt 'pav_shared_apt', 'rentSetup'
-	elseif pavIntroStep = 20:
+		shared_apt['servitudeLvl'] = 0
+		act 'Continue':shared_apt['pavIntroStep'] = 0 & gt 'pav_shared_apt', 'rentSetup'
+	elseif shared_apt['pavIntroStep'] = 20:
 		minut += 2
-		'<font color=#<<$yakov_font>>>"Fine. So the rest of this week you have free, but you need to prepay the next week. OK?"</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Fine. So the rest of this week you have free, but you need to prepay the next week. OK?"</font>'
 		'<font color=#<<$pcs_font>>>"Yes, OK, I understand."</font>'
-		'<font color=#<<$oleg_font>>>"We will prepare a list of the charges for the housekeeping services you may want to do, so it''s clear how much will be deducted from your rent."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"We will prepare a list of the charges for the housekeeping services you may want to do, so it''s clear how much will be deducted from your rent."</font>'
 		'<font color=#<<$pcs_font>>>"Cool!"</font>'
-		'<font color=#<<$yakov_font>>>"So the room is over there."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"So the room is over there."</font>'
 		'<font color=#<<$pcs_font>>>"Wait, Isn''t that the living room?"</font>'
-		'<font color=#<<$yakov_font>>>"Yes, it''s available, but we''re not using it, so we''re renting it out. It''s fully furnished with a bed, a table, and a chair. We''ve even added a curtain to separate the space. Feel free to move in whenever you''d like. See you later, <<$pcs_firstname>>!"</font>'
-		'<font color=#<<$oleg_font>>>"Have a nice day, <<$pcs_firstname>>."</font>'
-		'<font color=#<<$nestor_font>>>"See ya later, girlie..."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Yes, it''s available, but we''re not using it, so we''re renting it out. It''s fully furnished with a bed, a table, and a chair. We''ve even added a curtain to separate the space. Feel free to move in whenever you''d like. See you later, <<$pcs_firstname>>!"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"Have a nice day, <<$pcs_firstname>>."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"See ya later, girlie..."</font>'
 		'<font color=#<<$pcs_font>>>"Later, guys!"</font>'
 			
-		servitudeLvl = 1
-		act 'Continue':pavIntroStep = 0 & gt 'pav_shared_apt', 'rentSetup'
-	elseif pavIntroStep = 30:
+		shared_apt['servitudeLvl'] = 1
+		act 'Continue':shared_apt['pavIntroStep'] = 0 & gt 'pav_shared_apt', 'rentSetup'
+	elseif shared_apt['pavIntroStep'] = 30:
 		minut += 2
-		'<font color=#<<$yakov_font>>>"Fine. So, the rest of this week you have free, but you need to prepay the next week. OK?"</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Fine. So, the rest of this week you have free, but you need to prepay the next week. OK?"</font>'
 		'<font color=#<<$pcs_font>>>"Yes, OK, I understand."</font>'
-		'<font color=#<<$oleg_font>>>"We will prepare a list of the charges for the housekeeping services you may want to do, so it''s clear how much will be deducted from your rent."</font>'
-		'<font color=#<<$nestor_font>>>"The extra stuff services will be there too, girl."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"We will prepare a list of the charges for the housekeeping services you may want to do, so it''s clear how much will be deducted from your rent."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"The extra stuff services will be there too, girl."</font>'
 		'<font color=#<<$pcs_font>>>"OK..."</font>'
-		'<font color=#<<$yakov_font>>>"So, the room is over there."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"So, the room is over there."</font>'
 		'<font color=#<<$pcs_font>>>"Wait, isn''t that the living room?"</font>'
-		'<font color=#<<$yakov_font>>>"Yes, it is, but we don''t use it, so we are renting it out. There is all you need, a bed, a table with a chair, all this stuff. Just move in when you want, we even put a curtain over the doorway. See you later, <<$pcs_firstname>>!"</font>'
-		'<font color=#<<$oleg_font>>>"Have a nice day, <<$pcs_firstname>>."</font>'
-		'<font color=#<<$nestor_font>>>"See ya later, girlie..."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Yes, it is, but we don''t use it, so we are renting it out. There is all you need, a bed, a table with a chair, all this stuff. Just move in when you want, we even put a curtain over the doorway. See you later, <<$pcs_firstname>>!"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"Have a nice day, <<$pcs_firstname>>."</font>'
+		'<font color=#<<$Nestor[''font'']>>>"See ya later, girlie..."</font>'
 		'<font color=#<<$pcs_font>>>"Later, guys!"</font>'
-		servitudeLvl = 2
-		act 'Continue':pavIntroStep = 0 & gt 'pav_shared_apt', 'rentSetup'
-	elseif pavIntroStep = 40:
+		shared_apt['servitudeLvl'] = 2
+		act 'Continue':shared_apt['pavIntroStep'] = 0 & gt 'pav_shared_apt', 'rentSetup'
+	elseif shared_apt['pavIntroStep'] = 40:
 		minut += 2
-		'<font color=#<<$oleg_font>>>"I told you idiot not to scare her away!"</font>'
-		'<font color=#<<$nestor_font>>>"Sorry man! We can still lock her to the radiator like I suggested in the first place..."</font>'
-		'<font color=#<<$oleg_font>>>"Just shut up already!"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"I told you idiot not to scare her away!"</font>'
+		'<font color=#<<$Nestor[''font'']>>>"Sorry man! We can still lock her to the radiator like I suggested in the first place..."</font>'
+		'<font color=#<<$Oleg[''font'']>>>"Just shut up already!"</font>'
 		''
-		'<font color=#<<$yakov_font>>>"Sorry <<$pcs_firstname>>. We respect your decision. If you change your mind and the room is still empty, let us know and we can talk again. Goodbye!"</font>'
-		act 'Tell them goodbye and leave':pavIntroStep = 0 & gt 'pav_complex', 'start'
-	elseif pavIntroStep = 50:
+		'<font color=#<<$Yakov[''font'']>>>"Sorry <<$pcs_firstname>>. We respect your decision. If you change your mind and the room is still empty, let us know and we can talk again. Goodbye!"</font>'
+		act 'Tell them goodbye and leave':shared_apt['pavIntroStep'] = 0 & gt 'pav_complex', 'start'
+	elseif shared_apt['pavIntroStep'] = 50:
 		minut += 2
 		!add dialogue for returning after being previously expelled from apartment
-		'<font color=#<<$oleg_font>>>"I''m sorry <<$pcs_firstname>>, but we don''t want children or pets in the apartment!"</font>'
-		'<font color=#<<$nestor_font>>>"If you get rid of the kid, come back and see us."</font>'
-		'<font color=#<<$yakov_font>>>"Don''t mind him. There''s simply not enough room for 4 people, plus kids or pets. I hope you understand"</font>'
+		'<font color=#<<$Oleg[''font'']>>>"I''m sorry <<$pcs_firstname>>, but we don''t want children or pets in the apartment!"</font>'
+		'<font color=#<<$Nestor[''font'']>>>"If you get rid of the kid, come back and see us."</font>'
+		'<font color=#<<$Yakov[''font'']>>>"Don''t mind him. There''s simply not enough room for 4 people, plus kids or pets. I hope you understand"</font>'
 		if func('homes_properties', 'has_access', 'parents_home'):
 			act 'Suggest a compromise':
 				cla
-				pavIntroStep = 2
+				shared_apt['pavIntroStep'] = 2
 				'<font color=#<<$pcs_font>>>"I can leave them with my parents for the time being, and keep them away from the apartment, how does this sound?'
-				'<font color=#<<$yakov_font>>>"Are you certain you want to do this?"</font>'
-				'<font color=#<<$nestor_font>>>"Sounds good to me!"</font>'
-				'<font color=#<<$oleg_font>>>"hmmmm"</font>'
+				'<font color=#<<$Yakov[''font'']>>>"Are you certain you want to do this?"</font>'
+				'<font color=#<<$Nestor[''font'']>>>"Sounds good to me!"</font>'
+				'<font color=#<<$Oleg[''font'']>>>"hmmmm"</font>'
 				act 'Continue':gt 'pav_shared_apt', 'intro'
 			end
 			act 'I won''t leave my children':
 				cla
-				pavIntroStep = 0
+				shared_apt['pavIntroStep'] = 0
 				'<font color=#<<$pcs_font>>>"OK, I will make do with my current accommodation.'
-				'<font color=#<<$yakov_font>>>"We understand"</font>'
-				'<font color=#<<$nestor_font>>>"Damn"</font>'
-				'<font color=#<<$oleg_font>>>"No problem <<$pcs_firstname>>"</font>'
+				'<font color=#<<$Yakov[''font'']>>>"We understand"</font>'
+				'<font color=#<<$Nestor[''font'']>>>"Damn"</font>'
+				'<font color=#<<$Oleg[''font'']>>>"No problem <<$pcs_firstname>>"</font>'
 				act 'Continue':gt 'pav_shared_apt', 'intro'
 			end
 		else
 			'<font color=#<<$pcs_font>>>OK, I understand.</font>'
-			act 'Thank them and leave':pavIntroStep = 0 & gt 'pav_complex', 'start'
+			act 'Thank them and leave':shared_apt['pavIntroStep'] = 0 & gt 'pav_complex', 'start'
 		end
 	end
 end
@@ -468,38 +464,37 @@ if $ARGS[0] = 'list':
 	menu_off = 1
 	$loc_arg = 'list'
 	minut += 2
-	$goBack = $loc_arg
 	'<center><h3><<$pcs_firstname>>''s pricelist</h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/list.jpg"></center>'
 	''
-	'The basic weekly rent is <<rentWeekly>> rubles.'
+	'The basic weekly rent is <<shared_apt[''rentWeekly'']>> rubles.'
 	'It is possible to pay it in cash or offer services instead. The prices are following:'
 	''
-	'---------------'
+	'---------------------'
 	''
-	'Cook a warm meal: '+price_cook
-	'Clean the apartment: '+price_clean
-	if servitudeLvl >= 2:
+	'Cook a warm meal: '   +shared_apt['price_cook']
+	'Clean the apartment: '+shared_apt['price_clean']
+	if shared_apt['servitudeLvl'] >= 2:
 		''
-		'---------------'
+		'---------------------'
 		''
 		'Written in marker on the paper, are sexual favours you can offer as well.'
 		''
-		'---------------'
+		'---------------------'
 		'Rent discounts for the slut: '
-		'Handjob: '+price_handjob
-		'Blowjob: '+price_blowjob
-		'Sex: '+price_vaginal
-		'Anal sex: '+price_anal
-		'Special treats: '+price_special
+		'Handjob: '		  +shared_apt['price_handjob']
+		'Blowjob: '		  +shared_apt['price_blowjob']
+		'Sex: '			  +shared_apt['price_vaginal']
+		'Anal sex: '	  +shared_apt['price_anal']
+		'Special treats: '+shared_apt['price_special']
 	end
 	''
-	'---------------'
+	'---------------------'
 	''
 	'Not having paid the full weekly rent at the beginning of a new week will lead to termination of the accommodation services.'
-	'Signed: <a href="exec: gt ''pav_shared_oleg'', ''oleg_Dick''"><font color=#<<$oleg_font>>><<$npc_firstname[''A266'']>></font></a>, <a href="exec: gt ''pav_shared_nestor'', ''nestor_Dick''"><font color=#<<$nestor_font>>><<$npc_firstname[''A265'']>></font></a>, <a href="exec: gt ''pav_shared_yakov'', ''yakov_Dick''"><font color=#<<$yakov_font>>><<$npc_firstname[''A264'']>></font></a>, <<$pcs_firstname>>.'
+	'Signed: <a href="exec: gt ''pav_shared_oleg'', ''Oleg_Dick''"><font color=#<<$Oleg[''font'']>>><<$npc_firstname[''A266'']>></font></a>, <a href="exec: gt ''pav_shared_nestor'', ''Nestor_Dick''"><font color=#<<$Nestor[''font'']>>><<$npc_firstname[''A265'']>></font></a>, <a href="exec: gt ''pav_shared_yakov'', ''Yakov_Dick''"><font color=#<<$Yakov[''font'']>>><<$npc_firstname[''A264'']>></font></a>, <<$pcs_firstname>>.'
 	''
-	'---------------'
+	'---------------------'
 	act 'Continue':gt 'pav_shared_apt', 'start'
 end
 
@@ -599,12 +594,11 @@ if $ARGS[0] = 'cookForGuys':
 	$loc = 'pav_shared_apt'
 	$loc_arg = 'kitchen'
 	minut += 90
-	kuhdrova = 0
 	pcs_mood -= 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
 	'You prepare three meals, using what you can from the guys'' food. It''s not very healthy but you''re not planning to offer to do their shopping too.'
-	price = price_cook
+	shared_apt['price'] = shared_apt['price_cook']
 
 	act 'Leave the meal':gt 'pav_shared_apt', 'payService'
 end
@@ -619,11 +613,11 @@ if $ARGS[0] = 'cleanForGuys':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stir.jpg"></center>'
 
-	price = price_clean
+	shared_apt['price'] = shared_apt['price_clean']
 	*nl
 	'You collect piles of dirty clothes around the room, carry them into the bathroom, put them in a basin and then pour washing powder on them. You wash them until they are finally clean.'
 	cumStainCh =  rand(0, 100)
-	if servitudeLvl = 2 and cumStainCh <= 50:'<i>You notice bedsheets with what seems as dried out cum. Probably remainder of one of your "servings". Maybe it really is better to swallow every time...</i>'
+	if shared_apt['servitudeLvl'] = 2 and cumStainCh <= 50:'<i>You notice bedsheets with what seems as dried out cum. Probably remainder of one of your "servings". Maybe it really is better to swallow every time...</i>'
 
 	act 'Hang them to dry out and leave':gt 'pav_shared_apt', 'payService'
 end
@@ -656,8 +650,8 @@ if $ARGS[0] = 'pcsRoom':
 	if mc_inventory['tech_tv'] >= 1:$TV = 'an old CRT <a href="exec:gt ''TV'', ''start''">TV</a> sits on the shelf'
 	'There is an wall unit at the other side of the room, <<$TV>>. Everyone in the household spends their time in their own rooms, so there was never a reason to use the living room for its intended purpose.'
 	*nl
-	if stol = 0:$stol = 'an old scratched <a href="exec:gt ''stol'', ''start''">table</a>'
-	'In the corner there is <<$stol>>.'
+	''
+	'In the corner is an old scratched <a href="exec:gt ''stol'', ''start''">table</a>.'
 	*nl
 	'There is no door to the living room, instead there''s <a href="exec:view''images/shared/home/bedroom/curtain.jpg''">curtain</a> covering entry to the room, which gives you a modicum of privacy; not much better than the state of the non-existent window curtains.'
 
@@ -674,12 +668,12 @@ if $ARGS[0] = 'pcsRoom':
 	if mc_inventory['tech_computer'] = 1:
 		!! Sveta can''t do camshows unless she is blowing the guys for rent.
 		gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
-		if servitudeLvl = 2: access['nocamshow'] = 0
+		if shared_apt['servitudeLvl'] = 2: access['nocamshow'] = 0
 		'Your <a href="exec:gorodokKomp = 1 & gt ''Komp'',''start''">computer</a> is sitting on small table.'
 	end
 
-	if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
-	if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
+	if mc_inventory['vintage_card'] > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
+	if mc_inventory['card']  > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
 
 	if mc_inventory['cocaine'] > 0:'You have <<mc_inventory[''cocaine'']>> doses of Pale Lady, hidden from the other housemates.'
 
@@ -696,39 +690,18 @@ if $ARGS[0] = 'pcsRoom':
 		end
 	end
 
-	if gobelen>0:'You have <<gobelen>> completed tapestries.'
+	if mc_inventory['tapestry']>0:'You have <<mc_inventory[''tapestry'']>> completed tapestries.'
 	if pcs_sewng >= 40 and mc_inventory['sewing_fabric'] > 0:'You have enough fabric for <<mc_inventory[''sewing_fabric'']>> lessons.'
 	if pcs_sewng >= 40 and mc_inventory['sewing_fabric'] <= 0:'You do not have any fabric.'
-	if pcs_sewng >= 80:
+	if pcs_sewng >= 80 and mc_inventory['sewing_kit'] = 1:
+		*nl
 		if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0:
-			act'Start a new tapestry':
-				cls
-				mc_inventory['sewing_fabric'] -= 1
-				newgobelen = 1
-				minut += 15
-				gs'stat'
-				'You spend 15 minutes working on the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-				act'Set the tapestry aside':gt 'pav_shared_apt', 'pcsRoom'
-			end
+			 act'Start a new tapestry':gt 'sewing', 'tapestry'
 		end
+
 		if newgobelen>=1:
 			'Your tapestry is <<newgobelen/10>> percent finished.'
-			act'Work on the tapestry for an hour':
-				cls
-				minut+=60
-				gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
-				gobramax = (pcs_sewng - 70) * 6
-				gobramin = (pcs_sewng - 70) * 2
-				newgobelen += rand(gobramin,gobramax)
-				gs'stat'
-				if newgobelen < 1000:'You spent an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-					if newgobelen >= 1000:
-					newgobelen = 0
-					gobelen += 1
-					'Your work on the tapestry is done.'
-				end
-				act'Set the tapestry aside':gt 'pav_shared_apt', 'pcsRoom'
-			end
+			act 'Work on the tapestry':gt 'sewing', 'tapestry'
 		end
 	end
 
@@ -744,7 +717,7 @@ if $ARGS[0] = 'pcsRoom':
 		'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored on a shelf.'
 	end
 
-	if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry with you is 30.'
+	if mc_inventory['trinkets_home'] > 0:'You currently have <<mc_inventory[''trinkets_home'']>> trinkets to sell at the station. The maximum you can carry with you is 30.'
 
 	dynamic $wearpan
 	dynamic $removepan
@@ -785,35 +758,36 @@ if $ARGS[0] = 'sofabed':
 	act 'Get up':gt 'pav_shared_apt', 'pcsRoom'
 end
 
-if $ARGS[0] = 'oleg_Room':
+if $ARGS[0] = 'Oleg_Room':
 	$menu_loc = 'pav_shared_apt'
-	$menu_arg = 'oleg_Room'
+	$menu_arg = 'Oleg_Room'
 	menu_off = 0
 	$loc = 'pav_shared_apt'
-	$loc_arg = 'oleg_Room'
+	$loc_arg = 'Oleg_Room'
+	gs 'boyStat', 'A266'
 	minut += 2
-	'<center><h3><font color=#<<$oleg_font>>><<$npc_firstname[''A266'']>>''s room</font></h3></center>'
+	'<center><h3><font color=#<<$Oleg[''font'']>>><<$npc_firstname[''A266'']>>''s room</font></h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/room.jpg"></center>'
 	''
 	'The room isn''t as messy as one might expect, given that <<$npc_firstname[''A266'']>> is an IT guy.'
 	'There is one large window with a bed below it, but the entire room is dominated by a large table with several computers and monitors.'
 	'At first glance, one might mistake this room for a hacker''s den.'
 	
-	if hour >= oleg_sleeps and hour < oleg_wakes:
+	if hour >= Oleg['sleeps'] and hour < Oleg['comes']:
 		'<<$npc_firstname[''A266'']>> is sound asleep in his bed.'
-	elseif hour >= oleg_wakes and hour < oleg_leaves:
+	elseif hour >= Oleg['wakes'] and hour < Oleg['leaves']:
 		'<<$npc_firstname[''A266'']>> is already awake and getting ready to leave.'
-		act 'Approach him': gt 'pav_shared_oleg', 'oleg'
-	elseif hour >= oleg_leaves and hour < oleg_comes:
+		act 'Approach him': gt 'pav_shared_oleg', 'Oleg'
+	elseif hour >= Oleg['leaves'] and hour < Oleg['comes']:
 		'<<$npc_firstname[''A266'']>> is currently not here.'
-	elseif hour >= oleg_comes and hour < oleg_sleeps:
+	elseif hour >= Oleg['comes'] and hour < Oleg['sleeps']:
 		'<<$npc_firstname[''A266'']>> is behind his desk, engrossed in programming using an esoteric language.'
-		act 'Approach him': gt 'pav_shared_oleg', 'oleg'
+		act 'Approach him': gt 'pav_shared_oleg', 'Oleg'
 	end
 	
-	if servitudeLvl >= 1 and oleg_cleaned = 0:
+	if shared_apt['servitudeLvl'] >= 1 and Oleg['cleaned'] = 0:
 		if mc_inventory['laundry_soap'] >= 1:
-			act 'Clean the room':oleg_cleaned = 1 & gt 'pav_shared_apt', 'cleanForGuys'
+			act 'Clean the room':Oleg['cleaned'] = 1 & gt 'pav_shared_apt', 'cleanForGuys'
 		else
 			'You don''t have enough laundry detergent to clean the room'
 		end
@@ -821,32 +795,33 @@ if $ARGS[0] = 'oleg_Room':
 	act 'Leave':gt 'pav_shared_apt', 'start'
 end
 
-if $ARGS[0] = 'nestor_Room':
+if $ARGS[0] = 'Nestor_Room':
 	$menu_loc = 'pav_shared_apt'
-	$menu_arg = 'nestor_Room'
+	$menu_arg = 'Nestor_Room'
 	menu_off = 0
 	$loc = 'pav_shared_apt'
-	$loc_arg = 'nestor_Room'
+	$loc_arg = 'Nestor_Room'
+	gs 'boyStat', 'A265'
 	minut += 2
-	'<center><h3><font color=#<<$nestor_font>>><<$npc_firstname[''A265'']>>''s room</font></h3></center>'
+	'<center><h3><font color=#<<$Nestor[''font'']>>><<$npc_firstname[''A265'']>>''s room</font></h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/room.jpg"></center>'
 	''
 	'This room is a messy disaster, with clothes scattered all over the floor.'
 
-	if hour >= nestor_wakes and hour < nestor_leaves:
+	if hour >= Nestor['wakes'] and hour < Nestor['leaves']:
 		'<<$npc_firstname[''A265'']>> is already awake, getting ready to leave.'
-		act 'Approach him': gt 'pav_shared_nestor', 'nestor'
-	elseif hour >= nestor_leaves and hour < nestor_comes:
+		act 'Approach him': gt 'pav_shared_nestor', 'Nestor'
+	elseif hour >= Nestor['leaves'] and hour < Nestor['comes']:
 		'<<$npc_firstname[''A265'']>> is not here.'
-	elseif hour >= nestor_comes and hour < nestor_sleeps:
+	elseif hour >= Nestor['comes'] and hour < Nestor['sleeps']:
 		'<<$npc_firstname[''A265'']>> is currently on his bed, listing through some magazines.'
-		act 'Approach him': gt 'pav_shared_nestor', 'nestor'
-	elseif hour >= nestor_sleeps or hour < nestor_wakes:
+		act 'Approach him': gt 'pav_shared_nestor', 'Nestor'
+	elseif hour >= Nestor['sleeps'] or hour < Nestor['wakes']:
 		'<<$npc_firstname[''A265'']>> is sleeping in his bed.'
 	end
-	if servitudeLvl >= 1 and nestor_cleaned = 0:
+	if shared_apt['servitudeLvl'] >= 1 and Nestor['cleaned'] = 0:
 		if mc_inventory['laundry_soap'] >= 1:
-			act 'Clean the room':nestor_cleaned = 1 & gt 'pav_shared_apt', 'cleanForGuys'
+			act 'Clean the room':Nestor['cleaned'] = 1 & gt 'pav_shared_apt', 'cleanForGuys'
 		else
 			'You don''t have enough laundry detergent to clean the room'
 		end
@@ -854,34 +829,35 @@ if $ARGS[0] = 'nestor_Room':
 	act 'Leave':gt 'pav_shared_apt', 'start'
 end
 
-if $ARGS[0] = 'yakov_Room':
+if $ARGS[0] = 'Yakov_Room':
 	$menu_loc = 'pav_shared_apt'
-	$menu_arg = 'yakov_Room'
+	$menu_arg = 'Yakov_Room'
 	menu_off = 0
 	$loc = 'pav_shared_apt'
-	$loc_arg = 'yakov_Room'
+	$loc_arg = 'Yakov_Room'
+	gs 'boyStat', 'A264'
 	minut += 2
-	'<center><h3><font color=#<<$yakov_font>>><<$npc_firstname[''A264'']>>''s room</font></h3></center>'
+	'<center><h3><font color=#<<$Yakov[''font'']>>><<$npc_firstname[''A264'']>>''s room</font></h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/room.jpg"></center>'
 	''
 	'This room is very neat and organized, filled with sporting gear such as dresses, equipment, and trophies. The walls are adorned with several posters of famous athletes and sports teams.'
 
-	if hour >= yakov_wakes and hour < yakov_leaves:
+	if hour >= Yakov['wakes'] and hour < Yakov['leaves']:
 		'<<$npc_firstname[''A264'']>> is already awake, packing his gym bags to leave.'
-		act 'Approach him': gt 'pav_shared_yakov', 'yakov'
-	elseif hour >= yakov_leaves and hour < yakov_comes:
+		act 'Approach him': gt 'pav_shared_yakov', 'Yakov'
+	elseif hour >= Yakov['leaves'] and hour < Yakov['comes']:
 		'<<$npc_firstname[''A264'']>> is not here.'
-	elseif hour >= yakov_comes and hour < yakov_sleeps:
+	elseif hour >= Yakov['comes'] and hour < Yakov['sleeps']:
 		doesStuff = rand(0, 100)
 		if doesStuff < 50:'<<$npc_firstname[''A264'']>> is currently on his bed, listing through football magazines.'
 		if doesStuff >= 50:'<<$npc_firstname[''A264'']>> is working out on the floor.'
-		act 'Approach him': gt 'pav_shared_yakov', 'yakov'
-	elseif hour >= yakov_sleeps or hour < yakov_wakes:
+		act 'Approach him': gt 'pav_shared_yakov', 'Yakov'
+	elseif hour >= Yakov['sleeps'] or hour < Yakov['wakes']:
 		'<<$npc_firstname[''A264'']>> is sleeping in his bed.'
 	end
-	if servitudeLvl >= 1 and yakov_cleaned = 0:
+	if shared_apt['servitudeLvl'] >= 1 and Yakov['cleaned'] = 0:
 		if mc_inventory['laundry_soap'] >= 1:
-			act 'Clean the room':yakov_cleaned = 1 & gt 'pav_shared_apt', 'cleanForGuys'
+			act 'Clean the room':Yakov['cleaned'] = 1 & gt 'pav_shared_apt', 'cleanForGuys'
 		else
 			'You don''t have enough laundry detergent to clean the room'
 		end
@@ -891,13 +867,13 @@ end
 
 if $ARGS[0] = 'eoleg_agreement':
 	menu_off = 1
-	'<center><img border="5" bordercolor="<<$yakov_font>>" height="150" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
+	'<center><img border="5" bordercolor="<<$Yakov[''font'']>>" height="150" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
 	''
 
 	'You gather the guys around and explain to them that you wish to move out.'
-	'<font color=#<<$pcs_font>>><<$npc_firstname[''A264'']>> Looks disappointed as he addresses you. "That is a shame <<$pcs_firstname>> we''ve very much enjoyed having you stay here we us. Are you sure this is what you want?"</font>'
+	'<font color=#<<$Yakov[''font'']>>><<$npc_firstname[''A264'']>> Looks disappointed as he addresses you. "That is a shame <<$pcs_firstname>> we''ve very much enjoyed having you stay here with us. Are you sure this is what you want?"</font>'
 	act '"Yes." End agreement':
-		pavSharedAptEnabled = 0
+		shared_apt['enabled'] = 0
 		gs 'homes_properties', 'block_access', 'shared_apartment', 0
 		gt 'pav_complex', 'start'
 	end

Diff do ficheiro suprimidas por serem muito extensas
+ 316 - 317
locations/pav_shared_nestor.qsrc


Diff do ficheiro suprimidas por serem muito extensas
+ 342 - 342
locations/pav_shared_oleg.qsrc


Diff do ficheiro suprimidas por serem muito extensas
+ 308 - 308
locations/pav_shared_yakov.qsrc


+ 1 - 1
locations/pav_train_hall.qsrc

@@ -117,7 +117,7 @@ if $ARGS[0] = '':
 	if poezddalsled = 1:
 		'The platform is bustling with passengers that are entering or leaving the currently waiting train, carrying their heavy bags with them. Several police officers are patrolling the platforms while the train is here, keeping an eye out for any unruly activities.'
 	
-		if tovarL > 0:'You could <a href="exec:gt ''pav_train_hall_events'', ''trinkets''">try to sell some trinkets</a> to some of the passengers.'
+		if mc_inventory['trinkets_home'] > 0:'You could <a href="exec:gt ''pav_train_hall_events'', ''trinkets''">try to sell some trinkets</a> to some of the passengers.'
 	end
 
 	act 'Wait':gs 'obj_din', 'wait'

+ 3 - 3
locations/pav_train_hall_events.qsrc

@@ -647,11 +647,11 @@ if $ARGS[0] = 'trinkets':
 
 	tovarand = rand(minimumtov, prodskill / 10)
 
-	if tovarand > tovarL:tovarand = tovarL
+	if tovarand > mc_inventory['trinkets_home']:tovarand = mc_inventory['trinkets_home']
 
 	tovpay = tovarand * 300
 	money += tovpay
-	tovarL -= tovarand
+	mc_inventory['trinkets_home'] -= tovarand
 	gs 'exp_gain', 'sprt', rand(0, 1)
 	TorgVokzalTimes += 1
 	gs 'stat'
@@ -722,7 +722,7 @@ if $ARGS[0] = 'trinkets':
 		act 'Admit you have no permit':
 			*clr & cla
 			money = 0
-			tovarL = 0
+			mc_inventory['trinkets_home'] = 0
 			minut += 120
 			pcs_mood = 5
 			gs'stat'

+ 8 - 8
locations/pav_train_market.qsrc

@@ -70,7 +70,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if gobelen > 0 and gobQW = 0:
+		if mc_inventory['tapestry'] > 0 and gobQW = 0:
 			act'Sell tapestry':
 				menu_off = 1
 				*clr & cla
@@ -81,7 +81,7 @@ if $ARGS[0] = 'start':
 				'Not wanting to get into trouble, you pack your stuff away. The man was already gone, but you saw which direction he went, and he should be easy to find.'
 				act 'Leave':gt 'pav_train_market', 'start'
 			end
-		elseif gobelen > 0 and gobQW >= 1:
+		elseif mc_inventory['tapestry'] > 0 and gobQW >= 1:
 			act'Sell tapestry':
 				menu_off = 1
 				*clr & cla
@@ -98,18 +98,18 @@ if $ARGS[0] = 'start':
 				act 'Leave':gt 'pav_train_market', 'start'
 				act'Show your tapestry':
 					*clr & cla
-					gobelen -= 1
+					mc_inventory['tapestry'] -= 1
 					money += 1000
 					gs'stat'
 					'You show your tapestry to Roman, and he gives you 1000 <b>₽</b>. You take the money and give him the tapestry.'
 					act 'Leave':gt 'pav_train_market', 'start'
 				end
-				if gobelen > 1:
+				if mc_inventory['tapestry'] > 1:
 					act'Sell all of your tapestries':
 						*clr & cla
-						'You show Roman your tapestries, and he gives you <<gobelen * 1000>> <b>₽</b> for them. You take the money and give him the tapestries.'
-						money += gobelen * 1000
-						gobelen = 0
+						'You show Roman your tapestries, and he gives you <<mc_inventory['tapestry'] * 1000>> <b>₽</b> for them. You take the money and give him the tapestries.'
+						money += mc_inventory['tapestry'] * 1000
+						mc_inventory['tapestry'] = 0
 						gs'stat'
 						act 'Leave':gt 'pav_train_market', 'start'
 					end
@@ -413,7 +413,7 @@ if ARGS[0] = 4:
 			*clr & cla
 			minut += 5
 			money -= 699
-			card = 2
+			mc_inventory['card'] = 2
 			TimesBuyPorno += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'

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