Browse Source

[fixes] blocked schoolgirl/boy content for other starts

julzor 5 years ago
parent
commit
72fadb8d82
3 changed files with 16 additions and 9 deletions
  1. 1 1
      locations/gadfield.qsrc
  2. 1 4
      locations/gadukino.qsrc
  3. 14 4
      locations/pavaptcourtev.qsrc

+ 1 - 1
locations/gadfield.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'field':
 		else
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadfield_night.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadfield_night.jpg"></center>'
 		end
 		end
-		if hour >= 9 and hour <= 17 and grigoryEV = 0: gs 'grigory', 'meet' & exit
+		if hour >= 9 and hour <= 17 and grigoryEV = 0 and storyline = 1: gs 'grigory', 'meet' & exit
 	else
 	else
 		if hour >= 8 and hour < 18:
 		if hour >= 8 and hour < 18:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadfield_winter.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadfield_winter.jpg"></center>'

+ 1 - 4
locations/gadukino.qsrc

@@ -68,9 +68,6 @@ if $ARGS[0] = '':
 		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.'
 			'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'
 			act 'Grandparent''s house': minut += 5 & gt 'Gaddvor'
-		else
-			'Nearby are a series of small farms, on one of which <a href="exec:minut += 5 & gt ''Gaddvor''">old couple</a> live.'
-			act 'Old couple''s house': gt 'Gaddvor'
 		end
 		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 from your grandparents house is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s</a> house.'
 		*nl
 		*nl
@@ -167,7 +164,7 @@ if $ARGS[0] = '':
 		end
 		end
 
 
 		act 'Go to the river':minut += 20 & gt 'gadriver', 'start'
 		act 'Go to the river':minut += 20 & gt 'gadriver', 'start'
-		act 'Go to forest road':minut += 20 & gt'gadroad'
+		act 'Go to forest road':minut += 20 & gt 'gadroad'
 !!Succubus active hunting, can only hunt successfully once a day, but can try until success
 !!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 <= 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'
 			act 'Go Hunting (this can take a lot of time)': suchunt = 1 & gt 'gadukino', 'succubus_hunt'

+ 14 - 4
locations/pavaptcourtev.qsrc

@@ -104,7 +104,10 @@ if $ARGS[0] = 'events1':
 	if rolanmeet = 0: events = rand(0,17)
 	if rolanmeet = 0: events = rand(0,17)
 	if rolanmeet > 0: events = rand(0,22)
 	if rolanmeet > 0: events = rand(0,22)
 	
 	
+	:storyline_jump1
+	
 	if anushkaFirstvisit = 0 and npc_rel['A144'] > 50 and rand(0,1) = 1 and anushka_met ! daystart:
 	if anushkaFirstvisit = 0 and npc_rel['A144'] > 50 and rand(0,1) = 1 and anushka_met ! daystart:
+		if storyline ! 1: jump 'storyline_jump1'
 		*clr & cla
 		*clr & cla
 		anushka_met = daystart
 		anushka_met = daystart
 		'<center><img src="images\locations\pavlovsk\school\head\45.jpg"></center>'
 		'<center><img src="images\locations\pavlovsk\school\head\45.jpg"></center>'
@@ -127,6 +130,7 @@ if $ARGS[0] = 'events1':
 		'A boy and girl are sitting on one of the benches kissing. They are making out passionately, seemingly unaware that anyone is watching them or perhaps they just don''t care if anyone is watching them. You think you recognize the boy from smoking in the stairwell.'
 		'A boy and girl are sitting on one of the benches kissing. They are making out passionately, seemingly unaware that anyone is watching them or perhaps they just don''t care if anyone is watching them. You think you recognize the boy from smoking in the stairwell.'
 		act 'Move away':gt 'pavComplex', 'start'
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif events = 2:
 	elseif events = 2:
+		if storyline ! 1: jump 'storyline_jump1'
 		*clr & cla
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/evggkiss' + rand(1,3) + '.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/evggkiss' + rand(1,3) + '.jpg"></center>'
 		if rand(1,4) = 1:
 		if rand(1,4) = 1:
