Browse Source

[fixed] cut out some duplicate code in soniadisco by merging together the shared parts of disco0 and disco01

Spackled Lanturn 3 years ago
parent
commit
4122d312d5
1 changed files with 88 additions and 95 deletions
  1. 88 95
      locations/soniadisco.qsrc

+ 88 - 95
locations/soniadisco.qsrc

@@ -21,10 +21,8 @@ if $ARGS[0] = 'start':
 		elseif soniafall = 6:
 			gt 'soniadisco', 'disco6'
 		end
-	elseif soniafall < 3:
-		gt 'soniadisco', 'disco0'
 	else
-		gt 'soniadisco', 'disco01'
+		gt 'soniadisco', 'disco0'
 	end
 end
 
@@ -42,32 +40,97 @@ if $ARGS[0] = 'disco0':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/soniadance.jpg"></center>'
 		'You heard Sonia had started to hang around the gopniks lately, drinking, partying and generally cutting loose, but as you watch, you can tell she is getting totally wasted and is starting to really grind on any and everyone that comes up to dance with her. After a while, she seems barely able to stand up and is more hanging on guys as she grinds on them to keep her balance.'
-		act 'Just watch':
+		if soniafall < 3:
+			gs 'soniadisco', 'watchorhelp'
+		else
+			gs 'soniadisco', 'soniashowboobs'
+		end
+	end
+end
+
+if $ARGS[0] = 'watchorhelp':
+	act 'Just watch':
+		*clr & cla
+		minut += 20
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/soniadance.jpg"></center>'
+		'You keep on watching as the boys are getting quite frisky as Sonia is barely putting up any resistance. The boys are truly all over her, touching her wherever they please as Sonia keeps on stumbling around, too drunk to care what is happening...'
+		'After a few minutes, Katja walks up to her and obviously is trying to get her to leave the dance floor, but Sonia jerks away and says something that just leaves Katja shaking her head and then walking away.'
+		'Some time later looking a bit sick, Sonia stumbles into the girls bathroom followed by Katja. They emerge some time later, and Katja walks Sonia out of the disco, you presume taking her home.'
+		act 'Continue': gt 'gdkin'
+	end
+	act 'Help Sonia':
+		*clr & cla
+		minut += 2
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/soniadance.jpg"></center>'
+		'You keep on watching as the boys are getting quite frisky as Sonia is barely putting up any resistance. The boys are truly all over her, touching her wherever they please as Sonia keeps on stumbling around, too drunk to care what is happening...'
+		'You shake your head in disbelief; Sonia is too wasted to even realize what''s happening! If she isn''t careful, some guy is going to drag her away and take advantage of her.'
+		'You walk up to Sonia and say to her, "Slow down Sonia, you are pretty wasted and giving the guys the wrong idea." She turns and gives you a sour look.'
+		'"What are you my mother? God I am tired of having to always be the good girl, I just want to cut loose and party for once." With that, she starts grinding her butt on some guys crotch, who seems only too happy to help out.'
+		act 'Walk away':
 			*clr & cla
 			minut += 20
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/soniadance.jpg"></center>'
-			'You keep on watching as the boys are getting quite frisky as Sonia is barely putting up any resistance. The boys are truly all over her, touching her wherever they please as Sonia keeps on stumbling around, too drunk to care what is happening...'
+			'You just shake your head and walk away, leaving Sonia dancing around grinding on boys, and there is no shortage of boys trying to dance with her. She looks to be having fun, but she is also acting like a total slut, and you can see others watching and whispering about her.'
 			'After a few minutes, Katja walks up to her and obviously is trying to get her to leave the dance floor, but Sonia jerks away and says something that just leaves Katja shaking her head and then walking away.'
 			'Some time later looking a bit sick, Sonia stumbles into the girls bathroom followed by Katja. They emerge some time later, and Katja walks Sonia out of the disco, you presume taking her home.'
 			act 'Continue': gt 'gdkin'
 		end
