Merge remote-tracking branch 'upstream/master'

locations/lezbsex.qsrc

@@ -122,7 +122,7 @@ if $ARGS[0] = 'svag':
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/svag<<picrand>>.jpg"></center>'
 	'You put on the strap-on, adjusting it to your hips and centring it, and then insert it slowly into her pussy.  She moans and grinds back at you while you fuck her with it.'
 
-	gs 'arousal', 'vaginal_strap_give', 5, 'lesbian', 'dom'
+	gs 'arousal', 'vaginal_strap_give', 5, 'lesbian'
 	gs 'stat'
 	
 	act 'Continue': xgt 'lezbsex', 'var'
@@ -136,7 +136,7 @@ if $ARGS[0] = 'sanal':
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/sanal<<picrand>>.jpg"></center>'
 	'You suck on the shaft to get it well-lubed, then put on the strap-on and gently insert it into <<$lezbsexname>>''s anus, pressing into her slowly at first. Then, as she adjusts to the backdoor invasion, you push in and out, faster and faster.'
 
-	gs 'arousal', 'anal_strap_give', 5, 'lesbian', 'dom'
+	gs 'arousal', 'anal_strap_give', 5, 'lesbian'
 	gs 'stat'
 	
 	act 'Continue': xgt 'lezbsex', 'var'
@@ -150,7 +150,7 @@ if $ARGS[0] = 'usvag':
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/usvag<<picrand>>.jpg"></center>'
 	'You watch as she puts on the strap-on, adjusting it to her hips and centring the fake cock, and then she moves to you and inserts it slowly into your pussy.  You moan and grind back at her while she fucks you with it.'
 
-	gs 'arousal', 'vaginal_strap', 5, 'lesbian', 'sub'
+	gs 'arousal', 'vaginal_strap', 5, 'lesbian'
 	gs 'stat'
 	
 	act 'Continue': xgt 'lezbsex', 'var'
@@ -164,7 +164,7 @@ if $ARGS[0] = 'usanal':
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/usanal<<picrand>>.jpg"></center>'
 	'She spits on the crack of your ass, collecting some saliva to moisten the tip of the strap-on and slowly presses it against your pucker, firmly pushing it into you as you adjust to the invasion.  You feel the fullness of it as it moves in and out of your ass with every thrust, pumping faster and deeper.'
 
-	gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub'
+	gs 'arousal', 'anal_strap', 5, 'lesbian'
 	gs 'stat'
 	
 	act 'Continue': xgt 'lezbsex', 'var'
@@ -178,7 +178,7 @@ if $ARGS[0] = 'dvag':
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/dvag<<picrand>>.jpg"></center>'
 	'You take a dildo and poke her wet pussy with it.  She pulls your face to hers and kisses you while you drive one shaft into her cunny with one hand and caress her breasts with a second dildo.'
 
-	gs 'arousal', 'vaginal_dildo_give', 5, 'lesbian', 'sub'
+	gs 'arousal', 'vaginal_dildo_give', 5, 'lesbian'
 	gs 'stat'
 	
 	act 'Continue': xgt 'lezbsex', 'var'
@@ -192,7 +192,7 @@ if $ARGS[0] = 'danal':
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/danal<<picrand>>.jpg"></center>'
 	'You take a dildo, ensuring that she''s watching you slowly lick it, trying to cover it with the maximum amount of your thick saliva, and gently insert it into  <<$lezbsexname>>''s anus.  At first, you ease it in slowly, getting her used to the invasion, then push it deeper, stroking it into her faster and faster.'
 
-	gs 'arousal', 'anal_dildo_give', 5, 'lesbian', 'sub'
+	gs 'arousal', 'anal_dildo_give', 5, 'lesbian'
 	gs 'stat'
 	
 	act 'Continue': xgt 'lezbsex', 'var'
@@ -206,7 +206,7 @@ if $ARGS[0] = 'udvag':
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/udvag<<picrand>>.jpg"></center>'
 	'<<$lezbsexname>> inserts the dildo into your wet pussy, moving it in and out while constantly twisting and turning it in her hands to stimulate your love hole as much as possible.'
 	
-	gs 'arousal', 'vaginal_dildo', 5, 'lesbian', 'sub'
+	gs 'arousal', 'vaginal_dildo', 5, 'lesbian'
 	gs 'stat'
 
 	act 'Continue': xgt 'lezbsex', 'var'
