Browse Source

[changed] move entrance for drinking with Mitka out of the grandparents house so non school girls can play Mitkas quest now

sovietmercader 5 years ago
parent
commit
2471b9d7f9
3 changed files with 160 additions and 70 deletions
  1. 0 6
      locations/Gaddvor.qsrc
  2. 143 49
      locations/gadroad.qsrc
  3. 17 15
      locations/gadukino.qsrc

+ 0 - 6
locations/Gaddvor.qsrc

@@ -84,12 +84,6 @@ if $ARGS[0]='':
 		if meadow > 0 and hour >= 6 and hour < 20 and month >= 4 and month <= 10:act 'Go to the meadow':minut += 20 & gt 'Meadow', 'start'
 		act '<b>Go to Gadukino</b>':minut += 5 & gt 'gadukino'
 
-		if hour >= 17 and hour < 20:
-			if mitkaday!daystart:'<a href="exec:gt ''mitka''">Mitka</a> is hanging out near the barn in your grandparents'' backyard, he is following you while taking a smoke.'
-		elseif hour >= 20 and sunWeather = 1:
-			'Several <a href="exec:gt ''mitkabuh''">young men</a> are sitting near your grandparents'' backyard, drinking moonshine and talking loudly.'
-		end
-
 		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

+ 143 - 49
locations/gadroad.qsrc

@@ -1,64 +1,158 @@
 # gadroad
-$location_type = 'secluded'
-$metka = ''
-$loc = 'gadroad'
-gs 'gadukino_event', 'sound'
-$menu_loc = 'gadroad'
-$menu_arg = ''
-menu_off = 0
-clr
-gs'stat'
-!gs'time'
 
-'<center><H4>Forest road</H4></center>'
+if $ARGS[0] = '':
+	$loc = 'gadroad'
+	$metka = ''
+	$location_type = 'public_outdoors'
 
-if month >= 4 and month <= 10:
-	if hour >= 6 and hour < 22:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+	$menu_loc = 'gadroad'
+	$menu_arg = ''
+	menu_off = 0
+
+	CLOSE ALL
+	gs 'gadukino_event', 'sound'
+	gs'stat'
+
+	'<center><H4>Forest road</H4></center>'
+
+	if month >= 4 and month <= 10:
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		end
 	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		if hour >= 8 and hour < 18:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_winter.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_winter_night.jpg"></center>'
+		end
 	end
-else
-	if hour >= 8 and hour < 18:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_winter.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_winter_night.jpg"></center>'
+	*nl
+	'A dirt road leading to the outskirts of Gadukino. You are surrounded by grainfields where the grains appear reaching all the way to the heavens.'
+	'The forest '+iif(meadow > 0, 'and meadow','')+' can be found further down the road away from the village.'
+	*nl
+	! 10% chance of meeting Mitka once per day on the road when Sveta is not the village boys slut or whole villages whore
+	mitkarand = rand(1,10)
+	if mitka_first_drink > 0 and mitkaday ! daystart and hour >= 17 and hour < 20 and mitkarand = 1 and (npc_QW['A63'] < 11 or gadriver_gang > 2):
+		'<a href="exec:gt ''mitka''">Mitka</a> is smoking near the road, he smiles at you as you walk by.'
+	! Meet the boys to drink with them at 20 if Sveta has been invited by Mitka already
+	elseif mitka_first_drink > 0 and hour = 20:
+		'<a href="exec:gt ''gadroad'',''drinking_invite''">Mitka, Kolyamba, and Vasyan</a> are walking down the road towards the woods, drinking moonshine and talking loudly.'
+	! If Sveta is late to go drink with the boys if she already knows where the trailer is she can still get there
+	elseif mitka_first_drink = 2 and hour > 20 and alko < 10:
+		! if Sveta did not bring Mira with her and Mira has met the boys already then there is a 50% chance she will show up too
+		if MiraLoc ! 5 and npc_QW['A60'] >= 1:
+			mirarand = rand(1,10)
+			if mirarand >= 6: 
+				MiraLoc = 5
+				'You can go drink with Mira, Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh'',''partywithMira''">trailer</a> hidden in the woods.'
+			else
+				'You can go drink with Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh'',''partyalone''">trailer</a> hidden in the woods.'
+			end
+		else
+			'You can go drink with the Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh'',''partyalone''">trailer</a> hidden in the woods.'
+		end
 	end
