浏览代码

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

KeyMasterOfGozer 5 年之前
父节点
当前提交
5f86403c2d
共有 6 个文件被更改,包括 127 次插入118 次删除
  1. 11 18
      locations/casino.qsrc
  2. 39 30
      locations/deckShuffle.qsrc
  3. 63 63
      locations/gKristinaZv.qsrc
  4. 1 1
      locations/gschool_break.qsrc
  5. 9 2
      locations/pod_ezd.qsrc
  6. 4 4
      locations/saveupdater.qsrc

+ 11 - 18
locations/casino.qsrc

@@ -766,10 +766,11 @@ if $ARGS[0] = 'blackjack_play':
 	doubleBet = 0
 	minBet = 10
 	maxBet = 500
+	gs 'deckShuffle', 'sort'
 	*pl '<center><img <<$set_imgh>> src="images/locations/city/industrial/casino/stolbd.jpg"></center>'
 	*pl 'You are sitting at the blackjack table.'
 	act 'Move away from the table' : gt 'casino', 'cards'
-	act 'Play blackjack' : gt 'casino', 'bet'
+	act 'Play blackjack' : gt 'casino', 'bet1'
 	act 'Ask for the rules' : gt 'casino', 'rules'
 end
 
@@ -789,7 +790,7 @@ if $ARGS[0] = 'rules':
 	act 'Return' : gt 'casino', 'blackjack_play'
 end
 
-if $ARGS[0] = 'bet':
+if $ARGS[0] = 'bet1':
 	*pl '<center><img <<$set_imgh>> src="images/locations/city/industrial/casino/stavkabd.jpg"></center>'
 	playerBets[0] = input('Place your bet.')
 	if money < playerBets[0]:
@@ -801,9 +802,14 @@ if $ARGS[0] = 'bet':
 	elseif playerBets[0] > maxBet:
 		msg 'There is a maximum bet of <<maxBet>> <b>₽</b>.'
 		gt 'casino', 'blackjack_play'
+	else
+		gt 'casino', 'bet2'
 	end
+end
+
+if $ARGS[0] = 'bet2':
 	betTotal = playerBets[0]
-	gs 'deckShuffle'
+	gs 'deckShuffle', 'shuffle'
 	if (deckFace[playerHand[0]] = 1 and deckFace[playerHand[1]] > 9) or (deckFace[playerHand[0]] > 9 and deckFace[playerHand[1]] = 1):
 		gt 'casino', 'blackjack'
 	elseif deckFace[dealerHand[0]] > 9 and deckFace[dealerHand[1]] = 1:
@@ -869,11 +875,7 @@ if $ARGS[0] = 'insurance2':
 		*pl 'The dealer takes a peek at his hole card; no blackjack.'
 		if insurance > 0: *p 'He relieves you of <<insurance>> <b>₽</b> for your side bet.'
 		money -= insurance
-		act 'Continue' :
-			cla
-			wait 500
-			gt 'casino', 'player'
-		end
+		act 'Continue' : gt 'casino', 'player'
 	end
 end
 
@@ -888,11 +890,7 @@ if $ARGS[0] = 'player':
 		act 'Continue' : gt 'casino', 'blackjack_play'
 	elseif currentHand >= numHands:
 		*pl 'You can take no further actions.'
-		act 'Continue' :
-			cla
-			wait 500
-			gt 'casino', 'dealer'
-		end
+		act 'Continue' : gt 'casino', 'dealer'
 	else
 		if numHands = 1:
 			*pl 'You are considering actions for your hand.'
@@ -909,7 +907,6 @@ if $ARGS[0] = 'player':
 			cardsDealt += 1
 			*clr & cla
 			*pl '<center><img <<$set_imgh>> src="images/locations/city/industrial/casino/cartbde.jpg"></center>'
-			wait 750
 			gt 'casino', 'player'
 		end
 		if money >= betTotal + playerBets[currentHand]:
