Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/pavaptcourtev.qsrc

@@ -104,10 +104,10 @@ if $ARGS[0] = 'events1':
 	if rolanmeet = 0: events = rand(0,17)
 	if rolanmeet > 0: events = rand(0,22)
 	
-	:storyline_jump1
+	:reroll_jump1
 	
 	if anushkaFirstvisit = 0 and npc_rel['A144'] > 50 and rand(0,1) = 1 and anushka_met ! daystart:
-		if storyline ! 1: jump 'storyline_jump1'
+		if storyline ! 1: jump 'reroll_jump1'
 		*clr & cla
 		anushka_met = daystart
 		'<center><img src="images\locations\pavlovsk\school\head\45.jpg"></center>'
@@ -130,7 +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.'
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif events = 2:
-		if storyline ! 1: jump 'storyline_jump1'
+		if storyline ! 1: jump 'reroll_jump1'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/evggkiss' + rand(1,3) + '.jpg"></center>'
 		if rand(1,4) = 1:
@@ -175,7 +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.'
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif events = 9:
-		if storyline ! 1: jump 'storyline_jump1'
+		if storyline ! 1: jump 'reroll_jump1'
 		*clr & cla
 		'<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.'
@@ -193,7 +193,8 @@ if $ARGS[0] = 'events1':
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif events = 12:
 		*clr & cla
-		if month >=11 and month <= 12 or month >=1 and month <=3:
+		if temper < 10: jump 'reroll_jump1'
+		if month >= 11 and month <= 12 or month >= 1 and month <= 3:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/waterw.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/water.jpg"></center>'
@@ -225,7 +226,7 @@ if $ARGS[0] = 'events1':
 		gs 'stat'
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif events = 15:
-		if storyline ! 1: jump 'storyline_jump1'
+		if storyline ! 1: jump 'reroll_jump1'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evgopbj.jpg"></center>'
 		if soniaPS > 0 and rand(0,1) = 0:
@@ -281,7 +282,7 @@ if $ARGS[0] = 'events1':
 			end
 		end
 	elseif events >= 17:
-		if storyline ! 1: jump 'storyline_jump1'
+		if storyline ! 1: jump 'reroll_jump1'
 		gt 'pavcomplexrolan'
 	end	
 end
@@ -296,7 +297,7 @@ if $ARGS[0] = 'events2':
 	gs 'stat'
 !!ToDo: Remove this and the next line if places are added to the game where sveta can smoke the joints (julzor)
 	:night_events_jump
-	:storyline_jump2
+	:reroll_jump2
 	nightevents = rand(1,12)	
 	if nightevents = 1:
 		*clr & cla
@@ -338,7 +339,7 @@ if $ARGS[0] = 'events2':
 		gs 'stat'
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif nightevents = 5:
-		if storyline ! 1: jump 'storyline_jump2'
+		if storyline ! 1: jump 'reroll_jump2'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evgopbjn.jpg"></center>'
 		if 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.'
@@ -402,7 +403,7 @@ if $ARGS[0] = 'events2':
 !!will add this later when I find a good image set for it.
 !!act 'How about we party together?':				
 	elseif nightevents = 9:
-		if storyline ! 1: jump 'storyline_jump2'
+		if storyline ! 1: jump 'reroll_jump2'
 		*clr & cla
 		if month >= 11 or month <= 3:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/3stoogesw.jpg"></center>'
@@ -453,7 +454,7 @@ if $ARGS[0] = 'events2':
 			end
 		end
 	elseif nightevents = 10:
-		if storyline ! 1: jump 'storyline_jump2'
+		if storyline ! 1: jump 'reroll_jump2'
 		*clr & cla
 		'<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.'
@@ -488,7 +489,7 @@ if $ARGS[0] = 'events2':
 			end
 		end
 	elseif nightevents = 11:
-		if storyline ! 1: jump 'storyline_jump2'
+		if storyline ! 1: jump 'reroll_jump2'
 		*clr & cla
 		'<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.'

locations/stwork.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 	if (kosmetica >= 3 or pcs_makeup >= 4) and (hour >= 11 or hour <= 2):
 		act '<b>Prepare for your show</b>':
 			*clr & cla
-			if pcs_sweat >= 20 or (pcs_leghair > 3 or pcs_pubes > 3):
+			if pcs_sweat >= 20 or (pcs_leghair > 3 or ((pcs_pubes > 3 and pubestyle = 1) or (pubestyle >= 2 and pubestyle <=7) and pcs_pubes > 11)):
 				dynamic $showerdin
 				minut += 5
 				'<h3>Staff Bathroom</h3>'
@@ -77,13 +77,19 @@ if $ARGS[0] = 'start':
 										'You feel your pussy get a bit wet from his touch and hope that he doesn''t notice.'
 										gs 'arousal', 'foreplay', 2
 										gs 'stat'
-!! This should allow the different pubic styles. Right now it will require you to shave everything before you can strip.
-										if pcs_pubes <= 3:
+!! This allows different pubic styles but anything from small bush up is still not permitted.
+										if pubestyle = 1 and pcs_pubes > 3:
 											strippermission = 1
 											'"That''s very smooth. Looks like you are ready to get on the stage. You can get to work." He says and ushers you out of his office.'
-											stpredmet = 3 & gt 'stwork2', 'strip'
+											stpredmet = 3
+											act 'Perform': gt 'stwork2', 'strip'
+										elseif (pubestyle >= 2 and pubestyle <=7) and pcs_pubes > 11:
+											strippermission = 1
+											'"Very cute pubic hair, I''m sure the customers will appreciate it, now get on stage. You can work" He says and ushers you out of his office.'
+											stpredmet = 3
+											act 'Perform': gt 'stwork2', 'strip'
 										else
-											'"You need to shave everything off <<$pcs_stagename>>. Go take care of that and then come back here."'
+											'"You need to shave everything off <<$pcs_stagename>>, although a small and cute pubic style is popular at the moment if you feel creative." He smiles and pats you on the butt as he says, "Go take care of that and then come back here."'
 											act 'Go to the dressing room': gt 'stwork', 'start'
 										end
 									else
@@ -95,7 +101,7 @@ if $ARGS[0] = 'start':
 									act 'Go to the dressing room': gt 'stwork', 'start'
 								end
 							else
-								'"You need to scrub yourself harder <<$pcs_stagename>>. You need to be appealing to all the senses. Go take care of that and then come back here."'
+								'"Damn it <<$pcs_stagename>>, you stink. Grab a shower we can''t have the club smelling like a locker room."'
 								act 'Go to the dressing room': gt 'stwork', 'start'
 							end	
 						end