-end
 
-'A dirt road leading to the forest. You are surrounded by grainfields where the grains appear reaching all the way to the heavens.'
+	act 'Go to Gadukino':minut += 20 & gt'gadukino'
+	act 'Go into the woods':minut += 30 & gt'gadforest','1'
+	if meadow > 0: act 'Go to the meadow':minut += 20 & gt 'Meadow'
+	act 'Go to the fields':minut += 10 & gt'gadfield','field'
+	if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour >= 6 and hour < 22 and gadrunday ! daystart:
+		act 'Go for a run (1:00)':
+			*clr & cla
+			menu_off = 1
+			minut += 60
+			fat -= RAND(5,15)
+			run_exp += RAND(3,6)
+			pcs_sweat += 20
+			gadrunday = daystart
+			gs'stat'
 
-act 'Go to Gadukino':minut += 20 & gt'gadukino'
-act 'Go into the woods':minut += 30 & gt'gadforest','1'
-act 'Take a detour to the field':minut += 10 & gt'gadfield','field'
-if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour >= 6 and hour < 22 and daygadrun ! daystart:
-	act 'Go for a run (1:00)':
-		cls
-		menu_off = 1
-		minut += 60
-		fat -= RAND(5,15)
-		run_exp += RAND(3,6)
-		pcs_sweat += 20
-		daygadrun = daystart
-		gs'stat'
-		!gs'time'
-		if month <= 3 or month >= 11:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg4.jpg"></center>'
-		elseif month=9 or month=10 or month=4 or month=5:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg3.jpg"></center>'
-		else
-			if musle >= salo: 
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg1.jpg"></center>'
+			if month <= 3 or month >= 11:
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg4.jpg"></center>'
+			elseif month=9 or month=10 or month=4 or month=5:
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg3.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg2.jpg"></center>'
-			end	   
+				if musle >= salo: 
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg1.jpg"></center>'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg2.jpg"></center>'
+				end    
+			end
+			'You run for an hour enjoying the scenery.'
+
+			act 'Finish':gt'gadroad'
 		end
-		'You run for an hour enjoying the scenery.'
+	elseif ($clothingworntype ! 'exercise' or $shoeworntype ! 'trainers') and hour >= 6 and hour < 22 and gadrunday ! daystart:
+		'You could go for a run here if you were wearing sports clothes and shoes.'
+	end
+end
+
+if $ARGS[0] = 'drinking_invite':
+	$loc = 'gadroad'
+	$metka = 'drinking_invite'
+	$location_type = 'secluded'
 