@@ -924,7 +921,6 @@ if $ARGS[0] = 'player':
 				cardsDealt += 1
 				*clr & cla
 				*pl '<center><img <<$set_imgh>> src="images/locations/city/industrial/casino/cartbde.jpg"></center>'
-				wait 750
 				gt 'casino', 'player'
 			end
 			if playerHand[currentHand * 16 + 2] = 0 and ((deckFace[playerHand[currentHand * 16]] > 9 and deckFace[playerHand[currentHand * 16 + 1]] > 9) or deckFace[playerHand[currentHand * 16]] = deckFace[playerHand[currentHand * 16 + 1]]):
@@ -942,7 +938,6 @@ if $ARGS[0] = 'player':
 					cardsDealt += 1
 					*clr & cla
 					*pl '<center><img <<$set_imgh>> src="images/locations/city/industrial/casino/cartbde.jpg"></center>'
-					wait 750
 					gt 'casino', 'player'
 				end
 			end
@@ -950,7 +945,6 @@ if $ARGS[0] = 'player':
 		act '<<$text>>Stay' :
 			currentHand += 1
 			cla
-			wait 500
 			if currentHand < numHands: gt 'casino', 'player'
 			if currentHand >= numHands: gt 'casino', 'dealer'
 		end
@@ -968,7 +962,6 @@ if $ARGS[0] = 'dealer':
 			cardsDealt += 1
 			*clr & cla
 			*pl '<center><img <<$set_imgh>> src="images/locations/city/industrial/casino/cartbde.jpg"></center>'
-			wait 750
 			gt 'casino', 'dealer'
 		end
 	elseif dealerPoints > 21:

+ 39 - 30
locations/deckShuffle.qsrc

@@ -1,39 +1,48 @@
 # deckShuffle
 
-killvar 'deckFace'
-killvar '$deckImg'
+if $ARGS[0] = 'sort':
+	killvar 'deckFace'
+	killvar '$deckImg'
 
-i = 0
-:loop1
-if i < 4:
-	i += 1
-	if i = 1: $text = 'Spades'
-	if i = 2: $text = 'Hearts'
-	if i = 3: $text = 'Clubs'
-	if i = 4: $text = 'Diamonds'
-	j = 0
-	:loop2
-	if j < 13:
-		j += 1
-		deckFace[] = j
-		$deckImg[] = 'images/locations/city/industrial/casino/cards/<<$text>>/<<j>>.jpg'
-		jump 'loop2'
+	i = 0
+	:loop1
+	if i < 4:
+		i += 1
+		if i = 1: 
+			$text = 'Spades'
+		elseif i = 2: 
+			$text = 'Hearts'
+		elseif i = 3: 
+			$text = 'Clubs'
+		elseif i = 4: 
+			$text = 'Diamonds'
+		end
+		j = 0
+		:loop2
+		if j < 13:
+			j += 1
+			deckFace[] = j
+			$deckImg[] = 'images/locations/city/industrial/casino/cards/<<$text>>/<<j>>.jpg'
+			jump 'loop2'
+		end
+		jump 'loop1'
 	end
-	jump 'loop1'
 end
 
-i = 0
-:loop3
-if i < 52:
-	j = rand(0, 51)
-	temp = deckFace[i]
-	deckFace[i] = deckFace[j]
-	deckFace[j] = temp
-	$text = $deckImg[i]
-	$deckImg[i] = $deckImg[j]
-	$deckImg[j] = $text
-	i += 1
-	jump 'loop3'
+if $ARGS[0] = 'shuffle':
+	i = 0
+	:loop3
+	if i < 52:
+		j = rand(0,51)
+		temp = deckFace[i]
+		deckFace[i] = deckFace[j]
+		deckFace[j] = temp
+		$text = $deckImg[i]
+		$deckImg[i] = $deckImg[j]
+		$deckImg[j] = $text
+		i += 1
+		jump 'loop3'
+	end
 end
 
 --- deckShuffle ---------------------------------

+ 63 - 63
locations/gKristinaZv.qsrc