+		act 'Convince her':
+			*clr & cla
+			minut += 20
+			grupvalue[4] -= 2
+			grupvalue[1] += 2
+			npc_rel['A25'] += 5
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big25.jpg"></center>'
+			'You stand in front of her and grab ahold of her arms so she stops moving around. "Sonia! Look around, you are totally wasted and grinding on these guys like you plan to fuck them all."'
+			'Sonia resist for a moment, but then your words seem to sink in, and she drunkenly blinks a couple of times then looks around. She blushes a bit and seems to sober up just a little, as she realizes just how wasted she was. She gives you a grateful nod and awkwardly tries to leave the dance floor, but the guys are trying to keep her on it. You have to intervene on her behalf and make the guys let go of her. The two of you finally make it off the dance floor near the door leaving the dance hall.'
+			*nl
+			'She smiles at you a bit. "Thanks <<$pcs_nickname>>, I guess I got a little carried away."'
+			'"Maybe you should go home, you''re pretty wasted," you reply to her.'
+			'She nods. "Thanks, yeah." She starts to head out, and you notice she can barely walk, but when you start to help her, she pulls away. "I can handle it myself."'
+			'You sigh a bit. "Just be careful with drinking too much and be careful walking home."'
+			'She rolls her eyes. "It was just a little harmless fun, no one cares." Then she walks away.'
+			act 'Continue': gt 'gdkin'
+		end
+	end
+end
+
+if $ARGS[0] = 'soniashowsboobs':
+	act 'Boobs':
+		*clr & cla
+		minut += 10
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/titflash.jpg"></center>'
+		'You keep on watching as the boys are getting quite frisky as Sonia revels in the attention. The boys are truly all over her, touching her wherever they please as Sonia keeps on dancing seemingly not caring what is happening...'
+		'Then she grabs the top of her dress and exposes her bare breasts for everyone to see. The guys and some of the girls hoot and holler, but you also notice some of them shaking their heads and whispering. You know Sonia is starting to earn a bad reputation at school.'
+		act 'Just watch':
+			*clr & cla
+			minut += 10
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/titflash.jpg"></center>'
+			'You keep on watching as Sonia, the top of her dress still pulled down and her boobs bouncing around freely, continues dancing, perhaps even more energetically than before. After a few minutes, Katja walks up to her and obviously is trying to get her to leave the dance floor, but Sonia jerks away and says something that just leaves Katja shaking her head and then walking away.'
+			'Some time later looking a bit sick, Sonia stumbles into the girls bathroom followed by Katja. They emerge some time later, and Katja walks Sonia out of the disco, you presume taking her home.'
+			act 'Continue': gt 'gdkin'
+		end
 		act 'Help Sonia':
 			*clr & cla
 			minut += 2
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/soniadance.jpg"></center>'
-			'You keep on watching as the boys are getting quite frisky as Sonia is barely putting up any resistance. The boys are truly all over her, touching her wherever they please as Sonia keeps on stumbling around, too drunk to care what is happening...'
-			'You shake your head in disbelief; Sonia is too wasted to even realize what''s happening! If she isn''t careful, some guy is going to drag her away and take advantage of her.'
-			'You walk up to Sonia and say to her, "Slow down Sonia, you are pretty wasted and giving the guys the wrong idea." She turns and gives you a sour look.'
-			'"What are you my mother? God I am tired of having to always be the good girl, I just want to cut loose and party for once." With that, she starts grinding her butt on some guys crotch, who seems only too happy to help out.'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/titflash.jpg"></center>'
+			'You keep on watching as Sonia, the top of her dress still pulled down and her boobs bouncing around freely, continues dancing, perhaps even more energetically than before. You shake your head in disbelief; Sonia has to be too wasted to even realize what she is doing. You decide you have to do something before she completely ruins her reputation.'
+			'You walk up to Sonia and say to her, "Sonia what are you doing? Everyone can see your tits." She turns and gives you a sour look.'
+			'"What are you my mother? God I am tired of having to always be the good girl, I just want to cut loose and party for once." With that, she starts grinding her butt on some guy''s crotch, who seems only too happy to help out.'
 			act 'Walk away':
 				*clr & cla
 				minut += 20
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/soniadance.jpg"></center>'
-				'You just shake your head and walk away, leaving Sonia dancing around grinding on boys, and there is no shortage of boys trying to dance with her. She looks to be having fun, but she is also acting like a total slut, and you can see others watching and whispering about her.'
-				'After a few minutes, Katja walks up to her and obviously is trying to get her to leave the dance floor, but Sonia jerks away and says something that just leaves Katja shaking her head and then walking away.'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/titflash.jpg"></center>'
+				'You just shake your head and walk away, leaving Sonia dancing around grinding on boys with her tits hanging out, and there is no shortage of boys trying to dance with her. She looks to be having fun, but she is also acting like a total slut, and you can see others watching and whispering about her.'
+				'After a while, Katja walks up to her and obviously is trying to get her to leave the dance floor, but Sonia jerks away and says something that just leaves Katja shaking her head and then walking away.'
 				'Some time later looking a bit sick, Sonia stumbles into the girls bathroom followed by Katja. They emerge some time later, and Katja walks Sonia out of the disco, you presume taking her home.'
 				act 'Continue': gt 'gdkin'
 			end
