[fixed] Self loving was endless. Which is too much so now it should drop you out post orgasm.

locations/saveupdater.qsrc

@@ -903,6 +903,9 @@ end
 if pcs_gaming_exp > 0: gaming_exp += pcs_gaming_exp & killvar 'pcs_gaming_exp'
 if nerd_night_game ! 0: killvar 'nerd_night_game'
 if nerd_night_game_day ! 0: nerd_game['game_day'] = nerd_night_game_day & killvar 'nerd_night_game_day'
+
+!!Masturbation check wasn't being cleared
+mastrOnce = 0
 !! ----- Other bug fixes and cleanup ----- 0.8.0
 
 --- saveupdater ---------------------------------

locations/selfplay.qsrc

@@ -8,9 +8,14 @@ if $ARGS[0] = 'start':
 	if mastrOnce = 0:
 		stat['mast'] += 1
 		mastrOnce = 1
+		org_temp = orgasm
 		if pcs_inhib < 30:inhib_exp += rand(1,3)
 	end
 
+	if org_temp < orgasm:
+		act 'Finish': gt 'selfplay', 'stop'
+	exit
+	end
 	gs 'stat'
 
 	if $loc = 'bedrPar' or $loc = 'gadsarai':'<center><img <<$set_imgh>> src="images/shared/sex/mast/start.jpg"></center>'
@@ -66,9 +71,9 @@ if $ARGS[0] = 'start':
 
 			'<<$AnyaMsg>>'
 
-			act 'Stop touching yourself':gt $loc, $metka
+			act 'Stop touching yourself':gt 'selfplay', 'stop'
 
-			if pcs_horny > 0:gs 'selfplay', 'fingering'
+			if org_temp = orgasm:gs 'selfplay', 'fingering'
 		end
 	end
 
@@ -99,220 +104,222 @@ if $ARGS[0] = 'start':
 
 			act 'Stop touching yourself':gt $loc, $metka
 
-			act 'Add a second finger':
-				cls
-				selfplaytime += 5
-				gs 'selfplay', 'sis_prov'
+			if org_temp = orgasm:
+				act 'Add a second finger':
+					cls
+					selfplaytime += 5
+					gs 'selfplay', 'sis_prov'
 
-				'<center><img <<$set_imgh>> src="images/shared/sex/mast/2.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/shared/sex/mast/2.jpg"></center>'
 
-				gs 'arousal', 'masturbate', 5
-				gs 'stat'
+					gs 'arousal', 'masturbate', 5
+					gs 'stat'
 
-				if pcs_ass >= 10:
-					'You relax and squeeze a second finger in, alongside the first. It slides in fairly easily.'
+					if pcs_ass >= 10:
+						'You relax and squeeze a second finger in, alongside the first. It slides in fairly easily.'
 
-					if agape > 0:
-						if agape = 2:agape = 3
-						if agape = 1:agape = 2
+						if agape > 0:
+							if agape = 2:agape = 3
+							if agape = 1:agape = 2
 
-						pcs_horny -= 50
+							pcs_horny -= 50
 
-						if pcs_ass > 1:pcs_ass -= 1
+							if pcs_ass > 1:pcs_ass -= 1
 
-						'Pushing a second finger into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
-					end
-				elseif pcs_ass >= 5 and pcs_ass < 10:
-					analplay += 1
-					'You slide a second finger into your asshole. You can feel your anus squeezing your fingers tightly.'
+							'Pushing a second finger into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+						end
+					elseif pcs_ass >= 5 and pcs_ass < 10:
+						analplay += 1
+						'You slide a second finger into your asshole. You can feel your anus squeezing your fingers tightly.'
+
+						if agape > 0:
+							if agape = 2:agape = 3
+							if agape = 1:agape = 2
+							pcs_horny -= 50
+							pcs_ass += 1
+							'Pushing a second finger into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+						end
+					else
+						pcs_ass += 1
 
-					if agape > 0:
 						if agape = 2:agape = 3
 						if agape = 1:agape = 2