@@ -15,7 +15,7 @@ if randhumiliation = 0:
 	'Christina pulls a dildo out of her sports bag, and sticks it on the shower wall at groin level. "Start sucking, <<$pcs_nickname>>, if you do a good job I''ll maybe forgive you. Or do you want me to kick your face in again?"'
 
 	act 'Suck on the dildo':
-		cls
+		*clr & cla
 		if zverhumiliation < 6:zverhumiliation += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj.jpg"></center>'
@@ -25,14 +25,14 @@ if randhumiliation = 0:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 elseif randhumiliation = 1:
 	'"Bitch, it''s no wonder I kicked your ass so easily. Your body looks like you only do girly sports, you should bulk up a bit."'
 	'Christina pulls a dildo out of her sports bag, puts a stone on the floor and sticks the dildo on top of it. "Get down there, <<$pcs_nickname>>. Do some push-ups while you suck on it, you look like you could use the workout."'
 
 	act 'Suck on the dildo':
-		cls
+		*clr & cla
 		if zverhumiliation < 6:zverhumiliation += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj2.jpg"></center>'
@@ -42,13 +42,13 @@ elseif randhumiliation = 1:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 elseif randhumiliation = 2:
 	'Christina takes the by now familiar dildo out of her sports bag again, and tells you to squat. Afraid to stand up against her after what happened last time, you do as she says. She sticks the dildo right in front of you, and says: "Don''t move your feet, bitch. Those stay where they are. I don''t care how you do it, but I want to see your lips around that dildo. Someone, help her out."'
 
 	act 'Suck on the dildo':
-		cls
+		*clr & cla
 		if zverhumiliation < 6:zverhumiliation += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj3.jpg"></center>'
@@ -59,14 +59,14 @@ elseif randhumiliation = 2:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 elseif randhumiliation = 3:
 	'Christina smiles at you when she reaches into her bag. "You''ve been doing such a good job, bitch. I feel like you need a bigger challenge."'
 	'She pulls out not one, but three dildos and sticks them all on a large mirror at groin level. "Go ahead <<$pcs_nickname>>, get to work. Make sure none would feel left out."'
 
 	act 'Please the dildos':
-		cls
+		*clr & cla
 		if zverhumiliation < 6:zverhumiliation += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj4.jpg"></center>'
@@ -77,7 +77,7 @@ elseif randhumiliation = 3:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 elseif randhumiliation = 4:
 	'Christina laughs at you: "I see that worried look in your eyes! Don''t worry bitch, I didn''t forget about your big friend."'
@@ -85,7 +85,7 @@ elseif randhumiliation = 4:
 	'She taunts you: "Do you even know how big of a slut you are, <<$pcs_nickname>>? Of course you don''t... so I will show you. I want you to look yourself in the eye as you suck it off. Get to it."'
 
 	act 'Suck dildo':
-		cls
+		*clr & cla
 		if zverhumiliation < 6:zverhumiliation += 1
 		gs'stat'
 
@@ -96,14 +96,14 @@ elseif randhumiliation = 4:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end	
 elseif randhumiliation = 5:
 	'Christina stands in the middle of the locker room and says: "Bitch, come over here."'
 	'Expecting her to stick a dildo on a wall or mirror or something, you''re confused. As you walk over to her, she gives you a larger dildo than before. "Take it and start sucking." Christina steps back as you take the dildo from her hands, while all the girls look at you expectantly.'
 
 	act 'Suck on the large dildo':
-		cls
+		*clr & cla
 		if zverhumiliation < 6:zverhumiliation += 1
 		gs'stat'
 
@@ -114,10 +114,10 @@ elseif randhumiliation = 5:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 elseif randhumiliation = 6:
-	cls
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj7.jpg"></center>'
 	'Christina stops right in front of you. You notice she doesn''t have her sports bag in her hands like usual.'
 	'"Alright, bitch. We''re doing something a little different today. Show us your smelly pussy, now."'
@@ -127,10 +127,10 @@ elseif randhumiliation = 6:
 	gs 'stat'
 	
 	act 'Continue':