@@ -77,97 +140,27 @@ if $ARGS[0] = 'disco0':
 				grupvalue[4] -= 2
 				grupvalue[1] += 2
 				npc_rel['A25'] += 5
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big25.jpg"></center>'
-				'You stand in front of her and grab ahold of her arms so she stops moving around. "Sonia! Look around, you are totally wasted and grinding on these guys like you plan to fuck them all."'
-				'Sonia resist for a moment, but then your words seem to sink in, and she drunkenly blinks a couple of times then looks around. She blushes a bit and seems to sober up just a little, as she realizes just how wasted she was. She gives you a grateful nod and awkwardly tries to leave the dance floor, but the guys are trying to keep her on it. You have to intervene on her behalf and make the guys let go of her. The two of you finally make it off the dance floor near the door leaving the dance hall.'
+				'You stand in front of her and grab ahold of her arms so she stops moving around. "Sonia! Look around, you are totally wasted, showing off your tits, and grinding on these guys like you plan to fuck them all. What do you think everyone is going to say?"'
+				'Sonia resist for a moment, but then your words seem to sink in, and she drunkenly blinks a couple of times then looks around. She blushes a bit and seems to sober up just a little, as she seems to realize what she has been doing.'
 				*nl
+				'She gives you a grateful nod, pulling her dress back up, which gets a lot of guys giving you dirty looks. As Sonia and you try to leave the dance floor, the guys try to keep her on it. You have to intervene on her behalf and make the guys let go of her. The two of you finally make it off the dance floor near the door leaving the dance hall.'
 				'She smiles at you a bit. "Thanks <<$pcs_nickname>>, I guess I got a little carried away."'
 				'"Maybe you should go home, you''re pretty wasted," you reply to her.'
-				'She nods. "Thanks, yeah." She starts to head out, and you notice she can barely walk, but when you start to help her, she pulls away. "I can handle it myself."'
-				'You sigh a bit. "Just be careful with drinking too much and be careful walking home."'
-				'She rolls her eyes. "It was just a little harmless fun, no one cares." Then she walks away.'
-				act 'Continue': gt 'gdkin'
-			end
-		end
-	end	
-end
-
-if $ARGS[0] = 'disco01':
-	menu_off = 0
-	*clr & cla
-	minut += 15
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/0.jpg"></center>'
-	'You notice Sonia out on the dance floor really working her body. She seems to be dancing like there is no tomorrow. As you watch, she stops from time to time to go grab some drinks from the gopniks, who seem happy to supply her with alcohol.'
-	act 'Keep watching':
-		*clr & cla
-		minut += 15
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/soniadance.jpg"></center>'
-		'You heard Sonia had started to hang around the gopniks lately, drinking, partying and generally cutting loose, but as you watch, you can tell she is getting totally wasted and is starting to really grind on any and everyone that comes up to dance with her. After a while, she doesn''t seem to mind the guys pawing at her at all. In fact, she seems to be reveling in the attention.'
-		act 'Boobs':
-			*clr & cla
-			minut += 10
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/titflash.jpg"></center>'
-			'You keep on watching as the boys are getting quite frisky as Sonia revels in the attention. The boys are truly all over her, touching her wherever they please as Sonia keeps on dancing seemingly not caring what is happening...'
-			'Then she grabs the top of her dress and exposes her bare breasts for everyone to see. The guys and some of the girls hoot and holler, but you also notice some of them shaking their heads and whispering. You know Sonia is starting to earn a bad reputation at school.'
-			act 'Just watch':
-				*clr & cla
-				minut += 10
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/titflash.jpg"></center>'
-				'You keep on watching as Sonia, the top of her dress still pulled down and her boobs bouncing around freely, continues dancing, perhaps even more energetically than before. After a few minutes, Katja walks up to her and obviously is trying to get her to leave the dance floor, but Sonia jerks away and says something that just leaves Katja shaking her head and then walking away.'
-				'Some time later looking a bit sick, Sonia stumbles into the girls bathroom followed by Katja. They emerge some time later, and Katja walks Sonia out of the disco, you presume taking her home.'
-				act 'Continue': gt 'gdkin'
-			end
-			act 'Help Sonia':
-				*clr & cla
-				minut += 2
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/titflash.jpg"></center>'
-				'You keep on watching as Sonia, the top of her dress still pulled down and her boobs bouncing around freely, continues dancing, perhaps even more energetically than before. You shake your head in disbelief; Sonia has to be too wasted to even realize what she is doing. You decide you have to do something before she completely ruins her reputation.'
-				'You walk up to Sonia and say to her, "Sonia what are you doing? Everyone can see your tits." She turns and gives you a sour look.'
-				'"What are you my mother? God I am tired of having to always be the good girl, I just want to cut loose and party for once." With that, she starts grinding her butt on some guy''s crotch, who seems only too happy to help out.'
-				act 'Walk away':
-					*clr & cla
-					minut += 20
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/titflash.jpg"></center>'
-					'You just shake your head and walk away, leaving Sonia dancing around grinding on boys with her tits hanging out, and there is no shortage of boys trying to dance with her. She looks to be having fun, but she is also acting like a total slut, and you can see others watching and whispering about her.'
-					'After a while, Katja walks up to her and obviously is trying to get her to leave the dance floor, but Sonia jerks away and says something that just leaves Katja shaking her head and then walking away.'
-					'Some time later looking a bit sick, Sonia stumbles into the girls bathroom followed by Katja. They emerge some time later, and Katja walks Sonia out of the disco, you presume taking her home.'
-					act 'Continue': gt 'gdkin'
-				end
-				act 'Convince her':
+				'She nods. "Yeah I guess I should, thanks again <<$pcs_nickname>>." She starts to head out.'
+				act 'Let her go': gt 'gdkin'
+				act 'Offer to walk her home':
 					*clr & cla
