41 Commits e1346b2e9e ... 08f6491aee

Author SHA1 Message Date
  KevinSmarts 08f6491aee [fixed] Inconsistancies in pubic hair cutting/shaving options in the bathrooms 4 years ago
  KevinSmarts 3fd55cf7ad [added] Street rape scene that was missing wwriten and coded by nutluck 4 years ago
  KevinSmarts 7be7e90f80 [changed] Warning page now uses image from d4ltos 4 years ago
  KevinSmarts c37f7ccfca Merge remote-tracking branch 'Milky_boobs/master' 4 years ago
  KevinSmarts 1c45029e94 Merge remote-tracking branch 'julzor/master' 4 years ago
  KevinSmarts ed8fc82128 [fixes] CloDress wasn't resetting so everything counted as a dress after you had viewed one, syntax error in the descriptions and club didn't recognise when outfit bottoms were just panties 4 years ago
  sandra_schulz 3f494db7b8 [updated] Updated variable index in lact_lib 4 years ago
  julzor 55810f4b02 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  KevinSmarts d9b5a97279 Merge remote-tracking branch 'Milky_boobs/master' 4 years ago
  sandra_schulz 7b0a686638 [change\fix] Extensive changes to the breast size handling in lact_lib. 4 years ago
  julzor ffe2522633 [fixed] mom won't pack your lunch if she has thrown you out of the apartment 4 years ago
  julzor 51caa03ccf [fixed] eating for free at the restaurant if thrown out of the apartment 4 years ago
  julzor 4aae2149bc [text edit] small change in obj_din 4 years ago
  julzor 5c105fdd9b Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  julzor 26835ff2b1 [fixed] mod compatibility for food_menu 4 years ago
  KevinSmarts d532eace69 [added] ability to add selfies from Anushka post sex to your phone 4 years ago
  julzor 94faa7d398 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  julzor 0f24290077 [changed] when you change your home you can now see in which home you are living 4 years ago
  julzor 1ade9ca936 [text edit] removed unnecessary duplicate code in pavComplex 4 years ago
  julzor 25db353c58 [added] possibility to use food_menu in a mod 4 years ago
  KevinSmarts c24b19653b [fixed] Missing apostrophes 4 years ago
  sovietmercader 9b7d495e0e Merge remote-tracking branch 'kevin/master' 4 years ago
  sovietmercader 879ce1067d [changed] new root cellar on grandparents property, actions to report chores as done immediately and other quality of life improvements to actions and text throughout the village 4 years ago
  KevinSmarts 4ab8fbef8b Merge remote-tracking branch 'Sicaa/master' 4 years ago
  julzor 516460afd1 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  KevinSmarts 4b0191d3b8 [fixed] rename of DeMarcus to Djibril missed in these locations 4 years ago
  julzor 7bb7b583d9 [changed] blocked a few more events to happen only once per day 4 years ago
  julzor 7372d55c96 [added] birth control implant to the cycle message 4 years ago
  julzor d7e968b399 [fixed] the variable christinaphotos was used as a daystart check and a quest variable which could break the event chain 4 years ago
  julzor 43e3785082 [fixed] voyeur events increasing the lesbian variable. Watching a girl or two girls isn't lesbian sex 4 years ago
  julzor 5cfbf946a9 [fixed] minus times minus equals plus 4 years ago
  julzor 34de04878c Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  julzor ba305d07e8 [text edit] action makes no sense since the text states that the class is already over 4 years ago
  KevinSmarts e8972629eb [fixed] Links and actions for same thing, links removed 4 years ago
  julzor 8391a58ec9 [removed] lubricant is mentioned twice in the purse 4 years ago
  julzor b95d40efea Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  julzor 996886f2ce [changed] moved the default wait for the end of the class option to the top 4 years ago
  julzor 7277734064 [fixed] missing menu variables in gschool_lunch 4 years ago
  sovietmercader 3c8530892a [fixed] make swamp yard accessible again 4 years ago
  KevinSmarts ea36ae045f Merge remote-tracking branch 'Sicaa/master' 4 years ago
  KevinSmarts d1acf14e7a [fixed] Lack of basic maths in the comments, that or I copy/pasted it wrong. 4 years ago
47 changed files with 1287 additions and 1030 deletions
  1. 1 1
      locations/ParkKafe.qsrc
  2. 329 163
      locations/anushkaev1.qsrc
  3. 2 2
      locations/barbershop.qsrc
  4. 1 25
      locations/begin.qsrc
  5. 7 1
      locations/cikl.qsrc
  6. 1 0
      locations/clothing_attributes.qsrc
  7. 1 1
      locations/clothing_descriptions.qsrc
  8. 1 1
      locations/club.qsrc
  9. 2 2
      locations/danceGev.qsrc
  10. 6 1
      locations/din_bad.qsrc
  11. 21 37
      locations/din_van.qsrc
  12. 18 18
      locations/dorm.qsrc
  13. 2 18
      locations/fit.qsrc
  14. 22 10
      locations/food_menu.qsrc
  15. 1 1
      locations/gadbana.qsrc
  16. 99 11
      locations/gaddvor.qsrc
  17. 8 7
      locations/gadfield.qsrc
  18. 16 16
      locations/gadforest.qsrc
  19. 5 0
      locations/gadgarden.qsrc
  20. 18 23
      locations/gadhouse.qsrc
  21. 2 1
      locations/gadmarket.qsrc
  22. 5 5
      locations/gadriver.qsrc
  23. 4 4
      locations/gadroad.qsrc
  24. 172 208
      locations/gadsarai.qsrc
  25. 63 63
      locations/gadukino.qsrc
  26. 2 3
      locations/glake.qsrc
  27. 11 8
      locations/grandmahelp.qsrc
  28. 4 3
      locations/grandpahelp.qsrc
  29. 7 9
      locations/gschool_grounds.qsrc
  30. 8 3
      locations/gschool_lessons1.qsrc
  31. 12 4
      locations/gschool_lessons2.qsrc
  32. 5 2
      locations/gschool_lessons3.qsrc
  33. 3 1
      locations/gschool_lessonsev1.qsrc
  34. 1 1
      locations/gschool_lessonsev3.qsrc
  35. 12 8
      locations/gschool_lunch.qsrc
  36. 79 83
      locations/gschool_socialchg1.qsrc
  37. 1 1
      locations/gskver.qsrc
  38. 1 1
      locations/kafesvid.qsrc
  39. 166 144
      locations/lact_lib.qsrc
  40. 22 22
      locations/meadow.qsrc
  41. 4 2
      locations/obj_din.qsrc
  42. 8 20
      locations/pavComplex.qsrc
  43. 1 1
      locations/saveupdater.qsrc
  44. 129 91
      locations/street_event.qsrc
  45. 2 2
      locations/swamp.qsrc
  46. 1 1
      locations/swamp_yard.qsrc
  47. 1 1
      locations/traits.qsrc

+ 1 - 1
locations/ParkKafe.qsrc

@@ -414,7 +414,7 @@ if $ARGS[0] = 'negros':
 	
 	if hotcat >= 5 and afra < 1:
 		afra = 1
-		'A few of the Africans come over to your table, they are quite unrestrained, talking a lot in English, grabbing your back and chest. One of them introducing himself as DeMarcus, he tells you that they are all students from Africa and live in the dorm, he gives you directions on how to get to the hostel and find them.'
+		'A few of the Africans come over to your table, they are quite unrestrained, talking a lot in English, grabbing your back and chest. One of them introducing himself as Djibril, he tells you that they are all students from Africa and live in the dorm, he gives you directions on how to get to the hostel and find them.'
 
 		act 'Leave': gt 'parkKafe', 'end', 'cafe'
 	else

+ 329 - 163
locations/anushkaev1.qsrc

@@ -384,7 +384,7 @@ if $ARGS[0] = 'watch_nushrad':
 									minut += 1
 									'<center><img src="images/pc/npc_headshots/big154.jpg"></center>'
 									if hotcat >= 6:
-										'You only take a couple of steps from the door when it opens. You turn like you was just heading to the room. He gives you a knowing smirk. "Hey <<$pcs_nickname>>, next time why don''t you join us? I wouldn''t mind giving you the fucking of your life. I''m sure Nush wouldn''t mind, hell her ass could likely use a break, she finds me a bit to big, but what can a guy do." He asks rhetorically, with a laugh.'
+										'You only take a couple of steps from the door when it opens. You turn like you was just heading to the room. He gives you a knowing smirk. "Hey <<$pcs_nickname>>, next time why don''t you join us? I wouldn''t mind giving you the fucking of your life. I''m sure Nush wouldn''t mind, hell her ass could likely use a break, she finds me a bit too big, but what can a guy do." He asks rhetorically, with a laugh.'
 										act 'Say nothing':
 											*clr & cla
 											'<center><img src="images/pc/npc_headshots/big154.jpg"></center>'
@@ -577,75 +577,13 @@ if $ARGS[0] = 'radnush_asspound':
 						cumspclnt = 12
 						gs 'cum_cleanup'
 						gs 'stat'
-						'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/nushsvetar.jpg"></center>'
-						'Then, as you break the kiss, Anushka turns and sticks her tongue out. You notice just a moment later that she is holding up her phone, and takes a selfie of the two of you covered in cum. She then gets up and starts to wipe the cum off her face with a tissue, offering one to you as well. At this point, Radomir is almost dressed, apparently having started dressing while Anushka was kissing you. He then slaps Anushka on the ass and heads for the door. "Later, bitches!" Then he walks out, once he''s gone. She says. "What a asshole." The two of you finish getting dressed,  As she lays down on her bed.'
+						'<center><img src="images/pc/pictures/anushka/7.jpg"></center>'
+						'Then, as you break the kiss, Anushka turns and sticks her tongue out. You notice just a moment later that she is holding up her phone, and takes a selfie of the two of you covered in cum. She then gets up and starts to wipe the cum off her face with a tissue, offering one to you as well. At this point, Radomir is almost dressed, apparently having started dressing while Anushka was kissing you. He then slaps Anushka on the ass and heads for the door. "Later, bitches!" Then he walks out, once he''s gone. She says. "What a asshole." The two of you finish getting dressed, As she lays down on her bed.'
 						act 'Hangout in her room': gt 'anushapt','anushroom'
 						act 'Say nothing and join her on the bed': gt 'anushapt', 'bed'
-						act 'Talk about what just happened':
-							*clr & cla
-							minut += 2
-							gs 'stat'
-							'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
-							'Now that Radomir is gone and it is just the two of you, you decided to ask her about what all just happened. "So what was up with Rad being so rough? Is that normal for him?"'
-							'She shrugs a bit. "Sometimes... yeah ok most times, you would think he is allergic to lube or something." She says with a slight laugh.'
-							'You think for a moment, you don''t see her let other guys treat her like that. "Why do you let him treat you like that then? I know it hurts."'
-							'She gives you somewhat of a sour look. "Why did you?"'
-							'You smile to her. "Because you were here and I figured it wouldn''t be as bad for both of us. So why?" You press her.'
-							'She sighs. "It''s complicated ok?"'
-							act 'Let it drop': gt 'anushapt', 'bed'
-							act 'Then explain it':
-								*clr & cla
-								minut += 1
-								gs 'stat'
-								'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
-								'You nod. "Ok I got time, then how about you just tell me."'
-								'She frowns at you, you can tell she is getting annoyed at the questions. "Because.... because when it''s great it''s amazing and when it''s not, well I deal."'
-								'You can tell she is holding something back.'
-								act 'Let it drop': gt 'anushapt', 'bed'
-								act 'Press her for more details':
-									*clr & cla
-									radnushdate = 1
-									minut += 1
-									gs 'npc_relationship', 'modify', 'A144', 'dislike'
-									gs 'stat'
-									'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
-									'"There is more to it than that, where friends right? So why not just tell me." You tell her.'
-									'You can tell she is getting more and more annoyed. "For fuck''s sake you are like a dog with a bone about this. We use to date ok? It makes things different. You happy now?"'
-									'"Thank you for telling me." You say to her.'
-									act 'Let it drop': gt 'anushapt', 'bed'
-									act 'You guys use to date?':
-										*clr & cla
-										minut += 2
-										gs 'stat'
-										'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
-										'"So you guys use to date? I didn''t know that. What happened?" You ask her.'
-										'She frowns to you. "We fucking broke up obviously. Will you fucking drop it already." You can tell she is starting to get pissed at your prying.'
-										act 'Let it drop': gt 'anushapt', 'bed'
-										act 'Why did you break up?':
-											*clr & cla
-											minut += 1
-											gs 'npc_relationship', 'modify', 'A144', 'loathe'
-											gs 'stat'
-											'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
-											'You need to know why they broke up so you push on. "Why did you guys break up?" You ask her.'
-											'She gets off the bed. "None of your fucking business <<$pcs_nickname>>, I think you need to leave now!"'
-											'You can tell you pushed things to far, she is pretty pissed off at you. So you get up and head for the door.'
-											act 'Leave apartment': gt 'pavComplex','start'
-											act 'Say your sorry':
-												*clr & cla
-												gs 'npc_relationship', 'modify', 'A144', 'like'
-												minut += 1
-												gs 'stat'
-												'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
-												'You stop at the door. "I''m sorry I didn''t mean to upset you."'
-												'She shakes her head angrily obviously not willing to forgive just yet for your prying. "Whatever." She says angrily.'
-												'You nod. "Ok see you later." With that you leave before things get worse.'
-												act 'Leave apartment': gt 'pavComplex','start'
-											end
-										end
-									end
-								end
-							end
+						act 'Talk about what just happened': gt 'anushkaev1', 'about_rad'
+						if anushkaphoto[7] = 1:
+							act 'Ask about the selfie': gt 'anushkaev1', 'rad_selfie'
 						end
 					end
 				end
@@ -654,6 +592,114 @@ if $ARGS[0] = 'radnush_asspound':
 	end
 end
 
+if $ARGS[0] = 'rad_selfie':
+	*clr & cla
+	minut += 2
+	gs 'stat'
+	'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+	'Wondering why she took that selfie of the two you, with you having cum on your face. "What are you going to do with that selfie of us?"'
+	'She shrugs a little. "Keep it as a memento at least for awhile, I often take selfies during sex or after sex as keep sakes, why?"'
+	'You nod a little. "Your not going to show it to anyone are you?"'
+	'She looks a little surprised you would ask. "No of course not." Then she grins. "Unless you want me to."'
+	act 'Hangout in her room': gt 'anushapt','anushroom'
+	act 'Talk about something else': gt 'anushapt', 'bed'
+	act 'Talk about what just happened': gt 'anushkaev1', 'about_rad'
+	act 'Can I see it?':
+		*clr & cla
+		gs 'stat'
+		'<center><img src="images/pc/pictures/anushka/7.jpg"></center>'
+		'You decided to ask her to show it to you. "Can I see it? The selfie that is."'
+		'"Sure if you want." She reaches over and grabs her phone, takes a moment to pull up the image and then shows it to you. You take a moment to look at it and yep that is you and Anushka, with faces covered in Radomir''s cum. You have to admit it is kinda hot, very naughty and dirty. It turns you on a little looking at it. Then she interupts your thoughts with a question. "I can send it to you, if you want a copy of it."'
+		gs 'arousal', 'voyeur_sex', 2
+		gs 'arousal', 'end'
+		gs 'stat'
+		act 'Hangout in her room': gt 'anushapt','anushroom'
+		act 'Talk about something else': gt 'anushapt', 'bed'
+		act 'Talk about what just happened': gt 'anushkaev1', 'about_rad'
+		act 'Ask her to send it to you':
+			*clr & cla
+			minut += 1
+			anushkaphoto[7] = 1
+			gs 'stat'
+			'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+			'You think about it a moment and decided you would like to keep the selfie too. "Yeah send it to me."'
+			'She grins at that, obviously approving of your desire to keep it. She takes a moment, then you get a notice on your phone that you get a message. You check it real quick and add the selfie to a folder.'
+			act 'Hangout in her room': gt 'anushapt','anushroom'
+			act 'Talk about something else': gt 'anushapt', 'bed'
+			act 'Talk about what just happened': gt 'anushkaev1', 'about_rad'
+		end
+	end
+end
+
+if $ARGS[0] = 'about_rad':
+	*clr & cla
+	menu_off = 1
+	AnushkaLoc = 2
+	minut += 2
+	gs 'stat'
+	'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+	'Now that Radomir is gone and it is just the two of you, you decided to ask her about what all just happened. "So what was up with Rad being so rough? Is that normal for him?"'
+	'She shrugs a bit. "Sometimes... yeah ok most times, you would think he is allergic to lube or something." She says with a slight laugh.'
+	'You think for a moment, you don''t see her let other guys treat her like that. "Why do you let him treat you like that then? I know it hurts."'
+	'She gives you somewhat of a sour look. "Why did you?"'
+	'You smile to her. "Because you were here and I figured it wouldn''t be as bad for both of us. So why?" You press her.'
+	'She sighs. "It''s complicated ok?"'
+	act 'Let it drop': gt 'anushapt', 'bed'
+	act 'Then explain it':
+		*clr & cla
+		minut += 1
+		gs 'stat'
+		'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+		'You nod. "Ok I got time, then how about you just tell me."'
+		'She frowns at you, you can tell she is getting annoyed at the questions. "Because.... because when it''s great it''s amazing and when it''s not, well I deal."'
+		'You can tell she is holding something back.'
+		act 'Let it drop': gt 'anushapt', 'bed'
+		act 'Press her for more details':
+			*clr & cla
+			radnushdate = 1
+			minut += 1
+			gs 'npc_relationship', 'modify', 'A144', 'dislike'
+			gs 'stat'
+			'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+			'"There is more to it than that, where friends right? So why not just tell me." You tell her.'
+			'You can tell she is getting more and more annoyed. "For fuck''s sake you are like a dog with a bone about this. We use to date ok? It makes things different. You happy now?"'
+			'"Thank you for telling me." You say to her.'
+			act 'Let it drop': gt 'anushapt', 'bed'
+			act 'You guys use to date?':
+				*clr & cla
+				minut += 2
+				gs 'stat'
+				'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+				'"So you guys use to date? I didn''t know that. What happened?" You ask her.'
+				'She frowns to you. "We fucking broke up obviously. Will you fucking drop it already." You can tell she is starting to get pissed at your prying.'
+				act 'Let it drop': gt 'anushapt', 'bed'
+				act 'Why did you break up?':
+					*clr & cla
+					minut += 1
+					gs 'npc_relationship', 'modify', 'A144', 'loathe'
+					gs 'stat'
+					'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+					'You need to know why they broke up so you push on. "Why did you guys break up?" You ask her.'
+					'She gets off the bed. "None of your fucking business <<$pcs_nickname>>, I think you need to leave now!"'
+					'You can tell you pushed things to far, she is pretty pissed off at you. So you get up and head for the door.'
+					act 'Leave apartment': gt 'pavComplex','start'
+					act 'Say your sorry':
+						*clr & cla
+						gs 'npc_relationship', 'modify', 'A144', 'like'
+						minut += 1
+						gs 'stat'
+						'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+						'You stop at the door. "I''m sorry I didn''t mean to upset you."'
+						'She shakes her head angrily obviously not willing to forgive just yet for your prying. "Whatever." She says angrily.'
+						'You nod. "Ok see you later." With that you leave before things get worse.'
+						act 'Leave apartment': gt 'pavComplex','start'
+					end
+				end
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'watch_nushval':
 	*clr & cla
 	menu_off = 1
@@ -705,7 +751,7 @@ if $ARGS[0] = 'watch_nushval':
 						*nl
 						'Most of it ends up on her forehead and nose, but some of it ends up in her open mouth. He milks the last few drops of cum out of his dick, letting them land on her tongue. "Fuck that was amazing." He says as she swallows what was in her mouth. Then they both start to get dressed, as she cleans his cum off her face. Once she is cleaned up and they are both dressed he kisses her on the forehead. "I need to get going babe, gotta see that guy about a part for my bike."'
 						*nl
-						'She sits down on her bed and smirks at him. "What ever, I got what I needed, you may go."'
+						'She sits down on her bed and smirks at him. "What ever, I got what I needed, you can go."'
 						'He laughs and bows slightly. "Why thank you your majesty, I am glad I could be of service." Which they both laugh about, then he turns towards the door and you quickly close it before you are spotted.'
 						gs 'arousal', 'voyeur', 5
 						gs 'arousal', 'end'
@@ -846,7 +892,7 @@ if $ARGS[0] = 'val3some':
 															cumspclnt = 12
 															gs 'cum_cleanup'
 															gs 'stat'
-															'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/nushsvetav.jpg"></center>'
+															'<center><img src="images/pc/pictures/anushka/8.jpg"></center>'
 															'After couple of minutes of that Valentin gets up "I need to get going girls." With that he starts getting dressed. As you also get up, Anushka pulls you close looking to her side. You follow her gaze just in time to see her holding her phone taking a selfie of both of you with your tits covered in cum.'
 															*nl
 															'Then Anushka grabs some tissues and starts wiping his cum off her tits and hands you a tissue as well. As the two of you clean his cum off your tits he is almost finished getting dressed. Anushka and you then start to get dressed as well, once he finishes he leans over and gives Anushka a kiss on the forward. "See you around babe, this was a blast we should do again sometime." The last bit he points to both of you as he says it, then he heads out the door, leaving Anushka to roll her eyes at his comments, as the two of you finish getting dressed.'
@@ -871,10 +917,11 @@ if $ARGS[0] = 'val3some':
 														*clr & cla
 														gs 'stat'
 														'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/join/val/valnushs12.jpg"></center>'
-														'He pulls out of her and pulls her off you. "Get on your backs." You both lay down on your backs side by side as he jerks himself off. You barely make it when his cock explodes and streams of thick cum start splattering across both of your tits. Spurt after spurt, some landing on each of you. Finally once the last few drops fall from his dick onto Anushka he falls back onto the bed with a loud sigh. "Fuck that was amazing" The three of you just lay there in silence listening to each other breath and basking in the after glow of sex.'
+														'He pulls out of her and pulls her off you. "Get on your backs." You both lay down on your backs side by side as he jerks himself off. You barely make it when his cock explodes and streams of thick cum start splattering across both of your tits. Spurt after spurt, some landing on each of you, some of it landing on your faces. Finally once the last few drops fall from his dick onto Anushka he falls back onto the bed with a loud sigh. "Fuck that was amazing" The three of you just lay there in silence listening to each other breath and basking in the after glow of sex.'
 														gs 'arousal', 'foreplay', 2, 'group', 'lesbian'
 														gs 'arousal', 'end'
 														gs 'cum_call', 'breasts', 'A154'
+														gs 'cum_call', 'face', 'A154'
 														gs 'stat'
 														act 'Get dressed':
 															*clr & cla
@@ -882,7 +929,7 @@ if $ARGS[0] = 'val3some':
 															cumspclnt = 12
 															gs 'cum_cleanup'
 															gs 'stat'
-															'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/nushsvetav.jpg"></center>'
+															'<center><img src="images/pc/pictures/anushka/8.jpg"></center>'
 															'After couple of minutes of that Valentin gets up "I need to get going girls." With that he starts getting dressed. As you also get up, Anushka pulls you close looking to her side. You follow her gaze just in time to see her holding her phone taking a selfie of both of you with your tits covered in cum.'
 															*nl
 															'Anushka grabs some tissues and starts wiping his cum off her tits and hands you some as well. As the two of you clean his cum off your tits he is almost finished getting dressed. Anushka and you then start to get dressed as well, once he finishes he leans over and gives Anushka a kiss on the forward. "See you around babe, this was a blast we should do again sometime." The last bit he points to both of you as he says it, then he heads out the door, leaving Anushka to roll her eyes at his comments, as the two of you finish getting dressed.'
@@ -935,6 +982,44 @@ if $ARGS[0] = 'talkaboutval':
 	'She rolls her eyes slightly. "Yeah just friends that fuck."'
 	act 'Hangout in her room': gt 'anushapt','anushroom'
 	act 'Talk about something else': gt 'anushapt', 'bed'
+	if anushkaphoto[8] = 1:
+		act 'Ask about the selfie':
+			*clr & cla
+			minut += 2
+			gs 'stat'
+			'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+			'Wondering why she took that selfie of the two you, with you having cum on your face. "What are you going to do with that selfie of us?"'
+			'She shrugs a little. "Keep it as a memento at least for awhile, I often take selfies during sex or after sex as keep sakes, why?"'
+			'You nod a little. "Your not going to show it to anyone are you?"'
+			'She looks a little surprised you would ask. "No of course not." Then she grins. "Unless you want me to."'
+			act 'Hangout in her room': gt 'anushapt','anushroom'
+			act 'Talk about something else': gt 'anushapt', 'bed'
+			act 'Talk about what just happened': gt 'anushkaev1', 'about_rad'
+			act 'Can I see it?':
+				*clr & cla
+				gs 'stat'
+				'<center><img src="images/pc/pictures/anushka/8.jpg"></center>'
+				'You decided to ask her to show it to you. "Can I see it? The selfie that is."'
+				'"Sure if you want." She reaches over and grabs her phone, takes a moment to pull up the image and then shows it to you. You take a moment to look at it and yep that is you and Anushka, with faces covered in Valentin''s cum. You have to admit it is kinda hot, very naughty and dirty. It turns you on a little looking at it. Then she interrupts your thoughts with a question. "I can send it to you, if you want a copy of it."'
+				gs 'arousal', 'voyeur_sex', 2
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Hangout in her room': gt 'anushapt','anushroom'
+				act 'Talk about something else': gt 'anushapt', 'bed'
+				act 'Ask her to send it to you':
+					*clr & cla
+					minut += 1
+					anushkaphoto[8] = 1
+					gs 'stat'
+					'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+					'You think about it a moment and decided you would like to keep the selfie too. "Yeah send it to me."'
+					'She grins at that, obviously approving of your desire to keep it. She takes a moment, then you get a notice on your phone that you get a message. You check it real quick and add the selfie to a folder.'
+					act 'Hangout in her room': gt 'anushapt','anushroom'
+					act 'Talk about something else': gt 'anushapt', 'bed'
+				end
+			end
+		end
+	end
 end
 
 if $ARGS[0] = 'watch_nushmar':
@@ -980,10 +1065,11 @@ if $ARGS[0] = 'watch_nushmar':
 					act 'Leave apartment': gt 'pavComplex','start'
 					act 'Salty snack':
 						*clr & cla
+						nushmarcus_selfie = 1
 						'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spymar6.jpg"></center>'
 						'She slides off the bed in front of him, going to her knees. She tilts her head back and opens her mouth, while taking a firm grip on his dick and starts jerking him off. It doesn''t take long before he groans loudly and his cum starts raining down on her face. Some of it ends up on her cheeks but most of it manages to make it in her mouth. Pretty good aim if you have to say so yourself. She gives his cock several more hard long strokes milking out every last drop of cum from him, letting it fall onto her tongue. She doesn''t stop until he is dry, then she wiggles her tongue around showing the cum on it before swallowing it down, followed by her licking her lips clean of any stray cum. "God I love Russian girls, you are just so amazing Nush."'
 						*nl
-						'He bends over and gives her a kiss on the lips, then they both get up and start getting dressed, while she also cleans up the bit of cum that missed her mouth off the rest of her face. Once they are both dressed, she pats him on the chest with her hand. "That was amazing Marcus, I really needed that." Switching back to Russian, in a fairly dismissive tone. Just the way she said it, makes it clear she is done and is ready for him to leave. He seems to have picked up on the tone as well. "Oh yeah anytime, well I guess I better get going. See you at school yeah?" She nods and sits down on the bed. "Yeah sure, see you at school." You can hear the what ever in her tone even if she doesn''t say it. He seems to notice it too, then he turns towards the door, you quickly step away from the door before you get seen, softly shutting it.'
+						'He bends over and gives her a kiss on the lips, then they both get up. He starts getting dressed, while she pulls out her phone and takes a couple of naked selfies with his cum on her face. Once he is dressed and she is done taking selfies, she pats him on the chest with her hand. "That was amazing Marcus, I really needed that." Switching back to Russian, in a fairly dismissive tone. Just the way she said it, makes it clear she is done and is ready for him to leave. He seems to have picked up on the tone as well. "Oh yeah anytime, well I guess I better get going. See you at school yeah?" She nods and grabs her panties off the floor and starts to put them on. "Yeah sure, see you at school." You can hear the what ever in her tone even if she doesn''t say it. He seems to notice it too, then he turns towards the door, you quickly step away from the door before you get seen, softly shutting it.'
 						gs 'arousal', 'voyeur', 5
 						gs 'arousal', 'end'
 						gs 'stat'
@@ -995,8 +1081,15 @@ if $ARGS[0] = 'watch_nushmar':
 							'<center><img src="images/pc/npc_headshots/big146.jpg"></center>'
 							'You only take a couple of steps from the door when it opens. You turn like you was just heading to the room. He looks a bit surprised to see you and then blushes, obviously wondering if you heard. "Hey <<$pcs_nickname>>, I was just... I mean we were just..." He trails off obviously trying to think of a reason other than the truth why he is here.'
 							'You can''t help but smile about him trying to save Anushka''s rep and blushing at the same time. "I know what you guys were doing, hope you two had fun." You say to him with a wink, which makes him blush even more.'