-		cls
+		*clr & cla
 		gs 'stat'
 		if pcs_vag = 0:
-			cls
+			*clr & cla
 			if pcs_ass < 15:
 				pcs_ass += 1
 				if pcs_ass < 5:agape = 1
@@ -175,13 +175,13 @@ elseif randhumiliation = 6:
 				gs 'stat'
 				
 			end
-			act 'Continue': gt 'gschool_lessons', 'postphys2'
+			act 'Continue': gt 'gschool_lessons2', 'postphys2'
 		else
 			if zverhumiliation < 7:zverhumiliation += 1
 			pcs_vag += 1
-			if pcs_vag < 10:vgape = 2 & pcs_horny = RAND(5,15)
-			if pcs_vag >= 10 and pcs_vag < 15:vgape = 1 & pcs_horny = RAND(25,35)
-			if pcs_vag >= 15:pcs_horny = RAND(40,75)
+			if pcs_vag < 10:vgape = 2 & pcs_horny = rand(5,15)
+			if pcs_vag >= 10 and pcs_vag < 15:vgape = 1 & pcs_horny = rand(25,35)
+			if pcs_vag >= 15:pcs_horny = rand(40,75)
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj12.jpg"></center>'
 			'After Christina invites some of the other girls over to have a closer look as well, she nods contently as she tosses you her dildo.'
@@ -204,18 +204,18 @@ elseif randhumiliation = 6:
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			act 'Continue': gt 'gschool_lessons', 'postphys2'
+			act 'Continue': gt 'gschool_lessons2', 'postphys2'
 		end
 	end
 elseif randhumiliation = 7 and pcs_vag > 0:
 	'Christina walks towards the showers, and sticks a dildo to the wall at groin level. When you automatically walk up to it and move to kneel, she stops you: "No no, bitch. No mouth today, you ride it." You can tell your classmates are getting antsy, today''s show should be good.'
 
 	act 'Fuck your pussy with it':
-		cls
+		*clr & cla
 		if zverhumiliation < 14:zverhumiliation += 1
-		if pcs_vag < 10:vgape = 2 & pcs_horny = RAND(5,15)
-		if pcs_vag >= 10 and pcs_vag < 15:vgape = 1 & pcs_horny = RAND(25,35)
-		if pcs_vag >= 15:pcs_horny = RAND(40,75)
+		if pcs_vag < 10:vgape = 2 & pcs_horny = rand(5,15)
+		if pcs_vag >= 10 and pcs_vag < 15:vgape = 1 & pcs_horny = rand(25,35)
+		if pcs_vag >= 15:pcs_horny = rand(40,75)
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj13.jpg"></center>'
@@ -228,7 +228,7 @@ elseif randhumiliation = 7 and pcs_vag > 0:
 		if pcs_horny >= 100:
 			gs 'pain', 2, 'pinch', 'nipples'
 			gs 'pain', 2, 'slap', 'face'
-			pcs_horny -= RAND(15,40)
+			pcs_horny -= rand(15,40)
 			pcs_dom += 1
 			gs 'stat'
 			'When you are close to reaching orgasm, you close your eyes and moan softly. Suddenly you feel a sharp pain in your nipples! It''s Christina, pinching them hard. She slaps you in the face and says: "Bad bitch! Whores don''t get to cum on my dildo!"'
@@ -239,18 +239,18 @@ elseif randhumiliation = 7 and pcs_vag > 0:
 		gs 'arousal', 'end'
 		gs 'stat'
 			
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 elseif randhumiliation = 8 and pcs_vag > 0:
 	'Christina grabs your face with her hand, squishing your cheeks together: "What''s that, bitch? You''re scared I forgot about your best rubber buddy? Don''t worry, it''s right here!"'
 	'She pulls the dildo out of her bag and sticks it onto the floor. With an evil grin she says: "Go ahead bitch, hop on. I know you want to."'
 
 	act 'Ride the dildo':
