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

locations/arousal.qsrc

@@ -88,6 +88,11 @@ temp_text = 0
 !!orgasms restricted to direct stimulation using this flag
 killvar 'orgasm_flag'
 
+!!workaround over use
+if $ARGS[0] ! 'auto_lube' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0] ! 'count2':
+	if arousal_overcall = 1 and $arousal_overcall ! $ARGS[0]+$ARGS[2]+$ARGS[3]+$ARGS[4]+$ARGS[5]+$ARGS[6]+$ARGS[7]+$ARGS[8]: killvar 'arousal_overcall'
+end
+
 if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0] ! 'count2':
 
 	if arrpos('$ARGS', 'unaware') >= 0: temp_unaware = 1
@@ -205,41 +210,45 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		!! ARGS[4] grange of inserted object
 		!! ARGS[5] skill (0-2) aka silavag
 		!! ARGS[6] stimulation time
-		!! length and girth abilities of hole are not also separated
-		!! but I suppose that they are related although it is not propable
-		!! we can estimate difference in girth and length
-		grdif = (ARGS[4] - ARGS[0])/2
-		ltdif = (ARGS[3] - ARGS[0])/4
-		!! painful intercourse
-		if pain_coeff > rand(0,2):
-			grdif += rand(pain_coeff/2, pain_coeff)
-			ltdif += rand(pain_coeff/2, pain_coeff)
-		end
-		!! in pain, compensated with lube
-		if ARGS[2] > 0:
-			if ARGS[2] > rand(ARGS[1]/2, ARGS[1]): grdif += rand(ARGS[2] / max(1,ARGS[1]/2), ARGS[2] / max(1,ARGS[1]/4))
-			if ARGS[2] > rand(ARGS[1]/2, ARGS[1]): ltdif += rand(ARGS[2] / max(1,ARGS[1]/2), ARGS[2] / max(1,ARGS[1]/4))
-		end
-		!! lube can compensate the difference a bit, or make it worse if there is no lube at all
-		if ARGS[1] > 0:
-			grdif -= rand(ARGS[1]/2, ARGS[1])
-			ltdif -= rand(ARGS[1]/4, ARGS[1]/2)
-		else
-			grdif += max(1, rand(grdif/4, grdif/2)) / max(1,ARGS[5]+1)
-			ltdif += max(1, rand(ltdif/6, ltdif/4)) / max(1,ARGS[5]+1)
-		end
-		!! when skilled, it does not harm PC
-		if ARGS[5] > 0 and ltdif > 0: ltdif /= ARGS[5]+1
-		!! if there is any discomfort, check intercourse duration, compensated by skill
-		if stim_time > 1:
-			if grdif > rand(stim_time): grdif += rand(stim_time / (max(1,ARGS[5])*5), stim_time / (max(1,ARGS[5])*3))
-			if ltdif > rand(stim_time): ltdif += rand(stim_time / (max(1,ARGS[5])*5), stim_time / (max(1,ARGS[5])*3))
-		end
-
-		!! min\max
-		grdif = max(0, grdif / max(1, (ARGS[0]/6)))
-		ltdif = max(0, ltdif / max(1, (ARGS[0]/6)))
+		grdif = 0
+		ltdif = 0
+		!! cap pain to vitality
+		if ARGS[2] < (120 - pcs_vital)/2:
+			!! length and girth abilities of hole are not also separated
+			!! but I suppose that they are related although it is not propable
+			!! we can estimate difference in girth and length
+			grdif = (ARGS[4] - ARGS[0])/2
+			ltdif = (ARGS[3] - ARGS[0])/4
+			!! painful intercourse
+			if pain_coeff > rand(0,2):
+				grdif += rand(pain_coeff/2, pain_coeff)
+				ltdif += rand(pain_coeff/2, pain_coeff)
+			end
+			!! in pain, compensated with lube
+			if ARGS[2] > 0:
+				if ARGS[2] > rand(ARGS[1]/2, ARGS[1]): grdif += rand(ARGS[2] / max(1,ARGS[1]/2), ARGS[2] / max(1,ARGS[1]/4))
+				if ARGS[2] > rand(ARGS[1]/2, ARGS[1]): ltdif += rand(ARGS[2] / max(1,ARGS[1]/2), ARGS[2] / max(1,ARGS[1]/4))
+			end
+			!! lube can compensate the difference a bit, or make it worse if there is no lube at all
+			if ARGS[1] > 0:
+				grdif -= rand(ARGS[1]/2, ARGS[1])
+				ltdif -= rand(ARGS[1]/4, ARGS[1]/2)
+			else
+				grdif += max(1, rand(grdif/4, grdif/2)) / max(1,ARGS[5]+1)
+				ltdif += max(1, rand(ltdif/6, ltdif/4)) / max(1,ARGS[5]+1)
+			end
+			!! when skilled, it does not harm PC
+			if ARGS[5] > 0 and ltdif > 0: ltdif /= ARGS[5]+1
+			!! if there is any discomfort, check intercourse duration, compensated by skill
+			if stim_time > 1:
+				if grdif > rand(stim_time): grdif += rand(stim_time / (max(1,ARGS[5])*5), stim_time / (max(1,ARGS[5])*3))
+				if ltdif > rand(stim_time): ltdif += rand(stim_time / (max(1,ARGS[5])*5), stim_time / (max(1,ARGS[5])*3))
+			end
 
+			!! min\max
+			grdif = max(0, grdif / max(1, (ARGS[0]/6)))
+			ltdif = max(0, ltdif / max(1, (ARGS[0]/6)))
+		end
 		!{ 'hole size <<ARGS[0]>>; length: <<ARGS[3]>>; grange: <<ARGS[4]>>; hole slippery: <<ARGS[1]>>; current pain: <<ARGS[2]>>; stim_time: <<stim_time>>; skill: <<ARGS[5]>>; grdif: <<grdif>>; ltdif: <<ltdif>>' }
 	}
 
@@ -328,6 +337,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 			stim['mag'] += 1
 			stim['act'] = 80
 		end
+		if ARGS[1] > 0 and cumvol[3] > rand(pcs_ass/2,pcs_ass): gs 'cum_manage', 'cum_decay', rand(2,5)*max(1,stim_time/5)
 		if pain_coeff > 0:gs 'pain', rand(pain_coeff), 'asshole', 'stretch'
 	elseif $ARGS[0] = 'anal_fist':
 		orgasm_flag['anal'] = 1
@@ -338,11 +348,14 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['act'] = 70
 		end
-		dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], rand(15,20), rand(35,40), rand(0,2)
-		stim['act'] -= grdif + ltdif
-		gs 'pain', grdif+ltdif, 'asshole', 'stretch'
-		if grdif + ltdif > agape*2 + pcs_ass/2: agape += 1
-		pcs_ass += 1
+		if arousal_overcall = 0:
+			dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], rand(15,20), rand(35,40), rand(0,2)
+			stim['act'] -= grdif + ltdif
+			gs 'pain', grdif+ltdif, 'asshole', 'stretch'
+			if grdif + ltdif > agape*2 + pcs_ass/2: agape += 1
+			pcs_ass += 1
+		end
+		if ARGS[1] > 0 and cumvol[3] > rand(pcs_ass/2,pcs_ass): gs 'cum_manage', 'cum_decay', rand(15,20)*max(1,stim_time/5)
 	elseif $ARGS[0] = 'self_fisting_anal':
 		orgasm_flag['anal'] = 1
 		count['self_fisting_anal'] = 1