-		act 'Further':gt'gadroad'
+	$menu_loc = 'gadroad'
+	$menu_arg = 'drinking_invite'
+	menu_off = 1
+	
+	minut += 5
+	gs 'stat'
+	
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drunk.jpg"></center>'
+	'You quickly catch up to the boys who have already started drinking.'
+	!School girl Sveta
+	if StoryLine = 1:
+		! Sveta has never been drinking with Mitka before
+		if mitka_first_drink = 1:
+			'Mitka is the first to greet you, "Hey <<$pcs_nickname>>, glad you decided to join us today!"'
+			'Kolyamba and Vasyan nod in agreement as they look you over.'
+			'"We know this great spot in the woods to hang out. No one ever bothers us there."'
+		else
+			'Mitka is the first to greet you, "Hey <<$pcs_nickname>>, glad you decided to join us today!"'
+			'Kolyamba and Vasyan nod in agreement as they look you over.'
+		end
+	! Transformation or New In Town Sveta
+	else
+		if mitka_first_drink = 1:
+			'Mitka is the first to greet you, "Hey <<$pcs_nickname>>, glad you decided to join us today!"'
+			'"These are my two best friends, Kolyamba and Vasyan. We have grown up in this village our whole lives and do just about everything together."'
+			'Kolyamba and Vasyan quickly introduce themselves and look you over.'
+			'"We know this great spot in the woods to hang out. No one ever bothers us there."'
+		else
+			'Mitka is the first to greet you, "Hey <<$pcs_nickname>>, glad you decided to join us today!"'
+			'Kolyamba and Vasyan nod in agreement as they look you over.'
+		end
+	end
+	'Mitka asks, "Are you ready to go?"'
+	
+	! if Sveta did not bring Mira with her and Mira has met the boys already then there is a 50% chance she will show up too
+	if MiraLoc ! 5 and npc_QW['A60'] >= 1:
+		mirarand = rand(1,10)
+		if mirarand >= 6: MiraLoc = 5
+		'Just as the words leave Mitka''s mouth, Mira comes bounding around the corner.'
+		'"Hey guys, thanks for the invite! <<$pcs_nickname>> is here too, awesome! Let''s go!"'
+	end
+	
+	! Mira is here and both her and Sveta are the town whores
+	! mitkabuh_group has the drinking events for group sex for 2 girls and 3 boys
+	if MiraLoc = 5 and npc_QW['A60'] >= 16 and gadriver_gang = 2:
+		act 'Go with them': minut += 15 & npc_drunk['A60'] = 0 & gt 'mitkabuh_group'
+	! Mira is here and neither or only 1 out 2 of them is the town whore
+	! mitkabuh has the drinking events for group sex for 1 girl and 3 boys or no sex at all if quest is not far enough along
+	elseif MiraLoc = 5:
+		act 'Go with them': minut += 15 & npc_drunk['A60'] = 0 & gt 'mitkabuh'
+	! Mira is not here so Sveta goes by herself
+	else
+		act 'Go with them': minut += 15 & gt 'mitkabuh'
+	end
+	! if Sveta came here to kick off Miras quest then she cannot leave otherwise Sveta is free to decline the offer
+	if npc_QW['A60'] > 0 or (MiraLoc ! 5 and npc_QW['A60'] = 0):
+		act 'No thanks, not tonight': gt 'gadroad'
 	end
-elseif ($clothingworntype ! 'exercise' or $shoeworntype ! 'trainers') and hour >= 6 and hour < 22 and daygadrun ! daystart:
-	'You could go for a run here if you were wearing sports clothes and shoes.'
 end
 
 --- gadroad ---------------------------------

+ 17 - 15
locations/gadukino.qsrc

@@ -15,13 +15,21 @@ if $ARGS[0] = '':
 	!lower chance (1/3 to 1/12) and once per day by illume
 	! 10% chance of meeting Mitka once per day in the village when Sveta is not the village boys slut or whole villages whore
 	mitkarand = rand(1,10)
-	if mitkaday ! daystart and hour >= 7 and hour < 20 and mitkarand = 1 and (npc_QW['A63'] < 10 or gadriver_gang > 2):
+	if mitkaday ! daystart and hour >= 7 and hour < 20 and mitkarand = 1 and (npc_QW['A63'] < 11 or gadriver_gang > 2):
 		*clr & cla
 		minut += 5
 		gs 'stat'
 		'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
-		'In the village you are approached by your old friend Mitka.'
+		if StoryLine = 1:
+			'In the village you are approached by your old friend Mitka.'
+		else
+			if npc_rel['A63'] = 0:
+				'In the village you are approached by a boy about your age.'
+			else
+				'In the village you are approached by Mitka.'
+			end
+		end
 
 		act 'Say hello':gt 'mitka'
 	else
@@ -66,7 +74,7 @@ if $ARGS[0] = '':
 			! 17% chance for Mira to demand sex from Sveta
  			elseif mitkarand <= 6:
 				! Sveta is the boys slut and Mira is not and they have already had sex together