-					minut += 20
-					grupvalue[4] -= 2
-					grupvalue[1] += 2
-					npc_rel['A25'] += 5
 					'<center><img <<$set_imgh>> src="images/characters/shared/photos/big25.jpg"></center>'
-					'You stand in front of her and grab ahold of her arms so she stops moving around. "Sonia! Look around, you are totally wasted, showing off your tits, and grinding on these guys like you plan to fuck them all. What do you think everyone is going to say?"'
-					'Sonia resist for a moment, but then your words seem to sink in, and she drunkenly blinks a couple of times then looks around. She blushes a bit and seems to sober up just a little, as she seems to realize what she has been doing.'
-					*nl
-					'She gives you a grateful nod, pulling her dress back up, which gets a lot of guys giving you dirty looks. As Sonia and you try to leave the dance floor, the guys try to keep her on it. You have to intervene on her behalf and make the guys let go of her. The two of you finally make it off the dance floor near the door leaving the dance hall.'
-					'She smiles at you a bit. "Thanks <<$pcs_nickname>>, I guess I got a little carried away."'
-					'"Maybe you should go home, you''re pretty wasted," you reply to her.'
-					'She nods. "Yeah I guess I should, thanks again <<$pcs_nickname>>." She starts to head out.'
-					act 'Let her go': gt 'gdkin'
-					act 'Offer to walk her home':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/shared/photos/big25.jpg"></center>'
-						'You catch up to her. "Here let me walk you home," you tell her.'
-						'It looks like she is about to protest and tell you to mind your own business, but then she just nods and smiles at you. "You don''t have to, I can make it myself."'
-						'You nod to her. "I know, but us girls got to look out for each other you know?" you ask her.'
-						'She nods in understanding. "Yeah I guess you''re right. Ok, let''s go," she says with a friendly smile.'
-						act 'Walk her home': gt 'soniadisco', 'walkhome'
-					end
+					'You catch up to her. "Here let me walk you home," you tell her.'
+					'It looks like she is about to protest and tell you to mind your own business, but then she just nods and smiles at you. "You don''t have to, I can make it myself."'
+					'You nod to her. "I know, but us girls got to look out for each other you know?" you ask her.'
+					'She nods in understanding. "Yeah I guess you''re right. Ok, let''s go," she says with a friendly smile.'
+					act 'Walk her home': gt 'soniadisco', 'walkhome'
 				end
 			end
 		end
-	end	
+	end
 end
 	
 if $ARGS[0] = 'disco1':