@@ -171,6 +175,7 @@ if $ARGS[0] = 'events1':
 		'You notice three girls standing down near the garages, where they can see the alley. Each time a car drives down the alley they turn around and moon the car, laughing the whole time. After several times they seem to get bored with mooning cars and move off down the alley themselves.'
 		'You notice three girls standing down near the garages, where they can see the alley. Each time a car drives down the alley they turn around and moon the car, laughing the whole time. After several times they seem to get bored with mooning cars and move off down the alley themselves.'
 		act 'Move away':gt 'pavComplex', 'start'
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif events = 9:
 	elseif events = 9:
+		if storyline ! 1: jump 'storyline_jump1'
 		*clr & cla
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatu.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatu.jpg"></center>'
 		'You see your school mate Anushka across the courtyard. When she notices you looking she raises her hand up to her face spreading two fingers in a V in front of her mouth and sticks her tongue out between them, in the universal sign for eat me. Before you can respond she goes inside her building.'
 		'You see your school mate Anushka across the courtyard. When she notices you looking she raises her hand up to her face spreading two fingers in a V in front of her mouth and sticks her tongue out between them, in the universal sign for eat me. Before you can respond she goes inside her building.'
@@ -205,7 +210,7 @@ if $ARGS[0] = 'events1':
 		*clr & cla
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evbj' + rand(1,2) + '.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evbj' + rand(1,2) + '.jpg"></center>'
 		text_rand = rand(0,2)
 		text_rand = rand(0,2)
-		if text_rand = 0:
+		if text_rand = 0 or storyline ! 1:
 			'You spot an extremely happy looking man leaned up against the wall near the storage buildings, and squatting in front of him is a girl giving him an enthusiastic blowjob. You''re not exactly sure which of the two is enjoying it more. You don''t know either of these people, but you''ve seen them around here before. After a few minutes, you hear the guy moan, his cock never leaving the girl''s mouth. She continues to milk him for another minute before standing up and the two walk off together.'
 			'You spot an extremely happy looking man leaned up against the wall near the storage buildings, and squatting in front of him is a girl giving him an enthusiastic blowjob. You''re not exactly sure which of the two is enjoying it more. You don''t know either of these people, but you''ve seen them around here before. After a few minutes, you hear the guy moan, his cock never leaving the girl''s mouth. She continues to milk him for another minute before standing up and the two walk off together.'
 		elseif text_rand = 1:
 		elseif text_rand = 1:
 			'You see, between two of the storage buildings, Lena squatting down before Lavrenti as she sucks his dick. Lena seems to be enjoying this almost as much as Lavrenti is enjoying getting the blowjob. After a few minutes, you hear him moan, his cock never leaving her mouth. She continues to milk him for another minute before standing up and the two walk off together. You wonder if Vitek is aware of what his sister is getting up to, though you definitely aren''t going to ask him, knowing his reputation, when it comes to his sister.'
 			'You see, between two of the storage buildings, Lena squatting down before Lavrenti as she sucks his dick. Lena seems to be enjoying this almost as much as Lavrenti is enjoying getting the blowjob. After a few minutes, you hear him moan, his cock never leaving her mouth. She continues to milk him for another minute before standing up and the two walk off together. You wonder if Vitek is aware of what his sister is getting up to, though you definitely aren''t going to ask him, knowing his reputation, when it comes to his sister.'
