21 Commits 86c26462ef ... 400b8123d9

Author SHA1 Message Date
  KevinSmarts 400b8123d9 [text edits] From ParusMajors 4 years ago
  KevinSmarts 7147e57d28 [fixed] Spell and shave icon updated to the pubic shaving figures as per the bathroom file 4 years ago
  KevinSmarts e06449baf0 Merge remote-tracking branch 'sovietmercader/master' 4 years ago
  KevinSmarts a695aa5843 Merge remote-tracking branch 'hornguy6/master' 4 years ago
  KevinSmarts 578c68b57e [fixed] Syntax error 4 years ago
  sovietmercader 910600cac5 [text edit] typo in mitka 4 years ago
  sovietmercader 1112c1eb89 [fixed] quest stages in gadprostitutes 4 years ago
  sovietmercader d7d6cbffe3 [changed] rand bushcraft exp for doing things in forest now starts at 1 instead of 0 4 years ago
  sovietmercader 1f7b27515f [fixed] move feed chickens action below leave 4 years ago
  sovietmercader cd39379e30 [fixed] quest stage number in mitka 4 years ago
  sovietmercader 77386c5b1f [fixed] move bicycle actions below normal leave actions in gadsarai and swamp yard 4 years ago
  hornguy6 b776cb7d02 [fixed] incorrect code for a one-time payment 4 years ago
  hornguy6 6d388dfb00 [changed] block when trying to enter parents room late at night instead of taking away the option 4 years ago
  KevinSmarts 3d33347ac4 [fixed] Pubic hair growth more consistant, shaving and depilation values altered to fit new scale 4 years ago
  KevinSmarts 724ac1d302 [fixed] Lacking description so no one could tell what the treatment was 4 years ago
  sovietmercader 24df4da5c5 [text edit] wrong number in gadprostitutes 4 years ago
  sovietmercader 9270ddeb91 [fixed] drinking with the village boys now 15 min instead of 30 min 4 years ago
  sovietmercader ae818f47d2 [fixed] missing clr cla in gadforest_event 4 years ago
  sovietmercader b7a1ce53d9 [fixed] move mira morning walk into an event so it cant be missed 4 years ago
  KevinSmarts 7c8b7e02d0 [fixed] bad image replaced with selection of 5 better images 4 years ago
  KevinSmarts c8fb0f0f22 [fixed] wrong location variable used 4 years ago

+ 6 - 1
locations/cikl.qsrc

@@ -598,7 +598,12 @@ if ArrSize('$MenCal') = 60: killvar '$MenCal',0
 
 if lashair ! 1:
 	pcs_leghair += 1
-	pcs_pubes += rand(0,1)
+	!!Pubic hair growth at 1/2 per night
+	if pcs_pubes['growth'] > 1:
+		pcs_pubes['growth'] = 0
+		pcs_pubes += 1
+	end
+	pcs_pubes['growth'] += 1
 end
 
 if age < 18 and rand (0,2) = 0 and pcs_leghair > 0: pcs_leghair -= 1

+ 1 - 1
locations/din_van.qsrc

