Merge remote-tracking branch 'kevinsmarts/master'

locations/albinahome.qsrc

@@ -398,7 +398,7 @@ if $ARGS[0] = 'game':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'You shake your head. "Not this time."'
-					'She is a little disappointed but turns her attention to the game. "You are so going to lose!" she laughs. You play games for a while, although things are a little awkward between you. Eventually, Albina stops. "Well, I had fun, but there is some stuff I need to take care of," she says as she turns the console off.'
+					'She''s clearly a little disappointed, but turns her attention back to the game. "You''re so going to lose!" she laughs. You play some games for a while, although things are a little awkward between you. Eventually, Albina stops. "Well, I had fun, but there''s some stuff I need to take care of," she says as she turns the console off.'
 					'Getting the hint, you get up as well. "Yeah, I should probably get going myself." You exchange a brief hug before you leave.'
 					act 'Say goodbye and go home':
 						AlbinaQW['visiting'] = 0
@@ -434,7 +434,6 @@ if $ARGS[0] = 'playgame':
 		'She laughs in response. "You''re that sure? So, how about we make it a bit more interesting then?"'
 		'You arch your brow curiously. "What do you have in mind?"'
 		'She grins at you, gets up and walks over to her dresser. She rummages around in it before pulling out a strapon harness with a large black dildo attached. "The winner gets to use this on the loser... However. They. Want," she says with a smirk.'
