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

locations/_single_stock_item.qsrc

@@ -27,7 +27,7 @@ if ARGS[6] > 0:
 elseif ARGS[0] > in_inventory:
 	$RESULT += 	'<td align="left">(you have <<$in_inventory>>)</td>'
 	if money >= ARGS[2]:
-		$RESULT += '<td align="left"><a href="exec: gs ''$buy_single_item'', <<ARGS[0]>>, ''<<$ARGS[1]>>'', <<ARGS[2]>>, ''<<$ARGS[3]>>'', ''<<$ARGS[4]>>''">buy</a>'
+		$RESULT += '<td align="left"><a href="exec: gs ''$buy_single_item'', <<ARGS[0]>>, ''<<$ARGS[1]>>'', <<ARGS[2]>>, ''<<$ARGS[3]>>'', ''<<$ARGS[4]>>'', ''<<$ARGS[5]>>''">buy</a>'
 	else
 		$RESULT += 	'<td></td>'
 	end

locations/brother_voyeur.qsrc

@@ -1949,7 +1949,7 @@ if $ARGS[0] = 'shower_swallow':
 			if broshowerfuck = daystart:
 				act'Finish showering together':gt'brother_voyeur','brother_shower_fuck_end'
 			else
-				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		end
 
@@ -1960,7 +1960,7 @@ if $ARGS[0] = 'shower_swallow':
 			if broshowerfuck = daystart:
 				act'Finish showering together':gt'brother_voyeur','brother_shower_fuck_end'
 			else
-				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		end
 
@@ -1972,7 +1972,7 @@ if $ARGS[0] = 'shower_swallow':
 				if brotherbjcomment = 1:
 					'"That really tastes good to you?"'
 					'"Mhm," you nod, letting the water run through your hair a little more. "Didn''t used to at first. But maybe it''s just an acquired taste. Or maybe little brothers are just the best vintage of cum!" You grin and wiggle your eyebrows at him.'
-					act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				elseif brotherbjcomment = 2:
 					'Kolka regards you with a bit of a look as you stand back up.'
 					'"What?" you ask at him.'
@@ -1985,7 +1985,7 @@ if $ARGS[0] = 'shower_swallow':
 						'"Have you considered maybe it''s just yours?" you ask, looking over your shoulder.'
 						'"A cumslut is still a cumslut, even if it''s only for one kind."'
 						'You roll your eyes. He''s being a punk but you can''t find the anger to be annoyed with him. He does have a bit of a point after all.'
-						act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+						act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 					end
 
 					act'Careful what you say':
@@ -1998,7 +1998,7 @@ if $ARGS[0] = 'shower_swallow':
 							act'Finish showering together':gt'brother_voyeur','brother_shower_fuck_end'
 						else
 							'You roll your eyes. "I''m a slut remember? Maybe I''ll just go around the corner and blow someone else!" You growl at him and shut off the water. Tearing back the curtain, you step out of the tub somewhat annoyed with Kolka. Partially because he''s being a punk, but also partially because he''s actually kind of right. Swallowing your brother''s cum <i>is</i> pretty slutty...'
-							act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+							act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 						end
 					end
 
@@ -2011,7 +2011,7 @@ if $ARGS[0] = 'shower_swallow':
 						if broshowerfuck = daystart:
 							act'Finish showering together':gt'brother_voyeur','brother_shower_fuck_end'
 						else
-							act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+							act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 						end
 					end
 
@@ -2026,7 +2026,7 @@ if $ARGS[0] = 'shower_swallow':
 						if broshowerfuck = daystart:
 							act'Finish showering together':gt'brother_voyeur','brother_shower_fuck_end'
 						else
-							act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+							act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 						end
 					end
 
@@ -2042,7 +2042,7 @@ if $ARGS[0] = 'shower_swallow':
 						else
 							'"Hey! What''s wrong with that?" you grin at him. "I''d say it''s pretty weird to get slutty blowjobs from your sister in the shower. I thought you liked that! Don''t you want me to be a slutty weirdo then?"'
 							'"Bah!" he says, clambering out of the shower to escape you, grumbling as he does so. "More slut and less weirdo!"'