-		cls
+		*clr & cla
 		if zverhumiliation < 14:zverhumiliation += 1
-		if pcs_vag < 10:vgape = 2 & pcs_horny = RAND(5,15)
-		if pcs_vag >= 10 and pcs_vag < 15:vgape = 1 & pcs_horny = RAND(25,35)
-		if pcs_vag >= 15:pcs_horny = RAND(40,75)
+		if pcs_vag < 10:vgape = 2 & pcs_horny = rand(5,15)
+		if pcs_vag >= 10 and pcs_vag < 15:vgape = 1 & pcs_horny = rand(25,35)
+		if pcs_vag >= 15:pcs_horny = rand(40,75)
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj14.jpg"></center>'
@@ -273,18 +273,18 @@ elseif randhumiliation = 8 and pcs_vag > 0:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 elseif randhumiliation = 9 and pcs_vag > 0:
 	'Christina grabs your face with her hand, squishing your cheeks together: "What''s that, bitch? You''re scared I forgot about your best rubber buddy? Don''t worry, it''s right here!"'
 	'She pulls the dildo out of her bag and sticks it onto the floor. With an evil grin she says: "Go on bitch, hop on. You know you want to."'
 
 	act 'Ride the dildo':
-		cls
+		*clr & cla
 		if zverhumiliation < 14:zverhumiliation += 1
-		if pcs_vag < 10:vgape = 2 & pcs_horny = RAND(5,15)
-		if pcs_vag >= 10 and pcs_vag < 15:vgape = 1 & pcs_horny = RAND(25,35)
-		if pcs_vag >= 15:pcs_horny = RAND(40,75)
+		if pcs_vag < 10:vgape = 2 & pcs_horny = rand(5,15)
+		if pcs_vag >= 10 and pcs_vag < 15:vgape = 1 & pcs_horny = rand(25,35)
+		if pcs_vag >= 15:pcs_horny = rand(40,75)
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj15.jpg"></center>'
@@ -307,18 +307,18 @@ elseif randhumiliation = 9 and pcs_vag > 0:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 elseif randhumiliation = 10 and pcs_vag > 0:
 	'Christina smiles at you: "You''ve been doing such a good job, bitch... it''s about time I reward you."'
 	'She pulls an extra large dildo out of her back and grins: "Oh yes, I can see that greedy look in your eyes. It''s all yours today. Girls, you can help her out if you want" as she sticks it on the floor.'
 
 	act 'Ride the large dildo':
-		cls
+		*clr & cla
 		if zverhumiliation < 14:zverhumiliation += 1
-		if pcs_vag < 10:vgape = 2 & pcs_horny = RAND(5,15)
-		if pcs_vag >= 10 and pcs_vag < 20:vgape = 1 & pcs_horny = RAND(25,35)
-		if pcs_vag >= 20:pcs_horny = RAND(40,75)
+		if pcs_vag < 10:vgape = 2 & pcs_horny = rand(5,15)
+		if pcs_vag >= 10 and pcs_vag < 20:vgape = 1 & pcs_horny = rand(25,35)
+		if pcs_vag >= 20:pcs_horny = rand(40,75)
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj16.jpg"></center>'
@@ -341,18 +341,18 @@ elseif randhumiliation = 10 and pcs_vag > 0:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 elseif randhumiliation = 11 and pcs_vag > 0:
 	'Christina fakes sympathy as she says: "Oh no! Bad news, bitch... I forgot your rubber friend! Let''s see what else I have for you..."'
 	'She digs through her purse, and pulls out her hairbrush: "Here you go, bitch. You can use this today... I expect you to clean it properly before you give it back, I don''t want your pussy stinking up my purse."'
 
 	act 'Use the handle on yourself':
-		cls
+		*clr & cla
 		if zverhumiliation < 14:zverhumiliation += 1