@@ -354,11 +367,14 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['act'] = 70
 		end
-		dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], rand(10,15), rand(30,35), 2
-		stim['act'] -= grdif + ltdif
-		gs 'pain', grdif+ltdif, 'asshole', 'stretch'
-		if grdif + ltdif > agape*2 + pcs_ass/2: agape += 1
-		pcs_ass += 1
+		if arousal_overcall = 0:
+			dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], rand(10,15), rand(30,35), 2
+			stim['act'] -= grdif + ltdif
+			gs 'pain', grdif+ltdif, 'asshole', 'stretch'
+			if grdif + ltdif > agape*2 + pcs_ass/2: agape += 1
+			pcs_ass += 1
+		end
+		if ARGS[1] > 0 and cumvol[3] > rand(pcs_ass/2,pcs_ass): gs 'cum_manage', 'cum_decay', rand(10,15)*max(1,stim_time/5)
 	elseif $ARGS[0] = 'anal_vibe':
 		orgasm_flag['anal'] = 1
 		count['anal_vibe'] = 1
@@ -371,6 +387,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 			stim['mag'] += 2
 			stim['act'] = 90
 		end
+		if ARGS[1] > 0 and cumvol[3] > rand(pcs_ass/2,pcs_ass): gs 'cum_manage', 'cum_decay', rand(5,10)*max(1,stim_time/5)
 	elseif $ARGS[0] = 'anal':
 		pcs_sweat += rand(1,4)*max(1,stim_time/5)
 		stat['last_sex_day'] = daystart
@@ -385,39 +402,40 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 3
 		end
-		if vaginal_slip < max(1, anal_slip/2):
-			if cumloc[3] > 0: vaginal_slip += rand(cumvol[3]/10, cumvol[3]/5)
+		if arousal_overcall = 0:
+			!! add some lube for future sex type changes
+			if vaginal_slip < max(1, anal_slip/2) and cumloc[3] > 0: vaginal_slip += rand(cumvol[3]/10, cumvol[3]/5)
+			dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], temp_dick, grange, temp_silavag
+			stim['act'] = 80 - grdif + ltdif + temp_silavag*8
+			!! the pain lover the pleasure
+			gs 'pain', grdif + ltdif, 'asshole', 'stretch'
+			!! calculate the harm
+			if grdif + ltdif > agape*2 + pcs_ass/2: agape += 1
+			if pcs_ass < temp_dick:pcs_ass += 1
+			if pcs_ass*2 < temp_dick:pcs_ass += 1
 		end
-		dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], temp_dick, grange, temp_silavag
-		stim['act'] = 80 - grdif + ltdif + temp_silavag*8
-		!! the pain lover the pleasure
-		gs 'pain', grdif + ltdif, 'asshole', 'stretch'
-		!! calculate the harm
-		if grdif + ltdif > agape*2 + pcs_ass/2: agape += 1
 		!! force cum leak
 		if ARGS[1] > 0 and cumvol[3] > rand(pcs_ass/2,pcs_ass): gs 'cum_manage', 'cum_decay', ((temp_dick+grange)/2)*max(1,stim_time/5)
-		if pcs_ass < temp_dick:pcs_ass += 1
-		if pcs_ass*2 < temp_dick:pcs_ass += 1
 	elseif $ARGS[0] = 'anal_dildo':
 		pcs_sweat += rand(0,2)*max(1,stim_time/5)
 		orgasm_flag['anal'] = 1
 		count['anal_dildo'] = 1
 		!! the same as for 'anal'
-		if vaginal_slip < max(1, anal_slip/2):
-			if cumloc[3] > 0: vaginal_slip += rand(cumvol[3]/10, cumvol[3]/5)
-		end
-		dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], temp_dick, grange, temp_silavag
-		stim['act'] = 80 - grdif + ltdif + temp_silavag*8
 		if pcs_traits['buttslut_lvl'] = 1:
 			stim['act'] += 10
 		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 1
 		end
-		gs 'pain', grdif + ltdif, 'asshole', 'stretch'
-		if grdif + ltdif > agape*2 + pcs_ass/2: agape += 1
+		if arousal_overcall = 0:
+			if vaginal_slip < max(1, anal_slip/2) and cumloc[3] > 0: vaginal_slip += rand(cumvol[3]/10, cumvol[3]/5)
+			dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], temp_dick, grange, temp_silavag
+			stim['act'] = 80 - grdif + ltdif + temp_silavag*8
+			gs 'pain', grdif + ltdif, 'asshole', 'stretch'
+			if grdif + ltdif > agape*2 + pcs_ass/2: agape += 1
+			if pcs_ass < temp_dick:pcs_ass += 1
+			if pcs_ass*2 < temp_dick:pcs_ass += 1
+		end
 		if ARGS[1] > 0 and cumvol[3] > rand(pcs_ass/2,pcs_ass): gs 'cum_manage', 'cum_decay', ((temp_dick+grange)/2)*max(1,stim_time/5)
-		if pcs_ass < temp_dick:pcs_ass += 1
-		if pcs_ass*2 < temp_dick:pcs_ass += 1
 	elseif $ARGS[0] = 'anal_strap':
 		pcs_sweat += rand(1,2)*max(1,stim_time/5)
 		stat['last_sex_day'] = daystart
@@ -429,59 +447,62 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 			stim['mag'] += 1
 		end
 		!! the same as for 'anal'
-		if vaginal_slip < max(1, anal_slip/2):
-			if cumloc[3] > 0: vaginal_slip += rand(cumvol[3]/10, cumvol[3]/5)
+		if arousal_overcall = 0:
+			if vaginal_slip < max(1, anal_slip/2) and cumloc[3] > 0: vaginal_slip += rand(cumvol[3]/10, cumvol[3]/5)
+			dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], temp_dick, grange, temp_silavag
+			stim['act'] = 80 - grdif + ltdif + temp_silavag*8
+			gs 'pain', grdif + ltdif, 'asshole', 'stretch'
+			if grdif + ltdif > agape*2 + pcs_ass/2: agape += 1
+			if pcs_ass < temp_dick:pcs_ass += 1
+			if pcs_ass*2 < temp_dick:pcs_ass += 1
 		end
-		dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], temp_dick, grange, temp_silavag
-		stim['act'] = 80 - grdif + ltdif + temp_silavag*8
-		gs 'pain', grdif + ltdif, 'asshole', 'stretch'
-		if grdif + ltdif > agape*2 + pcs_ass/2: agape += 1
-		!! force cum leak
 		if ARGS[1] > 0 and cumvol[3] > rand(pcs_ass/2,pcs_ass): gs 'cum_manage', 'cum_decay', ((temp_dick+grange)/2)*max(1,stim_time/5)