-				if npc_QW['A63'] >= 10 and mirasex = 1 and npc_QW['A60'] < 11 and miraday ! daystart: gt 'Meadow','mira_lesb_talk4'
+				if npc_QW['A63'] >= 11 and mirasex = 1 and npc_QW['A60'] < 11 and miraday ! daystart: gt 'Meadow','mira_lesb_talk4'
 			end
 		end		
 		gs 'stat'
@@ -87,11 +95,11 @@ if $ARGS[0] = '':
 		end
 		'A small village with many rickety wooden houses and even more ruins of houses. This village has seen better times.'
 		if car > 0 and cardrive = 23: '<a href="exec:GS ''carF'',''start''">Your <<$car>></a> is close by.'
-		if StoryLine = 1 :
+		if StoryLine = 1:
 			'Nearby are a series of small farms, on one of which <a href="exec:minut += 5 & gt ''Gaddvor''">your grandparents</a> live.'
 			act 'Grandparent''s house': minut += 5 & gt 'Gaddvor'
 		end
-		if npc_rel['A60'] > 0: 'Just down the road from your grandparents house is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s</a> house.'
+		if npc_rel['A60'] > 0: 'Just down the road '+iif(StoryLine=1,'from your grandparents house ','')+'is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s</a> house.'
 		*nl
 
 		if month >= 6 and month <= 9:
@@ -104,9 +112,6 @@ if $ARGS[0] = '':
 			'It''s not the right season for mushrooms or berries. The truck which takes them in town won''t come.'
 		end
 
-		if hour >= 17 and hour < 20:'Not far from the house is <a href="exec:gt ''mitka''">Mitka Shkvoryen</a>'
-		if hour >= 20 and sunWeather = 1:'Not far from the house sits a group of country <a href="exec:gt ''mitkabuh''">youths</a>'
-	
 		!Looks like no reference to Gadmarket exists. Adding it...FinnMacha
 		*nl
 		if hour >= 8 and hour < 20:
@@ -140,7 +145,6 @@ if $ARGS[0] = '':
 
 		act 'Go to the river':minut += 20 & gt 'gadriver', 'start'
 		act 'Go to the forest road':minut += 20 & gt 'gadroad'
-		if meadow > 0: act 'Go to the meadow':minut += 20 & gt 'Meadow'
 		!!Succubus active hunting, can only hunt successfully once a day, but can try until success
 		if (hour <= 7 or hour >= 21) and succubusQW = 5 and suchuntday ! daystart:
 			act 'Go Hunting (this can take a lot of time)': suchunt = 1 & gt 'gadukino', 'succubus_hunt'
@@ -279,10 +283,8 @@ if $ARGS[0] = 'find_meadow':
 						minut += 20
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
-						if StoryLine = 1 :
-							'You spend another twenty minutes exploring the meadow and its surroundings. You''re positive no one visits this location. You loudly proclaim the meadow to be your domain and you are its ruler. Eventually, you decide to head back to the village. To your surpise, your discover a quick shortcut that leads from the meadow back to the village center.'
-							act 'Return to Gadukino': minut += 5 & gt 'gadukino'
-						end
+						'You spend another twenty minutes exploring the meadow and its surroundings. You''re positive no one visits this location. You loudly proclaim the meadow to be your domain and you are its ruler. Eventually, you decide to head back to the village. To your surpise, your discover a quick shortcut that leads from the meadow back to the forest road.'
+						act 'Return to the forest road': minut += 5 & gt 'gadroad'
 					end
 				end
 			end
@@ -292,13 +294,13 @@ end
 
 if $ARGS[0] = 'mira_events':
 	! never met mira before
-	if npc_rel['A60'] = 0:
+	if npc_rel['A60'] = 0 and npc_QW['A60'] = 0:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/miroslava.jpg"></center>'
 		'Walking around the village you notice a young girl around your own age. You do not recognize her from the last time you were at the village. She is pulling on a rope attached to the collar on a small calf. The calf grunts with displeasure, shakes her head and refuses to move any further.'
 		act 'Help her':
 			*clr & cla
-			npc_rel['A60'] = 1
+			npc_rel['A60'] = 10
 			minut += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira.jpg"></center>'