+						if agape = 0:agape = 1
+
 						pcs_horny -= 50
-						pcs_ass += 1
-						'Pushing a second finger into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+						'When you slide in the second finger, you feel a sharp pain in your anus. You may have tried too much, too fast.'
 					end
-				else
-					pcs_ass += 1
 
-					if agape = 2:agape = 3
-					if agape = 1:agape = 2
-					if agape = 0:agape = 1
+					gs 'stat'
+					'<<$AnyaMsg>>'
 
-					pcs_horny -= 50
-					'When you slide in the second finger, you feel a sharp pain in your anus. You may have tried too much, too fast.'
-				end
+					act 'Stop touching yourself':gt 'selfplay', 'stop'
 
-				gs 'stat'
-				'<<$AnyaMsg>>'
+					if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
-				act 'Stop touching yourself':gt $loc, $metka
 
-				if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
+					if org_temp = orgasm and agape < 3:
+						act 'Thrust three fingers in':
+							cls
+							selfplaytime += 5
+							gs 'selfplay', 'sis_prov'
+							'<center><img <<$set_imgh>> src="images/shared/sex/mast/3.jpg"></center>'
 
+							gs 'arousal', 'masturbate', 5
+							gs 'stat'
 
-				if pcs_horny > 0 and agape < 3:
-					act 'Thrust three fingers in':
-						cls
-						selfplaytime += 5
-						gs 'selfplay', 'sis_prov'
-						'<center><img <<$set_imgh>> src="images/shared/sex/mast/3.jpg"></center>'
+							if pcs_ass >= 15:
+								'Your asshole is fairly loose, and you manage to slide three fingers in without much effort.'
 
-						gs 'arousal', 'masturbate', 5
-						gs 'stat'
+								if agape > 0:
+									if agape = 2:agape = 3
+									if agape = 1:agape = 2
 
-						if pcs_ass >= 15:
-							'Your asshole is fairly loose, and you manage to slide three fingers in without much effort.'
+									pcs_horny -= 50
 
-							if agape > 0:
-								if agape = 2:agape = 3
-								if agape = 1:agape = 2
+									if pcs_ass > 1:pcs_ass += 1
 
-								pcs_horny -= 50
+									'Pushing three fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+								end
+							elseif pcs_ass >= 10 and pcs_ass < 15:
+								analplay += 1
+								'You slide three fingers into your asshole. You can feel your anus squeezing your fingers tightly.'
 
-								if pcs_ass > 1:pcs_ass += 1
+								if agape > 0:
+									if agape = 2:agape = 3
+									if agape = 1:agape = 2
 
-								'Pushing three fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
-							end
-						elseif pcs_ass >= 10 and pcs_ass < 15:
-							analplay += 1
-							'You slide three fingers into your asshole. You can feel your anus squeezing your fingers tightly.'
+									pcs_horny -= 50
+									pcs_ass += 1
+									'Pushing three fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+								end
+							else
+								pcs_ass += 1
 
-							if agape > 0:
 								if agape = 2:agape = 3
 								if agape = 1:agape = 2
+								if agape = 0:agape = 1
 
 								pcs_horny -= 50
-								pcs_ass += 1
-								'Pushing three fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+								'When you slide in three fingers, you feel a sharp pain in your anus. You may have tried too much, too fast.'
 							end
-						else
-							pcs_ass += 1
 
-							if agape = 2:agape = 3
-							if agape = 1:agape = 2
-							if agape = 0:agape = 1
+							if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
-							pcs_horny -= 50
-							'When you slide in three fingers, you feel a sharp pain in your anus. You may have tried too much, too fast.'
-						end
+							gs 'stat'
+							'<<$AnyaMsg>>'
 
-						if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
+							act 'Stop touching yourself':gt 'selfplay', 'stop'
 
-						gs 'stat'
-						'<<$AnyaMsg>>'
+							if org_temp = orgasm and agape < 3:
+								act 'Push four fingers into your asshole':
+									cls
+									selfplaytime += 5
+									gs 'selfplay', 'sis_prov'
 
