Merge remote-tracking branch 'sovietmercader/master'

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 ---------------------------------

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

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'

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.'

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

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

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'
 				

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)

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