-							'"Um yeah, uh we did... I need to go, see you at school <<$pcs_nickname>>." With that he hurries past you and out of the apartment. You open Anushka''s door and walk in and decide not to say anything about what you just saw.'
-							act 'Go in her room': gt 'anushapt','anushroom'
+							'"Um yeah, uh we did... I need to go, see you at school <<$pcs_nickname>>." With that he hurries past you and out of the apartment. You open Anushka''s door and walk in, Anushka is only half dressed with some of his cum still on her face.'
+							*nl
+							'She glances over at you as you walk in and smiles. "Hey you."'
+							'You smile back to her and how casual she is about having just been fucked. "Hey you back, so... you and Marcus huh?"'
+							'She arches her brow as she finishes getting dressed. "Me and Marcus what?"'
+							'You point to your side of your face where some of his cum is still on her face at. It takes her a moment then she looks in the mirror and cleans the rest of it off. "Oh... Shut up." She says but you can tell by her tone she is more amused than bothered by it.'
+							act 'Hangout in her room': gt 'anushapt','anushroom'
+							act 'Say nothing and join her on the bed': gt 'anushapt', 'bed'
+							act 'Talk about what just happened': gt 'anushkaev1', 'talk_about_marcus'
 						end
 					end
 				end
@@ -1120,104 +1213,177 @@ if $ARGS[0] = 'eat_nush_fucked':
 							cumspclnt = 12
 							gs 'cum_cleanup'
 							gs 'stat'
-							'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/nushsvetav.jpg"></center>'
-							'Anushka sits up next to you and before you know it she is holding her phone up taking a selfie of you are herself while your face is covered in cum. Then Anushka grabs some tissues and starts wiping his cum off her leg and hands you some as well. As the two of you clean his cum off you he gets dressed. Anushka and you then start to get dressed as well. "That was great Marcus, maybe we can do it again sometime. But we got some stuff to do right now, so seeya around okay." Anushka says to him, obvious to everyone that was her polite way of telling him to leave, by her tone.'
+							'<center><img src="images/pc/pictures/anushka/9.jpg"></center>'
+							'Anushka sits up next to you and before you know it she is holding her phone up taking a selfie of you and herself while your face is covered in cum. Then Anushka grabs some tissues and starts wiping his cum off her leg and hands you some as well. As the two of you clean his cum off you he gets dressed. Anushka and you then start to get dressed as well. "That was great Marcus, maybe we can do it again sometime. But we got some stuff to do right now, so seeya around okay." Anushka says to him, obvious to everyone that was her polite way of telling him to leave, by her tone.'
 							'"Oh... um yeah ok, I should get going anyways." He quickly finishes dressing and heads out the door.'
+							'Now that Marcus is gone and it is just the two of you, you decided to ask her about what all just happened. "So you and Marcus huh?"'
+							'She smiles and shakes her head. "Shut up."'
 							act 'Hangout in her room': gt 'anushapt','anushroom'
 							act 'Say nothing and join her on the bed': gt 'anushapt', 'bed'
-							act 'Talk about what just happened':
-								*clr & cla
-								minut += 1
-								gs 'stat'
-								'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
-								'Now that Marcus is gone and it is just the two of you, you decided to ask her about what all just happened. "So you and Marcus huh?"'
-								'She smiles and shakes her head. "Shut up."'
-								act 'Hangout in her room': gt 'anushapt','anushroom'
-								act 'Talk about something else': gt 'anushapt', 'bed'
-								act 'I didn''t even know you guys where friends':
-									*clr & cla
-									minut += 2
-									gs 'stat'
-									'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
-									'You give her a curious look. "I didn''t even know you guys where friends let alone hooking up."'
-									'She smiles and shakes her head. "Where not. Friends that is, he is ok don''t get me wrong but I wouldn''t say he was a friend."'
-									'You get a bit confused by that. "Then why are you hooking up, if you''re not friends?"'
-									'She laughs. "Because it''s taboo, you know how people are. He''s black, he''s a American. Either would be enough for people to think it is wrong, both just makes it doubly taboo. Which makes it fucking hot, not to mention he has a big fucking dick."'
-									'You nod in agreement, he does have a big dick. "So it''s just because he has a big dick and is black?"'
-									*nl
-									'She shrugs then rolls onto her back. "Yeah pretty much, I mean just thinking about getting ploughed by his big black dick is making me horny again." She says with a laugh but you can tell she really is starting to get aroused again.'
-									'You laugh. "Ok, ok I get it, big black dicks make you horny."'
-									'She shakes her head slightly. "It''s not just that, or I should say only that. It is about everyone saying it''s wrong. It is the same reason I like fucking other chicks, or getting naked. Breaking the rules and rubbing it in their narrow minded faces is a huge turn on. I mean fuck what society thinks or wants us to think or how to act. The more people tell me good girls shouldn''t do this or that, the more I want to fucking do it. I say break all the fucking rules and live free."'
-									'You only nod at that, you know Anushka is a bit of a anarchist at heart, so not a surprise breaking social norms turns her on.'
-									act 'Hangout in her room': gt 'anushapt','anushroom'
-									act 'Talk about something else': gt 'anushapt', 'bed'
-									if OluQW['sex'] = 1 and OluQW['nush_inv'] = 0:
-										act 'Tell her about Olu':
-											*clr & cla
-											minut += 1
-											gs 'stat'
-											'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
-											'You smile as you look at her like you have a big secret. Which perks her interest. "Well I am seeing a black guy too." You tell her.'
-											'Her eyebrow arches in curiosity. "Really who?"'
-											'You describe Olu to her and mention he lives in your building. She nods apparently knowing who you mean. "Yeah Ok I think I have seen him around the courtyard before. So he lives in your building huh? How did you meet? Cause I got to say he looks a little old for you."'
-											'"Well his name is Olu and he is my Aunt''s boyfriend." You tell her.'
-											'Which gets a bit of a shocked look from Anushka. "Oh my god does your aunt know?"'
-											act 'Yes':
-												*clr & cla
-												minut += 2
-												gs 'stat'
-												'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
-												'You nod to her. "Yeah in fact it was her idea." You add with a laugh.'
-												'If anything Anushka has a more shocked expression on her face now. "And I thought my family was weird." She says shaking her head slightly in disbelief.'
-												'"Well Olu wants to have sex all the time, I mean he has a insane sex drive." You tell her.'
-												'She snorts "So a typical guy."'
-												*nl
-												'You smile at that. "No no I mean he would be happy having sex twenty four seven." You see the look at her face which you can just tell means yeah like every other guy which makes you laugh. "Ok ok, but he has a really big dick, I mean really big, even bigger than Marcus." You tell her laying your hands far enough apart roughly with how long Olu is and then wrapping your hands together like they are holding something really thick to show how thick he is.'
-												'Her eyes get a bit wide and she bites her lower lip, you can tell talking about how big his dick is, is turning her on a little. "He is really that big, my god I don''t even know if that would fit, he is even bigger than Val." She says with a laugh, obviously not really serious.'
-												act 'Yes he is really that big':
-													*clr & cla
-													minut += 1
-													gs 'stat'
-													'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
-													'You nod your head. "He really is that massive and he loves fucking girls in the butt. That''s why my aunt needed a break."'
-													'She laughs. "Yeah I bet, I have never seen one that big, except maybe in some porno''s, my god that is crazy to think about."'
-													act 'Ask her if she wants join in':
-														*clr & cla
-														OluQW['nush_inv'] = 1
-														minut += 1
-														gs 'stat'
-														'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
-														'You give her a big grin. "Well if you would like to see it in person and know what it feels like, I could hook you up. I can tell you want to give it a try."'
-														'You think she might have even blushed a little at that, but then gives a rueful smile. "Ok yeah, the thought of having a huge black dick, that big shoved up my ass is a turn on. But seriously I don''t know if I can handle it."'
-														'You laugh. "You get use to it, trust me. So you want to or what?"'
-														*nl
-														'She bites her lower lip for a moment then laughs. "Yeah fuck it, next time you go see him, text me and I will come join you, if I can."'
-														'You nod. "Great, I''ll let you know." You tell her the story of your first time with Olu and what it was like, she presses you for details, she obviously finds the story a big turn on, then she shares her stories with the biggest guy she has been with Valentin, the two of you swap stories and giggle about your sex lives. Passing the time.'
-														act 'Hangout in her room': gt 'anushapt','anushroom'
-														act 'Talk about something else': gt 'anushapt', 'bed'
-													end
-													act 'Tell her about your experiences with Olu':
-														*clr & cla
-														minut += 30
-														gs 'stat'
-														'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
-														'You tell her the story of your first time with Olu and what it was like, she presses you for details, she obviously finds the story a big turn on, then she shares her stories with the biggest guy she has been with Valentin, the two of you swap stories and giggle about your sex lives. Passing the time.'
-														act 'Hangout in her room': gt 'anushapt','anushroom'
-														act 'Talk about something else': gt 'anushapt', 'bed'
-													end
-												end
-											end
-										end
-									end
-								end
-							end
+							act 'Talk about what just happened': gt 'anushkaev1', 'talk_about_marcus'
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'talk_about_marcus':
+	*clr & cla
+	minut += 2
+	gs 'stat'
+	'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+	'You give her a curious look. "I didn''t even know you guys where friends let alone hooking up."'
+	'She smiles and shakes her head. "Where not. Friends that is, he is ok don''t get me wrong but I wouldn''t say he was a friend."'
+	'You get a bit confused by that. "Then why are you hooking up, if you''re not friends?"'
+	'She laughs. "Because it''s taboo, you know how people are. He''s black, he''s a American. Either would be enough for people to think it is wrong, both just makes it doubly taboo. Which makes it fucking hot, not to mention he has a big fucking dick."'
+	*nl
+	'You nod in agreement, he does have a big dick. "So it''s just because he has a big dick and is black?"'
+	'She shrugs then rolls onto her back. "Yeah pretty much, I mean just thinking about getting ploughed by his big black dick is making me horny again." She says with a laugh but you can tell she really is starting to get aroused again.'
+	'You laugh. "Ok, ok I get it, big black dicks make you horny."'
+	*nl
+	'She shakes her head slightly. "It''s not just that, or I should say only that. It is about everyone saying it''s wrong. It is the same reason I like fucking other chicks, or getting naked. Breaking the rules and rubbing it in their narrow minded faces is a huge turn on. I mean fuck what society thinks or wants us to think or how to act. The more people tell me good girls shouldn''t do this or that, the more I want to fucking do it. I say break all the fucking rules and live free."'
+	'You only nod at that, you know Anushka is a bit of a anarchist at heart, so not a surprise breaking social norms turns her on.'
+	act 'Hangout in her room': gt 'anushapt','anushroom'
+	act 'Talk about something else': gt 'anushapt', 'bed'
+	if OluQW['sex'] = 1 and OluQW['nush_inv'] = 0:
+		act 'Tell her about Olu': gt 'anushkaev1', 'tell_about_olu'
+	end
+	if anushkaphoto[9] = 1:
+		act 'Ask about the selfie':
+			*clr & cla
+			minut += 2
+			gs 'stat'
+			'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+			if nushmarcus_selfie = 1:
+				'Curious why she took a selfie with his cum on her face. "Why did you take that selfie, you know... with his cum on your face?"'
+				'She cocks her head slightly and then smiles a bit. "How do you know I did that?"'
+				'Crap she is right you shouldn''t know. "When he opened the door to leave I seen you with your phone in your hand taking a selfie."'
+				'She gives you a slightly suspecious look, you are not sure she believes you or not, but either isn''t or doesn''t care. "I just often take selifes during or after sex as keep sakes, why?"'
+				'You shake your head slightly. "I was just curious is all."'
+			else
+				'Wondering why she took that selfie of the two you, with you having cum on your face. "What are you going to do with that selfie of us?"'
+				'She shrugs a little. "Keep it as a memento at least for awhile, I often take selfies during sex or after sex as keep sakes, why?"'
+				'You nod a little. "Your not going to show it to anyone are you?"'
+				'She looks a little surprised you would ask. "No of course not." Then she grins. "Unless you want me to."'
+			end
+			if OluQW['sex'] = 1 and OluQW['nush_inv'] = 0:
+				act 'Tell her about Olu': gt 'anushkaev1', 'tell_about_olu'
+			end
+			act 'Can I see it?':
+				*clr & cla
+				gs 'stat'
+				if nushmarcus_selfie = 1:
+					'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/nushmarselfie.jpg"></center>'
+					'You bite your lower lip a moment, you are curious what the selfie she took looks like. "Can I see it? The selfie you took I mean."'
+					'She grins at that. "Such a pervert." She says in a teasing tone but grabs her phone, takes a moment and then pulls up the image, before handing the phone over. You take it and look at the image, yep that is Anushka with cum on her face and Marcus dick right in front of her face. After a minute or so you hand her, her phone back.'
+					gs 'arousal', 'voyeur_sex', 2
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Hangout in her room': gt 'anushapt','anushroom'
+					act 'Talk about something else': gt 'anushapt', 'bed'
+					if OluQW['sex'] = 1 and OluQW['nush_inv'] = 0:
+						act 'Tell her about Olu': gt 'anushkaev1', 'tell_about_olu'
+					end
+				else
+					'<center><img src="images/pc/pictures/anushka/9.jpg"></center>'
+					'You decided to ask her to show it to you. "Can I see it? The selfie that is."'
+					'She reaches over and grabs her phone, takes a moment to pull up the image and then shows it to you. "Sure if you want I can send it to you."'
+					'You take a moment to look at it and yep that is you and Anushka, with cum on your face.'
+					gs 'arousal', 'voyeur_sex', 2
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Ask her to send it to you':
+						*clr & cla
+						minut += 1
+						anushkaphoto[9] = 1
+						gs 'stat'
+						'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+						'You think about it a moment and decided you would like to keep the selfie too. "Yeah send it to me."'
+						'She grins at that, obviously approving of your desire to keep it. She takes a moment, then you get a notice on your phone that you get a message. You check it real quick and add the selfie to a folder.'
+						act 'Hangout in her room': gt 'anushapt','anushroom'
+						act 'Talk about something else': gt 'anushapt', 'bed'
+						if OluQW['sex'] = 1 and OluQW['nush_inv'] = 0:
+							act 'Tell her about Olu': gt 'anushkaev1', 'tell_about_olu'
 						end
 					end
+					act 'Hangout in her room': gt 'anushapt','anushroom'
+					act 'Talk about something else': gt 'anushapt', 'bed'
+					if OluQW['sex'] = 1 and OluQW['nush_inv'] = 0:
+						act 'Tell her about Olu': gt 'anushkaev1', 'tell_about_olu'
+					end
 				end
 			end
 		end
 	end
 end
+		
+if $ARGS[0] = 'tell_about_olu':
+	*clr & cla
+	minut += 1
+	gs 'stat'
+	'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+	'You smile as you look at her like you have a big secret. Which perks her interest. "Well I am seeing a black guy too." You tell her.'
+	'Her eyebrow arches in curiosity. "Really who?"'
+	'You describe Olu to her and mention he lives in your building. She nods apparently knowing who you mean. "Yeah Ok I think I have seen him around the courtyard before. So he lives in your building huh? How did you meet? Cause I got to say he looks a little old for you."'
+	'"Well his name is Olu and he is my Aunt''s boyfriend." You tell her.'
+	'Which gets a bit of a shocked look from Anushka. "Oh my god does your aunt know?"'
+	act 'Yes':
+		*clr & cla
+		minut += 2
+		gs 'stat'
+		'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+		'You nod to her. "Yeah in fact it was her idea." You add with a laugh.'
+		'If anything Anushka has a more shocked expression on her face now. "And I thought my family was weird." She says shaking her head slightly in disbelief.'
+		'"Well Olu wants to have sex all the time, I mean he has a insane sex drive." You tell her.'
+		'She snorts "So a typical guy."'
+		*nl
+		'You smile at that. "No no I mean he would be happy having sex twenty four seven." You see the look at her face which you can just tell means yeah like every other guy which makes you laugh. "Ok ok, but he has a really big dick, I mean really big, even bigger than Marcus." You tell her laying your hands far enough apart roughly with how long Olu is and then wrapping your hands together like they are holding something really thick to show how thick he is.'
+		'Her eyes get a bit wide and she bites her lower lip, you can tell talking about how big his dick is, is turning her on a little. "He is really that big, my god I don''t even know if that would fit, he is even bigger than Val." She says with a laugh, obviously not really serious.'
+		act 'Yes he is really that big':
+			*clr & cla
+			minut += 1
+			gs 'stat'
+			'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+			'You nod your head. "He really is that massive and he loves fucking girls in the butt. That''s why my aunt needed a break."'
+			'She laughs. "Yeah I bet, I have never seen one that big, except maybe in some porno''s, my god that is crazy to think about."'
+			act 'Ask her if she wants join in':
+				*clr & cla
+				OluQW['nush_inv'] = 1
+				minut += 1
+				gs 'stat'
+				'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+				'You give her a big grin. "Well if you would like to see it in person and know what it feels like, I could hook you up. I can tell you want to give it a try."'
+				'You think she might have even blushed a little at that, but then gives a rueful smile. "Ok yeah, the thought of having a huge black dick, that big shoved up my ass is a turn on. But seriously I don''t know if I can handle it."'
+				'You laugh. "You get use to it, trust me. So you want to or what?"'
+				*nl
+				'She bites her lower lip for a moment then laughs. "Yeah fuck it, next time you go see him, text me and I will come join you, if I can."'
+				'You nod. "Great, I''ll let you know." You tell her the story of your first time with Olu and what it was like, she presses you for details, she obviously finds the story a big turn on, then she shares her stories with the biggest guy she has been with Valentin, the two of you swap stories and giggle about your sex lives. Passing the time.'
+				act 'Hangout in her room': gt 'anushapt','anushroom'
+				act 'Talk about something else': gt 'anushapt', 'bed'
+				act 'Tell her about your experiences with Olu':
+					*clr & cla
+					minut += 30
+					gs 'stat'
+					'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+					'You tell her the story of your first time with Olu and what it was like, she presses you for details, she obviously finds the story a big turn on, then she shares her stories with the biggest guy she has been with Valentin and Marcus, the two of you swap stories and giggle about your sex lives. Passing the time.'
+					act 'Hangout in her room': gt 'anushapt','anushroom'
+					act 'Talk about something else': gt 'anushapt', 'bed'
+				end
+			end
+			act 'Tell her about your experiences with Olu':
+				*clr & cla
+				minut += 30
+				gs 'stat'
+				'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+				'You tell her the story of your first time with Olu and what it was like, she presses you for details, she obviously finds the story a big turn on, then she shares her stories with the biggest guy she has been with Valentin and Marcus, the two of you swap stories and giggle about your sex lives. Passing the time.'
+				act 'Hangout in her room': gt 'anushapt','anushroom'
+				act 'Talk about something else': gt 'anushapt', 'bed'
+			end
+		end
+	end
+end
 	
 if $ARGS[0] = 'couch_strapon_give':
 	*clr & cla

+ 2 - 2
locations/barbershop.qsrc

@@ -42,8 +42,8 @@
 !!pcs_haircol 15 = Medium Purple
 !!pcs_haircol 16 = Light Purple
 !!pcs_haircol 17 = Orange
-!!pcs_haircol 16 = Dark Red
-!!pcs_haircol 17 = Medium Red
+!!pcs_haircol 18 = Dark Red
+!!pcs_haircol 19 = Medium Red
 
 $menu_loc = 'barbershop'
 $menu_arg = 'start'

+ 1 - 25
locations/begin.qsrc

@@ -75,31 +75,7 @@ if $ARGS[0] = 'warning':
 	'<center><b><font color = maroon>WARNING</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/system/gl3.jpg" ></center>'
 	*nl
-	'This game contains, but is not limited to the following:'
-	'Pornographic images;'
-	'Desriptions of sexual acts;'
-	'Rape;'
-	'Incest;'
-	'Violent assaults;'
-	'Blackmail for sex;'
-	'Drug use;'
-	'Extreme character weight (both very skinny and massively obese);'
-	'Urination as sexual fetish;'
-	'Underage sex 15 - 17 years old (in the text, sexual images used only contain performers 18+ years old);'
-	'Theft;'
-	'Drug use;'
-	'Prostitution;'
-	'BDSM;'
-	'Kidnap;'
-	'Death;'
-	'Alcohol abuse.'
-	*nl
-	'If any of these things upset you or you are under the age of 18 you must not continue.'
-	*nl
-	'Although many of these things are illegal in various places around the world this is a work of fiction and there are no people actually harmed in the making of this game.'
-	'Exhausted and frustrated by the code for sure but no bruises above the neck or below the elbow.'
-	'This means that with the exception of rather vague laws in Russia playing this game is not breaking any laws relating to the acts depicted.'
-	'Your local laws might be different to those we have checked and if you are worried you should not continue without checking your legal position.'
+	'<center><img <<$set_imgh>> src="images/system/start/warning.jpg" ></center>'
 	
 	act 'Continue': gt 'begin','real_character'
 end

+ 7 - 1
locations/cikl.qsrc

@@ -1620,7 +1620,7 @@ elseif grandmaQW['chore_gather_both'] = 1 or grandmaQW['chore_gather_both'] = 2:
 	grandmaQW['disappointment'] = 1
 end
 
-!!disappointing grandpa
+!! disappointing grandpa
 if grandpaQW['chore_fetch_firewood'] = 1 or grandpaQW['chore_fetch_firewood'] = 2:
 	grandpaQW['chore_fetch_firewood'] = 0
 	grandpaQW['disappointment'] = 1
@@ -1669,6 +1669,12 @@ elseif grandpaQW['chore_bale_hay'] = 1 or grandpaQW['chore_bale_hay'] = 2:
 	grandpaQW['chore_bale_hay'] = 0
 	grandpaQW['disappointment'] = 1
 end
+
+!! grandparents use root cellar
+if boletus_stored > 0: boletus_stored -= rand(0,1)
+if bilberry_stored > 0: bilberry_stored -= rand(0,1)
+if boletus_stored < 0: boletus_stored = 0
+if bilberry_stored < 0: bilberry_stored = 0
 !! end of new grandparent chore stuff, for 0.8.0
 
 if catout ! 0: catout = 0

+ 1 - 0
locations/clothing_attributes.qsrc

@@ -82,6 +82,7 @@ CloBra = 0
 CloPantsShortness = 0
 CloSkirtShortness = 0
 CloPanties = 0
+CloDress = 0
 CloOnePiece = 0
 CloStyle = 0
 CloStyle2 = 0

+ 1 - 1
locations/clothing_descriptions.qsrc

@@ -90,7 +90,7 @@ if CloDress = 1:
 		$description = $description + ' and a hemline not even long enough to hide your privates.'
 	end
 elseif CloPanties = 1:
-	$description += ' the bottom of which is so skimpy it replaces your panties.'
+	$description + ' the bottom of which is so skimpy it replaces your panties.'
 elseif CloPantsShortness > 0:
 	if CloPantsShortness = 1:
 		$description = $description + ' and long pants.'

+ 1 - 1
locations/club.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'start':
 	if money >= 250:
 		act 'Enter the club (250 <b>₽</b>)':
 			menu_off = 1
-			if pcs_makeup > 1 and pcs_sweat < 50 and (PCloSkirt > 2 or PCloPants > 4 or $clothingworntype = 'exhibit'):
+			if pcs_makeup > 1 and pcs_sweat < 50 and (PCloSkirt > 2 or PCloPants > 4 or PCloPanties = 1 or $clothingworntype = 'exhibit'):
 				'You can feel his eyes all over your body, but eventually he nods and lets pass where you are stopped just inside the door by another large man. He indicates the cashier window. You step over to it and pay the entry fee. With that paid he steps aside and lets you go inside.'
 				minut += 5
 				money -= 250

+ 2 - 2
locations/danceGev.qsrc

@@ -19,7 +19,7 @@ if danceevtimes >= 5:dancegevtipe = rand(0, 3)
 
 if dancegevtipe = 0:
 	'You see Veronichka Mokhova doing stretches, you watch as see does the splits her g-string leaving nothing to your imagination.'
-	if lesbian > 0:gs 'arousal', 'voyeur', 5, 'lesbian'
+	if lesbian > 0:gs 'arousal', 'voyeur', 5
 	gs 'stat'
 elseif dancegevtipe = 1:
 	'You see Veronichka Mokhova doing a handstand.'
@@ -27,7 +27,7 @@ elseif dancegevtipe = 2:
 	'You watch Veronichka Mokhova warming up.'
 elseif dancegevtipe = 3:
 	'Veronichka Mokhova goes from a handstand to the splits, you realise she is not wear any panties and probably thought she was alone.'
-	if lesbian > 0:gs 'arousal', 'voyeur', 5, 'lesbian'
+	if lesbian > 0:gs 'arousal', 'voyeur', 5
 	gs 'stat'
 end
 gs 'arousal', 'end'

+ 6 - 1
locations/din_bad.qsrc

@@ -199,7 +199,6 @@ if $ARGS[0] = 'd_bag':
 	if bcream_have > 0:'<a href="exec:dynamic $use_bcream & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<bcream_have>></b> cream left in your purse.'
 	if aphrodisiac_have > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $aphrodisiac_msg & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<aphrodisiac_have>></b> gum left in your purse.'
 
-	if lubri > 0:'There''s a tube of lubricant in your purse, enough for <b><<lubri>></b> applications.'
 	if refillable_bottle = 4: 
 		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: refillable_bottle = 3 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
 	elseif refillable_bottle = 3:
@@ -711,6 +710,10 @@ $d_cycreport_update = {
 				temp[1] = daystart-daylastperiod
 				if tabletkishot > 0:
 					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=green>You are currently protected by a birth control shot.</font>'
+				elseif birth_control['implant_status'] > 1 and pillcon2 >= 30000:
+					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=green>Your implant protects you from getting pregnant.</font>'
+				elseif birth_control['implant_status'] > 1 and pillcon2 < 30000:
+					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=red>Your implant is not yet effective.</font>'				
 				elseif pillcon2 > 30000:
 					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=green>You are currently on the birth control pill.</font>'
 				elseif pillcon2 > 8000 and ((FocH > (Foch_Max - 96)) or ovulate > 0):
@@ -721,6 +724,8 @@ $d_cycreport_update = {
 					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. You have taken the pill but it will be several weeks before it is fully effective.'
 				elseif FocH > (Foch_Max - 96) or ovulate > 0:
 					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=red>It is currently your fertile stage.</font>'
+				elseif birth_control['implant_status'] = 1:
+					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=red>Your implant stopped working. You need a new one.</font>'
 				else
 					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period.'
 				end

+ 21 - 37
locations/din_van.qsrc

@@ -259,7 +259,7 @@ $bath = {
 
 $brit = {
 	if shave_menu = 1  and stanok > 1:
-		if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (((pubestyle >= 2 and pubestyle <= 7) or pubestyle = 12) and pcs_pubes >= 15) or (pubestyle = 8 and pcs_pubes >= 20) or ((pubestyle = 9 or pubestyle >= 13) and pcs_pubes > 25) or (pubestyle = 10 and pcs_pubes >= 35) or (pubestyle = 11 and pcs_pubes > 10):
+		if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (((pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12) and pcs_pubes > 19) or (pubestyle = 10 and pcs_pubes > 29) or (pubestyle = 11 and pcs_pubes > 10):
 			act 'Shave yourself (0:15)':
 				menu_off = 1
 				*clr & cla
@@ -269,7 +269,7 @@ $brit = {
 					pcs_pubes = 0
 				elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
 					pcs_pubes = 16
-				elseif pubestyle = 10 and pcs_pubes >= 35:
+				elseif pubestyle = 10 and pcs_pubes > 29:
 					pcs_pubes = 26
 				elseif pubestyle = 11 and pcs_pubes > 10:
 					pcs_pubes = 0
@@ -289,16 +289,14 @@ $brit = {
 				elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 					pcs_mood += 10
 					'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
-				elseif pubestyle = 1:
+				elseif pubestyle = 1 or pubestyle = 11:
 					'You lather up your legs and crotch and carefully shave them. Once you''re finished you gently glide your hands over your smooth pussy and legs, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-				elseif pubestyle >= 2 and pubestyle <=7:
+				elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle <= 12:
 					'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time cleaning up the area around your neatly trimmed and styled patch of pussy hair as well.'
-				elseif pubestyle = 8:
-					'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time shaving off the stubble around your small patch of hair tidy as well.'
-				elseif pubestyle >= 9:
+				elseif pubestyle = 9:
 					'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your small neat bush as well.'
-				elseif pubestyle >= 10:
-					'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your	 bush as well.'
+				elseif pubestyle = 10:
+					'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your	bush as well.'
 				end
 				dynamic $dryOff
 			end
@@ -331,7 +329,7 @@ $brit = {
 		end
 	elseif shave_menu = 2 and stanok > 0:
 		if pcs_pubes > 3:
-			if pubestyle = 1:
+			if pubestyle = 1 or (pubestyle = 11 and pcs_pubes > 10):
 				act 'Shave your pussy (0:10)':
 					menu_off = 1
 					*clr & cla
@@ -345,25 +343,7 @@ $brit = {
 					'You lather your crotch with some soapy water and carefully shave your pubic hair. After shaving you can''t help but run your fingers over your pussy, enjoying the smooth feeling and getting slightly more aroused by the touch.'
 					dynamic $dryOff
 				end
-			elseif ((pubestyle >= 2 and pubestyle <= 7) or pubestyle = 12) and pcs_pubes >= 15:
-				act 'Trim your pussy (0:10)':
-					menu_off = 1
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
-					*nl
-					if pcs_pubes >= 20:
-						'You carefully shave away the hair at the edges of your pussy, trimming it all away until there is only a neatly styled bush left at the top.'
-					else
-						'You carefully shave away the stubble at the edges of your pussy, careful to only trim and maintain the neatly styled bush you have at the top.'
-					end
-					minut += 10
-					pcs_pubes = 11
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					dynamic $dryOff
-				end
-			elseif pubestyle = 8 and pcs_pubes >= 20:
+			elseif ((pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12) and pcs_pubes > 19:
 				act 'Trim your pubic hair (0:10)':
 					menu_off = 1
 					*clr & cla
@@ -374,24 +354,28 @@ $brit = {
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
 					*nl
-					'You spend some time trimming back your pubic hair, not shaving it away completely but careful to make it neat and tidy.'
+					'You spend some time carefully shaving your pubic hair to your desired shape, and then trim it to make it neat and tidy.'
 					dynamic $dryOff
 				end
-			elseif (pubestyle = 9 or pubestyle >= 13) and pcs_pubes >= 26:
-				act 'Trim your bush (0:10)':
+			elseif pubestyle = 9 and pcs_pubes > 19:
+				act 'Trim your pubic hair (0:10)':
 					menu_off = 1
 					*clr & cla
+					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
+					*nl
+					if pcs_pubes >= 20:
+						'You carefully shave away the hair at the edges of your pussy, trimming it all away until there is only a neatly styled bush left at the top.'
+					else
+						'You carefully shave away the stubble at the edges of your pussy, careful to only trim and maintain the neatly styled bush you have at the top.'
+					end
 					minut += 10
-					pcs_pubes = 21
+					pcs_pubes = 16
 					pcs_horny += 5
 					stanok -= 1
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
-					*nl
-					'You spend some time trimming back your light bush of pubic hair, tidying it up and keeping your bikini line nice and clean.'
 					dynamic $dryOff
 				end
-			elseif pubestyle = 10 and pcs_pubes >= 40:
+			elseif pubestyle = 10 and pcs_pubes >= 29:
 				act 'Trim back your bush (0:10)':
 					menu_off = 1
 					*clr & cla

+ 18 - 18
locations/dorm.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'start':
 		act 'Leave': minut += 5 & gt 'island'
 
 		if afra > 0 and hour < 22 and hour >= 7:
-			act 'I''m here to visit DeMarcus':
+			act 'I''m here to visit Djibril':
 				cla
 				'You say that you are here to visit the african students. The janitor remarks, "Look at this whore... What, your own kind not good enough for you? Go ahead and take care of those black cocks."'
 				reccoldorm = 1
@@ -122,7 +122,7 @@ if $ARGS[0] = 'korr':
 	end
 
 	if afra > 0 and hour < 22 and hour >= 7:
-		act 'DeMarcus'' room':
+		act 'Djibril'' room':
 			cla
 			afrand = rand(1, 2)
 
@@ -213,7 +213,7 @@ if $ARGS[0] = 'demarcusfuck':
 		afrand1 = rand(1,17)
 	end
 	gs 'stat'
-	act 'Drink with DeMarcus':
+	act 'Drink with Djibril':
 		cla
 		cls
 		minut += 120
@@ -231,7 +231,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_vag += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra.jpg"></center>'
-			'DeMarcus lays you on the bed, and pulls out his huge black cock. Before you''re able to speak up he spreads your legs apart to easily enter your pussy.'
+			'Djibril lays you on the bed, and pulls out his huge black cock. Before you''re able to speak up he spreads your legs apart to easily enter your pussy.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
@@ -240,7 +240,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_vag += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra1.jpg"></center>'
-			'DeMarcus lays you on the floor, and pulls out his huge black cock. Before you''re able to speak up he spreads your legs apart to easily enter your pussy.'
+			'Djibril lays you on the floor, and pulls out his huge black cock. Before you''re able to speak up he spreads your legs apart to easily enter your pussy.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
@@ -249,7 +249,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_vag += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra2.jpg"></center>'
-			'DeMarcus pushes you on all fours on the bed, he pulls out his huge black cock and spreads apart your ass cheeks before penetrating your pussy.'
+			'Djibril pushes you on all fours on the bed, he pulls out his huge black cock and spreads apart your ass cheeks before penetrating your pussy.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
@@ -259,7 +259,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_ass += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra4.jpg"></center>'
-			'DeMarcus pushes you on all fours on the bed, he pulls out his huge black cock and spreads apart your ass cheeks before thrusting his thick cock into your asshole.'
+			'Djibril pushes you on all fours on the bed, he pulls out his huge black cock and spreads apart your ass cheeks before thrusting his thick cock into your asshole.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			anal_slip += 4
 			$orgasm_or = 'yes'
@@ -269,7 +269,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_vag += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra24.jpg"></center>'
-			'DeMarcus pushes you on all fours on the bed, he pulls out his huge black cock and salms into your pussy, stretching it to the limit.'
+			'Djibril pushes you on all fours on the bed, he pulls out his huge black cock and salms into your pussy, stretching it to the limit.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
@@ -279,7 +279,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_ass += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra16.jpg"></center>'
-			'DeMarcus pushes you face down ass up on the bed and pulls out his huge black cock. He makes you spread wide apart and before you know it he enters your asshole.'
+			'Djibril pushes you face down ass up on the bed and pulls out his huge black cock. He makes you spread wide apart and before you know it he enters your asshole.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			anal_slip += 4
 			$orgasm_or = 'yes'
@@ -290,7 +290,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_ass += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra13.jpg"></center>'
-			'DeMarcus throws you on the bed and easily picks your back part up as he penetrates your asshole with his huge black cock.'
+			'Djibril throws you on the bed and easily picks your back part up as he penetrates your asshole with his huge black cock.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			anal_slip += 4
 			$orgasm_or = 'yes'
@@ -301,7 +301,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_ass += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra20.jpg"></center>'
-			'DeMarcus lays on the bed, you stradle him and force your asshole down on his huge black cock.'
+			'Djibril lays on the bed, you stradle him and force your asshole down on his huge black cock.'
 			'You ride his thick cock until you orgasm a few times. He cums inside you and passes out.'
 			anal_slip += 4
 			$orgasm_or = 'yes'
@@ -311,7 +311,7 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_vag += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra11.jpg"></center>'
-			'DeMarcus throws you on the bed and easily picks your back part up as he penetrates your pussy with his huge black cock.'
+			'Djibril throws you on the bed and easily picks your back part up as he penetrates your pussy with his huge black cock.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
@@ -330,8 +330,8 @@ if $ARGS[0] = 'demarcusfuck':
 			spafinloc = 11
 			gs 'cum_manage'
 			afra += 1
-			'DeMarcus has you drop on your knees, revealing his huge cock and before you know it, your lips are wrapped around his cock as he pushes his huge black cock down your throat.'
-			'While DeMarcus is fucking your mouth, you carefully massage and finger your pussy. DeMarcus takes out his cock and as cums all over your face, you orgasm.'
+			'Djibril has you drop on your knees, revealing his huge cock and before you know it, your lips are wrapped around his cock as he pushes his huge black cock down your throat.'
+			'While Djibril is fucking your mouth, you carefully massage and finger your pussy. Djibril takes out his cock and as cums all over your face, you orgasm.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
 			gs 'arousal', 'bj', 20
@@ -351,8 +351,8 @@ if $ARGS[0] = 'demarcusfuck':
 			gs 'cum_manage'
 			afra += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra10.jpg"></center>'
-			'DeMarcus has you drop on your knees, revealing his huge cock and before you know it, your lips are wrapped around his cock as he pushes his huge black cock down your throat.'
-			'While DeMarcus is fucking your mouth, you carefully massage and finger your pussy. DeMarcus takes out his cock and as cums all over your face, you orgasm.'
+			'Djibril has you drop on your knees, revealing his huge cock and before you know it, your lips are wrapped around his cock as he pushes his huge black cock down your throat.'
+			'While Djibril is fucking your mouth, you carefully massage and finger your pussy. Djibril takes out his cock and as cums all over your face, you orgasm.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
 			gs 'arousal', 'bj', 20
@@ -363,8 +363,8 @@ if $ARGS[0] = 'demarcusfuck':
 			afra += 1
 			pcs_vag += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra42.jpg"></center>'
-			'DeMarcus lays you on the bed, and pulls out his huge black cock. He spreads your legs apart as he slams into your pussy.'
-			'While DeMarcus furiously pounds you, you orgasm a few times on his cock. Just as he''s about to cum he pulls out and cums on you sore clit.'
+			'Djibril lays you on the bed, and pulls out his huge black cock. He spreads your legs apart as he slams into your pussy.'
+			'While Djibril furiously pounds you, you orgasm a few times on his cock. Just as he''s about to cum he pulls out and cums on you sore clit.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'rough'
 		end

+ 2 - 18
locations/fit.qsrc

@@ -16,26 +16,10 @@ if $ARGS[0] = 'start':
 	'This modern and well staffed fitness center provides all the latest equipment and trainers to help you make the most of them.'
 	*nl
 	'At the reception you may buy '+iif(abonement > 0, 'a subscription package', 'an additional subscription package')+' for access to all available facilities.'
-	if abonement > 0:'Your existing subscription package is valid for <<abonement>> more classes.'
 	*nl
-	'<b>Available Packages:</b>'
-	if money >= 3000:
-		'<a href="exec: money -= 3000 & abonement +=30 & gt ''fit'', ''start''">30 classes (3,000 <b>₽</b>)</a>'
-	else
-		'30 classes (3,000 <b>₽</b>)'
-	end
-	if money >= 2250:
-		'<a href="exec: money -= 2250 & abonement +=20 & gt ''fit'', ''start''">20 classes (2,250 <b>₽</b>)</a>'
-	else
-		'20 classes (2,250 <b>₽</b>)'
-	end
-	if money >= 1500:
-		'<a href="exec: money -= 1500 & abonement +=10 & gt ''fit'', ''start''">10 classes (1,500 <b>₽</b>)</a>'
-	else
-		'10 classes (1,500 <b>₽</b>)'
-	end
+	if abonement > 0:'Your existing subscription package is valid for <<abonement>> more classes.'
 	*nl
-	'<b>Included classes:</b>'
+	'<b>Classes included in subscription:</b>'
 	'Running'
 	'Crossfit'
 	'Aerobics'

+ 22 - 10
locations/food_menu.qsrc

@@ -1,20 +1,32 @@
 # food_menu
-!pcs_drank and pcs_ate variables track how much Sveta consumes each day. Vars are reset each day.
-!food_loc returns food and beverage menus back to the food_menu.
+!!pcs_drank and pcs_ate variables track how much Sveta consumes each day. Vars are reset each day.
+!!food_loc returns food and beverage menus back to the food_menu.
+
+!!How to use the food_menu location in a mod
+!!Step 1: set up $_eat and $_drink in the mod
+!!Step 2: add the following three lines to the mod:
+!!*clr & cla
+!!killvar '$_drink'
+!!killvar '$_eat'
+!!Step 3: call your own $_eat and $_drink afterwards
+!!Step 4: call this location with gs 'food_menu', 'mod'
 
 menu_off = 1
-food_loc = 1
 gs 'themes', 'food_menu'
 
-*clr & cla
+if $ARGS[0] ! 'mod':
+	*clr & cla
+	food_loc = 1
+	killvar '$_drink'
+	killvar '$_eat'
+end	
+
 act 'Return':
 	killvar 'food_loc'
 	minut += 5
-	gs 'stat'
 	gt $loc, $metka
 end
-killvar '$_drink'
-killvar '$_eat'
+
 if $loc = 'burger':
 	'<center><b><font color="maroon">Diner Bystroeshka</font></b></center>'
 	*nl
@@ -59,7 +71,7 @@ elseif $loc = 'gkafe':
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/menus/borislav.jpg"</center><br>'
 	!'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
-	if storyline = 1 and (home_owned[2] = 1 or SchoolBlock = 0):
+	if storyline = 1 and home_owned[2] = 1:
 		$_eat['0,name'] = 'Vegetarian Piroshki'
 		$_eat['0,type'] = 'pirosh'
 		$_eat['0,price'] = 'Free'
@@ -426,14 +438,14 @@ elseif $loc = 'restoran':
 	$_drink['5,price'] = 900
 end
 
-$_str = '<table border="0" width="800" cellpadding="0" cellspacing="1">'
+$_str = '<center><table border="0" width="800" cellpadding="0" cellspacing="1">'
 food_loop = 0
 :loop_diner_drinks
 $_str += '<tr><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="40%" align="center"><font color="<<$fcolor1>>">'+$_eat['<<food_loop>>,name']+'</td><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="10%" align="right">'+iif(money >= val($_eat['<<food_loop>>,price']),'<a href="exec:pcs_ate += 1 & gt''food'',$_eat[''<<food_loop>>,type''],<<food_loop>>">'+$_eat['<<food_loop>>,price']+'</a>',$_eat['<<food_loop>>,price'])+''+iif($_eat['<<food_loop>>,price'] ! '','<font color="<<$fcolor1>>"><b> ₽. </b>', '')+'</td><td bgcolor=<<$bcolor3>> border="0" width="50" cellpadding="0" cellspacing="0" ></td><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="40%" align="center"><font color="<<$fcolor1>>">'+$_drink['<<food_loop>>,name']+'</td><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="10%" align="right">'+iif(money >= val($_drink['<<food_loop>>,price']),'<a href="exec:pcs_drank += 1 & gt''beverage'',$_drink[''<<food_loop>>,type''],<<food_loop>>">'+$_drink['<<food_loop>>,price']+'</a>',$_drink['<<food_loop>>,price'])+''+iif($_drink['<<food_loop>>,price'] ! '','<font color="<<$fcolor1>>"><b> ₽. </b>', '')+'</td></tr>'
 food_loop += 1
 if food_loop < arrsize('$_drink')/3:jump 'loop_diner_drinks'
 $_str += '</table></center></font>'
-'Please place your order:<br><br>'+$_str
+'<center>Please place your order</center>:<br><br>'+$_str
 
 
 killvar '$_str'

+ 1 - 1
locations/gadbana.qsrc

@@ -296,7 +296,7 @@ else
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/miraban.jpg"></center>'
 			'While you undress, through the corner of your eye you notice Mira removing her panties.'
 
-			gs 'arousal', 'voyeur', 5, 'lesbian'
+			gs 'arousal', 'voyeur', 5
 			gs 'stat'
 
 			act 'Watch Mira clean herself':

+ 99 - 11
locations/gaddvor.qsrc

@@ -31,11 +31,8 @@ if $ARGS[0]='':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/dvor_winter_night.jpg"></center>'
 		end
 	end
-	if StoryLine = 1:
-		'A fenced yard behind your grandparents'' house. The yard is surrounded by a small barn packed with junk and a separate building that is used as a banya where you can take a bath. On the back porch are a few chairs to sit in.'
-	else
-		'A fenced yard behind the house. The yard is surrounded by a small barn packed with junk and a separate building that is used as a banya where people take a bath. On the back porch are a few chairs to sit in.'
-	end
+	*nl
+	'A fenced yard behind your grandparents'' house. The yard contains a small barn, garden, root cellar, and banya where you can bathe.'
 
 	if $clothingworntype = 'nude':
 		*nl
@@ -72,16 +69,16 @@ if $ARGS[0]='':
 				end
 				gs'stat'
 
-				act 'Continue':gt'gaddvor'
+				act 'Finish':gt'gaddvor'
+				act 'Return back to your grandfather': minut += 1 & gt 'gadhouse', 'grandpa'
 			end
 		end
-		if StoryLine = 1:
-			act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
-			act 'Enter the banya':minut += 1 & gt 'gadbana'
-		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'
-
+		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'
 		mira_temp = rand(1,5)
 		if mira_temp = 3 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 1 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
 			*clr & cla
@@ -117,6 +114,96 @@ if $ARGS[0]='':
 
 end
 
+if $ARGS[0] = 'root_cellar':
+	*clr & cla
+	'<center><h4>Root Cellar</h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/root_cellar.jpg"></center>'
+	*nl
+	if boletus_stored + bilberry_stored >= 20:
+		'Your grandparents'' root cellar is full.'
+	elseif boletus_stored + bilberry_stored > 0:
+		'Your grandparents'' root cellar is partially full.'
+	else
+		'Your grandparents'' root cellar is empty.'
+	end
+	'Even though your grandparents allow you to store extra mushrooms and berries you pick in here, they reserve the right to use them too, so you aren''t surprised if any go missing day to day.'
+	if boletus_stored > 0: 'You currently are storing <b><<boletus_stored>></b> kg of raw mushrooms.'
+	if bilberry_stored > 0: 'You currently are storing <b><<bilberry_stored>></b> kg of raw berries.'
+	*nl
+	if boletus + boletus_cooked + bilberry >= 5:
+		'Your basket is full and you cannot carry more.'
+	elseif boletus + boletus_cooked + bilberry > 0:
+		'Your basket is partially full.'
+	else
+		'Your basket is empty.'
+	end
+	if boletus > 0: 'You currently are carrying <b><<boletus>></b> kg of raw mushrooms.'
+	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'
+	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
+			if boletus > 0:
+				boletus_stored += 1
+				boletus -= 1
+				if boletus_stored + bilberry_stored < 20: jump 'store_bb_loop'
+			end
+			if bilberry > 0:
+				bilberry_stored += 1
+				bilberry -= 1
+				if boletus_stored + bilberry_stored < 20: jump 'store_bb_loop'
+			end
+			gt 'gaddvor', 'root_cellar'
+		end
+		if boletus > 0:
+			act 'Store 1 kg of raw mushrooms':
+				boletus_stored += 1
+				boletus -= 1
+				gt 'gaddvor', 'root_cellar'
+			end
+		end
+		if bilberry > 0:
+			act 'Store 1 kg of raw berries':
+				bilberry_stored += 1
+				bilberry -= 1
+				gt 'gaddvor', 'root_cellar'
+			end
+		end
+	end
+	if (boletus_stored > 0 or bilberry_stored > 0) and (boletus + boletus_cooked + bilberry < 5):
+		act 'Retrieve as many raw mushrooms and berries as you can carry (Max 5 kgs)':
+			:retrieve_bb_loop
+			if boletus_stored > 0:
+				boletus += 1
+				boletus_stored -= 1
+				if boletus + boletus_cooked + bilberry < 5: jump 'retrieve_bb_loop'
+			end
+			if bilberry_stored > 0:
+				bilberry += 1
+				bilberry_stored -= 1
+				if boletus + boletus_cooked + bilberry < 5: jump 'retrieve_bb_loop'
+			end
+			gt 'gaddvor', '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'
+			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'
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'chickens':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens1.jpg"></center>'
@@ -136,6 +223,7 @@ if $ARGS[0] = 'chickens':
 			gs 'stat'
 
 			act 'Finish':gt'gaddvor'
+			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
 		end
 	end
 	act 'Leave': gt'gaddvor'

+ 8 - 7
locations/gadfield.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = '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 >= 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':minut += 10 & gt'gadroad'
+	act 'Head back to the road (0:10)':minut += 10 & gt'gadroad'
 	
 	if hour >= 7 and hour <= 13 and grandpaQW['chore_bale_hay'] = 1:
 		act 'Spend the day helping to bale hay (6:00)':
@@ -72,6 +72,7 @@ if $ARGS[0] = 'field':
 			gs 'stat'
 
 			act 'Continue':gt'gadfield','field'
+			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gadhouse', 'grandpa'
 		end
 	end
 
@@ -105,7 +106,7 @@ if $ARGS[0] = 'horse':
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
-			act 'To your grandparent''s barn':gt'gadsarai'
+			act 'Continue':gt'gadfield','horse'
 		end
 	end
 end
@@ -139,7 +140,7 @@ if $ARGS[0] = 'cow':
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
-			act 'To your grandparent''s barn':gt'gadsarai'
+			act 'Continue':gt'gadfield','cow'
 		end
 	end
 	if grandpaQW['chore_herd_cattle'] = 1:
@@ -185,7 +186,7 @@ if $ARGS[0] = 'cow':
 			end
 
 			if mira = 0:
-				act 'Take a run on the field (1:00)':
+				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>'
@@ -306,7 +307,7 @@ if $ARGS[0] = 'cow':
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
-			act 'Herd the cows to the river':gt'gadfield','cow2'
+			act 'Herd the cows nearer to the river (0:15)': minut += 15 & gt'gadfield','cow2'
 		end
 	end
 end
@@ -456,7 +457,7 @@ if $ARGS[0] = 'cow2':
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
-			act 'Herd the cows to the forest':gt'gadfield','cow3'
+			act 'Herd the cows nearer to the forest (0:30)': minut += 15 & gt'gadfield','cow3'
 		end
 	end
 end
@@ -506,7 +507,7 @@ if $ARGS[0] = 'cow3':
 				act 'Continue':gt'gadfield','cow3'
 			end
 			if mira = 0:
-				act 'Take a run on the field (1:00)':
+				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>'

+ 16 - 16
locations/gadforest.qsrc

@@ -169,7 +169,7 @@ if $ARGS[0] = 'forest_edge':
 	!	end
 	!end
 
-	act 'Leave the woods':
+	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
@@ -250,7 +250,7 @@ if $ARGS[0] = 'forest_edge':
 						'No one saw you outside naked, but there''s a thrill in almost getting caught.'
 					end
 
-					act 'Continue home to your grandparents':
+					act 'Continue home to your grandparents (0:30)':
 						minut += 30
 						gs 'stat'
 
@@ -269,7 +269,7 @@ if $ARGS[0] = 'forest_edge':
 					'You begin to panic a little. You have no where to go and no one to help you can you are stuck naked in the woods.'
 					'As you look around frantically, you spot a sweatshirt someone must have lost. You quickly put it on, thinking about how lucky you are.'
 
-					act 'Leave':
+					act 'Leave (0:15)':
 						minut += 15
 						gs 'stat'
 
@@ -292,7 +292,7 @@ if $ARGS[0] = 'forest_edge':
 					*nl
 					'You decide to change back into your clothes rather than try to get home through the village naked.'
 
-					act 'Leave':
+					act 'Leave (0:15)':
 						minut += 15
 						gs 'stat'
 
@@ -314,21 +314,21 @@ if $ARGS[0] = 'forest_edge':
 
 	! Sveta cannot travel further into the forest if Mira is here at the forest with Sveta
 	if MiraLoc ! 3:
-		act 'Go further into the forest': minut += 15 & gt 'gadforest','forest_outskirts'
+		act 'Go further into the forest (0:15)': minut += 15 & gt 'gadforest','forest_outskirts'
 	end
 
 	gs 'bicycle', 'gadforest'
 
 	! Sveta can go to the Meadow if she has discovered it and bring Mira too if she is allowed
 	if (meadow > 0 and MiraLoc ! 3):
-		act 'Go to the meadow': minut += 20 & gt 'meadow'
+		act 'Go to the meadow (0:20)': minut += 20 & gt 'meadow'
 	elseif ((meadow = 3 or (meadow = 6 and npc_QW['A60'] >= 3)) and MiraLoc = 3):
 		act 'Go to the meadow with Mira': minut += 20 & MiraLoc = 2 & gt 'meadow'
 	end
 
 	! Can travel directly to the hunters cabin if Sveta has been there before, knows the hunters, and Mira is not here at the forest with Sveta
 	if hunterscabin = 1 and huntersKnow = 1 and MiraLoc ! 3:
-		act 'Go to the hunters cabin':
+		act 'Go 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'
@@ -418,9 +418,9 @@ if $ARGS[0] = 'forest_outskirts':
 	if foresteventrand <= 4 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers3'
 	if foresteventrand = 5 and month >= 4 and month <= 10 and ((hour >= 6 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforest_event', 'forest_hunters', 'forest_outskirts'
 
-	act 'Head back out of the forest': minut += 15 & gt 'gadforest', 'forest_edge'
+	act 'Head back out of the forest (0:15)': minut += 15 & gt 'gadforest', 'forest_edge'
 
-	act 'Go further into the forest': minut += 15 & gt 'gadforest','forest_center'
+	act 'Go further into the forest (0:15)': minut += 15 & gt 'gadforest','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'
@@ -499,9 +499,9 @@ if $ARGS[0] = 'forest_center':
 	if foresteventrand <= 4 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'mushroom'
 	if foresteventrand = 5 and month >= 4 and month <= 10 and ((hour >= 6 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforest_event', 'forest_hunters', 'forest_center'
 
-	act 'Head back out of the forest': minut += 15 & gt 'gadforest', 'forest_outskirts'
+	act 'Head back out of the forest (0:15)': minut += 15 & gt 'gadforest', 'forest_outskirts'
 
-	act 'Go further into the swamp': minut += 15 & gt 'swamp', 'start'
+	act 'Go further into the swamp (0:15)': minut += 15 & gt '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'
@@ -606,7 +606,7 @@ if $ARGS[0] = 'stripping':
 		if MiraLoc = 3 and $forest_args1 = 'forest_edge':
 			! stripping with Mira requires completing talking to her about it already and doing their nude event in the forest already
 			if miranudetalk = 2:
-				act 'Strip Naked with Mira':
+				act 'Strip Naked with Mira (0:05)':
 					*clr & cla
 					menu_off = 1
 					minut += 5
@@ -631,7 +631,7 @@ if $ARGS[0] = 'stripping':
 		else
 			! picnic blocks being naked at the forest edge but not other parts of the forest
 			if (forestpicnic = 0 and $forest_args1 = 'forest_edge') or $forest_args1 ! 'forest_edge':
-				act 'Strip Naked':
+				act 'Strip Naked (0:05)':
 					*clr & cla
 					menu_off = 1
 					minut += 5
@@ -668,7 +668,7 @@ if $ARGS[0] = 'dressing':
 	! code for different variations of getting dressed or dealing with clothes left in the forest
 	if clothesAtLocation = 1:
 		if $clothingworntype = 'nude':
-			act 'Get dressed':
+			act 'Get dressed (0:05)':
 				*clr & cla
 				menu_off = 1
 				minut += 5
@@ -691,7 +691,7 @@ if $ARGS[0] = 'dressing':
 		elseif $clothingworntype ! 'nude':
 			! hessian sack from hunters is not allowed to leave the woods it is only supposed to be a temporary item
 			if $clothingworntype = 'cheap' and clothingwornnumber = 414:
-				act 'Wear your abandoned clothing':
+				act 'Wear your abandoned clothing (0:05)':
 					*clr & cla
 					menu_off = 1
 					minut += 5
@@ -712,7 +712,7 @@ if $ARGS[0] = 'dressing':
 					end
 				end
 			else
-				act 'Pick up your abandoned clothing':
+				act 'Pick up your abandoned clothing (0:05)':
 					cla
 					menu_off = 1
 					minut += 5

+ 5 - 0
locations/gadgarden.qsrc

@@ -52,6 +52,7 @@ if $ARGS[0] = 'garden':
 			'<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
@@ -71,6 +72,7 @@ if $ARGS[0] = 'garden':
 			'<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
@@ -90,6 +92,7 @@ if $ARGS[0] = 'garden':
 			'<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
@@ -162,6 +165,7 @@ if $ARGS[0] = 'strawberry':
 			'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
@@ -227,6 +231,7 @@ if $ARGS[0] = 'fruit_garden':
 			'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

+ 18 - 23
locations/gadhouse.qsrc

@@ -356,23 +356,12 @@ if $ARGS[0] = 'main':
 		'Your grandparents are asleep. They sleep in separate beds, which is quite strange since they''re still madly in love with each other.'
 	end
 
-
 	if mira_guest = 1: MiraLoc = 6 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
 
 	gs 'stat'
 	gs 'themes', 'indoors'
 	gs 'kit_din'
 
-	!125s
-	!{
-	!New family system, skip for now.
-	gs 'zz_family', 'father_sheduler'
-	if $father['location'] = $curloc and home_owned[2] = 1:
-		'Your parents room.'
-		gs 'gadhouse', 'go_home'
-	end
-	}
-
 	gs 'gadhouse', 'family_trip'
 
 	if $clothingworntype ! 'nude':
@@ -417,6 +406,7 @@ if $ARGS[0] = 'main':
 			'You grab a bucket and a rag, and get down on your knees and begin scrubbing the floor. Within the hour the floor shines and you are satisfied with the work you''ve done. You put the cleaning supplies into a corner and continue on with your day.'
 
 			act 'Continue':gt 'gadhouse', 'start'
+			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
 		end
 	end
 
@@ -438,6 +428,7 @@ if $ARGS[0] = 'main':
 				'Once you are done with the washing, you walk over to the clothesline where you carefully hang the clothes to dry.'
 
 				act 'Continue':gt'gaddvor'
+				act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
 			end
 		end
 	end
@@ -529,7 +520,7 @@ if $ARGS[0] = 'grandma':
 				minut += 45
 				gs'stat'
 
-				grandmaQW['chore_mushrooms_given'] -= 6
+				boletus_stored -= 5
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_mushrooms.jpg"></center>'
 				'You tell Grandma you are ready to help her can mushrooms now.'
 				'She smiles and gives you a basket of mushrooms. You spend a while cleaning them, washing them, and cutting them up, in preparation for canning.'
@@ -562,7 +553,7 @@ if $ARGS[0] = 'grandma':
 				minut += 45
 				gs'stat'
 
-				grandmaQW['chore_berries_given'] -= 5
+				bilberry_stored -= 5
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_berries.jpg"></center>'
 				'Grandma gives you a basket of berries and you spend a while cleaning them, removing stems, and picking out any shriveled or bad ones.'
 				act 'Continue':
@@ -834,14 +825,14 @@ if $ARGS[0] = 'grandma':
 				*clr & cla
 				grandmaQW['help_amount'] += 3
 				boletus -= grandmaQW['chore_mushroom_quantity']
-				grandmaQW['chore_mushrooms_given'] += grandmaQW['chore_mushroom_quantity']
+				boletus_stored += grandmaQW['chore_mushroom_quantity']
 				minut += 5
 				grandmaQW['chore_gather_mushrooms'] = 0
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'You bring the basket of mushrooms to your grandmother and say, "Grandma, here are the mushrooms you wanted!"'
-				'She smiles and takes them from you. "Thank you my sweet girl."'
+				'She smiles and takes them from you. "Thank you my sweet girl. They will have to go down in the root cellar until we are ready to can them."'
 				'"Do you think that will be enough?"'
 				'She laughs. "Oh, with your grandfather around, it is never enough!"'
 				'"I can get more, if you want me to."'
@@ -857,7 +848,7 @@ if $ARGS[0] = 'grandma':
 				*clr & cla
 				grandmaQW['help_amount'] += 3
 				bilberry -= grandmaQW['chore_berry_quantity']
-				grandmaQW['chore_berries_given'] += grandmaQW['chore_berry_quantity']
+				bilberry_stored += grandmaQW['chore_berry_quantity']
 				minut += 5
 				grandmaQW['chore_gather_berries'] = 0
 				gs 'stat'
@@ -865,7 +856,7 @@ if $ARGS[0] = 'grandma':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'You walk over to Grandma and set the heavy basket of berries on the ground next to her.'
 				'"Grandma, I got all the berries!"'
-				'"Oh, thank you, <<$pcs_nickname>>," Grandma replied. "Those look perfect. Be a dear and set them in the kitchen, please?"'
+				'"Oh, thank you, <<$pcs_nickname>>," Grandma replied. "Those look perfect.  They will have to go down in the root cellar until we are ready to can them."'
 				'You heft the basket up and carry it in the kitchen. Walking back over to Grandma, you ask, "Do you think that will be enough for the winter?"'
 				'"Oh no dear," your Grandma says, "the winter is long and cold and you must gather as much as you can, while you can."'
 				'Seeing the dismayed look on your face, she adds, "But that is enough for today! I know it is harder work than it seems. You can rest now, child."'
@@ -881,8 +872,8 @@ if $ARGS[0] = 'grandma':
 				grandmaQW['help_amount'] += 3
 				boletus -= grandmaQW['chore_mushroom_quantity']
 				bilberry -= grandmaQW['chore_berry_quantity']
-				grandmaQW['chore_mushrooms_given'] += grandmaQW['chore_mushroom_quantity']
-				grandmaQW['chore_berries_given'] += grandmaQW['chore_berry_quantity']
+				boletus_stored += grandmaQW['chore_mushroom_quantity']
+				bilberry_stored += grandmaQW['chore_berry_quantity']
 				minut += 5
 				grandmaQW['chore_gather_both'] = 0
 				gs 'stat'
@@ -890,7 +881,7 @@ if $ARGS[0] = 'grandma':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'You bring your basket, heavy with mushrooms and berries from the forest, over to your grandmother.'
 				'"Grandma, here are the mushrooms and berries, just like you asked!"'
-				'"Oh, thank you very much, <<$pcs_nickname>>," your Grandma replied.'
+				'"Oh, thank you very much, <<$pcs_nickname>>, they will have to go down in the root cellar until we are ready to can them," your Grandma replied.'
 				'"Do I need to go out on another run, or do you think that''s enough?"'
 				'"Well, little one," your Grandma says, "There is a difference between enough, and enough for today."'
 				'"Oh..." you say, unsure of what to make of her response.'
@@ -1224,6 +1215,7 @@ if $ARGS[0]='grandpa':
 				*clr & cla
 				grandmaQW['help_amount'] += 3
 				boletus -= grandpaQW['chore_mushroom_quantity']
+				boletus_stored += grandpaQW['chore_mushroom_quantity']
 				minut += 5
 				grandpaQW['chore_gather_mushrooms'] = 0
 				gs 'stat'
@@ -1233,7 +1225,7 @@ if $ARGS[0]='grandpa':
 				'"Grandpa, here are the mushrooms!"'
 				'"Thank you <<$pcs_nickname>>, you''ve made an old man very happy," your grandfather replies with a smile. "The mushrooms are in a part of the forest that is difficult to reach."'
 				'"I can still go and gather more mushrooms, if you want?"'
-				'"There''s no need <<$pcs_nickname>>," said your grandfather. "But if I need some help, I''ll be sure to let you know."'
+				'"There''s no need <<$pcs_nickname>>," said your grandfather. "But if I need some help, I''ll be sure to 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'
@@ -1245,6 +1237,7 @@ if $ARGS[0]='grandpa':
 				*clr & cla
 				grandmaQW['help_amount'] += 3
 				bilberry -= grandpaQW['chore_berry_quantity']
+				bilberry_stored += grandpaQW['chore_berry_quantity']
 				minut += 5
 				grandpaQW['chore_gather_berries'] = 0
 				gs 'stat'
@@ -1254,7 +1247,7 @@ if $ARGS[0]='grandpa':
 				'"Grandpa, here are the berries!"'
 				'"Oh, thank you, nicely done," Grandpa replied. "It''s hard for your grandmother to gather the berries, and she needs them so she can make jam for the winter."'
 				'"If you need some more berries I''ll be glad to go out and gather more."'
-				'"There''s no need <<$pcs_nickname>>," your grandfather said. "But if your grandma needs some more berries, I''ll let you know."'
+				'"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, you go on with your business.'
 
 				act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
@@ -1267,6 +1260,8 @@ if $ARGS[0]='grandpa':
 				grandmaQW['help_amount'] += 3
 				boletus -= grandpaQW['chore_mushroom_quantity']
 				bilberry -= grandpaQW['chore_berry_quantity']
+				boletus_stored += grandpaQW['chore_mushroom_quantity']
+				bilberry_stored += grandpaQW['chore_berry_quantity']
 				minut += 5
 				grandpaQW['chore_gather_both'] = 0
 				gs 'stat'
@@ -1276,7 +1271,7 @@ if $ARGS[0]='grandpa':
 				'"Grandpa, here are the mushrooms and berries!"'
 				'"Oh, thank you <<$pcs_nickname>>," your grandfather replied.'
 				'"If you want, I can go out for another run."'
-				'"You don''t need to do that, <<$pcs_nickname>>," your grandfather said. "But I''ll be sure to let you know if something comes up."'
+				'"You don''t need to do that, <<$pcs_nickname>>," your grandfather said. "But I''ll be sure to 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'

+ 2 - 1
locations/gadmarket.qsrc

@@ -57,7 +57,8 @@ if grandmaQW['chore_groceries'] = 1:
 		'You take your basket of goods up to the teller and explain that you are getting these things for your grandmother.'
 		'"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 any more..."'
 		
-		act 'Thank him and take the groceries back to the house (0:15)':minut += 15 & gt 'gadhouse','start'
+		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'
 	end
 end
 

+ 5 - 5
locations/gadriver.qsrc

@@ -136,11 +136,11 @@ if $ARGS[0] = 'start':
 				act 'Finish': gt'gadukino'
 			end
 		else
-			act 'Go to Gadukino':minut += 20 & MiraLoc ! 1 & gt 'gadukino'
+			act 'Go to the road (0:10)':minut += 20 & MiraLoc ! 1 & gt 'gadroad'
 			act 'Go to the beach':gt 'gadriver', 'gadbitch'
 		end
 	else
-		act 'Go to Gadukino':minut += 20 & MiraLoc ! 1 & gt 'gadukino'
+		act 'Go to the road (0:10)':minut += 20 & MiraLoc ! 1 & gt 'gadugadroadkino'
 		act 'Go to the beach':gt 'gadriver', 'gadbitch'
 	end
 end
@@ -190,7 +190,7 @@ if $ARGS[0] = 'gadbitch':
 
 	if MiraLoc ! 1 and npc_QW['A63'] >= 13 and rand(0,10) = 0 and hour >= 8 and hour < 20 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1:'<a href="exec: gt ''gadriver'', ''GuysRiver'' ">Bob Colby</a> is resting on the riverbank.'
 
-	act 'Go back to the river':
+	act 'Go back to the river (0:05)':
 		cla
 		if $clothingworntype = 'swimwear':
 			cla
@@ -572,7 +572,7 @@ if $ARGS[0] = 'gadbitch':
 			end
 		end
 		if grandpaQW['chore_bathe_horse_prog'] = 2:
-			act 'Lead Desperado back home':
+			act 'Lead Desperado back home (0:30)':
 				if $clothingworntype = 'swimwear':
 					cla
 					'You need to dress in regular clothes first.'
@@ -588,7 +588,7 @@ if $ARGS[0] = 'gadbitch':
 					grandpaQW['chore_bathe_horse_prog'] = 0
 					gs 'stat'
 
-					gt'gadsarai'
+					gt'gadsarai','horse'
 				end
 			end
 		end

+ 4 - 4
locations/gadroad.qsrc

@@ -55,10 +55,10 @@ if $ARGS[0] = '':
 		end
 	end
 
-	act 'Go back to Gadukino':minut += 10 & gt'gadukino'
-	act 'Walk down to the river':minut += 10 & gt 'gadriver', 'start'
-	act 'Go into the woods':minut += 15 & gt'gadforest','forest_edge'
-	act 'Go to the fields':minut += 10 & gt'gadfield','field'
+	act 'Go back to Gadukino (0:10)':minut += 10 & gt'gadukino'
+	act 'Walk down to the river (0:10)':minut += 10 & gt 'gadriver', 'start'
+	act 'Go into the woods (0:15)':minut += 15 & gt'gadforest','forest_edge'
+	act 'Go to the fields (0:10)':minut += 10 & gt'gadfield','field'
 	if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour >= 6 and hour < 22 and gadrunday ! daystart:
 		act 'Go for a run (1:00)':
 			*clr & cla

+ 172 - 208
locations/gadsarai.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = '':
 	menu_off = 0
 	$location_type = 'secluded'
 
-	'<center><h4>Old Barn</h4></center>'
+	'<center><h4>Grandparents'' Barn</h4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/sarai.jpg"></center>'
@@ -22,24 +22,10 @@ if $ARGS[0] = '':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/sarai_winter_night.jpg"></center>'
 		end
 	end
-	'An old junk filled barn that could hold some useful items.'
-
-	if month > 4 and month < 10:
-		if hour > 9 and hour < 20:
-			'On your right is a cattle barn.'
-		else
-			'On your right is a <a href="exec: gt ''gadsarai'',''cow'' ">cattle</a> barn.'
-		end
-		if hour > 9 and hour < 20 and week < 6 or grandpaQW['chore_bathe_horse'] = 2:
-			'On your left is a horse stable.'
-		else
-			'On your left is a <a href="exec: gt ''gadsarai'',''horse'' ">horse</a> stable.'
-		end
-	else
-		'On your right is a <a href="exec: gt ''gadsarai'',''cow'' ">cattle</a> barn.'
-		'On your left is a <a href="exec: gt ''gadsarai'',''horse'' ">horse</a> stable.'
-	end
-	'There''s a <a href="exec: gt ''gadsarai'',''boar'' ">boar</a> living in a separate stable.'
+	'Your grandparents old barn that could hold some useful items if you spend some time searching.'
+	'The right side of the barn is piled high with various boxes, barrels, and chests of items.'
+	'You can store some extra mushrooms and berries here if you don''t want to carry them around all the time.'
+	'The left side of the barn has the stalls for your grandparents horse, cow, and boar.'
 
 	gs 'bicycle', 'gadsarai'
 	clr
@@ -58,138 +44,163 @@ if $ARGS[0] = '':
 			'You decide to grab the firewood that your grandfather asked for, loading up as much as you can carry.'
 			grandpaQW['chore_fetch_firewood'] = 2
 			minut += 10
-			grandmaQW['help_amount'] += 1
 			gs'stat'
 
-			act 'Continue':gt 'gadsarai'
+			act 'Finish':gt 'gadsarai'
+			act 'Return back to your grandfather': minut += 2 & gt 'gadhouse', 'grandpa'
 		end
 	end
+	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'
+	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'
+	end
+	act 'Enter the boars stall': gt 'gadsarai', 'horse'
+	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'
+	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'
+end
 
-	act 'Poke around in the barn':
-		if npc_qw['A221'] > 0 and grigory_barn ! daystart and hour > 8 and hour < 12: gt 'grigory', 'barn'
+if $ARGS[0] = 'search':
+	if npc_qw['A221'] > 0 and grigory_barn ! daystart and hour > 8 and hour < 12: gt 'grigory', 'barn'
+	*clr & cla
+	minut += 15
+	gs 'stat'
+	if BikeLoc = 0 and rand(0,10) >= 6:
 		*clr & cla
-		minut += 15
+		BikeLoc = 1
+		observ_exp += 3
 		gs 'stat'
-		if BikeLoc = 0:
-			*clr & cla
-			if rand(0,8) >= 7:
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findbike.jpg"></center>'
-				'In the far corner of the barn you manage to find an old bicycle. It''s in surprisingly good condition. You pull it out of the barn and clean it up.'
-				BikeLoc = 1
-				observ_exp += 3
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
-				'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
-			end
-			act 'Leave and get some fresh air':gt 'gadsarai'
-		elseif vcard = 0 and vcard_trash = 0:
-			*clr & cla
-			if rand(0,5) >= 4:
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vcards.jpg"></center>'
-				'"Hmm, what''s this?" You''ve found an unopened deck of vintage adult playing cards, still in its original cellophone wrapper.'
-				vcard = 1
-				observ_exp += 3
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
-				'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
-			end
-			act 'Leave and get some fresh air':gt 'gadsarai'
-		elseif findbag = 0 and bag = 0:
-			*clr & cla
-			if rand(0,10) > 9:
-				findbag = 1
-				observ_exp += 3
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/pc/purses/cheap/5.jpg"></center>'
-				'In a far corner of the barn you find a hessian sack filled with mostly junk, but at the bottom you find a good quality messenger bag.'
-				cheap_purses[5] = 1
-				$currentpursetype = 'cheap'
-				currentpursenumber = 5
-				'You can use this cool looking bag as a handbag.'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
-				'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
-			end
-			act 'Leave and get some fresh air':
-				if findbag = 1: bag = 1
-				gt 'gadsarai'
-			end
-		elseif findbraclet = 0:
-			*clr & cla
-			if rand(0,15) >= 14:
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bracelet.jpg"></center>'
-				'While looking through the barn you spot a glint of metal under a pile of wood. Upon closer inspection you see a bracelet made of silver and crafted into the likeness of a snake. Strange, but cool that you would find something this valuable in the barn.'
-				findbraclet = 1
-				observ_exp += 3
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
-				'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
-			end
-			act 'Leave and get some fresh air':gt 'gadsarai'
-		elseif findbraclet > 0 and findneck = 0:
-			*clr & cla
-			if rand(0,20) >= 19:
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/necklace.jpg"></center>'
-				if altQS = 1:
-					'While looking through the barn your foot goes through a rotten floorboard. You suddenly feel the presence of something magical under the floor. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The feeling of power is coming from within the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You feel the power coming from the necklace, but it doesn''t feel like any power you have ever felt.'
-				else
-					'While looking through the barn your foot goes through a rotten floorboard and gets stuck. As you work your foot free, you glimpse something underneath the floor - a box or something. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The exotic look of the box gives you gooseflesh and you find yourself holding your breath as you prepare to open the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You let your breath out slowly as you tilt the necklace from side to side, watching the light sparkle as it is reflected by the facets on the deep red rubies. You cannot begin to guess what this necklace must be worth.'
-				end
-				findneck = 1
-				observ_exp += 3
-			else
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
-				'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
-			end
-			act 'Leave and get some fresh air':gt 'gadsarai'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findbike.jpg"></center>'
+		*nl
+		'In the far corner of the barn you manage to find an old bicycle. It''s in surprisingly good condition. You pull it out of the barn and clean it up.'
+	elseif findbag = 0 and bag = 0 and rand(0,10) >= 7:
+		*clr & cla
+		findbag = 1
+		if findbag = 1: bag = 1
+		observ_exp += 3
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/pc/purses/cheap/5.jpg"></center>'
+		*nl
+		'In a far corner of the barn you find a hessian sack filled with mostly junk, but at the bottom you find a good quality messenger bag.'
+		'You can use this cool looking bag as a handbag.'
+		cheap_purses[5] = 1
+		$currentpursetype = 'cheap'
+		currentpursenumber = 5
+	elseif vcard = 0 and vcard_trash = 0 and rand(0,10) >= 8:
+		*clr & cla
+		vcard = 1
+		observ_exp += 3
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vcards.jpg"></center>'
+		*nl
+		'"Hmm, what''s this?" You''ve found an unopened deck of vintage adult playing cards, still in its original cellophone wrapper.'
+	elseif findbraclet = 0 and rand(0,10) >= 9:
+		*clr & cla
+		findbraclet = 1
+		observ_exp += 3
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bracelet.jpg"></center>'
+		*nl
+		'While looking through the barn you spot a glint of metal under a pile of wood. Upon closer inspection you see a bracelet made of silver and crafted into the likeness of a snake. Strange, but cool that you would find something this valuable in the barn.'
+	elseif findbraclet > 0 and findneck = 0 and rand(0,10) >= 10:
+		*clr & cla
+		findneck = 1
+		observ_exp += 3
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/necklace.jpg"></center>'
+		*nl
+		if altQS = 1:
+			'While looking through the barn your foot goes through a rotten floorboard. You suddenly feel the presence of something magical under the floor. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The feeling of power is coming from within the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You feel the power coming from the necklace, but it doesn''t feel like any power you have ever felt.'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
-				'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
-			act 'Leave and get some fresh air':gt 'gadsarai'
+			'While looking through the barn your foot goes through a rotten floorboard and gets stuck. As you work your foot free, you glimpse something underneath the floor - a box or something. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The exotic look of the box gives you gooseflesh and you find yourself holding your breath as you prepare to open the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You let your breath out slowly as you tilt the necklace from side to side, watching the light sparkle as it is reflected by the facets on the deep red rubies. You cannot begin to guess what this necklace must be worth.'
 		end
+	else
+		observ_exp += rand(0,1)
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
+		*nl
+		'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
 	end
-
-	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'
-
-	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 scrapping noice above you.':gt 'serpent'
-!!	end
+	act 'Finish':gt 'gadsarai'
 end
 
-if $ARGS[0] = 'boar':
+if $ARGS[0] = 'horse':
 	*clr & cla
 	minut += 1
 	gs 'stat'
 
-	'<center><H4>The barn</H4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/boar.jpg"></center>'
-	'One of your grandparents'' dearest possessions: the boar, Nickle.'
+	'<center><h4>Grandparents'' Barn</h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse.jpg"></center>'
+	'Grandfather''s trusted workhorse, Desperado.'
 
-	act 'Leave':minut += 5 & gt 'gadsarai'
+	act 'Leave':minut += 1 & gt 'gadsarai'
 
-	if grandpaQW['chore_feed_boar'] = 1:
-		act 'Feed the hog':
-			cla
-			*clr
+	if grandpaQW['chore_feed_horse'] = 1:
+		act 'Feed the horse (0:30)':
+			*clr & cla
 			minut += 30
-			grandpaQW['chore_feed_boar'] = 2
-			hndiwrk_exp += rand(0,3)
+			grandpaQW['chore_feed_horse'] = 2
+			hndiwrk_exp += rand(1,3)
 			gs 'stat'
 
-			'<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.'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_horse.jpg"></center>'
+			'You grab a sack of grain and fill Desperado''s feed bucket. 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','boar'
+			act 'Finish':gt 'gadsarai','horse'
+			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
+		end
+	end
+	if grandpaQW['chore_lead_horse_to_field'] = 1:
+		act 'Lead the horse to the field (1:00)':
+			*clr & cla
+			minut += 60
+			grandpaQW['chore_lead_horse_to_field'] = 2
+			hndiwrk_exp += rand(1,3)
+			gs 'stat'
+
+			'<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. There, you let him free in the paddock area, and watch him run about for a bit before moving on.'
+
+			act 'Continue':gt'gadfield','field'
+			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gadhouse', 'grandpa'
+		end
+	end
+	if grandpaQW['chore_bathe_horse'] = 1:
+		act 'Lead the horse to the river (0:30)':
+			*clr & cla
+			minut += 30
+			grandpaQW['chore_bathe_horse_prog'] = 1
+			hndiwrk_exp += rand(1,3)
+			gs 'stat'
+
+			'<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'
+		end
+	end
+	if grandpaQW['chore_bathe_horse'] = 2:
+		act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
+	end
+	if grandpaQW['chore_brush_horse'] = 1:
+		act 'Groom the horse (1:00)':
+			*clr & cla
+			minut += 60
+			grandpaQW['chore_brush_horse'] = 2
+			hndiwrk_exp += rand(1,3)
+			gs 'stat'
+
+			'<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. You are satisfied with the result - he is looking as clean and healthy as ever.'
+
+			act 'Finish':gt 'gadsarai','horse'
+			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
 		end
 	end
 end
@@ -199,48 +210,48 @@ if $ARGS[0] = 'cow':
 	minut += 1
 	gs 'stat'
 
-	'<center><H4>The barn</H4></center>'
+	'<center><h4>Grandparents'' Barn</h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow.jpg"></center>'
-	'Grandma''s favorite animal, the cow Dawn.'
+	*nl
+	'Grandma''s favorite animal, the cow, Dawn.'
 
-	act 'Leave':minut += 5 & gt 'gadsarai'
+	act 'Leave':minut += 1 & gt 'gadsarai'
 
 	if grandmaQW['chore_milk_cow'] = 1:
-		act 'Milk the cow':
-			cla
-			*clr
+		act 'Milk the cow (0:30)':
+			*clr & cla
 			minut += 30
 			grandmaQW['chore_milk_cow'] = 2
-			hndiwrk_exp += rand(0,3)
+			hndiwrk_exp += rand(1,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/milk_cow.jpg"></center>'
 			'You start milking Dawn, improving for each time you do it.'
 
-			act 'Continue':gt 'gadsarai','cow'
+			act 'Finish':gt 'gadsarai','cow'
+			act 'Return back to your grandmother': minut += 3 & gt 'gadhouse', 'grandma'
 		end
 	end
 	if grandpaQW['chore_feed_cow'] = 1:
-		act 'Feed the cow':
-			cla
-			*clr
+		act 'Feed the cow (0:30)':
+			*clr & cla
 			minut += 30
 			grandpaQW['chore_feed_cow'] = 2
-			hndiwrk_exp += rand(0,3)
+			hndiwrk_exp += rand(1,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_cow.jpg"></center>'
 			'Dawn is obviously excited about feeding time, shaking her head and doing little cow tippy-taps with her feet. You dump a sizable amount of hay in her trough and watch as she digs in.'
 
-			act 'Continue':gt 'gadsarai','cow'
+			act 'Finish':gt 'gadsarai','cow'
+			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
 		end
 	end
 	if grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_herd_cattle'] = 1:
-		act 'Lead the cow to the field':
-			cla
-			*clr
+		act 'Lead the cow to the field (1:00)':
+			*clr & cla
 			minut += 60
-			hndiwrk_exp += rand(0,3)
+			hndiwrk_exp += rand(1,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
@@ -251,84 +262,37 @@ if $ARGS[0] = 'cow':
 			if grandpaQW['chore_herd_cattle'] = 1:'You lead Dawn to the field, where you 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'
 		end
 	end
-
 end
 
-if $ARGS[0] = 'horse':
+if $ARGS[0] = 'boar':
 	*clr & cla
 	minut += 1
 	gs 'stat'
 
-	'<center><H4>The barn</H4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse.jpg"></center>'
-	'Grandfather''s trusted assistant, the horse Desperado.'
-
-
-	if grandpaQW['chore_feed_horse'] = 1:
-		act 'Feed the horse':
-			cla
-			*clr
-			minut += 30
-			grandpaQW['chore_feed_horse'] = 2
-			hndiwrk_exp += rand(0,3)
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_horse.jpg"></center>'
-			'You grab a sack of grain and fill Desperado''s feed bucket. 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 'Continue':gt 'gadsarai','horse'
-		end
-	end
-	if grandpaQW['chore_lead_horse_to_field'] = 1:
-		act 'Lead the horse to the field':
-			cla
-			*clr
-			minut += 60
-			grandpaQW['chore_lead_horse_to_field'] = 2
-			hndiwrk_exp += rand(0,3)
-			gs 'stat'
+	'<center><h4>Grandparents'' Barn</h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/boar.jpg"></center>'
+	'One of your grandparents'' dearest possessions, the boar, Nickle.'
 
-			'<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. There, you let him free in the paddock area, and watch him run about for a bit before moving on.'
+	act 'Leave':minut += 1 & gt 'gadsarai'
 
-			act 'Continue':gt'gadfield','field'
-		end
-	end
-	if grandpaQW['chore_bathe_horse'] = 1 and sunWeather = 1 and temper >= 15:
-		act 'Lead the horse to the river':
-			cla
-			*clr
+	if grandpaQW['chore_feed_boar'] = 1:
+		act 'Feed the hog (0:30)':
+			*clr & cla
 			minut += 30
-			grandpaQW['chore_bathe_horse_prog'] = 1
-			hndiwrk_exp += rand(0,3)
-			gs 'stat'
-
-			'<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'
-		end
-	end
-	if grandpaQW['chore_brush_horse'] = 1:
-		act 'Groom the horse':
-			cla
-			*clr
-			minut += 60
-			grandpaQW['chore_brush_horse'] = 2
-			hndiwrk_exp += rand(0,3)
+			grandpaQW['chore_feed_boar'] = 2
+			hndiwrk_exp += rand(1,3)
 			gs 'stat'
 
-			'<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. You are satisfied with the result - he is looking as clean and healthy as ever.'
+			'<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 'Continue':gt 'gadsarai','horse'
+			act 'Finish':gt 'gadsarai','boar'
+			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
 		end
 	end
-
-	act 'Go':minut += 5 & gt'gadsarai'
 end
 
 --- gadsarai ---------------------------------

+ 63 - 63
locations/gadukino.qsrc

@@ -108,10 +108,10 @@ if $ARGS[0] = '':
 		*nl
 
 		if month >= 6 and month <= 9:
-			if hour >= 9 and hour <= 11:
-				'An old farm truck is parked halfway off one of the roads nearby. The farmer who drives it will buy <a href="exec: gt ''gadukino'',''collection_point''">mushrooms and berries</a> from the locals to sell back in the city. He usually hangs around town until from nine until noon.'
+			if hour >= 6 and hour <= 16:
+				'An old farm truck is parked halfway off one of the roads nearby. The farmer who owns it will buy <a href="exec: gt ''gadukino'',''collection_point''">mushrooms and berries</a> from the locals to sell back in the city. He makes multiple trips from Gadukino to the city each day to ensure the freshest produce so he can be found from 6 am to 4 pm.'
 			else
-				'This time of year, a truck usually comes by in the mornings between 9AM and noon to purchase mushrooms and berries from the locals.'
+				'This time of year, a truck usually comes by multiple times per day between 6 am and 4 pm to purchase mushrooms and berries from the locals.'
 			end
 		else
 			'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.'
@@ -127,8 +127,11 @@ if $ARGS[0] = '':
 			'In the center of the village is a small grass covered square where villagers gather to meet and discuss or argue politics or village life.'
 			'One of the building facing the square has a sign saying General Store. A sign in 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'
 		if hour >= 6 and hour < 20:
-			act 'Walk through the village':
+			act 'Walk around the village (0:15)':
 				*clr & cla
 				minut += 15
 				menu_off = 1
@@ -144,14 +147,64 @@ if $ARGS[0] = '':
 				end
 			end
 		end
-
-		act 'Walk to the forest road':minut += 10 & gt 'gadroad'
+		if month >= 6 and month <= 9 and hour >= 6 and hour <= 16: act 'Sell mushrooms and berries': gt 'gadukino','collection_point'
 		!!Succubus active hunting, can only hunt successfully once a day, but can try until success
-		if (hour <= 7 or hour >= 21) and succubusQW = 5 and suchuntday ! daystart:
+		if (hour <= 5 or hour >= 21) and succubusQW = 5 and suchuntday ! daystart:
 			act 'Go Hunting (this can take a lot of time)': suchunt = 1 & gt 'gadukino', 'succubus_hunt'
 		end
+	end
+end
+
+if $ARGS[0] = 'collection_point':
+	*clr & cla
+	menu_off = 1
+	minut += 1
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
+	*nl
+	'Parked halfway off the road is an old, unmarked truck. The back doors are open and inside is a farmer looking to buy any mushrooms or berries the locals find while out in the nearby woods.'
+	'Some find it odd that they''re operating out of a truck, but you imagine it''s cheaper to maintain than a shop and it lets them get around to other villages like this one to buy their mushrooms and berries, too.'
+	'There is a small sign hanging off of one of the back doors, which says:'
+	'"Buying: mushrooms 25<b>₽</b>/kg, berries 25<b>₽</b>/kg"'
+
+	act 'Go back to the village center':minut += 1 & gt 'gadukino'
+	if boletus > 0 and bilberry > 0:
+		act 'Sell all your mushrooms and berries':
+			*clr & cla
+			minut += 10
+			money += boletus*25+bilberry*25
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
+			'You decide to sell your mushrooms and berries for <<boletus*25+bilberry*25>> <b>₽</b>.'
+			gs 'stat'
+
+			act'Continue':boletus = 0 &  bilberry = 0 & gt 'gadukino','collection_point'
+		end
+	end
+	if boletus > 0:
+		act 'Sell all your mushrooms':
+			*clr & cla
+			minut += 10
+			money += boletus*25
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
+			'You decide to sell your mushrooms for <<boletus*25>> <b>₽</b>.'
+			gs 'stat'
 
-		act 'Walk to the highway':minut += 15 & nroad = 10 & gt 'road'
+			act'Continue':boletus = 0 & gt 'gadukino','collection_point'
+		end
+	end
+	if bilberry > 0:
+		act 'Sell all your berries':
+			*clr & cla
+			minut += 10
+			money += bilberry*25
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
+			'You decide to sell your berries for <<bilberry*25>> <b>₽</b>.'
+			gs 'stat'
+
+			act'Continue':bilberry = 0 & gt 'gadukino','collection_point'
+		end
 	end
 end
 
@@ -425,7 +478,7 @@ if $ARGS[0] = 'mira_events':
 							npc_rel['A60'] += 1
 							gs 'willpower', 'exhib', 'force'
 							gs 'willpower', 'pay', 'force'
-							gs 'arousal', 'voyeur', 5, 'lesbian'
+							gs 'arousal', 'voyeur', 5
 							gs 'arousal', 'end'
 							gs 'stat'
 
@@ -446,7 +499,7 @@ if $ARGS[0] = 'mira_events':
 							npc_rel['A60'] += 1
 							gs 'willpower', 'exhib', 'force'
 							gs 'willpower', 'pay', 'force'
-							gs 'arousal', 'voyeur', 10, 'lesbian'
+							gs 'arousal', 'voyeur', 10
 							gs 'arousal', 'end'
 							gs 'stat'
 
@@ -638,58 +691,5 @@ if $ARGS[0] = 'other_events':
 	end
 end
 
-if $ARGS[0] = 'collection_point':
-	*clr & cla
-	menu_off = 1
-	minut += 1
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-	*nl
-	'Parked halfway off the road is an old, unmarked truck. The back doors are open and inside is a farmer looking to buy any mushrooms or berries the locals find while out in the nearby woods.'
-	'Some find it odd that they''re operating out of a truck, but you imagine it''s cheaper to maintain than a shop and it lets them get around to other villages like this one to buy their mushrooms and berries, too.'
-	'There is a small sign hanging off of one of the back doors, which says:'
-	'"Buying: mushrooms 25<b>₽</b>/kg, berries 25<b>₽</b>/kg"'
-
-	act 'Go back to the village center':minut += 1 & gt 'gadukino'
-	if boletus > 0 and bilberry > 0:
-		act 'Sell all your mushrooms and berries':
-			*clr & cla
-			minut += 10
-			money += boletus*25+bilberry*25
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You decide to sell your mushrooms and berries for <<boletus*25+bilberry*25>> <b>₽</b>.'
-			gs 'stat'
-
-			act'Continue':boletus = 0 &  bilberry = 0 & gt 'gadukino','collection_point'
-		end
-	end
-	if boletus > 0:
-		act 'Sell all your mushrooms':
-			*clr & cla
-			minut += 10
-			money += boletus*25
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You decide to sell your mushrooms for <<boletus*25>> <b>₽</b>.'
-			gs 'stat'
-
-			act'Continue':boletus = 0 & gt 'gadukino','collection_point'
-		end
-	end
-	if bilberry > 0:
-		act 'Sell all your berries':
-			*clr & cla
-			minut += 10
-			money += bilberry*25
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You decide to sell your berries for <<bilberry*25>> <b>₽</b>.'
-			gs 'stat'
-
-			act'Continue':bilberry = 0 & gt 'gadukino','collection_point'
-		end
-	end
-end
-
 --- gadukino ---------------------------------
 

+ 2 - 3
locations/glake.qsrc

@@ -59,12 +59,11 @@ if storyline = 1 and (month <= 2 or month = 12):
 	end
 end
 
-!! Why wouldn''t this happen in the summer?
 if storyline = 1 and ((month >= 3 and month <= 5) or (month >= 9 and month <= 11)) and rand(0,4) = 0:
-	if week <= 5 and hour >= 15 and hour <= 20 and $clothingworntype = 'nude' and rand(0,3) = 0 and christinaphotos ! daystart:
+	if week <= 5 and hour >= 15 and hour <= 20 and $clothingworntype = 'nude' and rand(0,3) = 0 and socialchg['christina_day'] ! daystart:
 		gt 'gschool_socialchg1', 'chrislina_naked'
 	else
-		'<a href="exec:gt ''gschool_socialchg1'', ''tChristina''">Christina</a> is standing by the beach looking out over the lake. You also notice <a href="exec:gt ''gschool_socialchg1'', ''tLina''">Lina</a> in the background standing next to her, breathing heavily.'
+		iif(socialchg['tChristina_day'] ! daystart, '<a href="exec:gt ''gschool_socialchg1'', ''tChristina''">Christina</a>', 'Christina')+' is standing by the beach looking out over the lake. You also notice '+iif(socialchg['tLina_day'] ! daystart, '<a href="exec:gt ''gschool_socialchg1'', ''tLina''">Lina</a>', 'Lina')+' in the background standing next to her, breathing heavily.'
 		act'Walk away':gt'glake'
 	end
 end

+ 11 - 8
locations/grandmahelp.qsrc

@@ -26,9 +26,9 @@ if $ARGS[0] = 'start':
 		gt 'grandmahelp', 'milkcows'
 	elseif grandmaQW['chore_type'] = 3:
 		gt 'grandmahelp', 'groceries'
-	elseif grandmaQW['chore_type'] = 4 and grandmaQW['chore_mushrooms_given'] >= 6:
+	elseif grandmaQW['chore_type'] = 4 and boletus_stored >= 5:
 		gt 'grandmahelp', 'can_mushrooms'
-	elseif grandmaQW['chore_type'] = 5 and grandmaQW['chore_berries_given'] >= 5:
+	elseif grandmaQW['chore_type'] = 5 and bilberry_stored >= 5:
 		gt 'grandmahelp', 'can_berries'
 	elseif grandmaQW['chore_type'] = 6 and grandmaQW['chore_harvest_done'] = 1:
 		gt 'grandmahelp', 'can_veggies'
@@ -40,11 +40,11 @@ if $ARGS[0] = 'start':
 		gt 'grandmahelp', 'waterplants'
 	elseif grandmaQW['chore_type'] = 10 and sunWeather = 1:
 		gt 'grandmahelp', 'harvest'
-	elseif grandmaQW['chore_type'] = 11:
+	elseif grandmaQW['chore_type'] = 11 and boletus_stored <= 18:
 		gt 'grandmahelp', 'pickforest_mushrooms'
-	elseif grandmaQW['chore_type'] = 12:
+	elseif grandmaQW['chore_type'] = 12 and bilberry_stored <= 18:
 		gt 'grandmahelp', 'pickforest_berries'
-	elseif grandmaQW['chore_type'] = 13:
+	elseif grandmaQW['chore_type'] = 13 and ((boletus_stored + bilberry_stored) <= 16):
 		gt 'grandmahelp', 'pickforest_both'
 	else
 		'"There is nothing to do today <<$pcs_nickname>>, take the day off.'
@@ -68,6 +68,7 @@ if $ARGS[0] = 'cleanfloor':
 		'You grab a bucket and a rag, and get down on your knees and begin scrubbing the floor. Within the hour the floor shines and you are satisfied with the work you''ve done. You put the cleaning supplies into a corner and continue on with your day.'
 
 		act 'Continue':gt 'gadhouse', 'start'
+		act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
 	end
 end
 
@@ -80,7 +81,6 @@ if $ARGS[0] = 'washclothes':
 		*clr & cla
 		minut += 60
 		grandmaQW['chore_wash_clothes'] = 2
-		grandmaQW['help_amount'] += 1
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
@@ -94,6 +94,7 @@ if $ARGS[0] = 'washclothes':
 		    'Once you are done with the washing, you walk over to the clothesline where you carefully hang the clothes to dry.'
 
 		    act 'Continue':gt'gaddvor'
+			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
 		end
 	end
 end
@@ -141,7 +142,7 @@ if $ARGS[0] = 'can_mushrooms':
 		minut += 45
 		gs'stat'
 
-		grandmaQW['chore_mushrooms_given'] -= 6
+		boletus_stored -= 5
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_mushrooms.jpg"></center>'
 		'Grandma gives you a basket of mushrooms and you spend a while cleaning them, washing them, and cutting them up, in preparation for canning.'
 		act 'Continue':
@@ -157,6 +158,7 @@ if $ARGS[0] = 'can_mushrooms':
 				gs'stat'
 
 				grandmaQW['chore_can_mushrooms'] = 0
+				grandmaQW['help_amount'] += 2
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_mushrooms.jpg"></center>'
 				'Finally, you help Grandma take them out of the canner and set them aside to cool.'
 				'"Thank you, <<$pcs_nickname>>," she says. "It is important to save food up for the hard winter months. Sure, now you can just walk to the store and get whatever you want, but it wasn''t always that way!"'
@@ -176,7 +178,7 @@ if $ARGS[0] = 'can_berries':
 		minut += 45
 		gs'stat'
 
-		grandmaQW['chore_berries_given'] -= 5
+		bilberry_stored -= 5
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_berries.jpg"></center>'
 		'Grandma gives you a basket of berries and you spend a while cleaning them, removing stems, and picking out any shriveled or bad ones.'
 		act 'Continue':
@@ -253,6 +255,7 @@ if $ARGS[0] = 'feedchickens':
 		'You take the grain mix for the chickens with you and walk over to the yard.'
 
 		act 'Continue':gt'gaddvor','chickens'
+		
 	end
 end
 

+ 4 - 3
locations/grandpahelp.qsrc

@@ -87,11 +87,11 @@ if $ARGS[0] = 'start':
 		gt 'grandpahelp', 'grazecows'
 	elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5 and ARRSIZE('swimwear') > 0:
 		gt 'grandpahelp', 'washhorse'
-	elseif grandpaQW['chore_type'] = 10:
+	elseif grandpaQW['chore_type'] = 10 and boletus_stored <= 18:
 		gt 'grandpahelp', 'pickforest_mushrooms'
-	elseif grandpaQW['chore_type'] = 11:
+	elseif grandpaQW['chore_type'] = 11 and bilberry_stored <= 18:
 		gt 'grandpahelp', 'pickforest_berries'
-	elseif grandpaQW['chore_type'] = 12:
+	elseif grandpaQW['chore_type'] = 12 and ((boletus_stored + bilberry_stored) <= 16):
 		gt 'grandpahelp', 'pickforest_both'
 	elseif grandpaQW['chore_type'] = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
 		'"<<$pcs_nickname>>, we need to help out with baling hay today. We have to go to the field to meet the others."'
@@ -161,6 +161,7 @@ if $ARGS[0] = 'cleanyard':
 		gs'stat'
 
 		act 'Continue':gt'gaddvor'
+		act 'Return back to your grandfather': minut += 1 & gt 'gadhouse', 'grandpa'
 	end
 end
 

+ 7 - 9
locations/gschool_grounds.qsrc

@@ -320,15 +320,15 @@ if $ARGS[0] = 'sports':
 	*clr & cla
 	gs 'stat'
 	if month > 2 and month < 9:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school//grounds/field.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/field.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school//grounds/fieldwinter.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/fieldwinter.jpg"></center>'
 	end
 	'There is a football field and around it is a track, often before and after school kids use the field and track.'
 
-	if week = 5 and hour >= 16 and hour <= 18: 'As you pass by the sports field you hear lots of cheering and yelling coming from the younger kids on the field. As you approach you see <a href="exec: gt ''gschool_socialchg1'', ''tLazar''">Lazar</a> is on the football field showing off his skills.'
+	if week = 5 and hour >= 16 and hour <= 18: 'As you pass by the sports field you hear lots of cheering and yelling coming from the younger kids on the field. As you approach you see '+iif(socialchg['tLazar_day'] ! daystart, '<a href="exec: gt ''gschool_socialchg1'', ''tLazar''">Lazar</a>', 'Lazar')+' is on the football field showing off his skills.'
 
-	if (week = 1 or week = 3) and hour >= 16 and hour <= 18: 'Looking toward what you can barely describe as a running track, you notice <a href="exec: gt ''gschool_socialchg1'', ''tSvyatoslav''">Svyatoslav</a> doing sprints by the football field.'
+	if (week = 1 or week = 3) and hour >= 16 and hour <= 18: 'Looking toward what you can barely describe as a running track, you notice '+iif(socialchg['tSvyatoslav_day'] ! daystart, '<a href="exec: gt ''gschool_socialchg1'', ''tSvyatoslav''">Svyatoslav</a>', 'Svyatoslav')+' doing sprints by the football field.'
 
 	act 'Leave the sports field': minut += 1 & gt 'gschool_grounds', 'main'
 
@@ -457,16 +457,14 @@ if $ARGS[0] = 'bulding':
 end
 
 if $ARGS[0] = 'KristinaFight':
-	$location_type = 'event_outdoors'
 	*clr & cla
 	menu_off = 1
-	gs 'stat'
-
 	zverRageQW = 2
+	$location_type = 'event_outdoors'
+	gs 'stat'
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/christina/school/fight.mp4"></video></center>'
 	'As you cross the school yard after school, you are surprised by a powerful kick in your back. You fall to your hands and knees and rub your sore back for a second, before you turn around and see Christina Zvereva, her face contorted with rage. She yells at you, "You fucking bitch! How dare you spread shit about me like that? I''ll break your fucking face!"'
-!! Fightcheck
-	act 'fight':
+	act 'Fight her':
 		gs 'fight', 'initFight'
 		gs 'fight_npcdata', 'christina'
 		gt 'fight', 'start'

+ 8 - 3
locations/gschool_lessons1.qsrc

@@ -47,6 +47,8 @@ if $ARGS[0] = 'russian':
 		'All of a sudden you hear a loud bang, making the whole class jump up from their chairs.'
 		'Like a well trained unit, everyone in the room turns to look, only to see Lesco on the floor, his desk overturned; his cellphone sliding across the floor before clattering against the wall. Silence is soon replaced by laughter. The eyes of the entire class on him, Lesco struggles to act nonchalant as he works to quickly return his desk to an upright position and gather the items that had fallen to the floor.'
 		'Mr. Yenotin approaches Lesco, you''re for certain he''ll get a scolding, but to your dismay, Mr. Yenotin starts joking with Lesco instead. He shares an embarrassing story about how the same thing happened to him once except there were no phones at his time but notes instead. No one is buying his story and instead are focusing their attention on the gopnik clique. They''re laughing loudly, wondering what Lesco was doing when he fell.'
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -309,7 +311,6 @@ if $ARGS[0] = 'russian':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 	end
 	
 !!The actions from before lead to the teacher telling your mother about you mouthing off at the parents conference
@@ -547,6 +548,9 @@ if $ARGS[0] = 'geography':
 		'That comes to an abrupt end when a bang from the front desk that nearly startles you out of your chair.'
 		'Without any hesitation, Mrs. Sokoloff starts shouting at Vitek that''s fast asleep. Her eyes sharpen as she approaches his desk. She slams her hand on his table while Vitek struggles to act nonchalant as he works to quickly return to his senses.'
 		'Mrs. Sokoloff scowls at him, and is about to offer a few stern words when the bell rings. He''ll likely get a talking to, but as class is over, you won''t get to listen in. One of the girls whispers that Vitek is in deep trouble now.'
+		
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -809,7 +813,6 @@ if $ARGS[0] = 'geography':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 	end
 	
 	act'Daydream':
@@ -1049,6 +1052,9 @@ if $ARGS[0] = 'history':
 		'That comes to an abrupt end when a bang from the front desk that nearly startles you out of your chair.'
 		'Without any hesitation, Mrs. Sokoloff starts shouting at Vitek that''s fast asleep. Her eyes sharpen as she approaches his desk. She slams her hand on his table while Vitek struggles to act nonchalant as he works to quickly return to his senses.'
 		'Mrs. Sokoloff scowls at him, and is about to offer a few stern words when the bell rings. He''ll likely get a talking to, but as class is over, you won''t get to listen in. One of the girls whipsers that Vitek is in deep trouble now.'
+		
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -1311,7 +1317,6 @@ if $ARGS[0] = 'history':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 	end
 	
 	act 'Daydream':

+ 12 - 4
locations/gschool_lessons2.qsrc

@@ -51,6 +51,9 @@ if $ARGS[0] = 'computer':
 		pcs_grades -= rand(0,1)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 		'You quickly grow bored with the class and instead spend most of the time trying to browse the internet while Mr. Ivanov is busy or pay attention to your fellow students and what they are up to. You can see several of them seem to have the same idea as you do. The only times you pay attention is when he calls on you to answer one of the questions.'
+		
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -312,7 +315,6 @@ if $ARGS[0] = 'computer':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end	
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 	end
 	
 	act'Daydream':
@@ -560,6 +562,9 @@ if $ARGS[0] = 'science':
 		pcs_grades -= rand(0,1)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 		'You quickly grow bored with the class and instead spend most of the time trying to browse the internet while Miss Orlov is busy or pay attention to your fellow students and what they are up to. You can see several of them seem to have the same idea as you do. The only times you pay attention is when she calls on you to answer one of the questions.'
+		
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -722,7 +727,6 @@ if $ARGS[0] = 'science':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 	end
 	
 	act'Daydream':
@@ -953,6 +957,9 @@ if $ARGS[0] = 'music':
 		pcs_grades -= rand(0,1)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classmusic.jpg"></center>'
 		'Mr. Vasilyev has go on one of his epically long indepth explanations about one of the music styles and how it influenced society in all sorts of ways and in return was influenced by current events. You thought this was about music not history.'
+		
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -1215,7 +1222,6 @@ if $ARGS[0] = 'music':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 	end
 	
 	act'Daydream':
@@ -1440,6 +1446,9 @@ if $ARGS[0] = 'biology':
 		pcs_grades -= rand(0,1)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 		'You quickly grow bored with the class and instead spend most of the time trying to browse the internet while Miss Orlov is busy or pay attention to your fellow students and what they are up to. You can see several of them seem to have the same idea as you do. The only times you pay attention is when she calls on you to answer one of the questions.'
+		
+		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
+		
 		act 'Draw dick in margin':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -1602,7 +1611,6 @@ if $ARGS[0] = 'biology':
 				act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 	end
 	
 	act'Daydream':

+ 5 - 2
locations/gschool_lessons3.qsrc

@@ -552,6 +552,9 @@ if $ARGS[0] = 'art':
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 			'Mr. Vasilyev has gone on one of his epically long indepth explanations about one of the art styles and how it influenced society in all sorts of ways and in return was influenced by current events. You thought this was about art not history.'
+			
+			act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
+			
 			act 'Draw dick in margin':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -814,7 +817,6 @@ if $ARGS[0] = 'art':
 					act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-			act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 		end
 	end
 	
@@ -1083,7 +1085,9 @@ if $ARGS[0] = 'shop':
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 			'Mr. Kuznetsov''s is lecturing on safety, but it keeps getting more and more boring. You look around for something to pass the time, desperate for any kid of distraction.'
+			
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
+			
 			act 'Draw dick in margin':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/drawdick.jpg"></center>'
@@ -1346,7 +1350,6 @@ if $ARGS[0] = 'shop':
 					act 'Remove panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-			act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 		end
 	end
 	

+ 3 - 1
locations/gschool_lessonsev1.qsrc

@@ -1098,11 +1098,13 @@ if $ARGS[0] = 'computer':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/computer/alyrage2.jpg"></center>'
 				'He fumes. "That''s enough young lady. I''m taking you to the principal''s office." he says as he starts walking torwards her, but she grabs a chair and violently yells at him. "I will bash your fucking head in with this chair if you even dare try to touch me asshole!" This causes him to stop and take a step back, the whole class is stunned by this. Alyona is known to have a violent streak, but normally she spends most of her time sleeping in class.'
+				
 				act 'Keep watching':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/computer/alyrage3.jpg"></center>'
 					'Mr Ivanov somewhat calmly says "Fine I won''t touch you, but you are going to the principal''s office." She screams and throws the chair across the room into the wall, then in a much more calm tone says. "Fine, whatever, let''s go." She heads out of class with Mr. Ivanov trailing behind her. Once they are gone, everyone starts talking about what just happened and sending texts on their phones. Neither of them return to class before the bell rings.'
-					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+					
+					act 'Leave the classroom': gt 'gschool_lessons', 'short_break'
 				end
 			end
 		elseif scooltiperand = 19:

+ 1 - 1
locations/gschool_lessonsev3.qsrc

@@ -1272,7 +1272,7 @@ if $ARGS[0] = 'art':
 				else
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_6_2.jpg"></center>'
 					'Katja is trying to draw your attention for some reason. When she notices you''re watching, she quickly makes sure no one else is paying attention and then puts one leg on her desk, revealing her bare pussy to you. You bite your lip and give her an appreciative nod as you think to yourself, "Damn, I''ll have to take a closer look into that after classes are over!"'
-					gs 'arousal', 'voyeur', 2, 'lesbian'
+					gs 'arousal', 'voyeur', 2
 				end
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			else

+ 12 - 8
locations/gschool_lunch.qsrc

@@ -75,15 +75,17 @@ if $ARGS[0] = 'cafeteria':
 		act 'Continue': gt 'gschool_lunch', 'break'
 	end
 
-	act 'Eat bagged lunch':
-		cla
-		menu_off = 1
-		gs 'food', 'bag_lunch'
-		delact 'Finish'
-		gs 'gschool_gossip', 'bagged'
-		act 'Continue': gt 'gschool_lunch', 'break'
+	if home_owned[2] = 1:
+		act 'Eat bagged lunch':
+			cla
+			menu_off = 1
+			gs 'food', 'bag_lunch'
+			delact 'Finish'
+			gs 'gschool_gossip', 'bagged'
+			act 'Continue': gt 'gschool_lunch', 'break'
+		end
 	end
-
+	
 	if money >= 50:
 		act 'Buy food (50 <b>₽</b>)':
 			cla
@@ -101,6 +103,8 @@ end
 
 if $ARGS[0] = 'break':
 	*clr & cla
+	$loc = 'gschool_lunch'
+	$metka = 'break'
 	$menu_loc = 'gschool_lunch'
 	$menu_arg = 'break'
 	$location_type = 'public_indoors'

+ 79 - 83
locations/gschool_socialchg1.qsrc

@@ -1,13 +1,28 @@
 # gschool_socialchg1
 
+!!all those events need to be restricted to once per day socialchg['eventname_day'] = daystart
+
 if $ARGS[0] = 'tLazar':
 	cla & *clr
 	menu_off = 1
+	socialchg['tLazar_day'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
 	'You decide on to walk over to see what the fuss is about. As usual Lazar is showing off his skills as he has some of the younger kids challenge him 1-on-1 or even 1-on-2 and he''s still managing to beat them quite easily.'
-	'As you step on the field he waves to you to come over before he kicks the ball further away so that the younger kids go chasing after it.'
-	act 'Walk over':
+	'As you step on the field he waves to you to come over before he kicks the ball further away so that the younger kids go chasing after it. You stop in your tracks as you see your brother being one of the kids chasing the ball that Lazar kicked away and you know he would do anything to embarrass you in front of him.'
+	
+	act 'Run away':
+		cla & *clr
+		minut += 10
+		npc_rel['A149'] -= 1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
+		'While blushing you quickly make a signal to Lazar that you have to run and quickly turn your back before Kolka notices you being there.'
+		'Lazar is standing there a bit dumbfounded, wondering why you suddenly had a change of heart but shrugs it off and quickly yells to the kids who''s next to challenge him.'
+		act 'Run back to the school grounds': gt 'gschool_grounds', 'main'
+	end
+	
+	act 'Walk over to him':
 		cla & *clr
 		minut += 10
 		gs 'stat'
@@ -139,17 +154,6 @@ if $ARGS[0] = 'tLazar':
 			end
 		end
 	end
-	act 'Run away':
-		cla & *clr
-		minut += 10
-		npc_rel['A149'] -= 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
-		'You stop in your tracks as you see your brother being one of the kids chasing the ball that Lazar kicked away and you know he would do anything to embarrass you in front of him.'
-		'While blushing you quickly make a signal to Lazar that you have to run and quickly turn your back before Kolka notices you being there.'
-		'Lazar is standing there a bit dumbfounded, wondering why you suddenly had a change of heart but shrugs it off and quickly yells to the kids who''s next to challenge him.'
-		act 'Run back to the school grounds': gt 'gschool_grounds', 'main'
-	end
 end
 
 if $ARGS[0] = 'lazar_vaginal':
@@ -352,16 +356,14 @@ if $ARGS[0] = 'ivanfedor_threesome':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some1.jpg"></center>'
 	'The three of you walk further down the beach past the sauna where almost no one ever goes. Just around a bend in the shore to block the view from the rest of the beach, and the park forest further down. Once the three of you are sure no one else is around the boys start stripping off their clothes, while you drop down to your knees between them. You take both their cocks in your hands and start stroke them until you get them both rock hard.'
 	gs 'arousal', 'hj', 5, 'group', 'exhibitionism'
-	gs 'arousal', 'hj', 5, 'group', 'exhibitionism'
-	minut -= 5
+	gs 'arousal', 'hj', -5, 'group', 'exhibitionism'
 	gs 'stat'
 	act 'Suck them':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some2.jpg"></center>'
 		'Once they are both hard, you take Ivan''s cock into your mouth and start sucking it while you keep stroking it with your hand. You use your other hand to keep stroking Fedor''s dick. After a couple of minutes you switch cocks and start sucking on Fedor''s dick instead. The boys give each other a high five above your head.'
 		gs 'arousal', 'hj', 5, 'group', 'exhibitionism'
-		gs 'arousal', 'bj', 5, 'group', 'exhibitionism'
-		minut -= 5
+		gs 'arousal', 'bj', -5, 'group', 'exhibitionism'
 		gs 'stat'
 		act 'Switch cocks':
 			cla & *clr
@@ -369,8 +371,7 @@ if $ARGS[0] = 'ivanfedor_threesome':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some3.jpg"></center>'
 			'Once switch back to sucking on Ivan''s cock, Fedor steps away from you a moment. Then he bends over and takes hold of your hips and pulls you up. You keep sucking on Ivan''s cock, which forces you to bend over as Fedor pulls you up into a standing position. Which you are sure that is exactly what he wanted and he steps behind you at once. He rubs your clit a few times to get your a little wet, before he rubs the tip of his dick against your slit. Once he is sure you are wet enough he pushes his <<dick>>cm <<$dick_girth>> dick inside your pussy, stretching and filling it out. He slowly fucks you, steadily going a little deeper with each stroke, while you suck on Ivan''s cock.'
 			gs 'arousal', 'vaginal', 5, 'group', 'exhibitionism'
-			gs 'arousal', 'bj', 5, 'group', 'exhibitionism'
-			minut -= 5
+			gs 'arousal', 'bj', -5, 'group', 'exhibitionism'
 			gs 'stat'
 			act 'DP time':
 				cla & *clr
@@ -380,16 +381,14 @@ if $ARGS[0] = 'ivanfedor_threesome':
 				'Fedor pulls out of you and lays down on his back and the boys guide you down onto Fedor, Ivan fingers you a little bit until he gets his fingers nice and wet and then he smears your wetness on his dick. You are lowered down onto Fedor and you feel his cock easily sliding back inside of your pussy. Ivan kneels down behind you and spits on your ass and rubs his spit against your asshole, he repeats it a couple of times until your asshole is nice and wet with his spit. You feel the tip of his dick pressing against your butthole, building up into the head of his dick pops in your ass. Ivan starts slowly fucking your ass being as gentle as he can while you get use to his <<dick>>cm <<$dick_girth>> dick filling your butt.'
 				anal_slip += 4
 				gs 'arousal', 'vaginal', 5, 'group', 'exhibitionism'
-				gs 'arousal', 'anal', 5, 'group', 'exhibitionism'
-				minut -= 5
+				gs 'arousal', 'anal', -5, 'group', 'exhibitionism'
 				gs 'stat'
 				act 'Double the fun':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some5.jpg"></center>'
 					'Ivan grabs your hips and holds them in place while Fedor thrusts into your twat from beneath you, while Ivan pounds your little asshole. It hurt a little at first but now the pleasure of both your holes filling this full over takes any pain you felt and replaces it with pleasure. You find yourself moaning louder and louder as the boys fuck both your holes.'
 					gs 'arousal', 'vaginal', 5, 'group', 'exhibitionism'
-					gs 'arousal', 'anal', 5, 'group', 'exhibitionism'
-					minut -= 5
+					gs 'arousal', 'anal', -5, 'group', 'exhibitionism'
 					gs 'stat'
 					act 'Cum on my titties':
 						cla & *clr
@@ -414,6 +413,7 @@ end
 if $ARGS[0] = 'tSvyatoslav':
 	cla & *clr
 	menu_off = 1
+	socialchg['tSvyatoslav_day'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></center>'
 	'You wait patiently until Svyatoslav ends one of his runs. "You''re improving greatly," You complement him.'
@@ -446,6 +446,7 @@ end
 if $ARGS[0] = 'tVanya':
 	cla & *clr
 	menu_off = 1
+	socialchg['tVanya_day'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big165.jpg"></center>'
 	'Seeing you he stops in his tracks, "Hey, <<$pcs_nickname>>, you''re out early today!" he gives you a subtle smile.'
@@ -505,6 +506,7 @@ end
 if $ARGS[0] = 'tChristina':
 	cla & *clr
 	menu_off = 1
+	socialchg['tChristina_day'] = daystart
 	gs 'stat'
 	if $clothingworntype ! 'nude':
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
@@ -544,7 +546,7 @@ if $ARGS[0] = 'tChristina':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
 		'"What are the two of you up to?" you ask Christina ignoring Lina as you walk up to them.'
 		'"I''m trying to get this lazy ass to perform better..." Then Christina stops talking as she turns to face you and sees you are completely naked. She bursts out laughing. "Oh my god, what a fucking slut you are." Lina joins in laughing at you as well, as they both point and laugh at you being naked. Christina pulls out her phone and starts taking pictures of you with her phone. You start to blush as you realize what this means, while Christina keeps taking your picture as she talks. "I am going to send these to everyone, they are going to love seeing these."'
-		act 'Run off': christinaphotos = daystart & gt 'gLake'
+		act 'Run off': socialchg['christina_day'] = daystart & gt 'gLake'
 		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
 	end
 end
@@ -552,6 +554,7 @@ end
 if $ARGS[0] = 'tLina':
 	cla & *clr
 	menu_off = 1
+	socialchg['tLina_day'] = daystart
 	gs 'stat'
 	if $clothingworntype ! 'nude':
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
@@ -584,19 +587,16 @@ if $ARGS[0] = 'tLina':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
 		'"What are you two up to?" you ask Lina ignoring Christina as you walk up to them.'
 		'Lina is just about to answer but gets interrupted by Christina, "Who told you that you could speak?!..." Then Christina stops talking as she turns to face you and sees you are completely naked. She bursts out laughing. "Oh my god, what a fucking slut you are." Lina joins in laughing at you as well, as they both point and laugh at you being naked. Christina pulls out her phone and starts taking pictures of you with her phone. You start to blush as you realize what this means, while Christina keeps taking your picture as she talks. "I am going to send these to everyone, they are going to love seeing these."'
-		gs 'willpower', 'crime', 'self', 'medium'
-!!I picked crime because it is assault unless there is a better one
+		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Kick her ass (<<will_cost>> Willpower)':
-				*clr & cla
 				gs 'willpower', 'pay', 'self'
-				gs 'stat'
 				gt 'gschool_socialchg1', 'christina_fight'
 			end
 		else
 			act 'Kick her ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end	
-		act 'Run off': christinaphotos = daystart & gt 'gLake'
+		act 'Run off': socialchg['christina_day'] = daystart & gt 'gLake'
 		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
 	end
 end
@@ -612,53 +612,45 @@ if $ARGS[0] = 'chrislina_naked':
 	'She suddenly bursts out laughing, pointing at you, and walks towards you. Lina is confused a moment and then she realizes what Christina is laughing at and joins in as she follows Christina over. "Don''t you have any shame, you fucking slut?"'
 	'"Yeah." Lina adds kinda half heartedly, you think she is just doing it to make Christina happy.'
 	'Christina looks you over head to toe with a look of disgust on her face. "Maybe this is the only way you can get guys to even look at you, hag."'
-	act 'I made a mistake':
-		cla & *clr
-		gs 'stat'
+	
+	act 'I made a mistake': christina_temp = 0 & gt 'gschool_socialchg1', 'christina_decision'	
+	act 'I''m not ashamed': christina_temp = 1 & gt 'gschool_socialchg1', 'christina_decision'
+end
+
+if $ARGS[0] = 'christina_decision':
+	cla & *clr
+	minut += 2
+	gs 'stat'	
+	
+	if christina_temp = 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
 		'Hearing the girls laugh and Christina''s stinging words you blush and cover yourself up as best you can. "I... I made a mistake. I don''t know what I was thinking. Please don''t tell anyone." You beg.'
-		'Christina pulls out her phone and starts taking pictures of you with her phone as she talks. "Yeah you make a mistake you stupid cunt and now your going to pay for it. I am going to send these to everyone, they are going to love seeing these." You start to panic as you realize what this means, this might ruin your reputation, while Christina keeps taking your picture.'
-		gs 'willpower', 'crime', 'self', 'medium'
-!!I picked crime because it is assault unless there is a better one
-		if will_cost <= pcs_willpwr:
-			act 'Kick her ass (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'pay', 'self'
-				gs 'stat'
-				gt 'gschool_socialchg1', 'christina_fight'
-			end
-		else
-			act 'Kick her ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
-		act 'Run off': christinaphotos = daystart & gt 'gLake'
-		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
-	end
-	act 'I''m not ashamed':
-		cla & *clr
-		gs 'stat'
+		'Christina pulls out her phone and starts taking pictures of you with her phone as she talks. "Yeah you make a mistake you stupid cunt and now your going to pay for it. I am going to send these to everyone, they are going to love seeing these." You start to panic as you realize what this means, this might ruin your reputation, while Christina keeps taking your picture.'	
+	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
 		'Hearing the girls laugh and Christina''s words you shake your head and don''t cover up, you know you have nothing to be ashamed of. "I have nothing to be ashamed of. This is how I was made and I look amazing, just because you are ashamed of your body Christina, doesn''t mean I am." You tell her with a sneer.'
 		'Christina''s jaw tightens and her eyes narrow in obvious anger as she pulls out her phone and starts taking pictures of you with her phone as she talks. "No? Well then you won''t mind if I take your picture and send to everyone then right? They are going to love seeing these." Your confidence wavers a little, despite not being ashamed you do realize what this means, this might ruin your reputation.'
-		gs 'willpower', 'crime', 'self', 'medium'
-!!I picked crime because it is assault unless there is a better one
-		if will_cost <= pcs_willpwr:
-			act 'Kick her ass (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'pay', 'self'
-				gs 'stat'
-				gt 'gschool_socialchg1', 'christina_fight'
-			end
-		else
-			act 'Kick her ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
-		act 'Run off': christinaphotos = daystart & gt 'gLake'
-		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
 	end
+	
+	killvar 'christina_temp'
+	
+	gs 'willpower', 'misc', 'self', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'Kick her ass (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'self'
+			gt 'gschool_socialchg1', 'christina_fight'
+		end
+	else
+		act 'Kick her ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end	
+	act 'Run off': socialchg['christina_day'] = daystart & gt 'gLake'
+	act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
 end
 	
 if $ARGS[0] = 'beg_christina':
 	cla & *clr
 	menu_off = 1
+	socialchg['christina_day'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
 	'Panic sets in as you try and cover yourself up as best you can. Maybe you can convince her not to send the pictures to everyone. "Please Christina, don''t send those pictures, please?" You beg her.'
@@ -666,13 +658,11 @@ if $ARGS[0] = 'beg_christina':
 	'You are a bit confused, own you? "Own me?" You ask.'
 	'Christina snarls at you. "Yeah that''s right bitch I will own you, I tell you to do my homework you will, if I tell you to lick my shoes clean you will, if I tell you to stick a bottle up your ass you will, got it?"'
 	'You feel the blood drain from your face as you realize she means it and will likely torment you for the rest of the school year, but it will save your reputation.'
-!!I went with misc on this one cause nothing else seemed to fit
 	gs 'willpower', 'misc', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
 			*clr & cla
 			gs 'willpower', 'pay', 'resist'
-			christinaphotos = daystart
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
 			'You shake your head no. "No I''m not going to do that, you will humiliate me worse than those photos every would."'
@@ -682,11 +672,12 @@ if $ARGS[0] = 'beg_christina':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end	
+	
 	act 'Agree':
 		cla & *clr
-		mood -= 10
-!! check with nutluck about post PE scenes
-		christinaphotos = 1
+		pcs_mood -= 10
+		christinaphotos = 1		
+		gs 'pain', 1, 'labia', 'kick'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/christina/beach/onall4s.jpg"></center>'
 		'You reluctantly nod your head and meekly agree. "Ok." You tell her.'
@@ -696,7 +687,7 @@ if $ARGS[0] = 'beg_christina':
 		'Then you feel a swift kick from behind, between your open legs, as Christina kicks you in the twat hard. You cry out and tears running down your cheeks as you grab your crotch and roll over onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it." Christina demands as she towers over you.'
 		*nl
 		'You croak out. "I am a little cunt that will do anything you say, anytime you say it." With that Christina laughs with a fairly evil laugh, she seems to be enjoying bullying you a lot, then she and Lina walk off leaving you laying on the beach naked and in pain. Once the walk off you dry your tears as best you can and get up.'
-		gs 'pain', 1, 'labia', 'kick'
+		
 		act 'Walk off': gt 'gLake'
 	end
 end
@@ -707,7 +698,8 @@ if $ARGS[0] = 'christina_fight':
 	gs 'stat'
 	'You step closer to Christina and say. "Give me the fucking phone before I kick you ass."'
 	'She smirks to you and puts her phone in her pocket and gets in fighting stance obviously more than willing to fight you. "Take if you think you can cunt!" Lina moves out of the way to watch, just as you take your first swing. Which Christina was waiting for and easily side steps your first blow, but now the fight is on.'
-	act 'fight':
+	
+	act 'Fight her':
 		gs 'fight','initFight'
 		gs 'fight_npcdata', 'christina'
 		fightEnding = 15
@@ -723,6 +715,7 @@ if $ARGS[0] = 'tBella':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big22.jpg"></center>'
 	'You approach her and tap her on her shoulder, "Hi, Bella! You''re heading into the city?" you ask.'
 	'Sighing, Bella replies, "Yeah, I''m meeting some of my older friends in town. There''s a new gym opening so we though we might check it out."'
+	
 	act 'Sounds amazing':
 		cla & *clr
 		npc_rel['A22'] += 2
@@ -734,6 +727,7 @@ if $ARGS[0] = 'tBella':
 		'"Oh, the stories I''ve got to tell..." Bella replies but before she can continue on there''s an announcement and she excuses herself saying that''s the train she needs to catch.'
 		act 'Return to the train station': gt 'pavtrainhall'
 	end
+	
 	act 'What''s wrong with the gym in Pavlovsk?':
 		cla & *clr
 		npc_rel['A22'] -= 2
@@ -762,17 +756,7 @@ if $ARGS[0] = 'tVeronika':
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
 		'"Hi, Veronika!" you shout out, "Looking great out there!"'
 		'Ice cold with a blank expression, she stops in front of you, "What do you want? Can''t you see that I''m practicing?"'
-		act 'Encourage':
-			cla & *clr
-			npc_rel['A141'] += 2
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
-			'"I just wanted to say that you''re looking great out there." You smile, "I bet you''ll have no issues getting on the Russian team."'
-			'Veronika, still stone faced and rigid, replies a bit reluctantly. "Thanks, I guess. I do train a lot to succeed so I can leave this god forsaken hole..."'
-			'You awkwardly smile, "I know what you mean. It really is a dump isn''t it?"'
-			'"If there wasn''t anything more I need to get back to my training..." she replies. Before you''re able to answer back, Veronika is already skating away from you...'
-			act 'Walk away': gt 'gLake'
-		end
+
 		act 'Discourage':
 			cla & *clr
 			npc_rel['A141'] -= 2
@@ -785,6 +769,18 @@ if $ARGS[0] = 'tVeronika':
 			'Stone cold Veronika only shrugs her shoulders, turning around and skates away like the two of you never had a conversation...'
 			act 'Walk away': gt 'gLake'
 		end
+		
+		act 'Encourage':
+			cla & *clr
+			npc_rel['A141'] += 2
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
+			'"I just wanted to say that you''re looking great out there." You smile, "I bet you''ll have no issues getting on the Russian team."'
+			'Veronika, still stone faced and rigid, replies a bit reluctantly. "Thanks, I guess. I do train a lot to succeed so I can leave this god forsaken hole..."'
+			'You awkwardly smile, "I know what you mean. It really is a dump isn''t it?"'
+			'"If there wasn''t anything more I need to get back to my training..." she replies. Before you''re able to answer back, Veronika is already skating away from you...'
+			act 'Walk away': gt 'gLake'
+		end
 	end
 end
 

+ 1 - 1
locations/gskver.qsrc

@@ -128,7 +128,7 @@ if $ARGS[0] = 'start':
 		act 'Go and see Rex':gt 'reks', 'skver'
 	end
 
-	if week >= 6 and hour >= 8 and hour <= 9 and StoryLine = 1: '<a href="exec:gt ''gschool_socialchg1'',''tVanya''">Vanya</a> is out on a light jog and is slowly approaching you.'
+	if week >= 6 and hour >= 8 and hour <= 9 and StoryLine = 1 and socialchg['tVanya_day'] ! daystart: '<a href="exec:gt ''gschool_socialchg1'',''tVanya''">Vanya</a> is out on a light jog and is slowly approaching you.'
 
 	act 'Go for a walk (0:15)':
 		menu_off = 1

+ 1 - 1
locations/kafesvid.qsrc

@@ -73,7 +73,7 @@ if $ARGS[0] = '1':
 	'The cafe is pretty empty, and you are in the far corner, where it is kind of dark. <<$telsob>> uses this little bit of privacy to slowly hike up her shirt. When she notices you staring, she puts a leg up right between your thighs. It gives you an excellent view of her already wet panties.'
 	'"Like what you see, <<$pcs_nickname>>?" she says, with a wicked grin.'
 
-	gs 'arousal', 'voyeur', 5, 'lesbian'
+	gs 'arousal', 'voyeur', 5
 	gs 'stat'
 	gs 'willpower', 'foreplay', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:

+ 166 - 144
locations/lact_lib.qsrc

@@ -12,13 +12,13 @@
 !!	lactation['lactmess'] = old lactatemess variable
 !!	lactation['engorgement'] = old lact_engorgement variable. 1 = engorged breasts, 0 = not engorged.
 !!	lactation['dailyoverdemand'] = old milkoverdemand variable
-!!	lactation['inducegrowth'] = old milkinduceday variable
 !!	lactation['nipgrowth'] = variable to count nipplegrowth with lactation start nipples will grow by 2 points.
 !!	lactation['milkgrowday'] = old milkgrowday variable.
 !!	lactation['breastdensitytype'] = variable to define breast type. 0 = not initialized, 1 = 17% gland tissue, 2 = 36% gland tissue, 3 = 55% gland tissue, 4 = 74% gland tissue, 5 = 93% gland tissue
 !!	lactation['breastglandtissue'] = the amount of glandular tissue per breast
-!!	lactation['alveoliexpandlvl'] = variable for alveoli expansion 0 = not expanded 5 fully expanded.
-!!	lactation['breastcount'] = how many breasts does sveta have? Usually should be set to 2.
+!!	lactation['alveoliexpandlvl'] = variable for alveoli expansion 0 = not expanded; 10 fully expanded.
+!!	lactation['alveoliexpandlvl_change'] = change checking variable for alveoli expansion
+!!	lactation['breastcount'] = how many breasts does sveta have? Usually should be set to 2 unless you want to amputate or go multibreast
 !!	lactation['maturebreast'] = Did Svetas breast fully change during pregnancy yet? 0 = no, 1 = yes
 !!	lactation['breastpumped'] = old breastpumped variable.
 !!	lactation['max_sucktion_demand'] = old max_sucktion_demand variable. Used in milking function
@@ -44,82 +44,64 @@
 !!	This function is called only once in the begining of the game. It is calculating svetas mammary gland density and alveolicount and sets the breastcount which will be 2 naturally
 if $ARGS[0] = 'init_breasttissue' and lactation['breasttissueinitiated'] <= 0:
 	!!	use func('lact_lib','init_breasttissue')
-	lactation['breasttissueinitiated'] = 1
-	!! breast density type. Density of glands.
-	!! 0 = not initialized, 1 = 17% gland tissue, 2 = 36% gland tissue, 3 = 55% gland tissue, 4 = 74% gland tissue, 5 = 93% gland tissue. This is based on studies I found on the internet.
-	!! The logic behind the below is, when losing fat, breasts usually volunteer first. So the more bodyfat sveta has, the more she has in her breasts, and therefore the percentage of gland tissue goes down.
-	!! Breasts cannot lose glandular tissue (if not cut out, yikes), therefore this will define the maximum they can shrink if fat is removed. At the moment this is done by Genbsize. The below will replace this in the future.
-	!! Genbsize is the breastsize that is given to Sveta by her parents. During puberty the breasts swell up to this size with mostly being fat tissue. Due to genetic variability and hormones, breasts will develop more or
-	!! less mammary gland tissue during puberty. As the game starts after Svetas puberty, this is impossible to simulate. That is why I came up with the below part. It will calculate the breastdensity using Svetas body fat.
-	!! During pregnancy most of the breast fat is getting replaced by conjuctive tissue and mammary glands. But the genetical breastsize also affects the total mammary gland growth. So for example, if Sveta is a chubby,
-	!! and has D cups with a breastdensitytype of 1, and she looses weight, her breast will shrink down to B cups. If her Genbsize is D, then she will grow D cups or bigger during pregnancy. But that is part of another function.
-	lactation['breastcount'] = 2
-	if lactation['breastdensitytype'] <= 0:
-		if pregtimes > 0:
-			lactation['breastdensitytype'] = 5
-		elseif salo <= 20:
-			lactation['breastdensitytype'] = 5
-		elseif salo <= 40:
-			lactation['breastdensitytype'] = 4
-		elseif salo <= 60:
-			lactation['breastdensitytype'] = 3
-		elseif salo <= 80:
-			lactation['breastdensitytype'] = 2
-		elseif salo <= 100:
-			lactation['breastdensitytype'] = 1
+	!!	getting the useable tissue
+	lactation['useable_cupsize'] = nbsize + magicf2b - vofat
+	!!	checking the variable. If it is greater 0, sveta has natural breast tissue to work with.
+	!!	else she has fake breasts or no breasts at all and no ability to lactate
+	if lactation['useable_cupsize'] > 0:
+		lactation['breasttissueinitiated'] = 1
+		lactation['last_useable_cupsize'] = lactation['useable_cupsize']
+		!! breast density type. Density of glands.
+		!! 0 = not initialized, 1 = 17% gland tissue, 2 = 36% gland tissue, 3 = 55% gland tissue, 4 = 74% gland tissue, 5 = 93% gland tissue. This is based on studies I found on the internet.
+		!! The logic behind the below is, when losing fat, breasts usually volunteer first. So the more bodyfat sveta has, the more she has in her breasts, and therefore the percentage of gland tissue goes down.
+		!! Breasts cannot lose glandular tissue (if not cut out, yikes), therefore this will define the maximum they can shrink if fat is removed. At the moment this is done by Genbsize. The below will replace this in the future.
+		!! Genbsize is the breastsize that is given to Sveta by her parents. During puberty the breasts swell up to this size with mostly being fat tissue. Due to genetic variability and hormones, breasts will develop more or
+		!! less mammary gland tissue during puberty. As the game starts after Svetas puberty, this is impossible to simulate. That is why I came up with the below part. It will calculate the breastdensity using Svetas body fat.
+		!! During pregnancy most of the breast fat is getting replaced by conjuctive tissue and mammary glands. But the genetical breastsize also affects the total mammary gland growth. So for example, if Sveta is a chubby,
+		!! and has D cups with a breastdensitytype of 1, and she looses weight, her breast will shrink down to B cups. If her Genbsize is D, then she will grow D cups or bigger during pregnancy. But that is part of another function.
+		lactation['breastcount'] = 2
+		lactation['lactlib_change'] = 1
+		!!	setting breastdensitypercent (y) with y = -0,95x + 112 with x being svetas salo
+		if salo <= 20:
+			lactation['breastdensitypercent'] = 93
+		elseif salo > 100:
+			lactation['breastdensitypercent'] = 17
+		else
+			lactation['breastdensitypercent'] = 112 - ((95*salo)/100)
+		end
+		:ibt_loop
+		!!	initiating breastglandtissue. the size is converted to ccm.
+		lactation['breastglandtissue'] = (func('lact_lib','bsizetoccm', lactation['useable_cupsize'])*lactation['breastdensitypercent'])/100
+		!!	getting the breast max milk storage. Please be aware that there is storage even if no lactation is happening. Factors 100 and 500 stand for flat glands and inflated glands.
+		!!	usually nature intented women to be able to breastfeed. depending on age and size, babys eat about 80ml to 150ml. if both breast make 80ml together, then we are fine. Even AA cups can do this.
+		!!	this is what the pregtime check is for. Making sure sveta would have been able to breastfeed. There is a jump to loop back.
+		if lactation['active'] > 0:
+			lactation['breastmm'] = (lactation['breastglandtissue']*500)*lactation['breastcount']
+			if pregtimes > 0 and (lactation['breastglandtissue']*500) < 80000:
+				!!	make the percentage change and jump back, so everything is recalculated. Do not mess with the factors.
+				lactation['breastdensitypercent'] = 8500/func('lact_lib','bsizetoccm', lactation['useable_cupsize'])
+				jump 'ibt_loop'
+			end
+		elseif lactation['active'] < 1:
+			lactation['breastmm'] = (lactation['breastglandtissue']*100)*lactation['breastcount']
+			if pregtimes > 0 and lactation['breastglandtissue'] < 40:
+				!!	make the percentage change and jump back, so everything is recalculated. Do not mess with the factors.
+				lactation['breastdensitypercent'] = 4500/func('lact_lib','bsizetoccm', lactation['useable_cupsize'])
+				jump 'ibt_loop'
+			end
 		end
-	end
-	!!	setting breastdensitypercent (y) with y = -0,95x + 112 with x being svetas salo
-	if salo <= 20:
-		lactation['breastdensitypercent'] = 93
-	elseif salo > 100:
-		lactation['breastdensitypercent'] = 17
 	else
-		lactation['breastdensitypercent'] = 112 - ((95*salo)/100)
-	end
-	!!	breast tissue that can have mammary glands is nbsize + magicf2b
-	!!	Silicone is obviously not a good material to grow milkglands in
-	!!	full breastccm would be nbsize + magicf2b + silicone.
-	!!	Getting percentage tissue from breastccm.
-	lactation['breastccm'] = func('lact_lib','bsizetoccm',(nbsize + magicf2b + silicone))
-	if lactation['breastccm'] <= 0: lactation['breastccm'] = 1	
-	lactation['nbsizepercent'] = ((nbsize*100/(nbsize + magicf2b + silicone)*100)/100)
-	lactation['magicf2bpercent'] = ((magicf2b*100/(nbsize + magicf2b + silicone)*100)/100)
-	lactation['siliconepercent'] = ((silicone*100/(nbsize + magicf2b + silicone)*100)/100)
-	lactation['nbsizepercent_wos'] = ((nbsize*100/(nbsize + magicf2b)*100)/100)
-	lactation['magicf2bpercent_wos'] = ((magicf2b*100/(nbsize + magicf2b)*100)/100)
-	lactation['nbsizechange'] = nbsize
-	lactation['magicf2bchange'] = magicf2b
-	lactation['siliconechange'] = silicone
-	!!	Getting the usuable amount of breast tissue which can actually have mammary glands (in ccm)
-	lactation['breastuseabletissue'] = ((lactation['nbsizepercent'] + lactation['magicf2bpercent'])*lactation['breastccm'])/100
-	lactation['breastsiliconeccm'] = (lactation['siliconepercent']*lactation['breastccm'])/100
-	!!	Getting mammary gland tissue per breast, based on the breastdensitytype/breastdensitypercent. Explaination on the percentages is in the head of the function.
-	lactation['breastglandtissue'] = (lactation['breastuseabletissue']*lactation['breastdensitypercent'])/100
-	!!	calculating breast fat per breast
-	lactation['breastfat'] = lactation['breastuseabletissue'] - lactation['breastglandtissue']
-	!!	calculating alveolicount per breast Alveoli volume 2.18mm² (flat), milk volume 0.18mm³ (flat) and 4mm³ (inflated), milk volume 2mm³ (inflated) 1000 mm³ = 1 cm³
-	if lactation['active'] <= 0:
-		lactation['alveolicount'] = ((lactation['breastglandtissue']*100000)/218)
+		!! when there is no tissue, set everything for zero. Note: the breasttissueinitiated variable is set to 0, so the function will always check if there is useable tissue available and then will create the glandtissue.
+		lactation['breastcount'] = 0
+		lactation['breasttissueinitiated'] = 0
+		lactation['breastdensitypercent'] = 0
+		lactation['breastmm'] = 0
+		lactation['active'] = 0
+		lactation['lactlib_change'] = 0
 		lactation['alveoliexpandlvl'] = 0
-		lactation['nipgrowth'] = 0
-	else
-		lactation['alveolicount'] = ((lactation['breastglandtissue']*1000)/4)
-		lactation['alveoliexpandlvl'] = 10
-		lactation['nipgrowth'] = 2
+		lactation['alveoliexpandlvl_change'] = 0
 	end
-	!!	storing start volumes for later use
-	lactation['breastccm_start'] = lactation['breastccm']
-	lactation['breastfat_start'] = lactation['breastfat']
-	lactation['breastglandtissue_start'] = lactation['breastglandtissue']
-	lactation['alveolicount_start'] = lactation['alveolicount']
-	lactation['nipgrowth_start'] = lactation['nipgrowth']
-	lactation['breastdensitytype_start'] = lactation['breastdensitytype']
-	lactation['usablebtissue_start'] = lactation['usablebtissue']
-	lactation['usablebtissue_change'] = lactation['usablebtissue']
-	!!	Svetas breast can only shrink if there fat to go away. Mammary glands cannot shrink away. Setting minimum nbsize.
-	lactation['min_nbsize'] = func('lact_lib','bccmtosize',lactation['breastglandtissue'])
-	if lactation['min_nbsize'] < 1: lactation['min_nbsize'] = 1
+	
 end
 
 if $ARGS[0] = 'bsizetoccm':
@@ -209,73 +191,112 @@ if $ARGS[0] = 'bccmtosize':
 	end
 end
 
-!!	This function is used for breastgrowth. When nbsize, magicf2b, silicone, alveolicount or the alveoliexpandlvl are changed the breastccm changes. Everything will be written back to the specific variable
-if $ARGS[0] = 'BreastGrowth':
-	!!	usage func('lact_lib','BreastGrowth')
-	!!	Checking for variable errors, and re-initializing breastccm or alveolicount
-	if lactation['breastccm'] <= 0 or lactation['alveolicount'] <= 0:
-		lactation['breasttissueinitiated'] = 0
+!! This function checks for non lact_lib changes made to svetas breasts.
+if $ARGS[0] = 'checkExtBreastGrowth':
+	!!	usage func('lact_lib','checkExtBreastGrowth')
+	!!	lactation['lactlib_change'] is checked here. It is called in the growing functions in lact_lib. State 0 = no internal change, 1 = internal change. If the lactlib did not act upon svetas breasts, make the changes.
+	lactation['useable_cupsize'] = nbsize + magicf2b - vofat
+	if lactation['lactlib_change'] > 0:
+		lactation['lactlib_change'] = 0
+		lactation['useable_cupsize'] = lactation['last_useable_cupsize']
+	else
+		!!	technically, the below will recalculate everything. Nothing else. Just like in init breast tissue. Just added some extra cases for lactation and induction.
+		!!	checking if changes were made to the stuff that is interesting for lactation.
+		if lactation['useable_cupsize'] <> lactation['last_useable_cupsize'] and lactation['useable_cupsize'] > 0:
+			:cEBG_loop
+			lactation['breastglandtissue'] = ((func('lact_lib','bsizetoccm', lactation['useable_cupsize'])*lactation['breastdensitypercent'])/100) + (lactation['preggrowth']/100)
+			!!	getting the breast max milk storage. Please be aware that there is storage even if no lactation is happening. Factors 100 and 500 stand for flat glands and inflated glands.
+			!!	usually nature intented women to be able to breastfeed. depending on age and size, babys eat about 80ml to 150ml. if both breast make 80ml together, then we are fine. Even AA cups can do this.
+			!!	this is what the pregtime check is for. Making sure sveta would have been able to breastfeed. There is a jump to loop back.
+			if lactation['active'] > 0:
+				lactation['breastmm'] = (lactation['breastglandtissue']*(100 + (lactation['alveoliexpandlvl'] * 40)))*lactation['breastcount']
+				if pregtimes > 0 and (lactation['breastglandtissue']*500) < 80000:
+					!!	make the percentage change and jump back, so everything is recalculated. Do not mess with the factors.
+					lactation['breastdensitypercent'] = 8500/func('lact_lib','bsizetoccm', lactation['useable_cupsize'])
+					jump 'cEBG_loop'
+				end
+			elseif lactation['active'] <= 0:
+				!! Taking gland inflation level into account.
+				lactation['breastmm'] = (lactation['breastglandtissue']*(100 + (lactation['alveoliexpandlvl'] * 40)))*lactation['breastcount']
+				if pregtimes > 0 and lactation['breastglandtissue'] < 40:
+					!!	make the percentage change and jump back, so everything is recalculated. Do not mess with the factors.
+					lactation['breastdensitypercent'] = 4500/func('lact_lib','bsizetoccm', lactation['useable_cupsize'])
+					jump 'cEBG_loop'
+				end
+			end
+			lactation['last_useable_cupsize'] = lactation['useable_cupsize']
+		elseif lactation['useable_cupsize'] <= 0:
+			!! when there is no tissue, set everything for zero. Note: the breasttissueinitiated variable is set to 0, so the function will always check if there is useable tissue available and then will create the glandtissue.
+			lactation['breastcount'] = 0
+			lactation['breasttissueinitiated'] = 0
+			lactation['breastdensitypercent'] = 0
+			lactation['breastmm'] = 0
+			lactation['active'] = 0
+			lactation['lactlib_change'] = 0
+		end
+	end	
+end
+
+!! This function is used for lactation based growth. It writes back to nbsize, magicf2b.
+if $ARGS[0] = 'lactationBreastGrowth':
+	lactation['useable_cupsize'] = nbsize + magicf2b - vofat
+	!!	make sure lactation['breasttissueinitiated'] is 1 before starting this.
+	if lactation['breasttissueinitiated'] = 0:
 		lactation['result'] = func('lact_lib','init_breasttissue')
 	end
-	!!	things will start if breastccm is different from bust/cup size (mostly due to other events or cheating) or if the mammaryglands change due to breastpumping or pregnancy.
-	if lactation['breastccm'] <> func('lact_lib','bsizetoccm',(nbsize + magicf2b + silicone)) or lactation['alveolicount_change'] <> lactation['alveolicount'] or lactation['alveoliexpandlvl_change'] <> lactation['alveoliexpandlvl']:
-		!!	There are general breast growth events that will increase nbsize, magicf2b or silicone. So the breast "contents" have to be recalculated. This is happening here with the breastrecalc function.
-		!!	Now the fun part. Warning, crazy math ahead. I got headaches while doing this, so better not mess with it or you will break everything.
-		!!	first - check for alveoligrowth: yes, do the crazy stuff
-		!!	second - check for nbsize, magicf2b and silicone change
-		!!	there is no else on purpose, because nothing should happen to svetas breasts if nothing else changes
-		!!	changes in nbsize, magicf2b or silicone?
-		if nbsize <> lactation['nbsizechange'] or magicf2b <> lactation['magicf2bchange'] or silicone <> lactation['siliconechange']:
-			!!	getting the new percentages
-			!!	nbsize checker. if nbsize is getting too small.
-			if lactation['min_nbsize'] < 1: lactation['min_nbsize'] = 1
-			if nbsize < lactation['min_nbsize']: nbsize = lactation['min_nbsize']
-			lactation['nbsizepercent'] = (nbsize*100/(nbsize + magicf2b + silicone)*100)/100
-			lactation['magicf2bpercent'] = (magicf2b*100/(nbsize + magicf2b + silicone)*100)/100
-			lactation['siliconepercent'] = (silicone*100/(nbsize + magicf2b + silicone)*100)/100
-			lactation['magicf2bpercent_wos'] = (magicf2b*100/(nbsize + magicf2b)*100)/100
-			!!	calculating new breastccm
-			lactation['breastccm'] = func('lact_lib','bsizetoccm',(nbsize + magicf2b + silicone))
-		end
-		!!	calculating all the breast tissue - breastglandtissue, breastfat and silicone.
-		lactation['breastfat'] = (lactation['breastccm'] - lactation['breastglandtissue'] - ((lactation['siliconepercent']*lactation['breastccm'])/100))
-		lactation['breastsiliconeccm'] = (lactation['siliconepercent']*lactation['breastccm'])/100
-		if lactation['breastfat'] < 0: lactation['breastfat'] = 0
-		if lactation['breastsiliconeccm'] < 0: lactation['breastsiliconeccm'] = 0
-		!!	getting new breastglandtissue
-		lactation['breastglandtissue']= (lactation['alveolicount'] * (218 + (lactation['alveoliexpandlvl'] * 20)))/100000
-		!!	Crazy Math going on here. When I was coding this, only god and I knew what I was doing. Now only god knows.
-		!!	Well actually, this one recalculates all the CCM stuff to normal nbsize, magicf2b and silicone. It works, no idea why, but it works.
-		lactation['breastccm'] = (lactation['breastglandtissue'] + lactation['breastfat'] + lactation['breastsiliconeccm'])
-		lactation['siliconepercent'] = ((lactation['breastsiliconeccm']*100)/lactation['breastccm'])
-		lactation['magicf2bccm'] = ((lactation['breastccm'] - ((lactation['breastccm']*lactation['siliconepercent'])/100))*lactation['magicf2bpercent_wos'])/100
-		lactation['nbsizebccm'] = lactation['breastccm'] - lactation['breastsiliconeccm'] - lactation['magicf2bccm']
-		lactation['nbsizepercent'] = ((lactation['nbsizebccm']*100)/lactation['breastccm'])
-		lactation['magicf2bpercent'] = ((lactation['magicf2bccm']*100)/lactation['breastccm'])
-		!!	fixing QSP rounding issue
-		if (lactation['magicf2bpercent'] + lactation['nbsizepercent'] + lactation['siliconepercent']) < 100:
-			lactation['nbsizepercent'] += (100 - (lactation['magicf2bpercent'] + lactation['nbsizepercent'] + lactation['siliconepercent']))
-		elseif (lactation['magicf2bpercent'] + lactation['nbsizepercent'] + lactation['siliconepercent']) > 100:
-			lactation['nbsizepercent'] -= (100 - (lactation['magicf2bpercent'] + lactation['nbsizepercent'] + lactation['siliconepercent']))
+	!!	the milk glands expand.
+	if lactation['preggrowth'] > 0:
+		lactation['breastglandtissue'] = ((func('lact_lib','bsizetoccm', lactation['last_useable_cupsize'])*lactation['breastdensitypercent'])/100) + (lactation['preggrowth']/100)
+	end
+	if lactation['alveoliexpandlvl_change'] <> lactation['alveoliexpandlvl']:
+		!!	lactlib makes a change. we need to flag that, else checkExtBreastGrowth will go off and mess up everything.
+		lactation['lactlib_change'] = 1
+		if pcs_cupsize < 60:
+			!!	getting breastfat in ccm
+			lactation['breastfat'] = func('lact_lib','bsizetoccm', lactation['useable_cupsize']) - lactation['breastglandtissue']
+			!!	calculating the new breasttissue ccm
+			lactation['breastglandtissue'] = (((lactation['breastglandtissue']*10000)/(20 + (lactation['alveoliexpandlvl_change'] * 2)))*(20 + (lactation['alveoliexpandlvl'] * 2)))/10000
+			!!	setting the new breastmm volume in cmm
+			lactation['breastmm'] = (lactation['breastglandtissue']*(100 + (lactation['alveoliexpandlvl'] * 40)))*lactation['breastcount']
+			!!	checking the current pcs_cupsize - silicone versus the new cupsize
+			if (pcs_cupsize - silicone) > func('lact_lib','bccmtosize', (lactation['breastfat'] + lactation['breastglandtissue'])):
+				!!	In case nbsize will go to negative we catch that here. Sad sveta has no breast tissue anymore. Go cry.
+				if nbsize < (func('lact_lib','bccmtosize', (lactation['breastfat'] + lactation['breastglandtissue'])) - (pcs_cupsize - silicone)):
+					nbsize = 0
+				else
+					!!	Writing negative growth (i.e. shrinking) to nbsize. 
+					nbsize -= (func('lact_lib','bccmtosize', (lactation['breastfat'] + lactation['breastglandtissue'])) - (pcs_cupsize - silicone))
+				end
+			elseif (pcs_cupsize - silicone) <= func('lact_lib','bccmtosize', (lactation['breastfat'] + lactation['breastglandtissue'])):
+				!!	Wrting positive (or no growth) to nbsize. You might think: what about magicf2b and vofat? Answer: breaking everything appart will give more space for error and this works well with cheats. Lazy Coding.
+				!!	We need to make sure that pcs_cupsize is not going over 60, so we have to check it. In case it is going over 60, svetas breasts will use breastfat for gland space.
+				if (func('lact_lib','bccmtosize', (lactation['breastfat'] + lactation['breastglandtissue'])) + silicone) > 60:
+					!!	Adding the gap to nbsize
+					nbsize += (60 - pcs_cupsize)
+					!!	Adding the overgrowth by removing fat, yay percentages everyone!
+					lactation['breastdensitypercent'] = (lactation['breastglandtissue']*100)/1580
+				else
+					!!	writing to nbsize, nothing fancy
+					nbsize += func('lact_lib','bccmtosize', (lactation['breastfat'] + lactation['breastglandtissue'])) - (pcs_cupsize - silicone)
+				end				
+			end
+		else
+			lactation['breastglandtissue'] = (((lactation['breastglandtissue']*10000)/(20 + (lactation['alveoliexpandlvl_change'] * 2)))*(20 + (lactation['alveoliexpandlvl'] * 2)))/10000
+			lactation['breastmm'] = (lactation['breastglandtissue']*(100 + (lactation['alveoliexpandlvl'] * 40)))*lactation['breastcount']
+			lactation['breastdensitypercent'] = (lactation['breastglandtissue']*100)/1580
 		end
-		!!	writing back nbsize and magicf2b. Silicone does not change
-		nbsize = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['nbsizepercent'])/100
-		magicf2b = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['magicf2bpercent'])/100
-		lactation['nbsizechange'] = nbsize
-		lactation['magicf2bchange'] = magicf2b
-		lactation['siliconechange'] = silicone
-		!!	if sveta is lactating, we need to reset the breastmm too
-		if lactation['active'] > 0:	lactation['result'] = func('lact_lib','set_breastmm')
-		!!	Svetas breast can only shrink if there fat to go away. Mammary glands cannot shrink away. Setting minimum nbsize.
-		lactation['min_nbsize'] = func('lact_lib','bccmtosize',lactation['breastglandtissue'])
-		if lactation['min_nbsize'] < 1: lactation['min_nbsize'] = 1
+		lactation['useable_cupsize'] = lactation['last_useable_cupsize']
 	end
 end
 
-!!	new lactation['breastmm'] function. Warning! lactation['breastmm'] is now in microliter (ml*1000) for more acuracy. Alveoli count per breast times 2mm³ (2mm³ = 0,002ml) times breastcount.
+!!	This function is used for breastgrowth. When nbsize, magicf2b, silicone, alveolicount or the alveoliexpandlvl are changed the breastccm changes. Everything will be written back to the specific variable
+!!	if $ARGS[0] = 'BreastGrowth':
+
+
+!!	new lactation['breastmm'] function. Warning! lactation['breastmm'] is in microliter (ml*1000) for more acuracy.
 !!	Breastcount can be changed later on if someone comes up with multibreasts or breast amputation.
 if $ARGS[0] = 'set_breastmm':
-	lactation['breastmm'] = (lactation['alveolicount']*2)*lactation['breastcount']
+	lactation['breastmm'] = (lactation['breastglandtissue']*(100 + (lactation['alveoliexpandlvl'] * 40)))*lactation['breastcount']
 end
 
 !!	Just a function used for debugging. Can be deleted if not needed anymore.
@@ -283,8 +304,8 @@ if $ARGS[0] = 'show_breast_stat':
 	!!	func('lact_lib','show_breast_stat')
 	'lactation[''breastcount''] = <<lactation[''breastcount'']>>'
 	'lactation[''breasttissueinitiated''] = <<lactation[''breasttissueinitiated'']>>'
-	'lactation[''breastccm''] = <<lactation[''breastccm'']>>'
-	'lactation[''min_nbsize''] = <<lactation[''min_nbsize'']>>'
+	'lactation[''breastglandtissue'']] = <<lactation[''breastglandtissue'']>>'
+	'lactation[''breastdensitypercent''] = <<lactation[''breastdensitypercent'']>>'
 	'lactation[''maturebreast''] = <<lactation[''maturebreast'']>>'
 	'lactation[''alveolicount''] = <<lactation[''alveolicount'']>>'
 	'lactation[''prolactinlvl''] = <<lactation[''prolactinlvl'']>>'
@@ -565,7 +586,7 @@ if $ARGS[0] = 'lact_switch':
 		!!	setting lactation to active
 		lactation['active'] = 1
 		!!	setting breast maximum milk volume via function
-		lactation['result'] = func('lact_lib','set_breastmm')
+		lactation['breastmm'] = (lactation['breastglandtissue']*(100 + (lactation['alveoliexpandlvl'] * 40)))*lactation['breastcount']
 		!!	resetting prolactinlvl so that the initial production rate is not too high
 		if lactation['prolactinlvl'] < 200: lactation['prolactinlvl'] = 200
 		!!	setting the lactation rate. Warning! lactation rate is in ml*1000 now for higher accuracy.
@@ -577,13 +598,14 @@ if $ARGS[0] = 'lact_switch':
 		pcs_nips += lactation['nipgrowth']
 		if lactation['alveoliexpandlvl'] < 10: lactation['alveoliexpandlvl'] = 10
 		if lactation['alveoliexpandlvl_change'] < 9: lactation['alveoliexpandlvl_change'] = 9
+		lactation['result'] = func('lact_lib', 'lactationBreastGrowth')
+		if lactation['alveoliexpandlvl_change'] < 10: lactation['alveoliexpandlvl_change'] = 10
 		lactation['milkprod_type'] = 1
 	else
 		!!	If lactation is on, the stuff below will switch it off again.
 		lactation['active'] = 0
 		lactation['lactaterate'] = 0
 		lactation['breastmv'] = 0
-		lactation['breastmm'] = 0
 		lactation['alveoliexpandlvl'] = 0
 		lactation['alveoliexpandlvl_change'] = 1
 		lactation['prolactinlvl'] = 0
@@ -600,15 +622,14 @@ if $ARGS[0] = 'breastcycle':
 	!!	usage func('lact_lib','breastcycle')
 	!!	if lactating or not, breasts will grow during pregnancy. This will only happen during first full pregnancy
 	if pregchem => 2191 and lactation['maturebreast'] <= 0:
-		!!	Alveoligrowth/breastgrowth + 78876 new aveoli per breast average during pregnancy
-		!!	Checking pregchem last. It should not be small than 0.
+		!!	breastgrowth 40ccm per breast.
+		!!	Checking pregchem last. It should not be smaller than 0.
 		if lactation['pregchemlast'] <= 0:
 			lactation['pregchemlast'] = 2191
 			lactation['preggrowth'] = 0
 		end
-		if lactation['preggrowth'] <= 78876 and (pregchem - lactation['pregchemlast']) >= 0:
-			lactation['preggrowth'] = (pregchem - 2191) * 36
-			lactation['alveolicount'] = lactation['alveolicount_start'] + lactation['preggrowth']
+		if lactation['preggrowth'] <= 40000 and (pregchem - lactation['pregchemlast']) >= 0:
+			lactation['preggrowth'] = (pregchem - 2191) * 18
 			lactation['growthsoreness_on'] = 1
 			if pain['breasts'] <= 20: pain['breasts'] = 20
 		else
@@ -718,7 +739,8 @@ if $ARGS[0] = 'breastcycle':
 		lactation['result'] = func('lact_lib','breast_engorment')
 	end
 	if lactation['milkgrowday'] < daystart:
-		lactation['result'] = func('lact_lib','BreastGrowth')
+		lactation['result'] = func('lact_lib','checkExtBreastGrowth')
+		lactation['result'] = func('lact_lib','lactationBreastGrowth')
 		lactation['dailyoverdemand'] = 0
 		lactation['alveolicount_change'] = lactation['alveolicount']
 		lactation['milkgrowday'] = daystart

+ 22 - 22
locations/meadow.qsrc

@@ -281,7 +281,7 @@ if $ARGS[0] = '0':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr1.jpg"></center>'
 			'Mira, pulls up harshly on her panties so that they bite deeply between her labia. Mira looks around again, but you are concealed in the dense thicket thus she fails to spot you watching...'
-			gs 'arousal', 'voyeur', 2, 'lesbian'
+			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 			act 'Watch':
 				*clr & cla
@@ -293,13 +293,13 @@ if $ARGS[0] = '0':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr3.jpg"></center>'
 					'Next she pulls down her panties and you can see her wet pussy.'
-					gs 'arousal', 'voyeur', 1, 'lesbian'
+					gs 'arousal', 'voyeur', 1
 					gs 'stat'
 					act 'Watch':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr4.jpg"></center>'
 						'Then she removes her jacket, exposing her small tits.'
-						gs 'arousal', 'voyeur', 2, 'lesbian'
+						gs 'arousal', 'voyeur', 2
 						gs 'stat'
 						act 'Watch':
 							*clr & cla
@@ -336,13 +336,13 @@ if $ARGS[0] = '0':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr9.jpg"></center>'
 				'Having made her decision, she walk over to the log and starts to remove her panties.'
-				gs 'arousal', 'voyeur', 2, 'lesbian'
+				gs 'arousal', 'voyeur', 2
 				gs 'stat'
 				act 'Watch':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr10.jpg"></center>'
 					'Taking off her panties, she gently sits down on the log...'
-					gs 'arousal', 'voyeur', 1, 'lesbian'
+					gs 'arousal', 'voyeur', 1
 					gs 'stat'
 					act 'Watch':
 						*clr & cla
@@ -364,7 +364,7 @@ if $ARGS[0] = '0':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr13.jpg"></center>'
 			'She soon gets bored and she, as if on purpose, turns her ass towards you and pulls off her skirt.'
-			gs 'arousal', 'voyeur', 2, 'lesbian'
+			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 			act 'Watch':
 				*clr & cla
@@ -376,7 +376,7 @@ if $ARGS[0] = '0':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr15.jpg"></center>'
 					'Getting up from the stump, Mira takes off her top and is now only in her panties.'
-					gs 'arousal', 'voyeur', 1, 'lesbian'
+					gs 'arousal', 'voyeur', 1
 					gs 'stat'
 					act 'Watch':
 						*clr & cla
@@ -857,37 +857,37 @@ if $ARGS[0] = 'mirameadow':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr1.jpg"></center>'
 			'Mira, pulls up harshly on her panties so that they bite deeply between her labia. Mira looks around again, but you are concealed in the dense thicket thus she fails to spot you watching...'
-			gs 'arousal', 'voyeur', 2, 'lesbian'
+			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 			act 'Watch':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr2.jpg"></center>'
 				'She pauses for a few seconds before slowly sliding her hand inside her panties to rub her crotch.'
-				gs 'arousal', 'voyeur', 2, 'lesbian'
+				gs 'arousal', 'voyeur', 2
 				gs 'stat'
 				act 'Watch':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr3.jpg"></center>'
 					'Next she pulls down her panties and you can see her wet pussy.'
-					gs 'arousal', 'voyeur', 1, 'lesbian'
+					gs 'arousal', 'voyeur', 1
 					gs 'stat'
 					act 'Watch':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr4.jpg"></center>'
 						'Then she removes her jacket, exposing her small tits.'
-						gs 'arousal', 'voyeur', 2, 'lesbian'
+						gs 'arousal', 'voyeur', 2
 						gs 'stat'
 						act 'Watch':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr5.jpg"></center>'
 							'She begins to fondle her breasts while continuing to finger herself.'
-							gs 'arousal', 'voyeur', 2, 'lesbian'
+							gs 'arousal', 'voyeur', 2
 							gs 'stat'
 							act 'Watch':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr6.jpg"></center>'
 								'Finally she leans against the nearest tree as she brings herself to orgasm. You watch a couple minutes in hopes of a sequel, but Mira begins to get dressed, so, you decide to make a hasty retreat...'
-								gs 'arousal', 'voyeur', 10, 'lesbian'
+								gs 'arousal', 'voyeur', 10
 								gs 'arousal', 'end'
 								gs 'stat'
 								act 'Hide until she leaves': minut += 10 & gt 'meadow'
@@ -901,31 +901,31 @@ if $ARGS[0] = 'mirameadow':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr7.jpg"></center>'
 		'Mira is leaning against a tree and starts to caress herself.'
-		gs 'arousal', 'voyeur', 2, 'lesbian'
+		gs 'arousal', 'voyeur', 2
 		gs 'stat'
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr8.jpg"></center>'
 			'She plays with herself for a few minutes before she stopping to look at a nearby log...'
-			gs 'arousal', 'voyeur', 5, 'lesbian'
+			gs 'arousal', 'voyeur', 5
 			gs 'stat'
 			act 'Watch':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr9.jpg"></center>'
 				'Having made her decision, she walk over to the log and starts to remove her panties.'
-				gs 'arousal', 'voyeur', 2, 'lesbian'
+				gs 'arousal', 'voyeur', 2
 				gs 'stat'
 				act 'Watch':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr10.jpg"></center>'
 					'Taking off her panties, she gently sits down on the log...'
-					gs 'arousal', 'voyeur', 1, 'lesbian'
+					gs 'arousal', 'voyeur', 1
 					gs 'stat'
 					act 'Watch':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr11.jpg"></center>'
 						'Mira begins to caress herself again and brings herself to orgasm... You watch a couple minutes in hopes of a sequel, but Mira begins to get dressed, so, you decide to make a hasty retreat...'
-						gs 'arousal', 'voyeur', 10, 'lesbian'
+						gs 'arousal', 'voyeur', 10
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Hide until she leaves': minut += 10 & gt 'meadow'
@@ -942,25 +942,25 @@ if $ARGS[0] = 'mirameadow':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr13.jpg"></center>'
 			'She soon gets bored and she, as if on purpose, turns her ass towards you and pulls off her skirt.'
-			gs 'arousal', 'voyeur', 2, 'lesbian'
+			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 			act 'Watch':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr14.jpg"></center>'
 				'After doing this, she sits down on the stump and continues to caress herself.'
-				gs 'arousal', 'voyeur', 5, 'lesbian'
+				gs 'arousal', 'voyeur', 5
 				gs 'stat'
 				act 'Watch':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr15.jpg"></center>'
 					'Getting up from the stump, Mira takes off her top and is now only in her panties.'
-					gs 'arousal', 'voyeur', 1, 'lesbian'
+					gs 'arousal', 'voyeur', 1
 					gs 'stat'
 					act 'Watch':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr16.jpg"></center>'
 						'Finally she takes off her shirt, squats, and brings herself to orgasm. You watch a couple minutes in hopes of a sequel, but Mira begins to get dressed, so, you decide to make a hasty retreat...'
-						gs 'arousal', 'voyeur', 10, 'lesbian'
+						gs 'arousal', 'voyeur', 10
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Hide until she leaves': minut += 10 & gt 'meadow'

+ 4 - 2
locations/obj_din.qsrc

@@ -238,8 +238,10 @@ if $ARGS[0] = 'cur_home':
 	!'<center><img src="images/system/icon/description.png"><br></center>'
 	'<center><h1><<$pcs_firstname>>''s Home Location</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr><td>'
-	act 'Return to main description': gt 'obj_din', 'description'
 	*nl
+	'Your current home is <<$home_name>>.'
+	*nl
+	act 'Return to main description': gt 'obj_din', 'description'	
 !!This is correct it just looks wrong
 	if home_owned[1] > 0: 'Set current home as <a href="exec:gs ''set_home'', 1 & gs ''obj_din'', ''cur_home''">City residential apartment</a>'
 	if home_owned[2] = 1: 'Set current home as <a href="exec:gs ''set_home'', 2 & gs ''obj_din'', ''cur_home''">Parent''s home in Pavlovsk</a>'
@@ -1660,7 +1662,7 @@ if $ARGS[0] = 'pain':
 	end
 	if pain['asshole'] + (agape * 10) > 0:
 		if pain['asshole'] + (agape * 10) > 70:
-			'<b><font color="red">You an extremely sore anus and it is bleeding.</font></b>'
+			'<b><font color="red">You have an extremely sore anus and it is bleeding.</font></b>'
 		elseif pain['asshole'] + (agape * 10) > 40:
 			'<b><font color="red">You have a very sore anus.</font></b>'
 		else

+ 8 - 20
locations/pavComplex.qsrc

@@ -66,30 +66,18 @@ if $ARGS[0] = 'start':
 		act 'Join Rex in his car':gt'reks','avto2'
 	end
 
-	if home_owned[2] = 1:
-		'In the old part of Pavlovsk, this is the Five Eight Estate made up of numerous Soviet era apartment blocks. Your family''s apartment is on the second floor of the nearest building.'
-		*nl
-		'Opposite you is a meager courtyard, which has changed over the years to now include a kid''s playground, basketball court and small grass area mostly used to play football on.'
-		'A few benches and tables surround it, and there''s a handful of small utility sheds tucked away in the corner for tenants to use if they''re willing to pay for the extra space.'
-		*nl
-		'Behind the apartments is a row of <a href="exec:minut += 3 & gt ''pavComplex'', ''garages''">garages</a> and storage space for tenants.'
-	elseif StoryLine = 1:
-		'In the old part of Pavlovsk, this is the Five Eight Estate made up of numerous Soviet era apartment blocks. Your family''s apartment is on the second floor of the nearest building, but you are no longer welcome in their home.'
-		*nl
-		'Opposite you is a meager courtyard, which has changed over the years to now include a kid''s playground, basketball court and small grass area mostly used to play football on.'
-		'A few benches and tables surround it, and there''s a handful of small utility sheds tucked away in the corner for tenants to use if they''re willing to pay for the extra space.'
-		*nl
-		' Behind the apartments is a row of <a href="exec:minut += 3 & gt ''pavComplex'', ''garages''">garages</a> and storage space for tenants.'
+	if StoryLine = 1:
+		'In the old part of Pavlovsk, this is the Five Eight Estate made up of numerous Soviet era apartment blocks. Your family''s apartment is on the second floor of the nearest building'+iif(home_owned[2] = 1, '.', ', but you are no longer welcome in their home.')
 	else
 		'In the old part of Pavlovsk, this is the Five Eight Estate made up of numerous Soviet era apartment blocks.'
-		*nl
-		'Opposite you is a meager courtyard, which has changed over the years to now include a kid''s playground, basketball court and small grass area mostly used to play football on.'
-		'A few benches and tables surround it, and there''s a handful of small utility sheds tucked away in the corner for tenants to use if they''re willing to pay for the extra space.'
-		*nl
-		'Behind the apartments is a row of <a href="exec:minut += 3 & gt ''pavComplex'', ''garages''">garages</a> and storage space for tenants.'
 	end
+	*nl
+	'Opposite you is a meager courtyard, which has changed over the years to now include a kid''s playground, basketball court and small grass area mostly used to play football on.'
+	'A few benches and tables surround it, and there''s a handful of small utility sheds tucked away in the corner for tenants to use if they''re willing to pay for the extra space.'
+	*nl
+	'Behind the apartments is a row of <a href="exec:minut += 3 & gt ''pavComplex'', ''garages''">garages</a> and storage space for tenants.'
 
-	if pavComplex_met_dealer >= 3 and hour > 20: '<br>You cann see the <a href="exec:minut += 3 & gt ''pavaptcourtev'', ''dealer''">boy</a> who sells weed in the courtyard.'
+	if pavComplex_met_dealer >= 3 and hour > 20: '<br>You can see the <a href="exec:minut += 3 & gt ''pavaptcourtev'', ''dealer''">boy</a> who sells weed in the courtyard.'
 	
 	if Enable_tablemap = 0:
 		if storyline = 1:'<a href="exec:minut += 15 & gt ''shulgahome''">The Shulgin family</a> live in the apartment above your parents.'

+ 1 - 1
locations/saveupdater.qsrc

@@ -719,7 +719,7 @@ end
 if rex > 0 and rex > npc_rel['A57']: npc_rel['A57'] = rex & killvar 'rex'
 
 !!------------------------------village variable clean up/translation---------------------------------------
-if findvel > 0: BikeLoc = findvel & killvar findvel
+if findvel > 0: BikeLoc = findvel & killvar 'findvel'
 !!------------------------------grandparent variable clean up---for 0.8.0 release---------------------------
 !!---Grandpa
 If grandpa_bilberry > 0: grandpaQW['chore_berry_quantity'] = grandpa_bilberry & killvar 'grandpa_bilberry'

+ 129 - 91
locations/street_event.qsrc

@@ -233,61 +233,12 @@ if $ARGS[1] = 'main':
 		streetev_day = daystart
 		'<<$streetev_title>>'
 		'<center><img src="images/locations/shared/street/rapist.jpg"></center>'
-		'As you walk down the street, a man jumps out of the shadows and suddenly grabs you, as you''re caught off-guard he manages to drag you into a nearby alleyway. You try to scream but his strong hand covers your mouth. You attempt to get free but his other arm wraps around your waist and lifts you off the grounds, as he drags you further down the alleyway. Once in the alley he throws you violently to the ground, knocking the wind out of you, stunning you for a moment. "You better not scream bitch or I will make this a lot worse."'
+		'As you walk down the street, a man jumps out of the shadows and suddenly grabs you, as you''re caught off-guard he manages to drag you into a nearby alleyway. You try to scream but his strong hand covers your mouth. You attempt to get free but his other arm wraps around your waist and lifts you off the grounds, as he drags you further down the alleyway.'
 		gs 'npcgeneratec', 0, 'Rapist', rand(18,45)
 		gs 'boyStat', $npclastgenerated
 		gs 'stat'
-		act 'Submit to the rape':
-			gs 'dinsexFX'
-			*clr & cla
-			pose = 3
-			guy += 1
-			'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/dogging.jpg"></center>'
-			'<center><img src="images/locations/shared/street/alleynight.jpg"></center>'
-			if $clothingworntype ! 'nude':
-				'You meekly don''t move or cry out. In the faint light you can see him grin as you obey him. "That''s right be a good little bitch and I''ll take it easy on you." He says as he unbuttons his pants and pulls out his rock hard cock. Without another word he grabs you and drags you to your feet, he turns you around, so your face is against the wall and he starts pulling your clothes aside to give him access.'
-			else
-				'You meekly don''t move or cry out. In the faint light you can see him grin as you obey him. "Yeah I knew you wanted this, walking around naked, you were hoping some man would take you. Well you''re going to get your wish bitch." He says as he unbuttons his pants and pulls out his rock hard dick. Without another word he grabs you and drags you to your feet, he turns you around, so your face is against the wall.'
-			end
-
-			act 'Stay silent':
-				cla
-				*nl
-				dynamic $vagstart2
-
-				'"Get ready, bitch." He says pushing you onto your knees. He moves behind you and takes you doggy-style. You can feel his hard cock entering your vagina.'
-
-				gs 'arousal', 'vaginal', 10, 'sub'
-				gs 'cum_call','',$boy,1
-
-				gs 'arousal', 'end'
-				gs 'stat'
-				act 'Leave':gt $loc
-			end
-
-			act 'Please don''t get me pregnant':
-				cla
-				*nl
-				if prezik > 0:
-					protect = 2
-					dynamic $prezik
-					'You give him a condom. "At least wear protection asshole. I don''t want a bastards child.", you tell him. He nods in silence, then puts it on.'
-				else
-					'You don''t have a condom and he just laughs at you'
-				end
-				dynamic $vagstart2
-
-				'"Get ready, bitch." He says pushing you onto your knees. He moves behind you and takes you doggy-style. You can feel his hard cock entering your vagina.'
-
-				gs 'arousal', 'vaginal', 10, 'sub'
-				gs 'cum_call','',$boy,1
-
-				gs 'arousal', 'end'
-				gs 'stat'
-				act 'Leave':gt $loc
-			end
-		end
 		act 'Attempt to escape':
+!!should likely add willpower here to increase the odds of escaping but I never did understand how to add willpower to increase a skill check, but it would make sense here.
 			if pcs_run < 10:
 				peshimraperand = rand(0, 11)
 			elseif pcs_run < 30:
@@ -311,18 +262,11 @@ if $ARGS[1] = 'main':
 			end
 
 			if peshimraperand <= 10:
-				cla
-				'You try to run away, but you''re not quick enough and he catches you. He drags you back into an alley.'
-				dynamic $vagstart2
-
-				'"Get ready, bitch." He says pushing you onto your knees. He moves behind you and takes you doggy-style. You can feel his hard cock entering your vagina.'
-
-				gs 'arousal', 'vaginal', 10, 'sub'
-				gs 'cum_call','',$boy,1
-
-				gs 'arousal', 'end'
-				gs 'stat'
-				act 'Leave':gt $loc
+				*clr & cla
+				'<center><img src="images/locations/shared/street/rapist.jpg"></center>'
+				'You try to run away, but you''re not quick enough and he catches you, before you even get close to the end of the alleyway. He places a hand over your mouth so you can''t scream and drags you back into an alley.'
+				act 'Submit to the rape': gt 'street_event', 'rape'
+				act 'Fight': gt 'street_event', 'fight_rape'
 			else
 				*clr & cla
 				'<center><img src="images/locations/shared/street/alleynight.jpg"></center>'
@@ -330,17 +274,6 @@ if $ARGS[1] = 'main':
 				act 'Continue':gt $loc
 			end
 		end
-
-		act 'Fight':
-			cla
-
-			gs 'fight','initFight'
-
-			gs 'fight_npcdata', 'rapist'
-
-			gt 'fight', 'start'
-		end
-
 		if succubusQW = 5:
 			!!Used if this was a random encounter instead of active hunting
 			act 'Lure him in and feed (this can take a lot of time)':
@@ -349,6 +282,8 @@ if $ARGS[1] = 'main':
 				act 'Continue': gt 'succubus', 'RapistFight'
 			end
 		end
+		act 'Submit to the rape': gt 'street_event', 'rape'
+		act 'Fight': gt 'street_event', 'fight_rape'
 		exit
 	end
 
@@ -1637,17 +1572,15 @@ if $ARGS[0] = 'divorce_party':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/divorcee/limo.jpg"></center>'
-	*nl
 	'You''re walking down the street when a car speeds past you. It''s nothing to be particularly interested in until it suddenly comes to a squealing stop ahead. You slow your pace and watch it idle for a few moments, only just now noticing the muffled music coming from inside it as you near it. The window rolls down and the sound of an obnoxious pop song spills out, followed by a woman. Her whole top half is leaning out the car window which almost leads to her falling out, but a pair of hands from inside the car steady her. "Ah fucking shit tits...<i>fuck</i>," she curses as she spills the drink in her hand onto the sidewalk. "Hey...hey you! Come here for a s-sec," she calls to you with a beckoning wave of her free hand.'
-
 	act '"Uhm..."':
 		*clr & cla
 		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/divorcee/limo.jpg"></center>'
+		'Understandably you hesitate but she picks up on that and shakes her head wildly, "Don''t worry, I''m not gonna, like, shnatch you up or a-anything, I just gotta queshtion!" If it wasn''t obvious before, it''s clear now that the woman is drunk. But that doesn''t mean she''s a bad person, and judging from the limo chauffeuring her and her friends around, you could think of worse people to kidnap you. You walk over to her and she welcomes you with an excited giggle. "I''m Marta," she introduces herself. "And you see my friend here?" She moves to give you a peek into the limo filled with two other women and points out the one in red before continuing.'
 		*nl
-		'Understandably you hesitate but she picks up on that and shakes her head wildly, "Don''t worry, I''m not gonna, like, shnatch you up or a-anything, I just gotta queshtion!" If it wasn''t obvious before, it''s clear now that the woman is drunk. But that doesn''t mean she''s a bad person, and judging from the limo chauffeuring her and her friends around, you could think of worse people to kidnap you. You walk over to her and she welcomes you with an excited giggle. "I''m Marta," she introduces herself. "And you see my friend here?" She moves to give you a peek into the limo filled with two other women and points out the one in red before continuing. "That''s Eva and her lying, whore of a husband had been cheating on her with some...some cheap, loose pussy, dog faced CUNT!" she shouts angrily before taking a deep breath. "So she divorced his sorry ass and now she''s a free who deserves ONLY the best things in life! And you know what one of those things is?" she asks and you awkwardly shake your head.'
-		*nl
+		'"That''s Eva and her lying, whore of a husband had been cheating on her with some...some cheap, loose pussy, dog faced CUNT!" she shouts angrily before taking a deep breath. "So she divorced his sorry ass and now she''s a free who deserves ONLY the best things in life! And you know what one of those things is?" she asks and you awkwardly shake your head.'
 		'"It''s to make out with a pretty little thing like you," Marta grins and gives you (a very poor attempt at) a wink. "So? What do you say? Wanna give her a little kiss?"'
 		gs 'willpower', 'kiss', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
@@ -1661,18 +1594,17 @@ if $ARGS[0] = 'divorce_party':
 		else
 			act 'Keep walking (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end	
-
 		act 'Agree':
 			*clr & cla
 			divorce_party = 2
 			gs 'arousal', 'kiss', 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/divorcee/makeout.jpg"></center>'
-			*nl
 			'You look behind her and see Eva blushing, trying to hide behind the rim of her cup as she takes a drink. She''s actually really pretty and younger than you thought. You''re not sure why her husband would cheat on her, but you''re not going to pass up the opportunity to have some fun with her. "You''re right, she does deserve the <i>best</i> and I can give her just that," you purr with a knowing smile.'
 			*nl
 			'In an instant, the other women are cheering and giggling as they lead Eva to the window. She tries to reluctantly argue against this, but she makes no real effort to stop them. "Uhm...hi?" she says sheepishly, her eyes avoiding yours as she bites her lip nervously. "My name is Eva..."'
 			'"Oh, I know..." Your hand cups her cheek gently and you guide her head back, her gaze now meeting yours. "I''m <<$pcs_nickname>>," you say before leaning in to kiss her. As soon as your lips meet, any resistance she had before melts away. Her lips part and your tongues intertwine. You can taste the sweet alcohol she had been drinking as she eagerly presses against you with a soft moan. When you finally pull away, Eva is breathless with a dazed yet satisfied look.'
+			*nl
 			'"Holy shit that was <i>amazing</i>!" Marta laughs as Eva collapses back into the car seat. Marta is back at the window with a wide grin, "Look, I even caught it on camera!" She holds up her phone and you see a shaky but still rather clear video of the two of you making out. "Hey, you know what, why don''t you come out with us? I know Eva would love to have you come!" Marta winks again, obviously hinting at the double meaning there.'
 			gs 'willpower', 'drink', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
@@ -1686,7 +1618,6 @@ if $ARGS[0] = 'divorce_party':
 			else
 				act 'Refuse and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end	
-
 			act 'Join them':
 				*clr & cla
 				gs 'drugs', 'alcohol', 'vodka'
@@ -1694,27 +1625,24 @@ if $ARGS[0] = 'divorce_party':
 				minut += 15
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/shared/divorcee/drinks.jpg"></center>'
+				'As soon as you enter the limo, Marta is shoving a red cup filled with a strong, yet sweet mixed drink into your hands. "C''mon, have a drink!" You have a feeling she won''t take no for an answer, so you start drinking with everyone else. You spend your time getting to know everyone, learning that the other woman is called Alla. Marta often leads the conversation so you just sit back and enjoy her antics, and while you do, you sometimes catch Eva eying you hungrily. It isn''t long before you arrive at the club.'
 				*nl
-				'As soon as you enter the limo, Marta is shoving a red cup filled with a strong, yet sweet mixed drink into your hands. "C''mon, have a drink!" You have a feeling she won''t take no for an answer, so you start drinking with everyone else. You spend your time getting to know everyone, learning that the other woman is called Alla. Marta often leads the conversation so you just sit back and enjoy her antics, and while you do, you sometimes catch Eva eying you hungrily. It isn''t long before you arrive at the club. You don''t recognize the area and you start to wonder where you are exactly, but you''re given no time to dwell on it as you''re ushered past the long line of people waiting and led through the club to a private room upstairs.'
-				*nl
+				'You don''t recognize the area and you start to wonder where you are exactly, but you''re given no time to dwell on it as you''re ushered past the long line of people waiting and led through the club to a private room upstairs.'
 				'Just outside the door, Marta stops everyone. "And now, what you''ve all been waiting for..."'
 				'"You''re the only one that knows what''s going on, you didn''t tell us anything!" Alla points out.'
 				'"Okay, what <i>I''ve</i> been waiting for," Marta teases before slowly opening the door.'
-
 				act 'Go inside':
 					*clr & cla
 					minut += 5
 					pcs_horny += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/shared/divorcee/d3.jpg"></center>'
-					*nl
 					'"Oh my God, Marta!" Eva exclaims as her and Alla squeal with delight at the sight of a tall, dark and handsome man standing in the middle of the room, proudly displaying his bulging erection as it presses against his briefs. "A male stripper? Really?!"'
 					'"That''s right! This is Yefim and he''s gonna make sure you forget you were ever married," Marta tells Eva before sitting her down in front of the man who begins to straddle her. The three of you surround the two of them, clapping and cheering as he dances and grinds against Eva, his erection just a few inches from her face. While Eva is being coy about it, you can''t help but think about just what he''s packing in those briefs.'
 					*nl
 					'"Look at him, he''s hard just for you!"'
 					'"Why not give him a <i>hand</i>, Eva!"'
 					'"Don''t just leave him like that!"'
-					*nl
 					'You end up so distracted by your thoughts that you almost don''t feel Marta nudging you. "We gotta get her in the mood, <<$pcs_nickname>>."'
 						act 'Help Eva relax':
 						*clr & cla
@@ -1722,19 +1650,16 @@ if $ARGS[0] = 'divorce_party':
 						pcs_horny += 10
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/shared/divorcee/d4.jpg"></center>'
-						*nl
 						'You place your hands on Eva''s shoulders, "Don''t worry, just relax..." you whisper against her ear as your hands slide down to her chest. You massage her tits gently through her top, smiling when you hear her let out a breathy moan. Feeling her nipples start to poke through the thin fabric, you lightly trace your finger around each one until they''re stiff and hard. "See, isn''t this fun?" Slowly, you pull open Eva''s dress to expose her bare chest. A quick hard pinch to her nipples causes her to whimper and squirm as you continue to play with her tits.'
 						*nl
 						'Marta and Alla are quick to catch on. Following your lead, they start to pull and tug not just on her clothes, but also on Yefim''s red briefs until his cock is freed and twitching eagerly in Eva''s face.'
 						*nl
 						'"Don''t you want to have a little taste?" Yefim asks while stroking his dick teasingly. Eva doesn''t need any more convincing. She leans forward and runs her tongue along the underside of his shaft before her lips wrap around the tip. Bobbing her head, she swallows every inch of this stranger''s cock with ease as you and the others watch. "Hey babe, don''t get too carried away, we just started," Marta giggles as she gently pushes Yefim away from her friend, his cock coming free from Eva''s mouth with a wet pop. Marta leads him to the couch where she has him lay down before kneeling beside him and calling Eva over.'
-
 						act 'Watch':
 							*clr & cla
 							gs 'arousal', 'masturbate', 10
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/shared/divorcee/d5.jpg"></center>'
-							*nl
 							'The two of them wrap their lips around each side of Yefim''s throbbing cock, sliding up and down, nibbling and sucking on every veiny inch. You feel the heat between your legs growing as you watch one focus on the reddened tip while the other kisses a trail down to his balls. He throws his head back and lets out a grunt, one of his hands gripping the back of Eva''s head as she laps up the leaking precum.'
 							*nl
 							'Overwhelmed by your lust, you rub your legs together, itching to touch yourself. You look around the room and are relieved to see Alla had the same idea as you as she''s sitting down with her legs spread, playing with herself while watching her friends. Without hesitation, you slide your own hand between your legs and shiver as your fingers glide along your slick folds, spreading them to find your clit. You follow the same pace as Eva and Marta, when they slowly kiss along his length, flicking the tips of their tongue along his glans, you take your time with long, hard against your clit. As soon as you see he''s had enough of their teasing and forces Marta to deep throat him fast and hard, fucking her mouth while Eva watches, you begin fingering yourself frantically. You''re edging closer and closer but you get an amazing idea when you see him throw his head back and groan loudly.'
@@ -1742,7 +1667,6 @@ if $ARGS[0] = 'divorce_party':
 								*clr & cla
 								minut += 15
 								'<center><img <<$set_imgh>> src="images/locations/shared/divorcee/d6.jpg"></center>'
-								*nl
 								'"Want to put that mouth to better use?" You tease with a smile as you present your dripping wet pussy to Yefim. Licking his lips, he pulls you over and helps you straddle his face. He grips your thighs and holds you in place as his tongue delves between your swollen pussy lips. You tremble and gasp, his tongue expertly flicking and massaging your clit when he isn''t playing with your labia. You grind your hips down as the pleasure builds, crying out as you cum on his tongue. Your pussy clenches and your body tenses as you ride out the bliss.'
 								*nl
 								'"Alright, that''s enough," You hear Marta say. She watches you slide off his face with a smirk, taking a moment to admire how wet his lips are with your juices before turning her attention to Eva. "I don''t think he can hold out much longer, so why don''t we end this with a <i>bang</i>!" You don''t know when Alla finished, but she''s here pulling Eva aside to undress her. When they''re done, Yefim switches spots with Eva, with her now on her back. "Now keep those legs spread, babe," Marta says as Yefim positions himself between her legs.'
@@ -1754,10 +1678,10 @@ if $ARGS[0] = 'divorce_party':
 									minut += 15
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/shared/divorcee/d7.jpg"></center>'
-									*nl
 									'"Fuck, you''re tight..." Yefim growls as he slides the first few inches of his cock inside her.'
 									'Eva inhales sharply as he slowly fills her. "Oh <i>fuck</i>!" she pants heavily as he sets a rhythm of steady, shallow thrusts.'
 									'Marta can''t keep from smiling as she watches her dear friend enjoying herself. "I know, it''s been awhile since you''ve been properly fucked..." she coos. "But like I said earlier...he''s going to fuck you until you can''t remember that bastard''s name."'
+									*nl
 									'Hearing this, Yefim pulls Eva''s hips down hard to slam into his, burying balls deep inside her in one stroke. She lets out a strangled moan as he pulls out to slam back into her again and again. Eva can barely manage a word out as she gasps and moans beneath him. You and the girls watch excitedly as he continues to pound into her with renewed vigor, having angled his hips to hit her sweet spot until her walls clench around him and she cums hard with a strained cry. Yefim thrusts a few more times before pulling out and shooting his load all over her flushed and sweaty body.'
 									*nl
 									'"Wow, you even managed to reach her tits," Marta amazes while pointing out the cum splattered across Eva''s chest. Yefim just chuckles and collapses back against the couch in exhaustion much like how Eva lay breathless and limp next to him, basking in the aftermath. "Well I think we need something to remember this night forever," Marta suggests before pulling out her phone. Carefully, you all help Eva to sit up and gather around her. "Say ''Jizz''!"'
@@ -1780,5 +1704,119 @@ if $ARGS[0] = 'divorce_party':
 	end
 end
 
+if $ARGS[0] = 'fight_rape':
+	*clr & cla
+	menu_off = 1
+	guy += 1
+	gs 'stat'
+	gs 'fight','initFight'
+
+	gs 'fight_npcdata', 'rapist'
+
+	gt 'fight', 'start'
+end
+		
+if $ARGS[0] = 'rape':
+	*clr & cla
+	menu_off = 1
+	guy += 1
+	gs 'stat'
+	'<center><img src="images/locations/shared/street/sex/rape1.jpg"></center>'
+	if $clothingworntype ! 'nude':
+		'Once he drags your far enough down into the alley he throws you violently against the wall, knocking the wind out of you, stunning you for a moment. He grabs you by the hair and pushes your face against the stone wall pinning it in place. He leans in and you can feel his hot breath on your cheek as he whispers to you. "You better not scream bitch or I will make this a lot worse."'
+	else
+		'You meekly don''t move or cry out. In the faint light you can see him grin as you obey him. "Yeah I knew you wanted this, walking around naked, you were hoping some man would take you. Well you''re going to get your wish bitch." He says as he unbuttons his pants and pulls out his rock hard dick. Without another word he grabs you and drags you to your feet, he turns you around, so your face is against the wall.'
+	end
+	act 'Stay silent':
+		*clr & cla
+		gs 'stat'
+		'<center><img src="images/locations/shared/street/sex/rape2.jpg"></center>'
+		'You meekly don''t move or cry out. In the faint light you can see him grin as you obey him. "That''s right be a good little bitch and I''ll take it easy on you. As long as you do what I say." He says as pulls your clothes away until your butt and pussy is exposed. Then he unbuttons his pants and pulls out his rock hard cock. Without another word he shoves his dick painfully into your pussy, not caring that you are not remotely wet.'
+		gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'rape'
+		gs 'stat'
+		act 'Submit':
+			*clr & cla
+			gs 'stat'
+			'<center><img src="images/locations/shared/street/sex/rape4.jpg"></center>'
+			'He pins you between himself and the wall, with you facing the wall. He roughly fucks your twat, grunting with each one of his balls deep thrust into you. "Yeah you like this don''t you slut, all you sluts love getting fucked." You do your best to endure the pain as he roughly fucks your pussy.'
+			gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'rape'
+			gs 'stat'
+			act 'Do nothing':
+				*clr & cla
+				gs 'stat'
+				'<center><img src="images/locations/shared/street/sex/rape5.jpg"></center>'
+				'As he roughly fucks your twat, grunting with each one of his balls deep thrust into you, he says. "Don''t worry slut, I don''t any bastards either, lucky for us both you have another hole." Just as he says that he pulls out of your pussy and then shoves it up your asshole, causing you to hiss in pain again.'
+				gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'rape'
+				gs 'stat'
+				act 'To much pain':
+					*clr & cla
+					gs 'stat'
+					'<center><img src="images/locations/shared/street/sex/rape6.jpg"></center>'
+					'He forces his prick balls deep into your ass and starts hammering away, just as roughly as he was fucking your pussy. He starts grunting a bit louder and faster, at least it sounds like he is nearly finished and this nightmare can finally be over. You think to yourself as tears stream down your face, from the pain and violation happening to you.'
+					gs 'arousal', 'anal', 5, 'sub', 'rough', 'rape'
+					gs 'stat'
+					act 'To much pain':
+						*clr & cla
+						minut +=3
+						gs 'stat'
+						'<center><img src="images/locations/shared/street/sex/rape7.jpg"></center>'
+						'He thrusts once, twice more balls deep into your butt before he groans loudly. You can feel his cum squirting inside of your ass, finally he finishes and pulls away. He presses your face against the wall with one hand. "Don''t move bitch!" With the other hand he puts his dick away, once he is fully dressed he lets go of you and jogs out of the alleyway, leaving you standing there half dressed and cum leaking out of your ass, with tears streaming down your face.'
+						gs 'arousal', 'anal', 2, 'sub', 'rough', 'rape'
+						gs 'cum_call','anus',$boy,1
+						gs 'arousal', 'end'
+						gs 'stat'
+						act 'Leave':gt $loc
+					end
+				end
+			end
+		end
+	end
+	act 'Please don''t get me pregnant':
+		*clr & cla
+		gs 'stat'
+		'<center><img src="images/locations/shared/street/sex/rape3.jpg"></center>'
+		'You can''t help it, you don''t want to get pregnant or some disease from her. "Please don''t get my pregnant, at least use a condom." You beg him.'
+		'He laughs. "Oh is that all your worried about? Don''t worry I won''t get you pregnant." He says as pulls your clothes away until your butt is exposed. Then he unbuttons his pants and pulls out his rock hard cock. With one hand on your neck he holds your head in place against the wall. Suddenly he pulls you away from the wall and shoves you face first down onto the dirty alleyway ground.'
+		gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'rape'
+		gs 'stat'
+		act 'Flung to the ground':
+			*clr & cla
+			gs 'stat'
+			'<center><img src="images/locations/shared/street/sex/rape8.jpg"></center>'
+			'He pins you between himself and the wall the ground. You hear him spit and then his other fingers slightly wet from his spit work there way into your ass, just getting it a little wet. Without another word he shoves his dick painfully into your asshole, you hiss in pain, as his cock rips it''s way into your mostly unlubricated ass. He roughly fucks your asshole, grunting with each one of his balls deep thrust into you. "Yeah you like this don''t you slut, all you sluts love getting fucked." You do your best to endure the pain as he roughly fucks your butt.'
+			gs 'arousal', 'anal', 5, 'sub', 'rough', 'rape'
+			gs 'stat'
+			act 'Submit':
+				*clr & cla
+				gs 'stat'
+				'<center><img src="images/locations/shared/street/sex/rape9.jpg"></center>'
+				'As he roughly fucks your asshole, grunting with each one of his balls deep thrust into you, he says. "yeah you was right slut, this is better than that nasty pussy of yours." He keeps hammers himself into your ass.'
+				gs 'arousal', 'anal', 5, 'sub', 'rough', 'rape'
+				gs 'stat'
+				act 'Do nothing':
+					*clr & cla
+					gs 'stat'
+					'<center><img src="images/locations/shared/street/sex/rape10.jpg"></center>'
+					'He starts grunting a bit louder and faster, at least it sounds like he is nearly finished and this nightmare can finally be over. You think to yourself as tears stream down your face, from the pain and violation happening to you.'
+					gs 'arousal', 'anal', 5, 'sub', 'rough', 'rape'
+					gs 'stat'
+					act 'To much pain':
+						*clr & cla
+						minut +=3
+						gs 'stat'
+						'<center><img src="images/locations/shared/street/sex/rape11.jpg"></center>'
+						'He thrusts once, twice more balls deep into your butt before he groans loudly. You can feel his cum squirting inside of your ass, finally he finishes and pulls away. He presses your face against the ground with one hand. "Don''t move bitch!" With the other hand he puts his dick away, once he is fully dressed he lets go of you, getting up off of you, next you can hear him jogging away. You turn and look up just in time to see him jog out of the alleyway. You slowly stand up, still half dressed, with cum leaking out of your ass, with tears streaming down your face.'
+						gs 'arousal', 'anal', 2, 'sub', 'rough', 'rape'
+						gs 'cum_call','anus',$boy,1
+						gs 'arousal', 'end'
+						gs 'stat'
+						act 'Leave':gt $loc
+					end
+				end
+			end
+		end
+	end
+end
+
 --- street_event ---------------------------------
 

+ 2 - 2
locations/swamp.qsrc

@@ -33,11 +33,11 @@ if $ARGS[0] = 'start':
 	'You are at the swamp on the far side of the woods from the village.'
 	'It can be dangerous to hike in this area, unless physically fit or have a good knowledge of the forest.'
 
-	act 'Head back out of the swamp': minut += 15 & gt 'gadforest', 'forest_center'
+	act 'Head back to the forest (0:15)': minut += 15 & gt 'gadforest', 'forest_center'
 
 	if hunterscabin = 1:
 		'You can see the small path to the clearing that contains the hunters cabin.'
-		act 'Go to the hunters cabin':
+		act 'Go to the hunters cabin (0:15)':
 			! daytime chance to get stuck in swamp - use bike to get there 100% of the time
 			if hour >= 6 and hour <= 22:
 				swamp_stuck = 0

+ 1 - 1
locations/swamp_yard.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	menu_off = 0
 	$location_type = 'secluded'
-
+	hunterscabin = 1
 	gs 'gadukino_event', 'sound'
 	gs 'hunter_ambient', 'schedule'
 	gs 'stat'

+ 1 - 1
locations/traits.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'menu':
 	
 	if traits['nerd_status'] = 0:
 		'<center><b>Likes learning</b></center>'
-		'You don''t have this trait and <<traits[''nerd_points'']>> points. You need to earn '+iif(traits['nerd_points'] > 0, '<<40 - traits[''nerd_points'']>>', '<<40 + traits[''nerd_points'']>>')+' more points to get level 1 of this trait.'
+		'You don''t have this trait and <<traits[''nerd_points'']>> points. You need to earn <<40 - traits[''nerd_points'']>> more points to get level 1 of this trait.'
 	elseif traits['nerd_status'] = 1:
 		'<center><b>Likes learning</b></center>'
 		'You have level 1 of this trait and <<traits[''nerd_points'']>> points. You need to earn <<60 - traits[''nerd_points'']>> more points to get level 2 of this trait. If you fall below 20 points, you''ll lose this trait.'