-						act 'Stop touching yourself':gt $loc, $metka
+									'<center><img <<$set_imgh>> src="images/shared/sex/mast/4.jpg"></center>'
 
-						if pcs_horny > 0 and agape < 3:
-							act 'Push four fingers into your asshole':
-								cls
-								selfplaytime += 5
-								gs 'selfplay', 'sis_prov'
+									gs 'arousal', 'masturbate', 5
+									gs 'stat'
 
-								'<center><img <<$set_imgh>> src="images/shared/sex/mast/4.jpg"></center>'
+									if pcs_ass >= 20:
+										'Your asshole is very loose, and you manage to push four fingers into it.'
 
-								gs 'arousal', 'masturbate', 5
-								gs 'stat'
+										if agape > 0:
+											if agape = 2:agape = 3
+											if agape = 1:agape = 2
 
-								if pcs_ass >= 20:
-									'Your asshole is very loose, and you manage to push four fingers into it.'
+											pcs_horny -= 50
 
-									if agape > 0:
-										if agape = 2:agape = 3
-										if agape = 1:agape = 2
+											if pcs_ass > 1:pcs_ass -= 1
 
-										pcs_horny -= 50
+											'Pushing four fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+										end
+									elseif pcs_ass >= 15 and pcs_ass < 20:
+										analplay += 1
+										'You manage to push four fingers into your asshole. You can feel your anus squeezing your fingers tightly.'
 
-										if pcs_ass > 1:pcs_ass -= 1
+										if agape > 0:
+											if agape = 2:agape = 3
+											if agape = 1:agape = 2
 
-										'Pushing four fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
-									end
-								elseif pcs_ass >= 15 and pcs_ass < 20:
-									analplay += 1
-									'You manage to push four fingers into your asshole. You can feel your anus squeezing your fingers tightly.'
+											pcs_horny -= 50
+											pcs_ass += 1
+											'Pushing four fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+										end
+									else
+										pcs_ass += 1
 
-									if agape > 0:
 										if agape = 2:agape = 3
 										if agape = 1:agape = 2
+										if agape = 0:agape = 1
 
 										pcs_horny -= 50
-										pcs_ass += 1
-										'Pushing four fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+										'When you slide in four fingers, you feel a sharp pain in your anus. You may have tried too much, too fast.'
 									end
-								else
-									pcs_ass += 1
 
-									if agape = 2:agape = 3
-									if agape = 1:agape = 2
-									if agape = 0:agape = 1
+									if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
-									pcs_horny -= 50
-									'When you slide in four fingers, you feel a sharp pain in your anus. You may have tried too much, too fast.'
-								end
+									gs 'stat'
+									'<<$AnyaMsg>>'
 
-								if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
+									act 'Stop touching yourself':gt 'selfplay', 'stop'
 
-								gs 'stat'
-								'<<$AnyaMsg>>'
+									if org_temp = orgasm and agape < 3:
+										act 'Put your whole hand in':
+											cls
+											SelfFisting += 1
+											selfplaytime += 5
+											gs 'selfplay', 'sis_prov'
 
-								act 'Stop touching yourself':gt $loc, $metka
+											'<center><img <<$set_imgh>> src="images/shared/sex/mast/5.jpg"></center>'
 
-								if pcs_horny > 0 and agape < 3:
-									act 'Put your whole hand in':
-										cls
-										SelfFisting += 1
-										selfplaytime += 5
-										gs 'selfplay', 'sis_prov'
+											gs 'arousal', 'masturbate', 5
+											gs 'stat'
 
-										'<center><img <<$set_imgh>> src="images/shared/sex/mast/5.jpg"></center>'
+											if pcs_ass >= 25:
+												'Slowly but surely, you manage to get your entire hand into your ass.'
 
-										gs 'arousal', 'masturbate', 5
-										gs 'stat'
+												if agape > 0:
+													if agape = 2:agape = 3
+													if agape = 1:agape = 2
 
-										if pcs_ass >= 25:
-											'Slowly but surely, you manage to get your entire hand into your ass.'
+													pcs_horny -= 50
 