@@ -222,7 +227,7 @@ if $ARGS[0] = 'events1':
 	elseif events = 15:
 	elseif events = 15:
 		*clr & cla
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evgopbj.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evgopbj.jpg"></center>'
-		if soniaPS > 0 and rand(0,1) = 0:
+		if storyline ! 1 or (soniaPS > 0 and rand(0,1) = 0):
 			'Between two of the storage buildings you notice Sonia squatting between Vitek, Dan and Vasily, taking turns sucking their cocks. She seems quite into the blow-jobs, almost as much as the three guys. It doesn''t take too long before the three Gopniks start jerking their dicks and cumming all over Sonia''s face.'
 			'Between two of the storage buildings you notice Sonia squatting between Vitek, Dan and Vasily, taking turns sucking their cocks. She seems quite into the blow-jobs, almost as much as the three guys. It doesn''t take too long before the three Gopniks start jerking their dicks and cumming all over Sonia''s face.'
 			*nl
 			*nl
 			'The trio begin laughing as they put their dicks back in the pants. Dan pulls out his phone and starts taking photos of Sonia still covered in their cum. As she gets to her feet, both Vitek and Vasily grab her by the arms and start pulling her towards the street, never giving her a chance to clean the cum from her face. She tries to struggle but they don''t seem to care and soon they''re gone.'
 			'The trio begin laughing as they put their dicks back in the pants. Dan pulls out his phone and starts taking photos of Sonia still covered in their cum. As she gets to her feet, both Vitek and Vasily grab her by the arms and start pulling her towards the street, never giving her a chance to clean the cum from her face. She tries to struggle but they don''t seem to care and soon they''re gone.'
@@ -275,6 +280,7 @@ if $ARGS[0] = 'events1':
 			end
 			end
 		end
 		end
 	elseif events >= 17:
 	elseif events >= 17:
+		if storyline ! 1: jump 'storyline_jump1'
 		gt 'pavcomplexrolan'
 		gt 'pavcomplexrolan'
 	end	
 	end	
 end
 end
@@ -289,6 +295,7 @@ if $ARGS[0] = 'events2':
 	gs 'stat'
 	gs 'stat'
 !!ToDo: Remove this and the next line if places are added to the game where sveta can smoke the joints (julzor)
 !!ToDo: Remove this and the next line if places are added to the game where sveta can smoke the joints (julzor)
 	:night_events_jump
 	:night_events_jump
+	:storyline_jump2
 	nightevents = rand(1,12)	
 	nightevents = rand(1,12)	
 	if nightevents = 1:
 	if nightevents = 1:
 		*clr & cla
 		*clr & cla
@@ -315,7 +322,7 @@ if $ARGS[0] = 'events2':
 		*clr & cla
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evbjn.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evbjn.jpg"></center>'
 		text_rand = rand(0,2)
 		text_rand = rand(0,2)
-		if text_rand = 0:
+		if text_rand = 0 or storyline ! 1:
 			'You spot an extremely happy looking man leaned up against the wall near the storage buildings, and squatting in front of him is a girl giving him an enthusiastic blowjob. You''re not exactly sure which of the two is enjoying it more. You don''t know either of these people, but you''ve seen them around here before. After a few minutes, you hear the guy moan, his cock never leaving the girl''s mouth. She continues to milk him for another minute before standing up and the two walk off together.'
 			'You spot an extremely happy looking man leaned up against the wall near the storage buildings, and squatting in front of him is a girl giving him an enthusiastic blowjob. You''re not exactly sure which of the two is enjoying it more. You don''t know either of these people, but you''ve seen them around here before. After a few minutes, you hear the guy moan, his cock never leaving the girl''s mouth. She continues to milk him for another minute before standing up and the two walk off together.'
 		elseif text_rand = 1:
 		elseif text_rand = 1:
 			'You see, between two of the storage buildings, Lena squatting down before Lavrenti as she sucks his dick. Lena seems to be enjoying this almost as much as Lavrenti is enjoying getting the blowjob. After a few minutes, you hear him moan, his cock never leaving her mouth. She continues to milk him for another minute before standing up and the two walk off together. You wonder if Vitek is aware of what his sister is getting up to, though you definitely aren''t going to ask him, knowing his reputation, when it comes to his sister.'
 			'You see, between two of the storage buildings, Lena squatting down before Lavrenti as she sucks his dick. Lena seems to be enjoying this almost as much as Lavrenti is enjoying getting the blowjob. After a few minutes, you hear him moan, his cock never leaving her mouth. She continues to milk him for another minute before standing up and the two walk off together. You wonder if Vitek is aware of what his sister is getting up to, though you definitely aren''t going to ask him, knowing his reputation, when it comes to his sister.'