@@ -266,7 +266,7 @@ $brit = {
 				minut += 15
 				pcs_leghair = 0
 				if pubestyle = 1:
-					pcs_pubes = 0
+					pcs_pubes = 1
 				elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
 					pcs_pubes = 16
 				elseif pubestyle = 10 and pcs_pubes > 29:

+ 1 - 1
locations/foto_shoot.qsrc

@@ -694,7 +694,7 @@ if $ARGS[0] = 'nude':
 	minut += 120
 	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
-	if modelfoto_nude = 0: modelpayfin * 2 & foto_persuade = 0
+	if modelfoto_nude = 0: modelpayfin = modelpayfin * 2 & foto_persuade = 0
 	modelfoto_nude += 1
 	modelfoto_fullnude += 1
 	modelfoto_nip += 1

+ 1 - 1
locations/gaddvor.qsrc

@@ -212,6 +212,7 @@ if $ARGS[0] = 'chickens':
 	minut += 1
 	gs 'stat'
 
+	act 'Leave': gt'gaddvor'
 	!job Granny
 	if grandmaQW['chore_feed_chickens'] = 1:
 		act 'Feed the chickens':
@@ -227,7 +228,6 @@ if $ARGS[0] = 'chickens':
 			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
 		end
 	end
-	act 'Leave': gt'gaddvor'
 end
 
 --- gaddvor ---------------------------------

+ 2 - 14
locations/gadforest.qsrc

@@ -107,19 +107,7 @@ if $ARGS[0] = 'forest_edge':
 	else
 		if metmira = 1 and MiraLoc ! 3 and hour >= 8 and hour <= 10:
 			mirarand = rand(1,10)
-			if mirarand >= 6:
-				*clr & cla
-
-				gs 'Miroslava','miraclothes'
-				*nl
-				'As you walk through the forest, you hear a familiar voice call out to you, "Hey <<$pcs_nickname>>, wait up!" You turn around and see Mira excitedly bounding up behind you.'
-				'"Want to join me on my walk?" she asks. "I love walking through the forest in the morning."'
-
-				act 'Say hi':
-					MiraLoc = 3
-					gt 'gadforest', 'forest_edge'
-				end
-			end
+			if mirarand >= 6: MiraLoc = 3 & gt 'gadforest_event', 'mira_morning_walk'
 		end
 		if foresteventrand <= 2 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 1 & gt 'gadforest_event', 'mushroom_pickers1'
 		if foresteventrand <= 4 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers2'
@@ -563,7 +551,7 @@ if $ARGS[0] = 'bushcraft':
 
 		! bushcraft exp gained is random to keep it from increasing too fast
 		if rand(0,1) = 0:
-			bushcraft_exp += rand(0,bushcraft_rand)
+			bushcraft_exp += rand(1,bushcraft_rand)
 		end
 	else
 		! use the lower chance of ripping clothes when Sveta has higher bushcraft

+ 12 - 0
locations/gadforest_event.qsrc

@@ -169,6 +169,17 @@ if $ARGS[0] = 'mira_nude_event':
 	end
 end
 
+if $ARGS[0] = 'mira_morning_walk':
+	*clr & cla
+
+	gs 'Miroslava','miraclothes'
+	*nl
+	'As you walk through the forest, you hear a familiar voice call out to you, "Hey <<$pcs_nickname>>, wait up!" You turn around and see Mira excitedly bounding up behind you.'
+	'"Want to join me on my walk?" she asks. "I love walking through the forest in the morning."'
+
+	act 'Say Hello': gt 'gadforest', 'forest_edge'
+end
+
 if $ARGS[0] = 'mushroom_pickers1':
 	*clr & cla
 	menu_off = 1
@@ -232,6 +243,7 @@ if $ARGS[0] = 'mushroom_pickers3':
 	else
 		act 'Leave them be':gt 'gadforest','forest_outskirts'
 		act 'Say Hello':
+			*clr & cla
 			minut += 5
 			if pickersQW <= 3:pickersQW += 1
 			gs 'stat'

+ 4 - 4
locations/gadprostitutes.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'start':
 	!end
 	if hour >= 16 and hour <= 23:
 		! event to remove Sveta from being miras pimp if she becomes the boys slut, the village whore
-		if MiraLoc = 8 and mirapimp = 1 and (npc_QW['A63'] >= 10 or gadriver_gang = 2):
+		if MiraLoc = 8 and mirapimp = 1 and (npc_QW['A63'] >= 11 or gadriver_gang = 2):
 			*clr & cla
 
 			mirapimp = 2
@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 			'As soon as you are face to face with Mira she winds up and smacks you across the face as hard as she can. You are stunned a bit by and stagger to the ground. You feel warm tears begin to run down your face.'
 			'Mira commands you, "Stand up bitch!"'
 			'You rise and meet her gaze, she looks very pleased with herself. "Remember that. Now you know exactly how that feels" she says.'
-			if npc_QW['A63'] >= 10:
+			if npc_QW['A63'] >= 11:
 				'Mira continues, "Look at you, just another slut. Mitka, Kolyamba, and Vasyan told me now much they all love fucking and sharing you now. You thought you were so much better than me, well no more! I''m not working for you anymore. You have proven yourself perfectly capable of enjoying getting shared by a group of friends."'
 			elseif gadriver_gang = 2:
 				'Mira continues, "Look at you, just another whore. All the village men can talk about is how much you moaned for each and every one of them. You thought you were so much better than me, well no more! I''m not working for you anymore. You have proven yourself perfectly capable of enjoying getting gangbanged by multiple groups of strangers."'
@@ -60,7 +60,7 @@ if $ARGS[0] = 'start':
 			if MiraLoc = 8:
 				'You see Mira standing below a streetlight a little ways down the road.'
 				! event to become miras pimp if not the boys slut, not the village whore
-				if mirapimp = 0 and npc_QW['A63'] < 10 and gadriver_gang = 0:
+				if mirapimp = 0 and npc_QW['A63'] < 11 and gadriver_gang = 0:
 					gs 'willpower', 'misc', 'force', 'hard'
 					if will_cost <= pcs_willpwr:
 						act 'Make Mira your prostitute (<<will_cost>> Willpower)':
@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 							gs 'miroslava', 'miraclothes'
 
 							'You call her over to you. Mira, hurries over and looks at you with downcast eyes.  "Hi, <<$pcs_nickname>>.  You having a good night?"'
-							'You look at her angrily. "A better question, my lovely whore, is ''Are you having a good night''?  I want 500 <b>₽</b> per customer you have each night."  You tell her earnestly.'
+							'You look at her angrily. "A better question, my lovely whore, is ''Are you having a good night''?  I want 200 <b>₽</b> per customer you have each night."  You tell her earnestly.'
 							'Mira looks up in shock and with a hurt look on her face.  "What are you talking about?  Do you think I am a hooker?"'
 							'You step up to her and place your hand on her face.  Mira closes her eyes and leans into your hand.  You look into her eyes once she opens them and then SLAP her hard across the face.  Mira falls to the ground and starts to cry.  "You''re my property whore.  You will do whatever I tell you.  You will never lie to me ever again, or I swear I will make you pay.  Understand me?!"'
 							'Mira nods and she wipes away tears.'

+ 1 - 1
locations/gadsarai.qsrc

@@ -27,7 +27,6 @@ if $ARGS[0] = '':
 	'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
 	gs 'stat'
 
@@ -50,6 +49,7 @@ if $ARGS[0] = '':
 			act 'Return back to your grandfather': minut += 2 & gt 'gadhouse', 'grandpa'
 		end
 	end
+	gs 'bicycle', 'gadsarai'
 	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

+ 1 - 1
locations/journal.qsrc

@@ -495,7 +495,7 @@ if $ARGS[0] = 'nerds':
 	'Natasha is an excellent student and one of the smartest people in your school. Even though you are living in the same building, her parents are very poor, and it shows as Natasha is always dressed in second-hand clothes and can never afford to do anything fun. As a result, she doesn''t have many friends, as most of the other girls shun her or mock her poor clothing.'
 
 	'<center><img <<$set_imgh>> src="images/pc/notebook/240.png"></center>'
-	'<center><<"Natalia "Nat" Pavlova">></center>'	
+	'<center><<"Natalia [Nat] Pavlova">></center>'	
 	'Natalia is a very smart but weak willed girl. She constantly struggles to maintain friendships but her good looks and eagerness to help others, prevents her from being an outcast. She is rarely seen with anyone but one thing she always keeps with her, is a special notebook that she never lets anyone touch.'
 	
 	act 'Go back': gt 'journal', 'school'

+ 2 - 2
locations/korrPar.qsrc

@@ -134,14 +134,14 @@ if momloc = 1:
 			end
 		end
 	else
-		'Your parents are asleep in their room'
+		act 'Go to your parents'' room': msg'Your parents are probably asleep, you shouldn''t go in right now.'
 	end
 else
 	act 'Go to your parents'' room':gt 'bedrPar2'
 end
 act 'Go to the living room':gt 'sitrPar'
 if momloc = 5:
-	'The bathroom door is locked as your Mom takes a shower'
+	act 'Go to the bathroom':msg'You try to open the bathroom door but it immediately stops, banging against the latch. You hear the water running and your mother shouting at the door. "Doesn''t anybody in this family know how to knock?!"'
 else
 	act 'Go to the bathroom':minut += 1 & gt 'vanrPar'
 end

+ 35 - 35
locations/ludahome.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'home':
 				*clr & cla
 				'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
 				'You shake your head no. "No thanks, actually I should get going, but thanks anyways."'
-				'He nods and smiles "Ok see you nother time." He closes the door after you walk away.'
+				'He nods and smiles "OK see you nother time." He closes the door after you walk away.'
 				act '<b>Leave Luda''s apartment</b>': gt 'pod_ezd', 'etaj_4'
 			end
 			act 'Yes':
@@ -205,7 +205,7 @@ if $ARGS[0] = 'textanya':
 		act 'Say you would rather talk':
 			*clr & cla
 			'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-			'He looks a bit disappointed but then smiles "It''s ok, maybe some other time."'
+			'He looks a bit disappointed but then smiles "It''s OK, maybe some other time."'
 			act 'Sit down and chat':
 				*clr & cla
 				'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
@@ -242,7 +242,7 @@ if $ARGS[0] = 'textnush':
 		act 'Say you would rather talk':
 			*clr & cla
 			'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-			'He looks a bit disappointed but then smiles "It''s ok maybe some other time."'
+			'He looks a bit disappointed but then smiles "It''s OK maybe some other time."'
 			act 'Sit down and chat':
 				*clr & cla
 				'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
@@ -281,7 +281,7 @@ if $ARGS[0] = 'textnatasha':
 		act 'Say you would rather talk':
 			*clr & cla
 			'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-			'He looks a bit disappointed but then smiles "It''s ok, maybe some other time."'
+			'He looks a bit disappointed but then smiles "It''s OK, maybe some other time."'
 			act 'Sit down and chat':
 				*clr & cla
 				'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
@@ -297,7 +297,7 @@ if $ARGS[0] = 'textnatasha':
 		OluQW['nat_busy'] = daystart
 		'You wait a little bit before you get a reply "Just reading, what''s up?"'
 		'You smile and reply "Come over to my Aunt''s and work off some of your debt."'
-		'You wait long enough you are about to send another text, when you finally get a reply "Ok. Be there in a couple of minutes."'
+		'You wait long enough you are about to send another text, when you finally get a reply "OK. Be there in a couple of minutes."'
 		'You glance up to Olu and say, with a smile "Natasha is on her way."'
 		act 'Wait for Natasha': gt 'olu', 'olunat'
 	end
@@ -345,7 +345,7 @@ if $ARGS[0] = 'bathroom':
 	$location_type = 'bathroom'
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img src="images/locations/pavlovsk/resident/apartment/ludahome/bathroom.jpg"></center>'
-	'The first thing you notice is the god awful pea green tile, with a white sink just infront of a large shelf and mirror. You don''t know who picked it but they obviously don''t have any good taste. Other than that it is a fairly typical bathroom.'
+	'The first thing you notice is the god awful pea green tile, with a white sink just in front of a large shelf and mirror. You don''t know who picked it but they obviously don''t have any good taste. Other than that it is a fairly typical bathroom.'
 	'You can do your hair and makeup in the <a href="exec: gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
@@ -411,7 +411,7 @@ if $ARGS[0] = 'livingroom':
 	gs 'stat'
 	'<center><b><font color = maroon>Living room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/ludahome/living.jpg"></center>'
-	'The living room is clean and neat. A couch rests against one wall, with a entertainment center on the opposite wall that holds a fairly decent sized flat screen TV along with a dvd player. Inside one of the glass doors of the entertainment center you see several dozen dvd''s.'
+	'The living room is clean and neat. A couch rests against one wall, with an entertainment center on the opposite wall that holds a fairly decent sized flat screen TV along with a DVD player. Inside one of the glass doors of the entertainment center you see several dozen DVD''s.'
 	gs 'family_schedule'
 	if momloc = 20 and OluLoc = 5:
 		'Olu is sitting on the couch watching some sports and he seems pretty intent on it. When he notices you, he briefly looks up and smiles at you as you walk back in.'
@@ -470,7 +470,7 @@ if $ARGS[0] = 'watchtv':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/ludahome/luda_olu_tv.jpg"></center>'
 		if hour > 22:
-			'As it starts to get late, Luda pats Olu on the leg. "Ok that''s enough for the night, we both need to get ready for bed." Olu glances at her and then picks up the remote and turns off the TV. As they both get up, Luda says to you. "I was wonderful you coming to visit but it is time for us to go to bed. Come back any time though." She says as she escorts you to the apartment door. Olu gives you a smile. "Good night." With that you say your good nights and leave.'
+			'As it starts to get late, Luda pats Olu on the leg. "OK that''s enough for the night, we both need to get ready for bed." Olu glances at her and then picks up the remote and turns off the TV. As they both get up, Luda says to you. "I was wonderful you coming to visit but it is time for us to go to bed. Come back any time though." She says as she escorts you to the apartment door. Olu gives you a smile. "Good night." With that you say your good nights and leave.'
 			act 'Leave Luda''s apartment': gt 'pod_ezd', 'etaj_4'
 		else
 			'You remain seated next to your aunt and watch TV with them for another half a hour. Olu seems very intent on the show and mostly just watches it and doesn''t speak. Luda on the other hand periodically makes small talk with you about a variety of things, seemingly only half paying attention to the show.'
@@ -720,9 +720,9 @@ if $ARGS[0] = 'chat_luda':
 			cla
 			LudaQW['olu_offer'] = 2
 			'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
-			'You nod, it sounds like it can be fun. Having a man just in your same building you can visit anytime you are feeling horning and no one else will know about it? Sounds perfect actually "Ok sure Auntie as long as you are ok with it, yeah I wouldn''t mind helping out with his sexual energy." You say with a wink.'
+			'You nod, it sounds like it can be fun. Having a man just in your same building you can visit anytime you are feeling horning and no one else will know about it? Sounds perfect actually "OK sure Auntie as long as you are OK with it, yeah I wouldn''t mind helping out with his sexual energy." You say with a wink.'
 			'She laughs at that "Well I will let him know, also I should warn you. He likes butts, but don''t worry I keep a large supply of lube in the apartment." Seeing your face at the thought of a man described as hung like a horse fucking your ass she quickly adds "Don''t worry, it might hurt the first time but you quickly get use to it and it even starts feeling good after awhile."'
-			'You nod to that "Ok well hopefully it doesn''t take me long to get use to it then." Then the two of you start talking about anal sex and she shares a few tips with you on how to relax and making it feel better.'
+			'You nod to that "OK well hopefully it doesn''t take me long to get use to it then." Then the two of you start talking about anal sex and she shares a few tips with you on how to relax and making it feel better.'
 			act 'Keep talking': gt 'ludahome', 'chat_luda'
 			act 'Stop talking': gt 'ludahome', 'livingroom'
 		end
@@ -738,8 +738,8 @@ if $ARGS[0] = 'chat_luda':
 			cla
 			LudaQW['olu_offer'] = -1
 			'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
-			'"I''m sorry aunt Luda, I thought about it but I can''t it is just to weird." You tell her.'
-			'"Oh, okay then... i understand and don''t give it another thought." she says and then changes the subject.'
+			'"I''m sorry aunt Luda, I thought about it but I can''t it is just too weird." You tell her.'
+			'"Oh, okay then... I understand and don''t give it another thought." she says and then changes the subject.'
 			act 'Keep talking': gt 'ludahome', 'chat_luda'
 			act 'Stop talking': gt 'ludahome', 'livingroom'
 		end
@@ -753,7 +753,7 @@ if $ARGS[0] = 'chat_luda':
 		'Luda pats the seat and sits close to you "<<$pcs_nickname>>, So tell me all about it, Olu told me the two of you had sex, I want to know all about it."'
 		'You tell her about it, the good and the bad "I am not sure how often I can do that though, he is so big and has so much stamina, it wears me out." You tell her.'
 		'She giggles a little "You don''t have to tell me about it, I fully understand and why I don''t mind that he sleeps with other women to give me a break, but feel free to sleep with him as much as you like, I really don''t mind " she says and you can tell she would like for you to do it a lot.'
-		'You give it some thought, you know a few other girls that might be interested as long as your Aunt doesn''t mind "Would it be ok if I brought another girl with me?"'
+		'You give it some thought, you know a few other girls that might be interested as long as your Aunt doesn''t mind "Would it be OK if I brought another girl with me?"'
 		'Luda thinks for only a moment  then nods yes "Of course dear as long as Olu likes them I don''t mind. Who did you have in mind?" She asks obviously a little bit curious.'
 		'You smile to her "I have a couple of friends that I think would be interested and maybe Anya. I wanted to make sure you didn''t mind first before asking them to join me."'
 		'She nods "Of course dear, of course. If they are interested bring them along, but it is up to Olu if he wants to sleep with them of course."'
@@ -800,7 +800,7 @@ if $ARGS[0] = 'chat_luda':
 					'You look at your Aunt and then tell her "I know my <<$npc_nickname[''A29'']>> is a slut, I can''t believe she is such a hypocrite."'
 					'Luda looks a little surprised by your words "<<$pcs_nickname>> you should not say that about your mother."'
 					'You laugh a little "Why? It''s true." You dare her to deny it.'
-					'She sighs a little "Maybe so but it is still not nice to say. While I havn''t always agreed with her choices, she is human and makes mistakes and while she might be hard on you girls. She does it out of love because she wants what is best for you."'
+					'She sighs a little "Maybe so but it is still not nice to say. While I haven''t always agreed with her choices, she is human and makes mistakes and while she might be hard on you girls. She does it out of love because she wants what is best for you."'
 					'You decided it is best to just change the subject.'
 					act 'Keep talking': gt 'ludahome', 'chat_luda'
 					act 'Stop talking': gt 'ludahome', 'livingroom'
@@ -864,7 +864,7 @@ if $ARGS[0] = 'chat_luda':
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 			'"So Auntie tell me about your boyfriend, what''s he like?" You ask her curious.'
-			'She lights up at your questions "He is a fairly quiet man but wonderful, so kind and careing. Not to mention so big... and muscular. He really is the perfect man." She goes on to talk about some of the things they have done together and it really sounds like they are very much in love, certainly your Aunt is in love with him anyways. You also notice she never once mentions that he is black.'
+			'She lights up at your questions "He is a fairly quiet man but wonderful, so kind and caring. Not to mention so big... and muscular. He really is the perfect man." She goes on to talk about some of the things they have done together and it really sounds like they are very much in love, certainly your Aunt is in love with him anyways. You also notice she never once mentions that he is black.'
 			act 'How do people react?':
 				*clr & cla
 				minut += 3
@@ -872,7 +872,7 @@ if $ARGS[0] = 'chat_luda':
 				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				'"How do people treat you and him, you know with him being black?"'
-				'She frowns "Some people are ok with it, most just make comments behind our back but I know they do. Some say nasty things to our face, but I don''t care, he is a good man and I don''t care what color his skin is."'
+				'She frowns "Some people are OK with it, most just make comments behind our back but I know they do. Some say nasty things to our face, but I don''t care, he is a good man and I don''t care what color his skin is."'
 				'"It doesn''t bother you?" You ask'
 				'"Of course it bothers me but not as much as losing him would. If this is the price we have to pay to be together I am willing to pay it. Even if your grand parents disowned me because of it."'
 				'You nod and not sure what more to say you change the subject.'
@@ -886,7 +886,7 @@ if $ARGS[0] = 'chat_luda':
 				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				'"So how did the two of you meet?" You ask her.'
-				'She laughs "Well everyone thinks I meet him in my travels in Africa but that isn''t true. Actually his nephew Djibril goes to the University in Saint Petersburg and he was up visiting him. I was in the city at the time shopping after I had moved back here. We run into each other on the metro and I mean we ran into each other. He is so big he nearly knocked me down, but he caught me in his strong arms and kept me from falling. He apologized for running into him and I apologized for running into him and thanked him for keeping me from falling." Then she stops to sigh happily, this is obviously a happy memory for her.'
+				'She laughs "Well everyone thinks I met him in my travels in Africa but that isn''t true. Actually his nephew Djibril goes to the University in Saint Petersburg and he was up visiting him. I was in the city at the time shopping after I had moved back here. We run into each other on the metro and I mean we ran into each other. He is so big he nearly knocked me down, but he caught me in his strong arms and kept me from falling. He apologized for running into him and I apologized for running into him and thanked him for keeping me from falling." Then she stops to sigh happily, this is obviously a happy memory for her.'
 				*nl
 				'Then she continues "So then it was my stop and I got off thinking nothing more of it. A few minutes later he comes strolling up beside me and gives me some flowers he had bought somewhere telling me pretty flowers for pretty lady in his bad accented Russian. I thanked him and I blushed, he was so handsome, then he asked me out to coffee and well we hit it off and started dating and not long after I asked him to move in with me."'
 				'You are glad your Aunt found someone that makes her happy.'
@@ -900,7 +900,7 @@ if $ARGS[0] = 'chat_luda':
 				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 				'"So what does he do? For a living I mean." You ask her.'
-				'"Well his visa expired so legally he can''t work, but while he could he saved up a little money and bought a van. Then he put some seats into it, cleaned it up real nice and now drives it around offering to give tourist rides to take them to all the different sites around the area. He makes ok money, though mostly he makes his money in the summers of course when there is a lot more tourist but he gets some fares year around. He mostly sits near the train station and tries to offer people rides. But I don''t care, I make enough for both of us, but it makes him feel good to work and it gives us a little extra spending money.'
+				'"Well his visa expired so legally he can''t work, but while he could he saved up a little money and bought a van. Then he put some seats into it, cleaned it up real nice and now drives it around offering to give tourist rides to take them to all the different sites around the area. He makes OK money, though mostly he makes his money in the summers of course when there is a lot more tourist but he gets some fares year around. He mostly sits near the train station and tries to offer people rides. But I don''t care, I make enough for both of us, but it makes him feel good to work and it gives us a little extra spending money.'
 				act 'Keep talking': gt 'ludahome', 'chat_luda'
 				act 'Stop talking': gt 'ludahome', 'livingroom'
 			end
@@ -912,10 +912,10 @@ if $ARGS[0] = 'chat_luda':
 				gs 'npc_relationship', 'modify', 'A30', 'like'
 				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
-				'"Well I meet Olu earlier, when you weren''t home he was here and I came in and talked to him for awhile. I didn''t realize just how big he was until I was so close to him."'
+				'"Well I met Olu earlier, when you weren''t home. He was here and I came in and talked to him for awhile. I didn''t realize just how big he was until I was so close to him."'
 				'She laughs "Oh dear you have no clue how big he is, he is just as big all over." She say with a wink "Yes he told me you stopped by and the two of you talked. He liked you, he asked about you."'
 				'You blush a little "Really? What did he say?"'
-				'She smiles with a amused smile at your blush "Well he thought you were cute for one."'
+				'She smiles with an amused smile at your blush "Well he thought you were cute for one."'
 				act 'You don''t mind?':
 					*clr & cla
 					minut += 5
@@ -923,28 +923,28 @@ if $ARGS[0] = 'chat_luda':
 					gs 'stat'
 					'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 					'You expect her to be upset but she doesn''t seem to mind at all her boyfriend finds you cute "That doesn''t bother you?"'
-					'She shakes her head no "Why should it? I don''t mind if he finds other women attractive. Just because we are together doesn''t make us suddenly blind to how attractive others might be, besides we are in a open relationship."'
-					act 'You have a open relationship?':
+					'She shakes her head no "Why should it? I don''t mind if he finds other women attractive. Just because we are together doesn''t make us suddenly blind to how attractive others might be, besides we are in an open relationship."'
+					act 'You have an open relationship?':
 						*clr & cla
 						minut += 5
 						LudaQW['open_rel'] = 1
 						gs 'npc_relationship', 'modify', 'A30', 'like'
 						gs 'stat'
 						'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
-						'You are a little shocked you didn''t know they had a open relationship "You are in a open relationship? You mean you can sleep with other people?"'
+						'You are a little shocked you didn''t know they had an open relationship "You are in an open relationship? You mean you can sleep with other people?"'
 						'She laughs at your reaction "Yes and no it doesn''t bother me and it doesn''t bother him. We know we love each other and sex is just sex."'
 						if pav_slut >= 50 and LudaQW['olu_offer'] = 0 and pcs_vag ! 0:
-							'You nod a bit "Yeah ok I guess I can see that."'
-							'Then she stops and seems to be considering something before saying "Actually I am kinda glad of it, the man has a amazing stamina and just loves sex, he can''t get enough of it honestly. Don''t get me wrong I love sex but he wears me out, so I am glad he can burn up some of that sexual energy with other women."'
-							'You are a little surprised by that, but it does explain why she is ok with sharing him "I see Auntie." You say with a sly smile of understanding.'
+							'You nod a bit "Yeah OK I guess I can see that."'
+							'Then she stops and seems to be considering something before saying "Actually I am kinda glad of it, the man has amazing stamina and just loves sex, he can''t get enough of it honestly. Don''t get me wrong I love sex but he wears me out, so I am glad he can burn up some of that sexual energy with other women."'
+							'You are a little surprised by that, but it does explain why she is OK with sharing him "I see Auntie." You say with a sly smile of understanding.'
 							'She giggles at little at your comment "Well since he finds you cute and I am pretty sure you are sexually active, if you would want to spend some time with him and help burn off his sexual energy I won''t mind. So what do you think? I have to warn you thought he is hung like a horse."'
 							act 'Agree to spend time with Olu':
 								*clr & cla
 								LudaQW['olu_offer'] = 2
 								'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
-								'You nod, it sounds like it can be fun. Having a man just in your same building you can visit anytime you are feeling horning and no one else will know about it? Sounds perfect actually "Ok sure Auntie as long as you are ok with it, yeah I wouldn''t mind helping out with his sexual energy." You say with a wink.'
+								'You nod, it sounds like it can be fun. Having a man just in your same building you can visit anytime you are feeling horning and no one else will know about it? Sounds perfect actually "OK sure Auntie as long as you are OK with it, yeah I wouldn''t mind helping out with his sexual energy." You say with a wink.'
 								'She laughs at that "Well I will let him know, also I should warn you. He likes butts, but don''t worry I keep a large supply of lube in the apartment." Seeing your face at the thought of a man described as hung like a horse fucking your ass she quickly adds "Don''t worry, it might hurt the first time but you quickly get use to it and it even starts feeling good after awhile."'
-								'You nod to that "Ok well hopefully it doesn''t take me long to get use to it then." Then the two of you start talking about anal sex and she shares a few tips with you on how to relax and making it feel better.'
+								'You nod to that "OK well hopefully it doesn''t take me long to get use to it then." Then the two of you start talking about anal sex and she shares a few tips with you on how to relax and making it feel better.'
 								act 'Keep talking': gt 'ludahome', 'chat_luda'
 								act 'Stop talking': gt 'ludahome', 'livingroom'
 							end
@@ -1060,16 +1060,16 @@ if $ARGS[0] = 'chat_luda':
 					'She looks curious "Who is the lucky boy?"'
 					'"Rex" You tell her.'
 					'She shakes her head "I don''t think I know him." With that you tell her about Rex and as you do she starts nodding and has a knowing smile on her face'
-					'She get a inquisitive look on her face "How did you meet him? Isn''t he a few years old?" She asks, obviously curious how you two crossed paths long enough to start dating.'
-					'You smile to her "I was invited to his party." You tell her and then add "Ok he is friends with my Anya and she invited me to his birthday party and thats when we meet." Then you talk about the night you meet him and your first date.'
+					'She get an inquisitive look on her face "How did you meet him? Isn''t he a few years old?" She asks, obviously curious how you two crossed paths long enough to start dating.'
+					'You smile to her "I was invited to his party." You tell her and then add "OK he is friends with my Anya and she invited me to his birthday party and that''s when we met." Then you talk about the night you meet him and your first date.'
 					act 'Keep talking': gt 'ludahome', 'chat_luda'
 					act 'Stop talking': gt 'ludahome', 'livingroom'
 				else
 					'You tell her "I have a boyfriend you know."'
 					'She looks curious "Who is the lucky boy?"'
 					'"<<$boyfriend>>" You tell her.'
-					'She shakes her head "I don''t think I know him." With that you tell her about Niko and as you do she starts nodding and has a knowing smile on her face'
-					'"Well that is a interesting way to meet a boy but i have heard of worse ways, as long as he makes you happy that is all that matters." She says with a wink.'
+					'She shakes her head "I don''t think I know him." With that you tell her about <<$boyfriend>> and as you do she starts nodding and has a knowing smile on her face'
+					'"Well that is an interesting way to meet a boy but i have heard of worse ways, as long as he makes you happy that is all that matters." She says with a wink.'
 					act 'Keep talking': gt 'ludahome', 'chat_luda'
 					act 'Stop talking': gt 'ludahome', 'livingroom'
 				end
@@ -1081,7 +1081,7 @@ if $ARGS[0] = 'chat_luda':
 			gs 'npc_relationship', 'modify', 'A30', 'like'
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
-			'You ask your aunt about her travels, she exicted tells you stories about her time in Europe. She started off traveling all over Europe then drifted further south into she ended up in Africa then she traveled all over there, which is where she meet Olu. She tells you a number of funny and some sex stories about her travels.'
+			'You ask your aunt about her travels and she excitedly tells you stories about her time in Europe. She started off travelling all over Europe then drifted further south into she ended up in Africa then she travelled all over there, which is where she meet Olu. She tells you a number of funny and some sex stories about her travels.'
 			act 'Keep talking': gt 'ludahome', 'chat_luda'
 			act 'Stop talking': gt 'ludahome', 'livingroom'
 		end
@@ -1114,14 +1114,14 @@ if $ARGS[0] = 'chat_olu':
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
 		'"So you and Luda seem to get along really well, do you love her?" You ask him curious.'
-		'He lights up at your questions "Yes very much, she is a very kind and loving woman, very understanding, she is the most wonderful woman I have ever meet." He goes on to talk about some of the things they have done together and it really sounds like they are very much in love, certainly he is in love with your Aunt anyways.'
+		'He lights up at your questions "Yes very much, she is a very kind and loving woman, very understanding, she is the most wonderful woman I have ever meet." He goes on to talk about some of the things they have done together and it really sounds like they are very much in love, certainly he is in love with your Aunt anyway.'
 		act 'How do people react?':
 			*clr & cla
 			minut += 3
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/olu/olutalk.jpg"></center>'
 			'"How do people treat you and my aunt, with you know you being black?"'
-			'He frowns "Some people are ok with it, most just make comments behind our back but I know they do. Some say nasty things to our face, but I don''t care, though any of them that say these things to her only do so once, where I can hear it."'
+			'He frowns "Some people are OK with it, most just make comments behind our back but I know they do. Some say nasty things to our face, but I don''t care, though any of them that say these things to her only do so once, where I can hear it."'
 			'You can understand why someone of his size could very easily convince someone else that they might not want to say more on the topic to Luda.'
 			'You can tell he would like to change the subject so you do.'
 			act 'Keep talking': gt 'ludahome', 'chat_olu'

+ 2 - 2
locations/mitka.qsrc

@@ -231,7 +231,7 @@ if $ARGS[0] = 'sex_chat':
 			end
 		end
 	! Sveta is not the boys slut but has had sex with Mitka and she does not know Mira likes Mitka or Mira is the boys slut
-	elseif (npc_QW['A63'] > 0 and npc_QW['A63'] < 10) and (npc_QW['A60'] < 2 or npc_QW['A60'] >= 11):
+	elseif (npc_QW['A63'] > 0 and npc_QW['A63'] < 11) and (npc_QW['A60'] < 2 or npc_QW['A60'] >= 11):
 		*nl
 		'Mitka scratches his balls and adds with a grin: "Hey <<$pcs_nickname>>, do you want to have some fun?"'
 		mitkarand = rand(1,10)
@@ -430,7 +430,7 @@ if $ARGS[0] = 'sex_chat':
 				else
 					'Mitka is clearly enjoying fucking your ass. He has a huge smile on his face as he holds you in place beneath him.'
 				end
-				'Mitka doesn''t bother to pull out and cums deep inside your ass. Breathing heavily, he gets off of you and says, "Still a good fuck, but I would prefer you pussy instead."'
+				'Mitka doesn''t bother to pull out and cums deep inside your ass. Breathing heavily, he gets off of you and says, "Still a good fuck, but I would prefer your pussy instead."'
 				
 				npc_rel['A63'] += 1
 				if npc_QW['A63'] < 10: npc_QW['A63'] += 1

+ 8 - 8
locations/mitkabuh.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'partyalone':
 		act 'Drink with the boys':
 			*clr & cla
 			menu_off = 1
-			minut += 30
+			minut += 15
 			npc_rel['A63'] += rand(0,1)
 			npc_rel['A62'] += rand(0,1)
 			npc_rel['A61'] += rand(0,1)
@@ -233,7 +233,7 @@ if $ARGS[0] = 'partywithMira':
 				end
 				act 'Drink the shot yourself':
 					cla
-					minut += 30
+					minut += 15
 					npc_rel['A63'] += rand(0,1)
 					npc_rel['A62'] += rand(0,1)
 					npc_rel['A61'] += rand(0,1)
@@ -283,7 +283,7 @@ if $ARGS[0] = 'partywithMira':
 				if will_cost <= pcs_willpwr:
 					act 'Make Mira drink the shot instead (<<will_cost>> Willpower)':
 						cla
-						minut += 30
+						minut += 15
 						npc_rel['A63'] += rand(0,1)
 						npc_rel['A62'] += rand(0,1)
 						npc_rel['A61'] += rand(0,1)
@@ -332,7 +332,7 @@ if $ARGS[0] = 'partywithMira':
 			act 'Drink with Mira and the boys':
 				*clr & cla
 				menu_off = 1
-				minut += 30
+				minut += 15
 				npc_rel['A63'] += rand(0,1)
 				npc_rel['A62'] += rand(0,1)
 				npc_rel['A61'] += rand(0,1)
@@ -346,7 +346,7 @@ if $ARGS[0] = 'partywithMira':
 				if will_cost <= pcs_willpwr:
 					act 'Make Mira drink the shot instead (<<will_cost>> Willpower)':
 						cla
-						minut += 30
+						minut += 15
 						npc_rel['A63'] += rand(0,1)
 						npc_rel['A62'] += rand(0,1)
 						npc_rel['A61'] += rand(0,1)
@@ -365,7 +365,7 @@ if $ARGS[0] = 'partywithMira':
 				end
 				act 'Drink the shot yourself':
 					cla
-					minut += 30
+					minut += 15
 					npc_rel['A63'] += rand(0,1)
 					npc_rel['A62'] += rand(0,1)
 					npc_rel['A61'] += rand(0,1)
@@ -407,7 +407,7 @@ if $ARGS[0] = 'partywithMira':
 			act 'Drink with the boys':
 				*clr & cla
 				menu_off = 1
-				minut += 30
+				minut += 15
 				npc_rel['A63'] += rand(0,1)
 				npc_rel['A62'] += rand(0,1)
 				npc_rel['A61'] += rand(0,1)
@@ -439,7 +439,7 @@ if $ARGS[0] = 'partywithMira':
 				npc_rel['A62'] += rand(0,1)
 				npc_rel['A61'] += rand(0,1)
 				npc_rel['A60'] += rand(0,1)
-				minut += 30
+				minut += 15
 				npc_drunk['A60'] += 5
 				gs 'stat'
 				

+ 1 - 1
locations/mitkabuh_group.qsrc

@@ -117,7 +117,7 @@ if $ARGS[0] = 'partywithMira':
 		act 'Drink with Mira and the boys':
 			*clr & cla
 			menu_off = 1
-			minut += 30
+			minut += 15
 			npc_rel['A63'] += rand(0,1)
 			npc_rel['A62'] += rand(0,1)
 			npc_rel['A61'] += rand(0,1)

+ 20 - 20
locations/nerd_game_night.qsrc

@@ -511,13 +511,13 @@ if $ARGS[0] = 'game_night4':
 			'"What the hell is this?!" Zinaida yells out, "Why are you all so tense, didn''t we have a great time yesterday?" she smirks.'
 			'"L-Look here we don''t want any trouble, you hear that!" the barkeep yells behind the counter.'
 			'"Don''t worry we''re not here to look for a fight," Julia tries to calm the barkeep, "We''re just looking for some information."'
-			'Feofan takes over, "In the tavern you can see several patrons sitting in their own corners minding their own business. There''s <a href="exec:minut += 5 & gt ''game_night'', ''woman''">a beautiful woman</a> sitting furthest back, almost hidden from the rest. She''s dressed in all black, observing your group. Closest to the bar counter you see a group of <a href="exec:minut += 5 & gt ''game_night'', ''group''">rowdy men</a>, they''re big and wear big armor. They''re drunk and are talking loudly about some of the adventures they''ve been on.'
+			'Feofan takes over, "In the tavern you can see several patrons sitting in their own corners minding their own business. There''s <a href="exec:minut += 5 & gt ''nerd_game_night'', ''woman''">a beautiful woman</a> sitting furthest back, almost hidden from the rest. She''s dressed in all black, observing your group. Closest to the bar counter you see a group of <a href="exec:minut += 5 & gt ''nerd_game_night'', ''group''">rowdy men</a>, they''re big and wear big armor. They''re drunk and are talking loudly about some of the adventures they''ve been on.'
 			*nl
-			'And lastly an <a href="exec:minut += 3 & gt ''game_night'', ''oldman''">old man</a>, face covered in scars, enjoying his drink..."'
+			'And lastly an <a href="exec:minut += 3 & gt ''nerd_game_night'', ''oldman''">old man</a>, face covered in scars, enjoying his drink..."'
 			'Someone nudges you, "Pick one and go talk to them." You look around confused, "Don''t look so confused, you have the highest persuasion out of the whole group. So decide on a person to talk to and if anything happens we have your back."'
-			act 'Go talk to the woman': gt 'game_night', 'woman'
-			act 'Go talk to the group': gt 'game_night', 'group'
-			act 'Go talk to the old man': gt 'game_night', 'oldman'
+			act 'Go talk to the woman': gt 'nerd_game_night', 'woman'
+			act 'Go talk to the group': gt 'nerd_game_night', 'group'
+			act 'Go talk to the old man': gt 'nerd_game_night', 'oldman'
 		end
 	end
 end
@@ -534,9 +534,9 @@ if $ARGS[0] = 'woman':
 	'"Then don''t..." the woman interrupts you, and after a short silent moment, "You should find someone you love before it''s too late. Better to love than never to have felt it. I should know, I had the most fairest man in this kingdom but our relationship turned sour and I threw it all away... I heard that the heartbreak killed him in the end and now there''s a fortune just sitting there at that damned mansion."'
 	'"Why are you telling this to me? If there''s a fortune there don''t you want to keep that a secret? This sounds too good to be true." you grow a bit suspicious of her ulterior motives.'
 	'"I''m too stricken to visit that place ever again, but if your path would cross that way be sure to visit it, it''s quite secluded." she describes the location of the mansion while you carefully listen.'
-	if nerd_game['taverngroup'] = 0: act 'Go talk to the group': gt 'game_night', 'group'
-	if nerd_game['tavernman'] = 0: act 'Go talk to the old man': gt 'game_night', 'oldman'
-	act 'Tell your party what you learned': gt 'game_night', 'inform_them'
+	if nerd_game['taverngroup'] = 0: act 'Go talk to the group': gt 'nerd_game_night', 'group'
+	if nerd_game['tavernman'] = 0: act 'Go talk to the old man': gt 'nerd_game_night', 'oldman'
+	act 'Tell your party what you learned': gt 'nerd_game_night', 'inform_them'
 end
 
 if $ARGS[0] = 'group':
@@ -573,9 +573,9 @@ if $ARGS[0] = 'group':
 			'You look up trying to read your co-players what they think about it but they''re keeping true to the role-play playing out, "Alright, you''ve got a deal!"'
 			'He picks up one of the scrolls from his bag and throws it towards you, "There you have it girl! Now hand over the gold!"'
 			'You hand over the gold and quickly return to the group, you hear the other players cheer you on, pleased with your decision.'
-			if nerd_game['tavernwoman'] = 0: act 'Go talk to the woman': gt 'game_night', 'woman'
-			if nerd_game['tavernman'] = 0: act 'Go talk to the old man': gt 'game_night', 'oldman'
-			act 'Tell your party what you learned': gt 'game_night', 'inform_them'
+			if nerd_game['tavernwoman'] = 0: act 'Go talk to the woman': gt 'nerd_game_night', 'woman'
+			if nerd_game['tavernman'] = 0: act 'Go talk to the old man': gt 'nerd_game_night', 'oldman'
+			act 'Tell your party what you learned': gt 'nerd_game_night', 'inform_them'
 		end
 		act 'Decline':
 			*clr & cla
@@ -586,9 +586,9 @@ if $ARGS[0] = 'group':
 			'"That''s way too much!" you shake your head, "I politely decline."'
 			'"Too bad then... Now leave us alone, we''re done with each other!" you can clearly hear that he''s upset...'
 			'As you return to the group, you hear the other players sigh, discontent with your decision.'
-			if nerd_game['tavernwoman'] = 0: act 'Go talk to the woman': gt 'game_night', 'woman'
-			if nerd_game['tavernman'] = 0: act 'Go talk to the old man': gt 'game_night', 'oldman'
-			act 'Tell your party what you learned': gt 'game_night', 'inform_them'
+			if nerd_game['tavernwoman'] = 0: act 'Go talk to the woman': gt 'nerd_game_night', 'woman'
+			if nerd_game['tavernman'] = 0: act 'Go talk to the old man': gt 'nerd_game_night', 'oldman'
+			act 'Tell your party what you learned': gt 'nerd_game_night', 'inform_them'
 		end
 	end
 end
@@ -610,9 +610,9 @@ if $ARGS[0] = 'oldman':
 	'"Where can I find this place, old man?" you curiously ask.'
 	'"I wouldn''t recommend you to go there, you''ll end up just like us, dead." the old man warns.'
 	'You shake your head, "We''re not afraid of anything!" and order another round and after a while you manage to pry out the information. After several more drinks that loosens his tongue and he describes how to find the necromancers lair.'
-	if nerd_game['tavernwoman'] = 0: act 'Go talk to the woman': gt 'game_night', 'woman'
-	if nerd_game['taverngroup'] = 0: act 'Go talk to the group': gt 'game_night', 'group'
-	act 'Tell your party what you learned': gt 'game_night', 'inform_them'
+	if nerd_game['tavernwoman'] = 0: act 'Go talk to the woman': gt 'nerd_game_night', 'woman'
+	if nerd_game['taverngroup'] = 0: act 'Go talk to the group': gt 'nerd_game_night', 'group'
+	act 'Tell your party what you learned': gt 'nerd_game_night', 'inform_them'
 end
 
 !Continuation of game night 4
@@ -621,9 +621,9 @@ if $ARGS[0] = 'inform_them':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'
 	if nerd_game['tavernwoman'] = 0 or nerd_game['taverngroup'] = 0 or nerd_game['tavernman'] = 0:
 		'You go back to your party and tell them what you found out, some of them seem excited by what you found out, while others are less interested. They discuss it for a few minutes while Feofan just watches all of you. After a bit Artem says to you. "Okay, go find out if there are any other options."'
-		if nerd_game['tavernwoman'] = 0: act 'Go talk to the woman': gt 'game_night', 'woman'
-		if nerd_game['taverngroup'] = 0: act 'Go talk to the group': gt 'game_night', 'group'
-		if nerd_game['tavernman'] = 0: act 'Go talk to the old man': gt 'game_night', 'oldman'
+		if nerd_game['tavernwoman'] = 0: act 'Go talk to the woman': gt 'nerd_game_night', 'woman'
+		if nerd_game['taverngroup'] = 0: act 'Go talk to the group': gt 'nerd_game_night', 'group'
+		if nerd_game['tavernman'] = 0: act 'Go talk to the old man': gt 'nerd_game_night', 'oldman'
 	else
 		minut += 120
 		gs 'stat'

+ 1 - 1
locations/nordtrain.qsrc

@@ -184,7 +184,7 @@ if $ARGS[0] = 'centre':
 	*clr & cla
 	minut += 5
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/train/electri.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/train/electri' + rand(1,5) + '.jpg"></center>'
 	'You pay for the ticket and board the next train going to the city center.'
 	'After 5 minutes, you see the office blocks and shops at the heart of the city. The train stops at its final destination, the busy station in the city center.'
 

+ 2 - 2
locations/poli.qsrc

@@ -1236,9 +1236,9 @@ if $ARGS[0] = 'cosmetic1':
 	'String implants slowly absorb your body fluids and grow larger over time. We can also drain it for you if it becomes too large.'
 	*nl
 	if money >= 80000 and lashair = 0:
-		'<a href="exec:gt ''poli'', ''electrolysis''">Electrolysis treatment</a> - 80,000 <b>₽</b>'
+		'<a href="exec:gt ''poli'', ''electrolysis''">Electrolysis</a> laser hair removal of legs and pubic area - 80,000 <b>₽</b>'
 		else
-		'Electrolysis treatment - 80,000 <b>₽</b>'
+		'Electrolysis - laser hair removal of legs and pubic area - 80,000 <b>₽</b>'
 	end
 	if money >= 25000 and pcs_lip < 4:
 		'<a href="exec:gt ''poli'', ''lipPlus''">Lip enlargement surgery</a> - 25,000 <b>₽</b>'

+ 1 - 1
locations/salon.qsrc

@@ -502,7 +502,7 @@ if $ARGS[0] = 'epilyaciya':
 	cla & *clr
 	minut += 60
 	pcs_leghair = -10
-	pcs_pubes = -10
+	pcs_pubes = -5
 	inhib_exp += rand(1,5)
 	money -= 2000
 	if salonrand = 0 and masha = 0:gt 'salon', '0'

+ 2 - 2
locations/spell.qsrc

@@ -397,10 +397,10 @@ if $ARGS[0] = 'cosmetica':
 		if shave_menu = 1 or shave_menu = 2:
 			! Shave Pubes
 			if pubestyle = 1:
-				pcs_pubes = 0
+				pcs_pubes = 1
 			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

+ 2 - 2
locations/sportShop.qsrc

@@ -79,7 +79,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if bookYog = 0 and money >= 1500:
-		act 'Buy "Benifits of yoga" (1,500 <b>₽</b>)':
+		act 'Buy "Benefits of yoga" (1,500 <b>₽</b>)':
 			cla
 			minut += 5
 			money -= 1500
@@ -88,7 +88,7 @@ if $ARGS[0] = 'start':
 			act 'Pick up a package':gt 'sportshop', 'start'
 		end
 	elseif bookYog = 0:
-		act 'Buy "Benifits of yoga" (<font color="red">1500 <b>₽</b></font>)': '<br><font color="red">You don''t have enough money to buy that.</font>'
+		act 'Buy "Benefits of yoga" (<font color="red">1500 <b>₽</b></font>)': '<br><font color="red">You don''t have enough money to buy that.</font>'
 	end
 	
 	if konki = 0 and money >= 3000:

+ 3 - 3
locations/stat_display.qsrc

@@ -1117,9 +1117,9 @@ if cheatStatusIcons = 0:
 	if deodorant_on = 1 and pcs_sweat < 20: $statusIconBarTab += '<td><a href="exec:msg $stat_sweat_msg"><img title="<<$stat_sweat_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/deodorant.png"></a></td>'
 
 	if pcs_sweat > 19: $statusIconBarTab += '<td><a href="exec:msg $stat_sweat_msg"><img title="<<$stat_sweat_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/need_shower.png"></a></td>'
-	
-	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 and pcs_pubes >= 25) or (pubestyle = 10 and pcs_pubes >= 40):
-		if (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 >= 26) or (pubestyle = 10 and pcs_pubes >= 40):
+
+	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):
+		if (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):
 			$stat_shave_msg = 'You need to shave your'+iif(pcs_leghair > 3, ' legs and ', ' ')+'pussy.'
 		elseif pcs_leghair > 3:
 			$stat_shave_msg = 'You need to shave your legs.'