-											if agape > 0:
-												if agape = 2:agape = 3
-												if agape = 1:agape = 2
+													if pcs_ass > 1:pcs_ass -= 1
 
-												pcs_horny -= 50
+													'Pushing your whole hand into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+												end
+											elseif pcs_ass >= 20 and pcs_ass < 25:
+												analplay += 1
+												'It takes a lot of effort, but over the course of several minutes you manage to work your whole hand into your ass. You feel your anus squeeze your wrist tightly.'
 
-												if pcs_ass > 1:pcs_ass -= 1
+												if agape > 0:
+													if agape = 2:agape = 3
+													if agape = 1:agape = 2
 
-												'Pushing your whole hand into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
-											end
-										elseif pcs_ass >= 20 and pcs_ass < 25:
-											analplay += 1
-											'It takes a lot of effort, but over the course of several minutes you manage to work your whole hand into your ass. You feel your anus squeeze your wrist tightly.'
+													pcs_horny -= 50
+													pcs_ass += 1
+													'Pushing your whole hand into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+												end
+											else
+												pcs_ass += 1
 
-											if agape > 0:
 												if agape = 2:agape = 3
 												if agape = 1:agape = 2
+												if agape = 0:agape = 1
 
 												pcs_horny -= 50
-												pcs_ass += 1
-												'Pushing your whole hand into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+												'When you push your hand into your asshole, you feel a sharp pain in your anus. You may have tried too much, too fast.'
 											end
-										else
-											pcs_ass += 1
-
-											if agape = 2:agape = 3
-											if agape = 1:agape = 2
-											if agape = 0:agape = 1
 
-											pcs_horny -= 50
-											'When you push your hand into your asshole, you feel a sharp pain in your anus. You may have tried too much, too fast.'
-										end
+											act 'Stop touching yourself':gt 'selfplay', 'stop'
 
-										act 'Stop touching yourself':gt $loc, $metka
+											if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
-										if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
-
-										gs 'stat'
-										'<<$AnyaMsg>>'
+											gs 'stat'
+											'<<$AnyaMsg>>'
+										end
 									end
 								end
 							end
@@ -403,18 +410,7 @@ if $ARGS[0] = 'start':
 
 	if pcs_horny > 0:gs 'selfplay', 'fingering'
 
-	act 'Stop masturbating':
-		analplay = 0
-		selfplaytime = 0
-		mastrOnce = 0
-		proverkasisterhere = 0
-
-		if vaginaTemp > pcs_vag * 2:pcs_vag += 1 & vaginaTemp = 0
-
-		gt $loc, $metka
-		gs 'arousal', 'end'
-		gs 'stat'
-	end
+	act 'Stop masturbating': gt 'selfplay', 'stop'
 
 	if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
@@ -527,14 +523,7 @@ if $ARGS[0] = 'van_vtor':
 		'You hear shouting from outside the bathroom: "<<$pcs_nickname>>! Are you drowning in there or something? What''s taking so long? Get out of there!"'
 
 		act 'Get out of the bath and dry yourself off':
-			analplay = 0
-			selfplaytime = 0
-			mastrOnce = 0
-			proverkasisterhere = 0
-
-			if vaginaTemp > pcs_vag * 2:pcs_vag += 1 & vaginaTemp = 0
-
-			gt $loc, $metka
+			gt 'selfplay', 'stop'
 		end
 
 		exit
@@ -574,14 +563,14 @@ if $ARGS[0] = 'fingering':
 			gs 'stat'
 			'<<$AnyaMsg>>'
 
-			gs 'selfplay', 'fingering2'
+			if org_temp = orgasm: gs 'selfplay', 'fingering2'
 
 		elseif mesec > 0:
 			pcs_mood -= 5
 			'Your vagina has some dried up blood from your period on it. You attempt to shove your finger in, but then are kind of grossed out by the idea and reconsider.'
 		end
 
-		act 'Stop touching yourself':gt $loc, $metka
+		act 'Stop touching yourself':gt 'selfplay', 'stop'
 	end
 end
 