-
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse the bet (<<will_cost>> Willpower)':
@@ -479,7 +478,7 @@ if $ARGS[0] = 'game_bet':
 	npc_rel['A23'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
-	'You stare at the size of the attached dildo. It''s almost as long and thick as your forearm. "Where did you get that?!" you laugh. "Whatever, you''re on. You''re so going to get fucked!"'
+	'You smile. "You''re on. You''re so going to get fucked!"'
 	'Albina laughs as she brings the strapon over with a bottle of lube and tosses them on the bed before she lies back beside you and picks her controller up. "Please! You''re so going to lose."' 
 	'She starts the game, and you both fall silent, your focus only on winning.'
 	act 'Play until someone wins':
@@ -504,10 +503,10 @@ if $ARGS[0] = 'game_bet':
 			'It''s close, but in the end, you just manage to win the game. "Yes!" you exclaim triumphantly, and she laughs as she grabs the strapon harness and hands it to you. You both undress, and you grin as you slide the harness on.'
 			act 'Continue': gt 'albinahome', 'wear_strapon'
 		elseif albplay = 1:
-			'Although you try your best, Albina proves a worthy opponent and barely defeats you. Laughing in a mocking and villainous tone, she slaps you on the ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress, and Albina slides the harness on with a smirk on her face.'
+			'Although you try your best, Albina proves a worthy opponent and barely defeats you. Laughing in a mocking and villainous tone, she slaps you on the ass. "Show me your ass, <<$pcs_nickname>>! You''re my bitch now!" You both undress, and Albina slides the harness on with a smirk on her face.'
 			act 'Get fucked with the strapon': gt 'albinahome', 'receive_strapon'
 		elseif albplay = 0:
-			'Although you try your best, Albina simply outplays you at every turn. You stand no chance, and she easily beats you. Laughing in a mocking and villainous tone, she slaps you on the ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress, and Albina slides the harness on with a smirk on her face.'
+			'Although you try your best, Albina simply outplays you at every turn. You stand no chance, and she easily beats you. Laughing in a mocking and villainous tone, she slaps you on the ass. "Show me your ass, <<$pcs_nickname>>! You''re my bitch now!" You both undress, and Albina slides the harness on with a smirk on her face.'
 			act 'Get fucked with the strapon': gt 'albinahome', 'receive_strapon'
 		end
 		killvar 'gameresult'
@@ -585,7 +584,7 @@ if $ARGS[0] = 'fuck_albina_ass':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
 		'"Come on, <<$pcs_nickname>>. Put it back in and fuck me... hard," she says while wiggling her hips. You smile at her and slide the dildo back into her hole with ease, making her moan in pleasure. Next, you grab onto her hips and start fucking her balls deep, filling her ass with the dildo as she reaches back and starts rubbing her clit. After several minutes, you feel her ass tighten around your fake cock. Finally, she cries out as her body is rocked by an intense orgasm and juices squirt from her pussy, soaking the sheets beneath her. You keep fucking her throughout her orgasm, only pulling out once her shudders have passed.'
-		'After you''ve pulled out, she inserts a few fingers into her gaping hole as juices leak from her pussy. "Oh fuck yes, <<$pcs_nickname>>! That was fucking amazing!"'
+		'After you''ve pulled out, she thrusts her fingers into her gaping hole as juices leak from her pussy. "That was fucking amazing!" she says as she pulls her fingers out of her ass and sucks on them.'
 		'"Fucking such a nice-looking ass was amazing!" you reply, and you both laugh.'
 		gs 'arousal', 'anal_strap_give', 5, 'lesbian'
 		gs 'stat'
@@ -596,13 +595,39 @@ end
 if $ARGS[0] = 'receive_strapon':
 	*clr & cla
 	menu_off = 1
-	npc_sex['A23'] += 1
 	lesbian += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
-	'You slide your panties off as she tightens the strapon firmly while standing next to the bed. You lie next to her, and she pulls your head down to the dildo. "Suck my dick, loser!" she says with a giggle.'
-	'You take the dildo into your mouth and start sucking on it while stroking the shaft with one hand. "Yeah, just like that, <<$pcs_nickname>>!" she moans as she reaches between the straps and gently rubs her pussy. You spend several minutes sucking on the dildo, getting it wet with your drool before she pulls it out of your mouth. "I''m so going to enjoy fucking you!"'
-	gs 'arousal', 'foreplay', 5, 'lesbian'
+	if stat['bj'] = 0:
+		stat['bj'] += 1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
+		'Albina notices you staring at the dildo as she tightens the straps firmly around her hips. "You okay, <<$pcs_nickname>>?"'
+		'"Yeah, it''s just..." you start to answer.'
+		'"You''ve never sucked dick before, have you?" she interrupts with a smile. "It''s okay. I can show you what to do so you''re ready for the real thing." She sits back on the bed and spreads her legs, motioning for you to crawl between them.'
+		'"Okay, first thing''s first. You''ll want to start off with a handjob. It gets them in the mood and wanting more," she explains as she takes your hand and places it on the dildo. "Take a firm grip of the shaft, but not too tight, and start moving your hand up and down."'
+		*nl
+		'You follow her instructions and slowly run your hand up and down the dildo. "That''s it, <<$pcs_nickname>>. Just keep doing that. If you feel like it, you can also lick the shaft or suck on their balls while jerking them off. They like it when you tease them like that."'
+		'After a few minutes, Albina moves on with her lesson. "Okay <<$pcs_nickname>>, you ready?" she asks and you nod your head. "Okay. Start off with a little teasing. Run your tongue around the tip while jerking them off."'
+		'You do as she says and she makes you look up at her. "Eye contact, <<$pcs_nickname>>. They like that." You nod at her and look her in the eye as you continue jerking off her fake cock. "Good. Now some guys like taking control, but only let them do that if it''s what you want. That''s enough teasing anyway. Now I want you take as much of the shaft into your mouth as you can."' 
+		*nl
+		'You obdiently take as much of the dildo into your mouth as you can without choking. "Good," Albina says. "Now start bobbing your head up and down; imagine that you''re sucking on a popsicle while swirling your tongue around the head. And keep using your hand."'
+		'You spend the next few minutes practicing on the dildo until your arm and jaw start to ache and you stop. You pop the dildo out of your mouth and look up at Albina, who smiles. "You''re a natural, <<$pcs_nickname>>! If I had a dick, then my cum would be all over your face by now."'
+		'You smile at the compliment. "Time for me to fuck you now," Albina says with a grin.'
+		gs 'arousal', 'foreplay', 5, 'lesbian'
+		gs 'stat'
+		act 'Continue': gt 'albinahome', 'albina_fucks_you'
+	else
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
+		'You slide your panties off as she tightens the strapon firmly while standing next to the bed. You lie next to her, and she pulls your head down to the dildo. "Suck my dick, loser!" she says with a giggle.'
+		'You take the dildo into your mouth and start sucking on it while stroking the shaft with one hand. "Yeah, just like that, <<$pcs_nickname>>..." she moans as she reaches between the straps and gently rubs her pussy. You spend several minutes sucking on the dildo, getting it wet with your drool before she pulls it out of your mouth. "I''m so going to enjoy fucking you!"'
+		gs 'arousal', 'foreplay', 5, 'lesbian'
+		gs 'stat'
+		act 'Continue': gt 'albinahome', 'albina_fucks_you'
+	end
+
+if $ARGS[0] = 'albina_fucks_you':
+	*clr & cla
+	menu_off = 1
 	gs 'stat'
 	if stat['think_virgin'] = 1:
 		act 'You''re a virgin':
@@ -615,6 +640,8 @@ if $ARGS[0] = 'receive_strapon':
 			act 'Just fuck my ass': gt 'albinahome', 'albina_ass_fucks_you'
 			act 'Get your cherry popped':
 				*clr & cla
+				npc_sex['A23'] += 1
+				lesbian += 1
 				gs 'boyStat', 'D3'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
@@ -638,6 +665,8 @@ if $ARGS[0] = 'receive_strapon':
 	else
 		act 'Get your pussy fucked':
 			*clr & cla
+			npc_sex['A23'] += 1
+			lesbian += 1
 			gs 'boyStat', 'D3'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
@@ -686,7 +715,7 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 				*nl
 				'Albina looks at you in what you can only describe as awe. "God damn, <<$pcs_nickname>>, even I''ve never taken a fist up my ass, and I''m the queen of butt stuff!"'
 				'"Is it weird to do that?" you ask with concern.'
-				'"No, not at all! I''ve always wanted to try it, but I''ve never found anyone interested in it. But, maybe that''s about to change..."'
+				'"No, not at all! I''ve always wanted to try it myself. Maybe I will now that I need to up my game."'
 				'She looks you over with lustful desire before continuing. "Practicing with a dildo makes your first butt fuck easier, but a whole fucking hand?! A cock or dildo would be a breeze for you!"'
 				'She then places a hand on your shoulder. "<<$pcs_nickname>>, be honest with me. Do you want me to fuck your ass? I''ll be as gentle as you want."'
 				act 'Yes': gt 'albinahome', 'first_anal1'
@@ -757,7 +786,7 @@ if $ARGS[0] = 'first_anal':
 		'You feel her start slowly pushing, and the pressure builds until the tip of the dildo suddenly pops into your ass, causing you to groan and grit your teeth while gripping the sheets even tighter. It''s a painful sensation, and you instinctively feel the urge to free yourself. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks as you feel a stinging pain shooting through you.'
 		'Remembering what she said, you fight the urge to pull away and try to relax. "No, I just need a second," you reply as you look back at her, and she nods.'
 		*nl
-		'After a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the slick dildo before placing her hands on your hips. "Okay, just keep your ass relaxed and tell me if it gets too painful. I don''t want you hurting yourself trying to impress me. Got it?"'
+		'After taking a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the slick dildo before placing her hands on your hips. "Okay, just keep your ass relaxed and tell me if it gets too painful. I don''t want you hurting yourself trying to impress me. Got it?"'
 		'You nod and prepare yourself as you feel Albina slowly push the dildo deeper into your ass. You feel stretched out as she reaches a depth she feels you''ll be comfortable with and starts gently thrusting.'
 		'Despite the shallow depth and Albina being gentle, the pain becomes too much after a few minutes, and you ask her to pull out. You sit on your knees and clutch your ass cheeks in your hands as pain pulses through your stretched asshole.'
 		'"You lasted longer than I thought you would. Not bad for your first go, <<$pcs_nickname>>," Albina says as she hands you some wipes to clean yourself up. "Next time you lose, maybe we can go deeper and... harder," she adds with a teasing grin as she cleans the dildo and puts it away.'
@@ -814,7 +843,7 @@ if ARGS[0] = 'anal_refuse':
 	'You shake your head. "No, I don''t think I''m ready for that yet."'
 	'Albina smiles. "That''s okay, but if you want to do it with me or want some advice, then just ask. It''s best to get help from someone with... experience on the matter," she says with a grin.'
 	'You grin back. "I''ll be sure to ask the master buttslut for any of her wisdom."'
-	'She punches you in the arm. "Damn right, you will."'
+	'She punches you in the arm. "Damn right you will."'
 	act 'Do something else' :gt 'albinahome', 'bedroom'
 end
 

locations/ender.qsrc

@@ -1081,9 +1081,9 @@ if $ARGS[0] = 'surrender':
 			'"You''re fucking pathetic! You deserve what''s coming next for being such a fucking wimp!"'
 		elseif fightPStats['Health'] > pcs_health/2:
 			'You immediately feel blood running from your nose when Lena jabs you in the face, causing you to panic. "You win, you win! Just don''t hit me again! Please!" you plead and Lena laughs.'
-			'"Look''s like our little bunny isn''t as tough as she likes to think. Maybe she needs to learn from her mistake?" she says and the two gopniks smile at you cruelly.' 
+			'"Looks like our little bunny isn''t as tough as she likes to think. Maybe she needs to learn from her mistake?" she says and the two gopniks smile at you cruelly.' 
 		else
-			'You''re barely able to defend yourself from the dirty tactics the two gopniks employ. Dodging one of Lena''s blows causes you to stumble; they catch you, only to then throw you towards the sink. You''re winded and collpase on the floor when you hit your stomach off the edge of the sink. "I- I give up..." you whisper while trying not to throw up.'
+			'You''re barely able to defend yourself from the dirty tactics the two gopniks employ. Dodging one of Lena''s blows causes you to stumble; they catch you, only to then throw you towards the sink. You''re winded and collapse on the floor when you hit your stomach off the edge of the sink. "I- I give up..." you whisper while trying not to throw up.'
 		end
 		'Lera heads into one of the stalls as Lena pins you to the floor by pressing her knee into your back, causing you to cry out in pain. "Not so tough now, are you bitch?" she smirks.' 
 		'Lera returns a few seconds later and you loudly protest as they haul into a stall and lean you over the toilet. The smell hits you immediately - the bowl is full of urine, likely Lera''s. You know exactly what they''re going to do and grip the toilet seat firmly to stop them, but they pull you back and pin your arms behind your back before pushing you back down. They laugh loudly as they dunk your head into the foul water multiple times before holding you under and flushing. When they pull you up and finally let you go, you splutter and gasp for air.'

locations/gschool_cheerleading.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = 'tryouts':
 		'Albina and the other girls grow silent and just stare at you as you enter. You feel very awkward and self-concious as Albina walks up to you with a puzzled glare. "What are <i>you</i> doing here?"'
 		'Christina laughs as she walks up to you. "Oh my god, does this '+iif(hotcat < 6,'hidious hag','social reject')+' actually think she can become a cheerleader? Everyone would be too busy laughing to focus on the game!"'
 		'"It''s best if you just leave. Nobody wants you hanging around making things awkward," Albina says.' 
-		'"You better hope that I''m still too busy laughing at your dumb ass that I forget to punish you for embarrassing me." Christina adds.'
+		'"You better hope that I''m still too busy laughing at your dumb ass that I forget to punish you for embarrassing me," Christina adds.'
 		'It''s clear that you''re not wanted here and all the girls present are pointing and laughing at you as Albina just shakes her head dismissively. Tears well up in your eyes as you run out the door, the vicious sound of mocking laughter following you down the corrider.'
 		act 'Flee': gt 'gschool_grounds', 'main'
 	elseif grupTipe = 4:
@@ -158,22 +158,14 @@ if $ARGS[0] = 'tryouts':
 			!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
 			gs 'exercise', 'tier2', 30, 'agil', 'vital', 'cheer', 'cheer', 'danc'
 			!! Success calculation - Contributing factors: social group, cool kids standing, Albina friendship, agility, endurance, dance skill, natural cheerleading talent
-			!!  New game character comparison:
 			!!  Cool kids would just about pass								~250 (100 cool + 55 friendship + 30 agi + 30 end + 20 dance + 15 talent)
 			!!  Any jock start would easily pass (especially dancers)		~280+(100 jock + 30 friendship + 50 agi + 50 end + 25 dance + 25 talent)
 			!!  Nerds would need a lot of work 								~112 (0 rep + 20 friendship + 30 agi + 30 end + 15 dance + 15 talent)
-			!!  Gopniks suffer from bias and stand little chance			~-20 (-125 rep + 0 friendship + 35 agi + 35 end + 17 dance + 17 talent)
-			!!  Outcasts stand no chance									~-90 (-200 outcast + 20 friendship + 30 agi + 30 end + 15 dance + 15 talent)
 			cheerleadingQW['try_physical'] = pcs_agil + pcs_vital + pcs_danc + pcs_cheer
 			cheerleadingQW['try_social'] = npc_rel['A23']
 			if grupTipe = 1 or grupTipe = 2:
 				cheerleadingQW['try_social'] += 100
-			elseif grupTipe = 5:
-				cheerleadingQW['try_social'] -= 200
-			elseif grupTipe = 4:
-				cheerleadingQW['try_social'] -= 150
 			else
-				!! If not jock or cool kid, adds half of your rep with Albina''s group
 				cheerleadingQW['try_social'] += grupvalue[npc_grupTipe['A23']]/2
 			end
 
@@ -285,6 +277,7 @@ if $ARGS[0] = 'afterschool_game':
 		act 'Skip the game (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	
+	act 'Quit the cheerleading squad': gt 'gschool_cheerleading', 'quit'
 end
 
 if $ARGS[0] = 'practice':
@@ -629,7 +622,7 @@ if $ARGS[0] = 'shower':
 				end
 			end
 		
-		elseif rand(0,4) = 0 and cheerleadingQW['practice_count'] <= 3 and (christinaQW['blackmail'] = 0 or christinaQW['fight'] ! 1):
+		elseif rand(0,4) = 0 and cheerleadingQW['practice_count'] <= 3 and christinaQW['blackmail'] = 0 and christinaQW['fight'] ! 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/events/christina_ambush.jpg"></center>'
 			'The locker room is quiet as you enter and head to your locker, but panic when you can''t find your '+iif(cheerleadingQW['quest_stage'] = 3,'cheerleading uniform','clothes')+' inside. "Looking for something?"'
 			'Before you can react to the voice, your towel is ripped away from you. You turn to see a naked Christina sitting on the bench with your '+iif(cheerleadingQW['quest_stage'] = 3,'uniform in her hand','clothes in a crumpled pile at her feet')+', smiling at you mockingly.'
@@ -1193,17 +1186,30 @@ if $ARGS[0] = 'quit':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/changing.jpg"></center>'
 	'You enter the locker room and look around for Albina, spotting her as she finishes getting ready. You walk over to her and she gives you a puzzled stare. "Hurry up and get dressed <<$pcs_nickname>>, we haven''t got all day to wait for you!" she barks. You meekly smile at her in response. "Well? Hurry up and spit it out." she says while motioning for you to hurry up.'
-	'"I... I don''t want to be a part of this anymore. I''ve thought it over and this just isn''t for me."' 
-	*nl
-	if cheerleadingQW['quest_stage'] = 2:
-		'Albina just rolls her eyes at you. "Whatever <<$pcs_firstname>>. I don''t really care if you want to be here or not. I have <i>actual</i> cheerleaders to lead, so if you want to go, then fuck off and don''t come back." She then pushes you aside and walks out of the room. The other girls then follow her out, leaving you alone.'
-	else
-		'Albina gives you an even bigger puzzled stare. "What? Why? Never mind. If you want to leave, then I won''t stop you. Just know that I thought you had some real potential here <<$pcs_nickname>>. And thanks for telling me and not just disappearing like <i>some other people</i> have." she adds. You breathe a sigh of relief as she gathers the girls and leaves, letting you go on your way.'
-	end
-	minut += 2
-	gs 'stat'
+	act 'Tell her you want to quit the cheerleading team':
+		cla
+		*nl
+		'"I... I don''t want to be a part of this anymore. I''ve thought it over and this just isn''t for me."' 
+		if cheerleadingQW['quest_stage'] = 2:
+			'Albina just rolls her eyes at you. "Whatever, <<$pcs_nickname>>. I don''t really care if you want to be here or not. I have <i>actual</i> cheerleaders to lead, so if you want to go, then fuck off and don''t come back." She then pushes you aside and walks out of the room. The other girls then follow her out, leaving you alone.'
+		else
+			'Albina gives you an even bigger puzzled stare. "What? Why? Never mind. If you want to leave, then I won''t stop you. Just know that I thought you had some real potential here <<$pcs_nickname>>. And thanks for telling me and not just disappearing like <i>some other people</i> have." she adds. You breathe a sigh of relief as she gathers the girls and leaves, letting you go on your way.'
+		end
+		minut += 2
+		gs 'stat'
 
-	act 'Leave':cheerleadingQW['quest_stage'] = 0 & gt 'gschool_grounds', 'main'
+		act 'Leave':cheerleadingQW['quest_stage'] = 0 & gt 'gschool_grounds', 'main'
+	end
+	act 'Change your mind':
+		cla
+		*nl
+		'"Err.. It''s nothing. Sorry."'
+		'Albina looks at you in confusion. "Are you okay, <<$pcs_nickname>>?"'
+		'You look at the floor as you try and stutter out an answer.'
+		'Albina stops you. "Just take today off. There''s clearly something bothering you and you obviously don''t feel like telling me what it is. Come back when you deal with it."'
+		'You just nod as Albina dismisses you.'
+		act 'Leave': gt 'gschool_grounds', 'main'
+	end
 end