-		if pcs_ass < temp_dick:pcs_ass += 1
-		if pcs_ass*2 < temp_dick:pcs_ass += 1
 	elseif $ARGS[0] = 'vaginal_finger':
 		orgasm_flag['vaginal'] = 1
 		count['vaginal_finger'] = 1
 		stim['mag'] += 1
 		stim['act'] = 80
 		if pain_coeff > 0:gs 'pain', rand(pain_coeff), 'vaginal', 'stretch'
+		if ARGS[1] > 0 and cumvol[0] > rand(pcs_vag/2,pcs_vag): gs 'cum_manage', 'cum_decay', rand(2,5)*max(1,stim_time/5)
 	elseif $ARGS[0] = 'vaginal_fist':
 		pcs_sweat += rand(0,1)*max(1,stim_time/5)
 		orgasm_flag['vaginal'] = 1
 		count['vaginal_fist'] = 1
 		stim['act'] = 70
-		dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], rand(15,20), rand(35,40), rand(0,2)
-		stim['act'] -= grdif + ltdif
-		gs 'pain', grdif+ltdif, 'vaginal', 'stretch'
-		gs 'pain', rand(grdif), 'labia', 'stretch'
-		if grdif + ltdif > vgape*2 + pcs_vag/2: vgape += 1
-		pcs_vag += 1
+		if arousal_overcall = 0:
+			dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], rand(15,20), rand(35,40), rand(0,2)
+			stim['act'] -= grdif + ltdif
+			gs 'pain', grdif+ltdif, 'vaginal', 'stretch'
+			gs 'pain', rand(grdif), 'labia', 'stretch'
+			if grdif + ltdif > vgape*2 + pcs_vag/2: vgape += 1
+			pcs_vag += 1
+		end
+		!! force cum leak
+		if ARGS[1] > 0 and cumvol[0] > rand(pcs_vag/2,pcs_vag): gs 'cum_manage', 'cum_decay', rand(15,20)*max(1,stim_time/5)
 	elseif $ARGS[0] = 'self_fisting':
 		orgasm_flag['vaginal'] = 1
 		count['self_fisting'] = 1
 		!! add lube from saliva
 		if vaginal_slip < max(1, pcs_hydra/20): vaginal_slip = max(1, pcs_hydra/20)
 		stim['act'] = 70
-		dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], rand(10,15), rand(30,35), 2
-		stim['act'] -= grdif + ltdif
-		gs 'pain', grdif+ltdif, 'vaginal', 'stretch'
-		gs 'pain', rand(grdif), 'labia', 'stretch'
-		if grdif + ltdif > vgape*2 + pcs_vag/2: vgape += 1
-		pcs_vag += 1
+		if arousal_overcall = 0:
+			dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], rand(10,15), rand(30,35), 2
+			stim['act'] -= grdif + ltdif
+			gs 'pain', grdif+ltdif, 'vaginal', 'stretch'
+			gs 'pain', rand(grdif), 'labia', 'stretch'
+			if grdif + ltdif > vgape*2 + pcs_vag/2: vgape += 1
+			pcs_vag += 1
+		end
+		if ARGS[1] > 0 and cumvol[0] > rand(pcs_vag/2,pcs_vag): gs 'cum_manage', 'cum_decay', rand(10,15)*max(1,stim_time/5)
 	elseif $ARGS[0] = 'vaginal_vibe':
 		orgasm_flag['vaginal'] = 1
 		count['vaginal_vibe'] = 1
 		stim['mag'] += 2
 		stim['act'] = 90
+		if ARGS[1] > 0 and cumvol[0] > rand(pcs_vag/2,pcs_vag): gs 'cum_manage', 'cum_decay', rand(5,10)*max(1,stim_time/5)
 	elseif $ARGS[0] = 'vaginal':
 		pcs_sweat += rand(1,3)*max(1,stim_time/5)
 		orgasm_flag['vaginal'] = 1
-		!! add anal lube from vaginal juices
-		if anal_slip < max(1, vaginal_slip/2):
-			anal_slip = max(1, vaginal_slip/rand(2,3))
-			if cumloc[0] > 0: anal_slip += rand(cumvol[0]/15, cumvol[0]/10)
-		end
 		!! pre-cum check
 		if rand(0,120) < ARGS[1]: cumprecheck = 1 & gs 'cum_manage'
 		if temp_unaware = 1:
@@ -499,38 +520,47 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 			stat['last_man_sex_day'] = daystart
 		end
 		stim['mag'] += 3
-		dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], temp_dick, grange, temp_silavag
-		stim['act'] = 80 - grdif + ltdif + temp_silavag*8
-		!! the pain lover the pleasure
-		gs 'pain', grdif+ltdif, 'vaginal', 'stretch'
-		if temp_dick/max(1, temp_silavag) > rand(pcs_vag/2,pcs_vag): gs 'pain', rand(ltdif), 'cervix', 'shock'
-		if grange/max(1, temp_silavag)    > rand(pcs_vag/2,pcs_vag): gs 'pain', rand(grdif), 'labia', 'stretch'
-		if pain_coeff > 0: gs 'pain', rand(pain_coeff)/5, 'clitoris', 'hit'
-		!! calculate the harm
-		if grdif + ltdif > vgape*2 + pcs_vag/2: vgape += 1
+		if arousal_overcall = 0:
+			!! add anal lube from vaginal juices
+			if anal_slip < max(1, vaginal_slip/2):
+				anal_slip = max(1, vaginal_slip/rand(2,3))
+				if cumloc[0] > 0: anal_slip += rand(cumvol[0]/15, cumvol[0]/10)
+			end
+			dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], temp_dick, grange, temp_silavag
+			stim['act'] = 80 - grdif + ltdif + temp_silavag*8
+			!! the pain lover the pleasure
+			gs 'pain', grdif+ltdif, 'vaginal', 'stretch'
+			if temp_dick/max(1, temp_silavag) > rand(pcs_vag/2,pcs_vag): gs 'pain', rand(ltdif), 'cervix', 'shock'
+			if grange/max(1, temp_silavag)    > rand(pcs_vag/2,pcs_vag): gs 'pain', rand(grdif), 'labia', 'stretch'
+			if pain_coeff > 0: gs 'pain', rand(pain_coeff)/5, 'clitoris', 'hit'
+			!! calculate the harm
+			if grdif + ltdif > vgape*2 + pcs_vag/2: vgape += 1
+			if pcs_vag < temp_dick:pcs_vag += 1
+			if pcs_vag*2 < temp_dick:pcs_vag += 1
+		end
 		!! force cum leak
 		if ARGS[1] > 0 and cumvol[0] > rand(pcs_vag/2,pcs_vag): gs 'cum_manage', 'cum_decay', ((temp_dick+grange)/2)*max(1,stim_time/5)