-		if pcs_vag < 10:pcs_horny = RAND(40,60)
-		if pcs_vag >= 10 and pcs_vag < 15:pcs_horny = RAND(30,50)
-		if pcs_vag >= 15:pcs_horny = RAND(20,40)
+		if pcs_vag < 10:pcs_horny = rand(40,60)
+		if pcs_vag >= 10 and pcs_vag < 15:pcs_horny = rand(30,50)
+		if pcs_vag >= 15:pcs_horny = rand(20,40)
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj17.jpg"></center>'
@@ -374,17 +374,17 @@ elseif randhumiliation = 11 and pcs_vag > 0:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 elseif randhumiliation = 12 and pcs_vag > 0:
 	'You notice all the girls from your class gathering around, wondering what Christina has in store for you today. Christina looks through her sports bag and shrugs: "Bad news bitch, I forgot to pack your friends this morning. Use your own hands today."'
 
 	act 'Masturbate in front of them':
-		cls
+		*clr & cla
 		if zverhumiliation < 14:zverhumiliation += 1
-		if pcs_vag < 10:vgape = 1 & pcs_horny = RAND(50,70)
-		if pcs_vag >= 10 and pcs_vag < 15:pcs_horny = RAND(40,60)
-		if pcs_vag >= 15:pcs_horny = RAND(30,50)
+		if pcs_vag < 10:vgape = 1 & pcs_horny = rand(50,70)
+		if pcs_vag >= 10 and pcs_vag < 15:pcs_horny = rand(40,60)
+		if pcs_vag >= 15:pcs_horny = rand(30,50)
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj18.jpg"></center>'
@@ -408,17 +408,17 @@ elseif randhumiliation = 12 and pcs_vag > 0:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 elseif randhumiliation = 13 and pcs_vag > 0:
 	'After you take your clothes off, Christina whips your ass with her towel: "We''re doing something a bit more interactive today, bitch. But first, you''re fisting yourself today. I want to see your whole hand disappear between those stinking folds. Girls, spit."'
 
 	act 'Fist yourself':
-		cls
+		*clr & cla
 		if zverhumiliation < 14:zverhumiliation += 1
-		if pcs_vag < 10:vgape = 3 & pcs_horny = RAND(10,20)
-		if pcs_vag >= 10 and pcs_vag < 15:vgape = 2 & pcs_horny = RAND(30,50)
-		if pcs_vag >= 15:vgape = 1 & pcs_horny = RAND(50,75)
+		if pcs_vag < 10:vgape = 3 & pcs_horny = rand(10,20)
+		if pcs_vag >= 10 and pcs_vag < 15:vgape = 2 & pcs_horny = rand(30,50)
+		if pcs_vag >= 15:vgape = 1 & pcs_horny = rand(50,75)
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj19,'+rand(0,1)+'.jpg"></center>'
@@ -430,7 +430,7 @@ elseif randhumiliation = 13 and pcs_vag > 0:
 		if pcs_horny >= 100:
 			gs 'pain', 2, 'pinch', 'nipples'
 			gs 'pain', 2, 'slap', 'face'
-			pcs_horny -= RAND(15,30)
+			pcs_horny -= rand(15,30)
 			gs 'stat'
 			'When you are close to reaching orgasm, you close your eyes and try to hide it from Christina. Suddenly you feel a sharp pain in your nipples! It''s Christina, pinching them hard. She slaps you in the face and says: "Orgasming on your own fist... you''re such a nasty whore, <<$pcs_nickname>>. Good thing I was there to stop you."'
 		end
@@ -446,15 +446,15 @@ elseif randhumiliation = 13 and pcs_vag > 0:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 elseif randhumiliation = 14:
 	'Christina laughs haughtily as she takes off her clothes: "You know what, bitch? I just realized... I do so many nice things for you, and you never do anything for me in return. So rude. Today, you''re pleasing me. Get on your knees and crawl over to me, you''re going to lick me to orgasm today."'
 
 	act 'Lick her pussy':
-		cls
+		*clr & cla
 		if zverhumiliation < 20:zverhumiliation += 1
