Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/_attributes_scandalicious_dress.qsrc

@@ -1128,7 +1128,7 @@ elseif ARGS[1] = 149:
 	CloSkirtShortness = 6
 	CloBimbo = 1
 	
-elseif ARGS[1] = 100:
+elseif ARGS[1] = 150:
 	CloQuality = 3
 	CloThinness = 4
 	CloBra = 1

locations/brother2.qsrc

@@ -631,7 +631,7 @@ if $ARGS[0] = 'nattalk':
 	'"So Kolka, did you like what you saw in the stairway?" You ask him coyly.'
 	'"I was wondering if you did that for my benefit." He says hesitantly.'
 	'"Well? Did you like it?"'
-	'"Ofcourse I did, Natasha wasn''t wearing any panties, I could see everything."'
+	'"Of course I did, Natasha wasn''t wearing any panties, I could see everything."'
 	'"She was wearing panties." You say with a grin. "I had stuffed them in her tight pussy."'
 	'"You? Wow. That''s hot."'
 	if NatbelQW['KolkaWantsNat'] = 0:
@@ -656,7 +656,7 @@ if $ARGS[0] = 'nattalk':
 				'"How would that work?"'
 				'"Just trust me. As long as you do as I tell you it''ll work out."'
 			end
-			'"Ofcourse, I promise." He says without hesitation.'
+			'"Of course, I promise." He says without hesitation.'
 			'"Good, I''ll keep you informed."'
 			act'Continue':gt'brother','start'
 		end

locations/ender.qsrc

@@ -377,14 +377,14 @@ if $ARGS[0] = 'loss':
 			if temp['rape_type'] = 'gang':
 				gt'rape_events','park_gangrape_fight_loss'
 			else
-			
+				gs'rape_events','park_rape_solo'
 			end
 		else
-			if temp['rape_type'] = 'gang':
+!!			if temp['rape_type'] = 'gang':
 			
-			else
+!!			else
 				gt'rape_events','urban_fight_rape'
-			end
+!!			end
 		end
 	end
 end

locations/gschool_events.qsrc

@@ -1465,6 +1465,7 @@ if $ARGS[0] = 'afterschool_events':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/upset.jpg"></center>'
 			'As you walk down the hallway you see a girl you don''t know from your brother''s class sitting on the floor with her head in her hands. She looks visibly upset and you think you can hear sniffs, as if she is crying.'
 			act 'Ignore her':
+				cla
 				if grupTipe ! 4 and pcs_mood > 10: pcs_mood -= 10
 				gs 'stat'
 				*nl

locations/music_actions.qsrc

@@ -121,7 +121,7 @@ if $ARGS[0] = 'play_something':
             minut += 10
             gs 'stat'
             'You hum a few notes to warm up your throat and start to some some songs you know, just for your own entertainment.'
-            'You sway and move your had to keep the temp, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
+            'You sway and move your head to keep the tempo, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
             act 'Finish': gs 'music_actions', 'start'
         end
     elseif ml_willcost  <= pcs_willpwr:
@@ -135,7 +135,7 @@ if $ARGS[0] = 'play_something':
             minut += 10
             gs 'stat'
             'You hum a few notes to warm up your throat and start to some some songs you know, just for your own entertainment.'
-            'You sway and move your had to keep the temp, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
+            'You sway and move your head to keep the tempo, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
             act 'Finish': gs 'music_actions', 'start'
         end
     else

locations/natbel_friend.qsrc

@@ -261,7 +261,7 @@ if $ARGS[0] = 'shopping_spree':
 						minut += 30
 						money -= 1300
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/Natasha11.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha11.jpg"></center>'
 						'The two of you make your way to G&M and start looking for clothes, with a focus on dresses.'
 						'You spend several minutes picking and choosing between various outfits until you have a small assortment of clothes that you can both agree on. Finally, Natasha steps into the dressing room to change, showing off each dress.'
 						'Natasha has difficulty choosing between three outfits and asks you to make the final choice. Finally, you decide on a lovely party dress. "Okay, <<$pcs_nickname>>," she says, smiling. "Then that''s the one. It''ll look much nicer than what I currently have at home."'

locations/rape_events.qsrc

@@ -40,7 +40,7 @@ if $ARGS[0] = 'fight_init':
 		i += 1
 		jump 'rape_gang_fight_loop'
 	else