-		if pcs_vag < temp_dick:pcs_vag += 1
-		if pcs_vag*2 < temp_dick:pcs_vag += 1
 	elseif $ARGS[0] = 'vaginal_dildo':
 		pcs_sweat += rand(0,2)*max(1,stim_time/5)
 		orgasm_flag['vaginal'] = 1
 		count['vaginal_dildo'] = 1
 		stim['mag'] += 1
-		!! the same as for 'vaginal'
-		if anal_slip < max(1, vaginal_slip/2):
-			anal_slip = max(1, vaginal_slip/rand(2,3))
-			if cumloc[0] > 0: anal_slip += rand(cumvol[0]/15, cumvol[0]/10)
+		if arousal_overcall = 0:
+			!! the same as for 'vaginal'
+			if anal_slip < max(1, vaginal_slip/2):
+				anal_slip = max(1, vaginal_slip/rand(2,3))
+				if cumloc[0] > 0: anal_slip += rand(cumvol[0]/15, cumvol[0]/10)
+			end
+			dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], temp_dick, grange, temp_silavag
+			stim['act'] = 80 - grdif + ltdif + temp_silavag*8
+			gs 'pain', grdif + ltdif, 'vaginal', 'stretch'
+			if temp_dick/max(1, temp_silavag) > rand(pcs_vag/2,pcs_vag): gs 'pain', rand(ltdif), 'cervix', 'shock'
+			if grange/max(1, temp_silavag)    > rand(pcs_vag/2,pcs_vag): gs 'pain', rand(grdif), 'labia', 'stretch'
+			if grdif + ltdif > vgape*2 + pcs_vag/2: vgape += 1
+			if pcs_vag < temp_dick:pcs_vag += 1
+			if pcs_vag*2 < temp_dick:pcs_vag += 1
 		end
-		dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], temp_dick, grange, temp_silavag
-		stim['act'] = 80 - grdif + ltdif + temp_silavag*8
-		gs 'pain', grdif + ltdif, 'vaginal', 'stretch'
-		if temp_dick/max(1, temp_silavag) > rand(pcs_vag/2,pcs_vag): gs 'pain', rand(ltdif), 'cervix', 'shock'
-		if grange/max(1, temp_silavag)    > rand(pcs_vag/2,pcs_vag): gs 'pain', rand(grdif), 'labia', 'stretch'
 		if ARGS[1] > 0 and cumvol[0] > rand(pcs_vag/2,pcs_vag): gs 'cum_manage', 'cum_decay', ((temp_dick+grange)/2)*max(1,stim_time/5)
-		if grdif + ltdif > vgape*2 + pcs_vag/2: vgape += 1
-		if pcs_vag < temp_dick:pcs_vag += 1
-		if pcs_vag*2 < temp_dick:pcs_vag += 1
 	elseif $ARGS[0] = 'vaginal_strap':
 		pcs_sweat += rand(1,2)*max(1,stim_time/5)
 		orgasm_flag['vaginal'] = 1
@@ -545,19 +575,21 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		end
 		stim['mag'] += 1
 		!! the same as for 'vaginal'
-		if anal_slip < max(1, vaginal_slip/2):
-			anal_slip = max(1, vaginal_slip/rand(2,3))
-			if cumloc[0] > 0: anal_slip += rand(cumvol[0]/15, cumvol[0]/10)
+		if arousal_overcall = 0:
+			if anal_slip < max(1, vaginal_slip/2):
+				anal_slip = max(1, vaginal_slip/rand(2,3))
+				if cumloc[0] > 0: anal_slip += rand(cumvol[0]/15, cumvol[0]/10)
+			end
+			dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], temp_dick, grange, temp_silavag
+			stim['act'] = 80 - grdif + ltdif + temp_silavag*8
+			gs 'pain', grdif + ltdif, 'vaginal', 'stretch'
+			if temp_dick/max(1, temp_silavag) > rand(pcs_vag/2,pcs_vag): gs 'pain', rand(ltdif), 'cervix', 'shock'
+			if grange/max(1, temp_silavag)    > rand(pcs_vag/2,pcs_vag): gs 'pain', rand(grdif), 'labia', 'stretch'
+			if grdif + ltdif > vgape*2 + pcs_vag/2: vgape += 1
+			if pcs_vag < temp_dick:pcs_vag += 1
+			if pcs_vag*2 < temp_dick:pcs_vag += 1
 		end
-		dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], temp_dick, grange, temp_silavag
-		stim['act'] = 80 - grdif + ltdif + temp_silavag*8
-		gs 'pain', grdif + ltdif, 'vaginal', 'stretch'
-		if temp_dick/max(1, temp_silavag) > rand(pcs_vag/2,pcs_vag): gs 'pain', rand(ltdif), 'cervix', 'shock'
-		if grange/max(1, temp_silavag)    > rand(pcs_vag/2,pcs_vag): gs 'pain', rand(grdif), 'labia', 'stretch'
-		if grdif + ltdif > vgape*2 + pcs_vag/2: vgape += 1
 		if ARGS[1] > 0 and cumvol[0] > rand(pcs_vag/2,pcs_vag): gs 'cum_manage', 'cum_decay', ((temp_dick+grange)/2)*max(1,stim_time/5)
-		if pcs_vag < temp_dick:pcs_vag += 1
-		if pcs_vag*2 < temp_dick:pcs_vag += 1
 	elseif $ARGS[0] = 'flashlite':
 		count['flashlite'] = 1
 		stim['act'] = 10
@@ -638,59 +670,64 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		stim['act'] = 25
 	elseif $ARGS[0] = 'bj':
 		pcs_sweat += rand(0,1)*max(1,stim_time/5)
-		!! add lube from saliva
-		if anal_slip < max(1, pcs_hydra/20): anal_slip += max(1, pcs_hydra/20)
-		if vaginal_slip < max(1, pcs_hydra/20): vaginal_slip += max(1, pcs_hydra/20)
 		if temp_unaware = 1:
 			count['hidden_bj'] = 1
 		else
 			count['bj'] = 1
 		end
 		stim['act'] = 45
-		if pain_coeff > 0:gs 'pain', rand(pain_coeff), 'mouth', 'stretch'
-		if pcs_lipbalm > 0:
-			pcs_lipbalm = max(0, pcs_lipbalm - 1*max(1,stim_time/5))
-			if arrpos('$ARGS', 'rape') >= 0 _ 
-			or arrpos('$ARGS', 'rough') >= 0 _ 
-			or arrpos('$ARGS', 'gangbang') >= 0 _ 
-			or arrpos('$ARGS', 'beast') >= 0:
+		if arousal_overcall = 0:
+			!! add lube from saliva
+			if anal_slip < max(1, pcs_hydra/20): anal_slip += max(1, pcs_hydra/20)
+			if vaginal_slip < max(1, pcs_hydra/20): vaginal_slip += max(1, pcs_hydra/20)
+			if pain_coeff > 0:gs 'pain', rand(pain_coeff), 'mouth', 'stretch'
+			if pcs_lipbalm > 0:
 				pcs_lipbalm = max(0, pcs_lipbalm - 1*max(1,stim_time/5))