@@ -331,7 +338,7 @@ if $ARGS[0] = 'events2':
 		act 'Move away':gt 'pavComplex', 'start'
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif nightevents = 5:
 	elseif nightevents = 5:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evgopbjn.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evgopbjn.jpg"></center>'
-		if soniaPS > 0 and rand(0,1) = 0:
+		if storyline ! 1 or (soniaPS > 0 and rand(0,1) = 0):
 			'Between two of the storage buildings you notice Sonia squatting between Vitek, Dan and Vasily, taking turns sucking their cocks. She seems quite into the blow-jobs, almost as much as the three guys. It doesn''t take too long before the three Gopniks start jerking their dicks and cumming all over Sonia''s face.'
 			'Between two of the storage buildings you notice Sonia squatting between Vitek, Dan and Vasily, taking turns sucking their cocks. She seems quite into the blow-jobs, almost as much as the three guys. It doesn''t take too long before the three Gopniks start jerking their dicks and cumming all over Sonia''s face.'
 			*nl
 			*nl
 			'The trio begin laughing as they put their dicks back in the pants. Dan pulls out his phone and starts taking photos of Sonia still covered in their cum. As she gets to her feet, both Vitek and Vasily grab her by the arms and start pulling her towards the street, never giving her a chance to clean the cum from her face. She tries to struggle but they don''t seem to care and soon they''re gone.'
 			'The trio begin laughing as they put their dicks back in the pants. Dan pulls out his phone and starts taking photos of Sonia still covered in their cum. As she gets to her feet, both Vitek and Vasily grab her by the arms and start pulling her towards the street, never giving her a chance to clean the cum from her face. She tries to struggle but they don''t seem to care and soon they''re gone.'
@@ -393,6 +400,7 @@ if $ARGS[0] = 'events2':
 !!will add this later when I find a good image set for it.
 !!will add this later when I find a good image set for it.
 !!act 'How about we party together?':				
 !!act 'How about we party together?':				
 	elseif nightevents = 9:
 	elseif nightevents = 9:
+		if storyline ! 1: jump 'storyline_jump2'
 		*clr & cla
 		*clr & cla
 		if month >= 11 or month <= 3:
 		if month >= 11 or month <= 3:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/3stoogesw.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/3stoogesw.jpg"></center>'
@@ -443,6 +451,7 @@ if $ARGS[0] = 'events2':
 			end
 			end
 		end
 		end
 	elseif nightevents = 10:
 	elseif nightevents = 10:
+		if storyline ! 1: jump 'storyline_jump2'
 		*clr & cla
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/gopgirls.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/gopgirls.jpg"></center>'
 		'Lena, Lera, Alyona, and Anushka are hanging out on one of the benches, drinking beers, smoking cigarettes and weed. All and all just getting wasted and having a good time, laughing and messing around.'
 		'Lena, Lera, Alyona, and Anushka are hanging out on one of the benches, drinking beers, smoking cigarettes and weed. All and all just getting wasted and having a good time, laughing and messing around.'
@@ -477,6 +486,7 @@ if $ARGS[0] = 'events2':
 			end
 			end
 		end
 		end
 	elseif nightevents = 11:
 	elseif nightevents = 11:
+		if storyline ! 1: jump 'storyline_jump2'
 		*clr & cla
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/lelepa.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/lelepa.jpg"></center>'
 		'Lena, Lera, and Paulina are hanging out on one of the benches, drinking beers and smoking cigarettes. All and all just getting wasted and having a good time, laughing and messing around.'
 		'Lena, Lera, and Paulina are hanging out on one of the benches, drinking beers and smoking cigarettes. All and all just getting wasted and having a good time, laughing and messing around.'