+ 2 - 2
locations/swamp_yard.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = 'start':
 	end
 	*nl
 	'Behind the hut there is a <a href="exec: gt ''swampspring'' ">spring</a>, if you continue a little further down there is a small <a href="exec: gt ''backwater'' ">creek</a> with relatively clean water.'
-	gs 'bicycle', 'swamp_yard'
+
 	if hunters_available = 1 and hunters_outside = 1 and huntersknow = 0:
 		*nl
 		'You spot some unfamiliar <a href="exec: gt ''hunters'', ''start'' ">people</a> standing in front of the hut.'
@@ -117,7 +117,7 @@ if $ARGS[0] = 'start':
 		end
 		gt 'swamp','stuck'
 	end
-
+	gs 'bicycle', 'swamp_yard'
 	act 'Go into the house':gt 'swamphouse', 'start'
 	if dirty_swamp_yard > 10:act 'Go out in the yard':hunterslut -= 1 & dynamic $dirty_swamp_yard
 

+ 4 - 4
locations/train.qsrc

@@ -815,7 +815,7 @@ if $ARGS[0] = 'young':
 							*clr
 							cla
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/locations/shared/train/electri.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/shared/train/electri' + rand(1,5) + '.jpg"></center>'
 							'The journey is uneventful and you aren''t paying much attention to it, it doesn''t seem like long before you arrive at your destination.'
 							act 'Get off the train': gt $loc, $metka
 						end
@@ -867,7 +867,7 @@ if $ARGS[0] = 'Gopnik':
 					*clr & cla
 					minut += 30	
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/shared/train/electri.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/shared/train/electri' + rand(1,5) + '.jpg"></center>'
 					'The journey is uneventful and you aren''t paying much attention to it, it doesn''t seem like long before you arrive at your destination.'
 					act 'Get off the train': gt $loc, $metka
 				end
@@ -956,7 +956,7 @@ if $ARGS[0] = 'Gopnik':
 									*clr & cla
 									minut += 30	
 									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/locations/shared/train/electri.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/locations/shared/train/electri' + rand(1,5) + '.jpg"></center>'
 									'The journey is uneventful and you aren''t paying much attention to it, it doesn''t seem like long before you arrive at your destination.'
 									act 'Get off the train': gt $loc, $metka
 								end
@@ -971,7 +971,7 @@ if $ARGS[0] = 'Gopnik':
 									*clr & cla
 									minut += 30	
 									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/locations/shared/train/electri.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/locations/shared/train/electri' + rand(1,5) + '.jpg"></center>'
 									'The journey is uneventful and you aren''t paying much attention to it, it doesn''t seem like long before you arrive at your destination.'
 									act 'Get off the train': gt $loc, $metka
 								end