+				if arrpos('$ARGS', 'rape') >= 0 _ 
+				or arrpos('$ARGS', 'rough') >= 0 _ 
+				or arrpos('$ARGS', 'gangbang') >= 0 _ 
+				or arrpos('$ARGS', 'beast') >= 0:
+					pcs_lipbalm = max(0, pcs_lipbalm - 1*max(1,stim_time/5))
+				end
 			end
+			if arrpos('$ARGS', 'deepthroat') >= 0:
+				dynamic $get_hole_pain, pcs_throat, pcs_hydra/10, pain['throat'], temp_dick, grange, temp_silavag
+				stim['act'] = 80 - ltdif + grdif + temp_silavag*8
+				gs 'pain', grdif + ltdif, 'throat', 'stretch'
+				gs 'pain', grdif, 'jaw', 'stretch'
+				if pcs_throat < temp_dick:pcs_throat += 1
+				if pcs_throat*2 < temp_dick:pcs_throat += 1
+			end
+			if pcs_throat*3 < temp_dick:pcs_throat += 1
 		end
-		if arrpos('$ARGS', 'deepthroat') >= 0:
-			dynamic $get_hole_pain, pcs_throat, pcs_hydra/10, pain['throat'], temp_dick, grange, temp_silavag
-			stim['act'] = 80 - ltdif + grdif + temp_silavag*8
-			gs 'pain', grdif + ltdif, 'throat', 'stretch'
-			gs 'pain', grdif, 'jaw', 'stretch'
-			if pcs_throat < temp_dick:pcs_throat += 1
-			if pcs_throat*2 < temp_dick:pcs_throat += 1
-		end
-		if pcs_throat*3 < temp_dick:pcs_throat += 1
 	elseif $ARGS[0] = 'dildo_suck':
+		pcs_sweat += rand(0,1)*max(1,stim_time/10)
 		count['dildo_suck'] = 1
 		stim['act'] = 30
-		!! add lube from saliva
-		if anal_slip < max(1, pcs_hydra/20): anal_slip += max(1, pcs_hydra/20)
-		if vaginal_slip < max(1, pcs_hydra/20): vaginal_slip += max(1, pcs_hydra/20)
-		if pain_coeff > 0:gs 'pain', rand(pain_coeff), 'mouth', 'stretch'
-		if pcs_lipbalm > 0:
-			pcs_lipbalm = max(0, pcs_lipbalm - 1*max(1,stim_time/5))
-			if arrpos('$ARGS', 'rape') >= 0 _ 
-			or arrpos('$ARGS', 'rough') >= 0 _ 
-			or arrpos('$ARGS', 'gangbang') >= 0 _ 
-			or arrpos('$ARGS', 'beast') >= 0:
+		if arousal_overcall = 0:
+			!! add lube from saliva
+			if anal_slip < max(1, pcs_hydra/20): anal_slip += max(1, pcs_hydra/20)
+			if vaginal_slip < max(1, pcs_hydra/20): vaginal_slip += max(1, pcs_hydra/20)
+			if pain_coeff > 0:gs 'pain', rand(pain_coeff), 'mouth', 'stretch'
+			if pcs_lipbalm > 0:
 				pcs_lipbalm = max(0, pcs_lipbalm - 1*max(1,stim_time/5))
+				if arrpos('$ARGS', 'rape') >= 0 _ 
+				or arrpos('$ARGS', 'rough') >= 0 _ 
+				or arrpos('$ARGS', 'gangbang') >= 0 _ 
+				or arrpos('$ARGS', 'beast') >= 0:
+					pcs_lipbalm = max(0, pcs_lipbalm - 1*max(1,stim_time/5))
+				end
 			end
+			if arrpos('$ARGS', 'deepthroat') >= 0:
+				dynamic $get_hole_pain, pcs_throat, pcs_hydra/10, pain['throat'], temp_dick, grange, temp_silavag
+				stim['act'] = 80 - ltdif + grdif + temp_silavag*8
+				gs 'pain', grdif + ltdif, 'throat', 'stretch'
+				gs 'pain', grdif, 'jaw', 'stretch'
+				if pcs_throat < temp_dick:pcs_throat += 1
+				if pcs_throat*2 < temp_dick:pcs_throat += 1
+			end
+			if pcs_throat*3 < temp_dick:pcs_throat += 1
 		end
-		if arrpos('$ARGS', 'deepthroat') >= 0:
-			dynamic $get_hole_pain, pcs_throat, pcs_hydra/10, pain['throat'], temp_dick, grange, temp_silavag
-			stim['act'] = 80 - ltdif + grdif + temp_silavag*8
-			gs 'pain', grdif + ltdif, 'throat', 'stretch'
-			gs 'pain', grdif, 'jaw', 'stretch'
-			if pcs_throat < temp_dick:pcs_throat += 1
-			if pcs_throat*2 < temp_dick:pcs_throat += 1
-		end
-		if pcs_throat*3 < temp_dick:pcs_throat += 1
 	elseif $ARGS[0] = 'footjob':
 		pcs_sweat += rand(0,2)*max(1,stim_time/5)
 		if temp_unaware = 1:
@@ -1042,6 +1079,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 	killvar '$stim_les'
 	killvar '$stim_foot'
 	killvar '$get_hole_pain'
+	killvar 'grdif' & killvar 'ltdif'
 
 	gs 'nichUtil','onArouse',$ARGS[0]
 	
@@ -1049,6 +1087,14 @@ end
 
 !!-----------------------------------------------
 
+!!workaround over use
+if $ARGS[0] ! 'auto_lube' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0] ! 'count2':
+	if arousal_overcall = 0:
+		$arousal_overcall = $ARGS[0]+$ARGS[2]+$ARGS[3]+$ARGS[4]+$ARGS[5]+$ARGS[6]+$ARGS[7]+$ARGS[8]
+		arousal_overcall = 1
+	end
+end
+
 !!This calculates the various sex stats and includes a small cooldown of stimulation so only use it once per event
 if $ARGS[0] = 'end':
 	if orgasm_buildup > 350: orgasm_buildup = 350
@@ -1130,6 +1176,7 @@ if $ARGS[0] = 'end':
 	killvar 'stim_time'
 	killvar 'pain_coeff'
 	killvar 'grdif' & killvar 'ltdif'
+	killvar 'arousal_overcall'
 
 !!Updating fetish exp for acts carried out and clearing data
 	gs 'arousal', 'checks', 'maso'

locations/journal.qsrc

@@ -587,7 +587,7 @@ if $ARGS[0] = 'uni':
 		'You have graduated from the University of St. Petersburg with a degree in '+func('uni_programs', 'program_name')+'.'
 
 	else