-		pcs_horny = RAND(10,20)
+		pcs_horny = rand(10,20)
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj20,'+rand(0,1)+'.jpg"></center>'
@@ -477,13 +477,13 @@ elseif randhumiliation = 14:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 elseif randhumiliation = 15:
 	'Christina mutters about having to go to the bathroom, but then an idea strikes her when she sees you: "Excellent, just when I thought there was no toilet nearby. Bitch, come here. Get on your knees and open your mouth... and make it quick, I''m ready to burst!"'
 
 	act 'Obey and open your mouth':
-		cls
+		*clr & cla
 		if zverhumiliation < 30:zverhumiliation += 1
 		if pcs_makeup > 1:pcs_makeup = 0
 		gs'stat'
@@ -498,14 +498,14 @@ elseif randhumiliation = 15:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons', 'postphys2'
+		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
 	
 else
 	'Christina grins as you walk up to her meekly, expecting your punishment: "Sorry bitch, I''m busy today. You''ll have to do without punishment today."'
 	'She quickly gets dressed and leaves the locker room, and for a second you feel unsure as to what to do. The other girls of your class smirk at your behaviour; you''d gotten so used to Christina''s abuse, that you have no idea how to posture yourself when she''s not here. You''re deeply embarrassed when you try to imagine what they must think of you, and you do your best to ignore them.'
 
-	act 'Continue': gt 'gschool_lessons', 'postphys2'
+	act 'Continue': gt 'gschool_lessons2', 'postphys2'
 end
 
 --- gKristinaZv ---------------------------------

+ 1 - 1
locations/gschool_break.qsrc

@@ -190,7 +190,7 @@ if $ARGS[0] = 'girls_restroom_events':
 	elseif girls_event_rand = 12:
 		*clr & cla
 		menu_off = 0
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/gopnik.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/gopniks.jpg"></center>'
 		if grupTipe = 4:
 			'As you enter the restroom, you see Paulina, Lena and Lera hanging around the stalls, chatting and tormenting some of the other girls. You exchange smiles and hello''s with them, as you go about your business.'
 		else

+ 9 - 2
locations/pod_ezd.qsrc

@@ -680,7 +680,14 @@ if $ARGS[0] = 'floor5_events':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/events/gopniks.jpg"></center>'
 		'When you walk up the stairs to the fifth floor, you see Vitek, Dan, Vasily, Lena, Lera, along with a few older gopniks you don''t know hanging out. They are smoking, drinking and laughing.'
 		act 'Leave': gt 'pod_ezd', 'etaj_5'
-		act 'Join them': gopnik_rand = rand(1,4) & jump 'gopnik_jump<<gopnik_rand>>'
+		act 'Join them':
+			if rand(0,2) = 2:
+				gopnik_rand = rand(1,4)
+				jump 'gopnik_jump<<gopnik_rand>>'
+			else
+				gt 'pod_ezd', 'gopnik_group_chat'
+			end
+		end
 	elseif floor5 = 7:
 		*clr & cla
 		menu_off = 1
@@ -1258,7 +1265,7 @@ if $ARGS[0] = 'lena_chat':
 	end
 end
 
-if $ARGS[0] = 'lena_chat':
+if $ARGS[0] = 'gopnik_group_chat':
 	*clr & cla
 	menu_off = 1
 	minut += 5

+ 4 - 4
locations/saveupdater.qsrc

@@ -528,10 +528,10 @@ if array_updater = 0:
 
 	i = 0
 	:npcvarloop
-	oldnpcvar = $oldnpcvars[i]
-	if i < ARRSIZE($oldnpcvars):
-		if 1 > ARRSIZE('oldnpcvar'):i += 1 & jump 'npcvarloop'
-		newnpcvar = $newnpcvars[i]
+	$oldnpcvar = $oldnpcvars[i]
+	if i < arrsize($oldnpcvars):
+		if 1 > arrsize('oldnpcvar'):i += 1 & jump 'npcvarloop'
+		$newnpcvar = $newnpcvars[i]
 		COPYARR 'newnpcvar', 'oldnpcvar'
 		i += 1
 		jump 'npcvarloop'