@@ -611,9 +600,9 @@ if $ARGS[0] = 'fingering2':
 
 		gs 'selfplay', 'fingering2', 1
 
-		if pcs_horny > 0 and pcs_vag > 0:gs 'selfplay', 'fingering3'
+		if org_temp = orgasm and pcs_vag > 0: gs 'selfplay', 'fingering3'
 
-		act 'Stop touching yourself':gt $loc, $metka
+		act 'Stop touching yourself':gt 'selfplay', 'stop'
 	end
 end
 
@@ -652,42 +641,59 @@ if $ARGS[0] = 'fingering3':
 
 		'<<$AnyaMsg>>'
 
-		act 'Fuck yourself with your fingers':
-			cls
-			selfplaytime += 10
-			gs 'selfplay', 'sis_prov'
+		if org_temp = orgasm:
+			act 'Fuck yourself with your fingers':
+				cls
+				selfplaytime += 10
+				gs 'selfplay', 'sis_prov'
 
-			if pcs_vag < 10:
-				if vgape = 2:vgape = 3
-				if vgape = 1:vgape = 2
-				if vgape = 0:vgape = 1
+				if pcs_vag < 10:
+					if vgape = 2:vgape = 3
+					if vgape = 1:vgape = 2
+					if vgape = 0:vgape = 1
 
-				pcs_horny -= 10
-				pcs_mood -= 10
-			end
+					pcs_horny -= 10
+					pcs_mood -= 10
+				end
 
-			'<center><img <<$set_imgh>> src="images/shared/sex/mast/hand.jpg"></center>'
-			'You start to slowly move your hand, thrusting your fingers into your pussy again and again.'
+				'<center><img <<$set_imgh>> src="images/shared/sex/mast/hand.jpg"></center>'
+				'You start to slowly move your hand, thrusting your fingers into your pussy again and again.'
 
-			gs 'arousal', 'masturbate', 10
-			gs 'stat'
+				gs 'arousal', 'masturbate', 10
+				gs 'stat'
 
-			if pcs_vag <= 15:pcs_horny -= 10 & pcs_mood -= 10 & 'You''re stretching your pussy to the point where it becomes rather painful, and don''t get any enjoyment out of it.'
-			if pcs_vag > 10:pcs_horny += rand(10, 20) & 'Your pussy walls are stretched nicely from the finger fucking, and you feel a pleasant warmth spread in your lower body.'
+				if pcs_vag <= 15:pcs_horny -= 10 & pcs_mood -= 10 & 'You''re stretching your pussy to the point where it becomes rather painful, and don''t get any enjoyment out of it.'
+				if pcs_vag > 10:pcs_horny += rand(10, 20) & 'Your pussy walls are stretched nicely from the finger fucking, and you feel a pleasant warmth spread in your lower body.'
 
-			gs 'stat'
+				gs 'stat'
 
-			if pcs_vag < 20:vaginaTemp += 1
+				if pcs_vag < 20:vaginaTemp += 1
 
-			'<<$AnyaMsg>>'
+				'<<$AnyaMsg>>'
 
-			gs 'selfplay', 'fingering3'
+				gs 'selfplay', 'fingering3'
 
-			act 'Stop touching yourself':gt $loc, $metka
+				act 'Stop touching yourself':gt 'selfplay', 'stop'
+			end
+		else
+			act 'Stop touching yourself':gt 'selfplay', 'stop'
 		end
 	end
 
-	act 'Stop touching yourself':gt $loc, $metka
+	act 'Stop touching yourself':gt 'selfplay', 'stop'
+end
+
+if $ARGS[0] = 'stop':
+	analplay = 0
+	selfplaytime = 0
+	mastrOnce = 0
+	proverkasisterhere = 0
+
+	if vaginaTemp > pcs_vag * 2:pcs_vag += 1 & vaginaTemp = 0
+
+	gs 'arousal', 'end'
+	gs 'stat'
+	gt $loc, $metka
 end
 
 --- selfplay ---------------------------------