-		'You have are enrolled in the '+trim(MID('  first, second,  third, fourth,  fifth,  sixth,seventh, eighth,  ninth,  tenth', university['enrolled_in_semester']*8-7,7))+' semester of the '+func('uni_programs', 'program_name')+' at the University of St. Petersburg.'
+		'You are currently enrolled in the '+trim(MID('  first, second,  third, fourth,  fifth,  sixth,seventh, eighth,  ninth,  tenth', university['enrolled_in_semester']*8-7,7))+' semester of the '+func('uni_programs', 'program_name')+' degree at the University of St. Petersburg.'
 	end
 
 	if $university['elective1'] ! '' or $university['elective2'] ! '' or $university['elective3'] ! '':
@@ -638,7 +638,7 @@ if $ARGS[0] = 'uni':
 			'You are in the '+trim(MID('  first, second,  third, fourth,  fifth,  sixth,seventh, eighth,  ninth,  tenth', university['semester_week']*8-7,7))+' week of the semester, which last 15 weeks.'
 
 		else
-			'You are in the '+str(university['semester_week']) + 'th week of the semester which last 15 weeks.'
+			'You are in the '+str(university['semester_week']) + 'th week of the semester, which last 15 weeks.'
 		end
 
 		'<center><h2>Class schedule</h2></center>'
@@ -656,10 +656,10 @@ if $ARGS[0] = 'uni':
 		:grade_loop
 			if $class_list_institution[j] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>':
 				if     dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >= dyneval( 'RESULT = (4*<<university[''semester_week'']>> + 32)'):
-					'You think you are doing great in <<$class_list_name[j]>> and will probably pass with a top grade if you keep this up.'
+					'You think you''re doing great in <<$class_list_name[j]>> and will probably pass with a top grade if you keep this up.'
 
 				elseif dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >  dyneval( 'RESULT = (2*<<university[''semester_week'']>> + 32)'):
-					'You are following the <<$class_list_name[j]>> class well and will probably pass with a good grade if you keep this up, but to get the top mark you need to put in some more effort.'
+					'You''re following the <<$class_list_name[j]>> class well and will probably pass with a good grade if you keep this up, but to get the top mark you''ll need to put in some more effort.'
 
 				elseif dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >= dyneval( 'RESULT = (1*<<university[''semester_week'']>> + 32)'):
 					'You have trouble following the <<$class_list_name[j]>> class, but will probably still pass. If you want a good grade, then you''ll really need to do something about it.'
@@ -686,22 +686,22 @@ if $ARGS[0] = 'uni':
 		:exam_loop
 			if $class_list_institution[j] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>':
 				if     dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_exam_done'']') = 1:
-					'You did your <<$class_list_name[j]>> exam and think you will get an <<$class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']>>.'
+					'You completed your <<$class_list_name[j]>> exam and think you will get an <<$class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']>>.'
 
 				elseif func('uni_programs', 'exam', 'is_over', $class_list_name[j]) = 1:
-					'Your exam <<$class_list_name[j]>> is over and you did not go. This means you will fail the class and thefore also the semester.'
+					'Your exam <<$class_list_name[j]>> is over, but you did not attend. This means you will fail the class and therefore the semester.'
 
 				elseif dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >= 100:
-					'You think you are well prepared in your <<$class_list_name[j]>> exam and will probably pass with the highest mark possible.'
+					'You think you''re well prepared for your <<$class_list_name[j]>> exam and will probably pass with the highest mark possible.'
 
 				elseif dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >= 90:
-					'You think you are well prepared in your <<$class_list_name[j]>> exam and will probably pass with a 5, but a little more studying never hurts.'
+					'You think you''re well prepared for your <<$class_list_name[j]>> exam and will probably pass with a 5, but a little more studying never hurts.'
 
 				elseif dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >= 70:
-					'You think that you are prepared pretty well for your <<$class_list_name[j]>> exam and will probably get a 4. With some more studying, you might get a 5.'
+					'You think that you''ve prepared pretty well for your <<$class_list_name[j]>> exam and will probably get a 4. With some more studying, you might get a 5.'
 
 				elseif dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >= 40:
-					'You think you are prepared enough to pass your <<$class_list_name[j]>> exam, but if you want a good grade, then you need to do some serious studying.'
+					'You think you''ve prepared enough to pass your <<$class_list_name[j]>> exam, but if you want a good grade, then you''ll need to do some serious studying.'
 
 				else
 					'If your <<$class_list_name[j]>> exam was today, then you would fail. Time to hit the books if you don''t want to fail the semester.'

locations/katja_chat.qsrc

@@ -248,7 +248,7 @@ if $ARGS[0] = 'first_meet':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'"Are you studying at uni?" you ask.'
 	'"Yes, I''m '+iif(year = 2017 and month < 9, 'going to study', 'studying')+' to become a teacher," she says. "What about you. Are you also studying here?"'
-	'"I''m '+iif( $university['enrolled_in'] = 'teaching_studies', ' also going to study to become a teacher,', ' '+iif(university[student] = 1, 'in the '+func('uni_programs', 'program_name')+' program', 'not studying at the university,')+',')+'" you reply.'
+	'"I''m'+iif( $university['enrolled_in'] = 'teaching_studies', ' also going to study to become a teacher,', ' '+iif(university['student'] = 1, 'in the '+func('uni_programs', 'program_name')+' program', 'not studying at the university,')+',')+'" you reply.'
 	act 'Talk about something else': gt 'katja_chat', 'chat1'
 end	
 

locations/uni_programs.qsrc

@@ -1,11 +1,11 @@
 # uni_programs
 
-!!This is the file containing the variabels and actions for handeling the different program the player can attend at the university.
+!!This is the file containing the variables and actions for handling the different programs the player can attend at the university.
 
-!!The following vaiables are important.
+!!The following variables are important.
 !! university['student'] is set to 1 if the player is enrolled in a university program.
 !! $university['enrolled_in'] is the name of the university program the player is enrolled in, there is the following progams: teaching_studies, nursing
-!! university['enrolled_in_semester'] is the semester the player enrolled in starting at 1 for the first semester and ending with 8 for the last.
+!! university['enrolled_in_semester'] is the semester the player enrolled in, starting at 1 for the first semester and ending with 8 for the last.
 
 if $ARGS[0] = 'program_name':
 	if  $university['enrolled_in']= 'teaching_studies':
@@ -17,7 +17,7 @@ if $ARGS[0] = 'program_name':
 end
 
 if $ARGS[0] = 'uni_period_first':
-	!!This arg have two functions. If called with gs without any optional argument it will make the cations to go to class availeble.
+	!!This arg has two functions. If called with gs without any optional argument, it will make the cations to go to class availeble.
 	!!Second if called as a function with the additional ARGS[1] of monday, tuesday, wednesday or thursday, it will print on the screen the name of the class and the time period. 
 	if $university['enrolled_in'] = 'teaching_studies':
 		if university['enrolled_in_semester'] = 1:
@@ -231,7 +231,7 @@ if $ARGS[0] = 'uni_period_first':
 			elseif $ARGS[1] = 'wednesday':
 				$Result = 'Examination and Treatment 101 (09:00 to 10:30)'
 			elseif $ARGS[1] = 'thursday':