-		fightEnding = 22
+		fightEnding = 23
 		gt 'fight', 'start'
 	end
 end
@@ -205,7 +205,7 @@ if $ARGS[0] = 'urban_rape_limp':
 		'Fear flashes through you. Your legs turn to jelly. Your mind goes blank as you tumble to the ground...'
 		act'Black out':
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/shared/sex/rape/unconscious_street.jpg"></center>'
+			'<center><video autoplay loop src="images/shared/sex/rape/unconscious_street.mp4"></video></center>'
 			'Time passes.'
 			*nl
 			if rand(0,1) = 1:
@@ -656,19 +656,20 @@ if $ARGS[0] = 'park_gangrape_start':
 !!	jump 'rapist_generate_loop'
 	
 	gs 'boyStat', $rapist[0]
-	'<center><img <<$set_imgh>> src="images/shared/misc/jumped.jpg"></center>'
+!!	'<center><img <<$set_imgh>> src="images/shared/sex/rape/gangrape1.jpg"></center>'
+	'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_undress1.mp4"></video></center>'
 	'The men haul you off into the bushes and you try to scream, but the hand clamped over your mouth prevents anything from coming out but muffled sobs. They tear the clothes from your body as you struggle but it''s no use.'
 	*nl
 	'You can''t escape.'
 	gs 'rape_events', 'park_gangrape_struggle1'
 	
-	act'Go limp':
+!!	act'Go limp':
 	
-	end
+!!	end
 end
 
 if $ARGS[0] = 'park_gangrape_fight_loss':
-	'<center><img <<$set_imgh>> src="images/shared/misc/jumped.jpg"></center>'
+	'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_undress1.mp4"></video></center>'
 	'A fist slugs you upside the head and your legs turn to jelly. You collapse to the ground and your vision swims.'
 	*nl
 	'"Fucking bitch made us work for it."'
@@ -693,7 +694,7 @@ end
 
 
 if $ARGS[0] = 'park_gangrape_fight_surrender':
-	'<center><img <<$set_imgh>> src="images/shared/misc/jumped.jpg"></center>'
+	'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_undress1.mp4"></video></center>'
 	'"Stop!" you cry out. "Please! Stop! I give u-"'
 	'Even as you attempt to surrender, a fist slugs you upside the head and your legs turn to jelly. You collapse to the ground and your vision swims.'
 	*nl
@@ -741,7 +742,7 @@ if $ARGS[0] = 'park_gangrape_struggle2':
 		gs 'arousal', 'vaginal', rand(3,5), 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape1.jpg"></center>'
 		if stat['think_virgin'] = 1:
 			'"Hey, I think this bitch is a virgin," the man giggles.'
 			'"<i>Was</i> a virgin," another voice snickers.'
@@ -764,7 +765,7 @@ if $ARGS[0] = 'park_gangrape_tp':
 		gs 'arousal', 'bj', -temp['rape_time'], 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape<<rand(3,4)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
 		'The men violate you, roughly fucking you with no regard for your pain or your pleasure. With one cock choking your mouth, it''s all you can do to breathe, let alone make any noise other than the occasional groan as the others ravage your ass and pussy.'
 		*nl
 		'There''s nothing for you to do except hold on for dear life until it ends.'
@@ -791,7 +792,7 @@ if $ARGS[0] = 'park_gangrape_end1':
 	act'Endure':
 		gs 'rape_events', 'park_gangrape_cum'
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
+		'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_fuck3.mp4"></video></center>'
 		'Time passes in a blur. You feel like your rape has been going on for hours. You''re not sure how much longer you can-'
 		*nl
 		'<b><i>"MMMMPH-!"</i></b>'
@@ -806,7 +807,7 @@ if $ARGS[0] = 'park_gangrape_end1':
 	
 	act'Pass out':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape<<rand(3,4)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
 		'In the end, it''s too much to bear.'
 		*nl
 		'With your body being pummelled in every hole and your mind overwhelmed, everything just shuts down, and unconsciousness takes you.'
@@ -834,7 +835,7 @@ if $ARGS[0] = 'park_gangrape_end2':
 	
 	act'Pass out':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape<<rand(3,4)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
 		'In the end, it''s too much to bear.'
 		*nl
 		'You try to pull back from the cock that chokes you, but you''re unable to escape it. You panic, coughing even as your vision grows blurry, but your rapist refuses to let you go until you''ve swallowed every drop.'