-							act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+							act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 						end
 					end
 
@@ -2059,7 +2059,7 @@ if $ARGS[0] = 'shower_swallow':
 						if broshowerfuck = daystart:
 							act'Finish showering together':gt'brother_voyeur','brother_shower_fuck_end'
 						else
-							act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+							act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 						end
 					end
 				end
@@ -2081,7 +2081,7 @@ if $ARGS[0] = 'shower_swallow':
 			if broshowerfuck = daystart:
 				act'Finish showering together':gt'brother_voyeur','brother_shower_fuck_end'
 			else
-				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		elseif brotherbjcomment = 2:
 			'"A little warning next time maybe?"'
@@ -2091,7 +2091,7 @@ if $ARGS[0] = 'shower_swallow':
 			if broshowerfuck = daystart:
 				act'Finish showering together':gt'brother_voyeur','brother_shower_fuck_end'
 			else
-				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		end
 	end
@@ -2120,7 +2120,7 @@ if $ARGS[0] = 'shower_facial':
 			if broshowerfuck = daystart:
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			else
-				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		end
 
@@ -2134,7 +2134,7 @@ if $ARGS[0] = 'shower_facial':
 			if broshowerfuck = daystart:
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			else
-				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		end
 
@@ -2148,7 +2148,7 @@ if $ARGS[0] = 'shower_facial':
 			if broshowerfuck = daystart:
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			else
-				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		end
 
@@ -2168,7 +2168,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 				else
-					act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 			act'I prefer to swallow':
@@ -2179,7 +2179,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 				else
-					act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 			act'I prefer creampies':
@@ -2190,7 +2190,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 				else
-					act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 				
@@ -2207,7 +2207,7 @@ if $ARGS[0] = 'shower_facial':
 			if broshowerfuck = daystart:
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			else
-				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		end
 
@@ -2221,7 +2221,7 @@ if $ARGS[0] = 'shower_facial':
 			if broshowerfuck = daystart:
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			else
-				act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		end
 
@@ -2242,7 +2242,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 				else
-					act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 
@@ -2256,7 +2256,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 				else
-					act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 		end
@@ -2275,7 +2275,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 				else
-					act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 		end
@@ -2295,7 +2295,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 				else
-					act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 
@@ -2309,7 +2309,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 				else
-					act'Finish showering together':gt'brother_voyeur','brother_shower_end'
+					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 		end

locations/garfather.qsrc

@@ -311,12 +311,7 @@ if pcs_horny > 50 and npc_sex['A28'] ! 0:
 						cls
 						if npc_rel['A28'] < 100: npc_rel['A28'] += 2
 						fatherSuck += 1
-						sexpartkno = 1
-						spafinloc = 12
-						gs 'cum_manage'
-						swallow += 1
-						pcs_hydra += 5
-						gs 'stat'
+						gs 'cum_call', 'mouth_swallow', 'A28', 1
 						'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,<<rand(0,10)>>.mp4"></video></center>'
 
 						'You continue to suck your stepfather''s dick as it continues throbbing. Suddenly, he arches his back and you feel cum begin to pour into your mouth. Although you try your best, the amount of cum flowing from your stepfathers dick is simply too much for you, and some of it instead flows out of your mouth and down your chin. Soon your <<$boydesc>> finishes and you pull his cock out of your sperm-smelling mouth. You can feel the taste of sperm in your mouth, and your <<$pc_desc[''lips'']>> lips are wet with cum.'

locations/gschool_events1.qsrc

@@ -192,6 +192,7 @@ if $ARGS[0] = 'butt_grab':
 				gs 'npc_relationship', 'modify', 'A8', 'love'
 				gs 'fame', 'pav', 'sex', 15
 				gs 'arousal', 'foreplay', 'exhibitionism', -5
+				gs 'boyStat', 'A8'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet1.jpg"></center>'
 				'You give Svyatoslav a sweet smile and take him by the hand, pulling him into the men''s room. Slightly lifting up your skirt, you put his hand between your legs. The other boys have followed you and now you''re being fondled in front of a crowd.'
 				act 'Take his cock out of his pants': gt 'gschool_sex', 'rand_bj'