-				$Result = 'Anatomy and Physiology 101 (09:00 to 10:30)'
+				$Result = 'Patient Care 101 (09:00 to 10:30)'
 			elseif week = 1: 
 				*nl
 				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
@@ -265,12 +265,12 @@ if $ARGS[0] = 'uni_period_first':
 			elseif week = 4: 
 				*nl
 				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Anatomy and Physiology 101 class': 
+				act 'Go to your Patient Care 101 class': 
 					if hour = 8: minut += 60 - minut
 					if hour = 7: minut += 120 - minut					
 					uni_period['first'] = daystart
 					gs 'stat'
-					gt 'uni_lessons1', 'anatomy_and_physiology_101'
+					gt 'uni_lessons1', 'patient_care_101'
 				end
 			end
 		elseif university['enrolled_in_semester'] = 2:
@@ -281,7 +281,7 @@ if $ARGS[0] = 'uni_period_first':
 			elseif $ARGS[1] = 'wednesday':
 				$Result = 'Examination and Treatment 102 (09:00 to 10:30)'
 			elseif $ARGS[1] = 'thursday':
-				$Result = 'Anatomy and Physiology 102 (09:00 to 10:30)'
+				$Result = 'Patient Care 102 (09:00 to 10:30)'
 			elseif week = 1: 
 				*nl
 				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
@@ -320,7 +320,7 @@ if $ARGS[0] = 'uni_period_first':
 					if hour = 7: minut += 120 - minut					
 					uni_period['first'] = daystart
 					gs 'stat'
-					gt 'uni_lessons2', 'anatomy_and_physiology_102'
+					gt 'uni_lessons2', 'patient_care_102'
 				end
 			end
 		elseif university['enrolled_in_semester'] = 3:
@@ -331,7 +331,7 @@ if $ARGS[0] = 'uni_period_first':
 			elseif $ARGS[1] = 'wednesday':
 				$Result = 'Dosages and Pharmaceuticals 101 (09:00 to 10:30)'
 			elseif $ARGS[1] = 'thursday':
-				$Result = 'Anatomy and Physiology 201 (09:00 to 10:30)'
+				$Result = 'Patient Care 201 (09:00 to 10:30)'
 			elseif week = 1: 
 				*nl
 				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
@@ -365,12 +365,12 @@ if $ARGS[0] = 'uni_period_first':
 			elseif week = 4: 
 				*nl
 				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Anatomy and Physiology 201 class': 
+				act 'Go to your Patient Care 201 class': 
 					if hour = 8: minut += 60 - minut
 					if hour = 7: minut += 120 - minut					
 					uni_period['first'] = daystart
 					gs 'stat'
-					gt 'uni_lessons3', 'anatomy_and_physiology_201'
+					gt 'uni_lessons3', 'patient_care_201'
 				end
 			end
 		elseif university['enrolled_in_semester'] = 4:
@@ -381,7 +381,7 @@ if $ARGS[0] = 'uni_period_first':
 			elseif $ARGS[1] = 'wednesday':
 				$Result = 'Dosages and Pharmaceuticals 102 (09:00 to 10:30)'
 			elseif $ARGS[1] = 'thursday':
-				$Result = 'Anatomy and Physiology 202 (09:00 to 10:30)'
+				$Result = 'Patient Care 202 (09:00 to 10:30)'
 			elseif week = 1: 
 				*nl
 				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
@@ -415,12 +415,12 @@ if $ARGS[0] = 'uni_period_first':
 			elseif week = 4: 
 				*nl
 				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Anatomy and Physiology 202 class': 
+				act 'Go to your Patient Care 202 class': 
 					if hour = 8: minut += 60 - minut
 					if hour = 7: minut += 120 - minut					
 					uni_period['first'] = daystart
 					gs 'stat'
-					gt 'uni_lessons4', 'anatomy_and_physiology_202'
+					gt 'uni_lessons4', 'patient_care_202'
 				end
 			end
 		end
@@ -428,9 +428,9 @@ if $ARGS[0] = 'uni_period_first':
 end
 
 if $ARGS[0] = 'uni_period_second':
-	!!This arg have two functions. If called with gs without any optional argument it will make the options to go to class availeble.
+	!!This arg has two functions. If called with gs without any optional argument, it will make the options to go to class available.
 	!!Second if called as a function with the additional ARGS[1] of monday, tuesday, wednesday or thursday, it will print on the screen the name of the classe and the time period. 
-	if $university['enrolled_in']= 'teaching_studies':
+	if $university['enrolled_in'] = 'teaching_studies':
 		if university['enrolled_in_semester'] = 1:
 			if $ARGS[1] = 'monday':
 				$Result = 'Teaching Methods 101 (11:00 to 12:30)'
@@ -529,7 +529,7 @@ if $ARGS[0] = 'uni_period_second':
 			elseif $ARGS[1] = 'tuesday':
 				$Result = 'Learning Theories 201 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'wednesday':
-				$Result = ' Assessment 201 (11:00 to 12:30)'
+				$Result = 'Assessment 201 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'thursday':
 				$Result = 'Learning Theories 201 (11:00 to 12:30)'
 			elseif week = 1: 
@@ -620,200 +620,184 @@ if $ARGS[0] = 'uni_period_second':
 	if $university['enrolled_in'] = 'nursing':
 		if university['enrolled_in_semester'] = 1:
 			if $ARGS[1] = 'monday':
-				$Result = 'Patient Care 101 (09:00 to 10:30)'
+				$Result = 'Anatomy and Physiology 101 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'tuesday':
-				$Result = 'Anatomy and Physiology 101 (09:00 to 10:30)'
+				$Result = 'Patient Care 101 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'wednesday':
-				$Result = 'Examination and Treatment 101 (09:00 to 10:30)'
+				$Result = 'Patient Care 101 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'thursday':
-				$Result = 'Anatomy and Physiology 101 (09:00 to 10:30)'
+				$Result = 'Anatomy and Physiology 101 (11:00 to 12:30)'
 			elseif week = 1: 
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Patient Care 102 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Anatomy and Physiology 101 class': 
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons1', 'patient_care_101'
+					gt 'uni_lessons1', 'anatomy_and_physiology_101'
 				end
 			elseif week = 2:
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Anatomy and Physiology 102 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Patient Care 101 class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons1', 'anatomy_and_physiology_101'
+					gt 'uni_lessons1', 'patient_care_101'
 				end
 			elseif week = 3:
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Examination and Treatment 102 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Patient Care 101 class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons1', 'examination_and_treatment_101'
+					gt 'uni_lessons1', 'patient_care_101'
 				end
 			elseif week = 4: 
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Anatomy and Physiology 102 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Anatomy and Physiology 101 class': 
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
 					gs 'stat'
 					gt 'uni_lessons1', 'anatomy_and_physiology_101'
 				end
 			end
 		elseif university['enrolled_in_semester'] = 2:
 			if $ARGS[1] = 'monday':