@@ -221,7 +221,7 @@ if $ARGS[0] = 'udanal':
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/udanal<<picrand>>.jpg"></center>'
 	'<<$lezbsexname>> spits in your asscrack, watching it slowly glide down to your pucker as she collects some of the saliva and rubs it all around the tip of the dildo before pressing it against your anus. You feel it stretching your puckered hole as it pushes farther inside, bringing you that unique back-door pleasure.'
 
-	gs 'arousal', 'anal_dildo', 5, 'lesbian', 'sub'
+	gs 'arousal', 'anal_dildo', 5, 'lesbian'
 	gs 'stat'
 	
 	act 'Continue': xgt 'lezbsex', 'var'

locations/vasilyhome.qsrc

@@ -242,7 +242,7 @@ if $ARGS[0] = 'livingroom':
 	end
 	act 'Watch TV': gt 'vasilyhome', 'shultv'
 	if shulga_lern_count > 0 and lernHome > 0 and kanikuli = 0 and SchoolAtestat = 0 and ((week >= 6 and hour >= 10 and hour < 17) or (week = 7 and hour >= 20)):
-		act 'Do homework with Vasily': gt 'vasilyhome', 'shulga_lern'
+		act 'Do homework with Vasily': gt 'vasilyhome', 'vasily_lern'
 	end
 
 	if (week >= 6 and hour >= 10 and hour < 17 and npc_rel['A11'] >=70) or (week = 7 and hour >= 20 and npc_rel['A11'] >= 70) or (week < 5 and hour >= 20 and fame['pav_slut'] >= 150 and alko >= 1):
@@ -697,7 +697,6 @@ if $ARGS[0] = 'vasily_bazar_day':
 		bazar_day = daystart
 		bazar_count -= 1
 		if bazar_count > 0: npc_rel['A11'] +=1
-		gs 'vasilyhome', 'vasya_shulgin_rep'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/talk/talk'+rand(1,5)+'.jpg"></center>'
 		vasyan_textb_day = rand(0,8)
 		if vasyan_textb_day = 0: $vasyan_textb_day = ' "Life is like a Matryoshka doll", Vasily says mysteriously.<br> "What the hell is that supposed to mean?", you ask.<br> "Think about it", is all he says.<br> You roll you eyes and give him a sarcastic: "Oh, I will."'
@@ -721,7 +720,7 @@ if $ARGS[0] = 'vasily_bazar_day':
 	end
 
 	if shulga_lern_count > 0 and SchoolAtestat = 0:
-		act 'Do homework': gt 'vasilyhome', 'shulga_lern'
+		act 'Do homework': gt 'vasilyhome', 'vasily_lern'
 	end
 	act 'Ask for some alcohol': 
 		'Vasily gets up and comes back with a bottle of cold vodka from the refrigerator. He takes a big swig of it and then passes it to you.'
@@ -1100,7 +1099,7 @@ if $ARGS[0] = 'fridge':
 	if beer_count > 0 and vodka_count > 0 and sup_count > 0:$r_pusto = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/holod'+rand(1,3)+'.jpg"></center>'
 	*nl
 	'You open the fridge and see:<<$r_vodka>><<$r_beer>><<$r_sup>><<$r_pusto>>'
-	act 'Close the refrigerator': gt 'vasilyhome', 'kitchen'
+	act 'Close the refrigerator': gt 'vasilyhome', 'vasilykitchen'
 
 	!drink beer
 	if beer_count > 0:
@@ -1115,7 +1114,7 @@ if $ARGS[0] = 'fridge':
 			*nl
 			'You take a bottle of beer from the fridge and drink it, quenching your thirst.'
 			act 'Keep looking around': gt 'vasilyhome', 'fridge'
-			act 'Close the refriderator': gt 'vasilyhome', 'kitchen'
+			act 'Close the refriderator': gt 'vasilyhome', 'vasilykitchen'
 		end
 	end
 	!drink vodka
@@ -1169,7 +1168,7 @@ if $ARGS[0] = 'fridge':
 			pcs_breath = 0
 			'You happily eat a bowl of soup. It''s good soup,<<$serg_obr>> Sergey sure knows how to cook!'
 			act 'Keep looking around': gt 'vasilyhome', 'fridge'
-			act 'Close the refriderator': gt 'vasilyhome', 'kitchen'
+			act 'Close the refriderator': gt 'vasilyhome', 'vasilykitchen'
 		end
 	end
 end