-				$Result = 'Patient Care 102 (09:00 to 10:30)'
+				$Result = 'Anatomy and Physiology 102 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'tuesday':
-				$Result = 'Anatomy and Physiology 102 (09:00 to 10:30)'
+				$Result = 'Patient Care 102 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'wednesday':
-				$Result = 'Examination and Treatment 102 (09:00 to 10:30)'
+				$Result = 'Patient Care 102 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'thursday':
-				$Result = 'Anatomy and Physiology 102 (09:00 to 10:30)'
+				$Result = 'Anatomy and Physiology 102 (11:00 to 12:30)'
 			elseif week = 1: 
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Patient Care 102 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Anatomy and Physiology 102 class': 
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons2', 'patient_care_102'
+					gt 'uni_lessons2', 'anatomy_and_physiology_102'
 				end
 			elseif week = 2:
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Anatomy and Physiology 102 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Patient Care 102 class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons2', 'anatomy_and_physiology_102'
+					gt 'uni_lessons2', 'patient_care_102'
 				end
 			elseif week = 3:
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Examination and Treatment 102 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Patient Care 102 class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons2', 'examination_and_treatment_102'
+					gt 'uni_lessons2', 'patient_care_102'
 				end
 			elseif week = 4: 
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
 				act 'Go to your Anatomy and Physiology 102 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
 					gs 'stat'
 					gt 'uni_lessons2', 'anatomy_and_physiology_102'
 				end
 			end
 		elseif university['enrolled_in_semester'] = 3:
 			if $ARGS[1] = 'monday':
-				$Result = 'Patient Care 201 (09:00 to 10:30)'
+				$Result = 'Anatomy and Physiology 201 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'tuesday':
-				$Result = 'Anatomy and Physiology 201 (09:00 to 10:30)'
+				$Result = 'Patient Care 201 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'wednesday':
-				$Result = 'Dosages and Pharmaceuticals 101 (09:00 to 10:30)'
+				$Result = 'Patient Care 201 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'thursday':
-				$Result = 'Anatomy and Physiology 201 (09:00 to 10:30)'
+				$Result = 'Anatomy and Physiology 201 (11:00 to 12:30)'
 			elseif week = 1: 
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Patient Care 201 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Anatomy and Physiology 201 class': 
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons3', 'patient_care_201'
+					gt 'uni_lessons3', 'anatomy_and_physiology_201'
 				end
 			elseif week = 2:
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Anatomy and Physiology 201 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Patient Care 201 class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons3', 'anatomy_and_physiology_201'
+					gt 'uni_lessons3', 'patient_care_201'
 				end
 			elseif week = 3:
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Dosages and Pharmaceuticals 101 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Patient Care 201 class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons3', 'dosages_and_pharmaceuticals_101'
+					gt 'uni_lessons3', 'patient_care_201'
 				end
 			elseif week = 4: 
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
 				act 'Go to your Anatomy and Physiology 201 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
 					gs 'stat'
 					gt 'uni_lessons3', 'anatomy_and_physiology_201'
 				end
 			end
 		elseif university['enrolled_in_semester'] = 4:
 			if $ARGS[1] = 'monday':
-				$Result = 'Patient Care 202 (09:00 to 10:30)'
+				$Result = 'Anatomy and Physiology 202 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'tuesday':
-				$Result = 'Anatomy and Physiology 202 (09:00 to 10:30)'
+				$Result = 'Patient Care 202 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'wednesday':
-				$Result = 'Dosages and Pharmaceuticals 102 (09:00 to 10:30)'
+				$Result = 'Patient Care 202 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'thursday':
-				$Result = 'Anatomy and Physiology 202 (09:00 to 10:30)'
+				$Result = 'Anatomy and Physiology 202 (11:00 to 12:30)'
 			elseif week = 1: 
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Patient Care 202 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Learning Theories 202 class': 
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons4', 'patient_care_202'
+					gt 'uni_lessons4', 'anatomy_and_physiology_202'
 				end
 			elseif week = 2:
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Anatomy and Physiology 202 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Patient Care 202 class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons4', 'anatomy_and_physiology_202'
+					gt 'uni_lessons4', 'patient_care_202'
 				end
 			elseif week = 3:
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Dosages and Pharmaceuticals 102 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Patient Care 202 class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons4', 'dosages_and_pharmaceuticals_102'
+					gt 'uni_lessons4', 'patient_care_202'
 				end
 			elseif week = 4: 
 				*nl
-				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
 				act 'Go to your Anatomy and Physiology 202 class': 
-					if hour = 8: minut += 60 - minut
-					if hour = 7: minut += 120 - minut					
-					uni_period['first'] = daystart
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
 					gs 'stat'
 					gt 'uni_lessons4', 'anatomy_and_physiology_202'
 				end
@@ -823,7 +807,7 @@ if $ARGS[0] = 'uni_period_second':
 end
 
 if $ARGS[0] = 'uni_period_third':
-	!!This arg have two functions. If called with gs without any optional argument it will make the options to go to class availeble.
+	!!This arg has two functions. If called with gs without any optional argument, it will make the options to go to class available.
 	!!Second if called as a function with the additional ARGS[1] of monday, tuesday, wednesday or thursday, it will print on the screen the name of the classe and the time period. 
 	if $university['enrolled_in']= 'teaching_studies':
 		if university['enrolled_in_semester'] = 1:
@@ -1063,7 +1047,7 @@ if $ARGS[0] = 'uni_period_third':
 					$Result = '<<$university[''elective_semester_1_3'']>> (13:15 to 14:45)'
 				end
 			elseif week = 1 and $university['elective_semester_1_1'] ! '': 
-					*nl
+				*nl
 				'Your next class will start at 13:15.'
 				act 'Go to your elective <<$university[''elective_semester_1_1'']>>': 
 					if hour = 12: minut += 75 - minut
@@ -1270,9 +1254,9 @@ if $ARGS[0] = 'uni_period_third':
 end
 
 if $ARGS[0] = 'exam':
-	!!This arg have three functions. If called with gs without any optional argument it will make the options to go to exam availeble.
+	!!This arg has three functions. If called with gs without any optional argument, it will make the options to go to exam availeble.
 	!!The second if called as a function with the additional $ARGS[1] = 'schedule', it will print on the screen the name and date of the exams you have left this semester. 
-	!!The third is if called with $ARGS[1] = 'is_over' and $ARGs[2] the name of the class to no if the time slot for the exam has passed by returning 1. Only use this during in the exam weeks, out side the exam week this is covered of the variabels that tell wether the semeter is passed or not.
+	!!The third is if called with $ARGS[1] = 'is_over' and $ARGS[2] the name of the class to no if the time slot for the exam has passed by returning 1. (Only use this during the exam weeks. Outside of the exam week, this is covered by the variable that says whether the semester is passed or not)
 	if $university['enrolled_in'] = 'teaching_studies':
 		if university['enrolled_in_semester'] = 1:
 			if $ARGS[1] = 'schedule':