24 Commits aa9754d1b9 ... 516d51e418

Author SHA1 Message Date
  LinaHirata 516d51e418 [fixed] `max all` cheat affecting `magik` in `nonmagic` starts 3 months ago
  anjuna krokus 8f9973b21b [fixed] Dead end in a Ksenya event 3 months ago
  anjuna krokus 5c3e14d587 [fixed] custom starts automatically having 100 in all school grades 3 months ago
  anjuna krokus c17959f071 [fixed] another typo in the therapist hotel questline 3 months ago
  anjuna krokus 40aa686c90 [fixed] small type which prevented the therapist hotel events from advancing 3 months ago
  Vengeance_11 b5cfd8c3eb More typo fixes 3 months ago
  Vengeance_11 c1e85ede9d Fixed typos 3 months ago
  Vengeance_11 ba010c0fcf (Hopefully) fixed the schedule issue with nursing degree 3 months ago
  bgkjdgbizgblzdgbr b02a42db79 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 months ago
  Lusticon a5e38e3e4e Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 months ago
  Lusticon d85eb55c49 [added] arousal pain cap 3 months ago
  bgkjdgbizgblzdgbr b0cf404875 [fixed] Misssing ' ' 3 months ago
  bgkjdgbizgblzdgbr 54903d6ab0 [fixed] Missing exit 3 months ago
  Kevin_Smarts 7832b5dda1 [fixed] Hardcoding goto variables to reduce errors 3 months ago
  Lusticon 1c39304de3 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 months ago
  Lusticon da6727f8df [fixed] arousal over use workaround fix 3 months ago
  Vengeance_11 d95d6bb758 Some idiot forgot to add the nursing degree to the uni start 3 months ago
  Lusticon 70a5ab3166 [fixed] arousal over use workaround 3 months ago
  Kevin_Smarts fce5c3f08e [fixed] Wrong variable setting total for server outifts causing load of broken images 3 months ago
  Kevin_Smarts 0a8a23b862 [fixed] Mom reconcilliation can't happen if Sveta has cum on her face or just left sentencing at court 3 months ago
  Kevin_Smarts c40b30057f [added] block to prevent changing into prostitute outfit during school break that allowed Sveta to wear said outfit to class 3 months ago
  Kevin_Smarts 4c13d4face Merge remote-tracking branch 'Hooded_Silence/master' 3 months ago
  Hooded Silence 31a3af71b3 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 months ago
  Hooded Silence 3d33097e3b [Grammar changes] Minor changes to fix grammar and headers. 3 months ago

+ 2 - 0
locations/Cheatmenu_din.qsrc

@@ -1190,6 +1190,8 @@ $cheatmenu['setAttrs'] = {
 	loop_index = 0
 	!! skip stren_plus and butt_tr
 	loop_index_max = arrsize('$att_name') - 2
+	!! skip magik in nonmagic starts
+	if $start_type[1] = 'nomagic': loop_index_max -= 1
 	:set_attrs_loop
 		gs 'shortgs', 'setStat', $att_name[loop_index], ARGS[0]
 		loop_index += 1

+ 208 - 161
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'

+ 17 - 17
locations/ballet_secrets.qsrc

@@ -22,9 +22,9 @@ if $ARGS[0] = 'init':
   if week < 7 and hour >= 9 and hour <= 17:
     'You enter the shop and greeted by a riot of displays showcasing ballet and other dance equipment. A woman is sewing something in the corner and glances at you before continuing.'
     if balletqw['ballet_secrets'] = 1:
-      act 'Approach the woman': gt $loc, 'first_visit'
+      act 'Approach the woman': gt 'ballet_secrets', 'first_visit'
     else
-      act 'Enter studio area': gt $loc, 'reception'
+      act 'Enter studio area': gt 'ballet_secrets', 'reception'
       !! act 'Talk to assistant':
       !! act'Look at equipment'
       !! act 'look at dance wear'
@@ -33,7 +33,7 @@ if $ARGS[0] = 'init':
   else
     'You look at the shop window and realise it''s closed, there is a security door to the left of you that allows you access the studio areas if you are a member.'
     if balletqw['membership'] >= daystart:
-      act 'Swipe membership card': gt $loc, 'reception'
+      act 'Swipe membership card': gt 'ballet_secrets', 'reception'
     end
   end
 
@@ -60,7 +60,7 @@ if $ARGS[0] = 'first_visit':
   '"Of course as you are aware the school is sponsoring these costs, but only for the first year she says and you will need to manage your own equipment after this.", Madame Pushkina advises.'
   '"Is there anything else you neeed? No? Good, I will see you again in two weeks for your final shoe fitting. I would like to extend my congratulations and wish you a successful career Ms. <<$pcs_lastname>>."'
   act 'Leave': gt 'pushkin_sq'
-  act 'Return to shop': gt $loc, 'init'
+  act 'Return to shop': gt 'ballet_secrets', 'init'
   
 
 end
@@ -83,18 +83,18 @@ if $ARGS[0] = 'reception':
   'There is a <a href="exec: gt ''food'', ''watercooler''">drinking fountain</a> near the doors to the gym hall to refill your water bottle.'
  
 
-  act 'Return to shop': gt $loc, 'init'
-  act 'Changing rooms': gt $loc, 'changing_room'
+  act 'Return to shop': gt 'ballet_secrets', 'init'
+  act 'Changing rooms': gt 'ballet_secrets', 'changing_room'
   !! if membership not active:
   if balletqw['membership'] = 0 or balletqw['membership'] < daystart:
-    act 'Discuss membership': gt $loc, 'enrol'
+    act 'Discuss membership': gt 'ballet_secrets', 'enrol'
   elseif hour <= 15 and $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pcs_stam >= stammax / 5 and pcs_energy >= 20:
     !! link to services:
     !! if membership active
-    !! act 'Attend Physio': gt $loc, 'physio'
-    !! act 'Attend a gymnastics class.': gt $loc, 'gymnastics_courses'
-    !! act 'Attend a dance class': gt $loc, 'ballet_courses'
-    act 'Attend a yoga class': gt $loc, 'yoga_courses'
+    !! act 'Attend Physio': gt 'ballet_secrets', 'physio'
+    !! act 'Attend a gymnastics class.': gt 'ballet_secrets', 'gymnastics_courses'
+    !! act 'Attend a dance class': gt 'ballet_secrets', 'ballet_courses'
+    act 'Attend a yoga class': gt 'ballet_secrets', 'yoga_courses'
   elseif hour >= 16:
     'All the evening classes have started today, you need to be here before 16:00 to ensure you can attend.'
   end
@@ -116,7 +116,7 @@ if $ARGS[0]= 'enrol':
   elseif balletqw['membership'] ! 0:
     'You approach the reception to renew your membership.'
   end
-  act 'Return to the studio entrance': gt $loc, 'reception'
+  act 'Return to the studio entrance': gt 'ballet_secrets', 'reception'
 
   'The gym offers a weekly or monthly subscription for of 1,500<b> ₽</b>  or 5,000<b> ₽</b> respectively to use the facilities with some courses included. Physio appointments are charged seperately.'
   'The subscriptions includes classes in gymnastics, yoga and introductory ballet. For advanced classes there is an additional instructor charge. A physical trainer is on hand to assist at all times if you so need one.'
@@ -141,7 +141,7 @@ if $ARGS[0] = 'changing_room':
   '<center><h2>Changing Room</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/locker.jpg"></center>'
 
-  act 'Return to the studio reception': gt $loc, 'reception'
+  act 'Return to the studio reception': gt 'ballet_secrets', 'reception'
   if mc_inventory['shampoo'] > 0:
 		act 'Take a shower (0:15)':
 			cla
@@ -157,7 +157,7 @@ if $ARGS[0] = 'changing_room':
 			'You go into the bathroom and turn on the shower. You lather your body and wash in the shower.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
-			act 'Get out of the shower':gt $loc, 'changing_room'
+			act 'Get out of the shower':gt 'ballet_secrets', 'changing_room'
 
 		end
 	else
@@ -186,7 +186,7 @@ if $ARGS[0] = 'changing_room':
 			gs 'sweat', 'deo'
 			iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
 			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
-			act 'Continue': menu_off = 0 & gt $loc, $loc_arg
+			act 'Continue': menu_off = 0 & gt 'ballet_secrets', 'changing_room'
 		end
 	end
 	dynamic $tampon
@@ -272,12 +272,12 @@ if $ARGS[0] = 'yoga_courses':
       gs 'pain', 2, 'chest', 'stretch'
 
       killvar 'lesson_tier'
-      act 'Return to the studio reception': gt $loc, 'reception'
+      act 'Return to the studio reception': gt 'ballet_secrets', 'reception'
     end
   else 
     'There is another fitness class in progress and no more yoga sessions today.'
   end
-  act 'Return to the studio reception': gt $loc, 'reception'
+  act 'Return to the studio reception': gt 'ballet_secrets', 'reception'
 end 
 
 !! Shopping

+ 1 - 1
locations/budgetclothes.qsrc

@@ -344,7 +344,7 @@ if $ARGS[0] = 'gm_server':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'gm_outfits'
+	gs 'clothing', 'totals', 'gm_server'
 
 	act 'Return':
 		cla

+ 1 - 1
locations/city_center.qsrc

@@ -49,7 +49,7 @@ end
 
 gs 'street_event','city_center', 'extras'
 
-if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and $ARGS[1] ! 'mom_check' and cumloc[11] = 0:
 	gs 'mother_chats', 'reconciliation_talk'
 exit
 end

+ 1 - 1
locations/city_residential.qsrc

@@ -53,7 +53,7 @@ if gopdeath = 1 and vsehsdaladay ! daystart:
 	gt 'gameover'
 end
 
-if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and cumloc[11] = 0:
 	gs 'mother_chats', 'reconciliation_talk'
 exit
 end

+ 1 - 1
locations/din_van.qsrc

@@ -710,7 +710,7 @@ $publicpan = {
 	end
 
 	!! Changing into a different outfit for prostitution
-	if prostitute['active'] = 1 and ARGS[1] ! 'no_prost':
+	if prostitute['active'] = 1 and ARGS[1] ! 'no_prost' and $loc ! 'gschool_break':
 		gs 'prostitution_functions', 'work_clothes'
 		if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']: 
 			act 'Change into prostitute outfit': gt 'prostitution_functions', 'change_to_work', 'restroom'

+ 14 - 19
locations/intro_sg.qsrc

@@ -4,18 +4,17 @@ gs 'themes', 'indoors'
 
 if $ARGS[0] = 'start':
 	menu_off = 1
-
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/pre_5.jpg"></center>'
-	'You were born in the small town of Pavlovsk near the city of St Petersburg. You have an older sister, Anya, who is two years older than you.'
-	'Your mother is Natasha. You don''t know much about your biological father; your mother never wants to talk about him, or why he left you and Anya with her.'
-	'Your mother met another man not too long after her and your biological father got divorced, Vladimir. Together they had your little brother Kolka. Even though he''s not your real father, Vladimir has always treated you and Anya as if you were his own children.'
-	act '<center><b>Continue</b></center>': gt 'intro_sg', 'Two'
+	'You were born in the small town of Pavlovsk, near the city of St Petersburg.'
+	'Your mother is Natasha, but you don''t know much about your biological father since your mother never wants to talk about him, or why he left you and your older sister, Anya.'
+	'Your mother met another man, Vladimir, not long after she and your biological father got divorced. Together, they had your little brother, Kolka. Even though he''s not your real father, Vladimir has always treated you and Anya as if you were his own children.'
+	act 'Continue': gt 'intro_sg', 'Two'
 end
 
 if $ARGS[0] = 'Two':
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/pre_6.jpg"></center>'
 	'You had a pleasant, undisturbed childhood when you were young. Although you don''t remember much from kindergarten, you do remember going to elementary school when you were 6 years old.'
-	act '<center><b>Continue</b></center>': gt 'intro_sg', 'Three'
+	act 'Continue': gt 'intro_sg', 'Three'
 end
 
 if $ARGS[0] = 'Three':
@@ -25,25 +24,23 @@ if $ARGS[0] = 'Three':
 	'Like it does for most girls, you reached the milestone of puberty when you were 13 years old. You had your first period, which sucked, but that was just the start of your changes.'
 	'Your chest felt strange and you discovered your breasts were growing! This excited you: how big will they be when you grow up? Hair also began to grow in your armpits and pubic area, and at the same time you felt things... intimate things. Over time you learned to appreciate these feelings, and how to manage your developing body. Your troublesome skin complexion remains an issue though.'
 	'When you finished 9th grade, you decided to continue with your secondary education. You completed the first one, only one more year of school to go, but first: What type of student are you?'
-	act '<center><b>Time to choose</b></center>': gt 'intro_sg_select', 'start'
+	act 'Continue': gt 'intro_sg_select', 'start'
 end
 
 if $ARGS[0] = 'four':
 	$loc = 'intro_sg'
 	$loc_arg = 'four'
-
-
 	'<center><b><font color = maroon>Character Face</font></b></center>'
-	'<center><b>Allows you to alter hair and eyes, use to match fixed profile picture if in use.</b></center>'
+	'<center><b>Allows you to alter hair and eyes. Use to match fixed profile picture if in use.</b></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/character_creation_2.jpg"></center>'
 	*nl
 	'<center>Customize your:</center>'
 	'<center><a href="exec:gs ''intro_customization'', ''hair''"><img src="images/system/1_openings/shared/icon_hair.png"></a> <a href="exec:gs ''intro_customization'', ''eyes''"><img src="images/system/1_openings/shared/icon_eye.png"></a></center>'
 
 	if $start_type['magic'] = 'magic':
-		act '<center><b>Done</b></center>': gt 'intro_sg_m', 'four'
+		act 'Finished': gt 'intro_sg_m', 'four'
 	else
-		act '<center><b>Done</b></center>': gt 'intro_sg', 'five'
+		act 'Finished': gt 'intro_sg', 'five'
 	end
 end
 
@@ -53,11 +50,10 @@ if $ARGS[0] = 'five':
 	showstat 1
 	showobjs 1
 	gs 'obj_din', 'old'
-	*clr
-	cla
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/start_sg.jpg"></center>'
 	'Welcome to the Schoolgirl version! You will need to carry on with your school life, manage your relationships and deal with whatever else comes up along the way!'
-	act 'Begin':
+	act 'Start':
 		close all
 		if start_location = 2:
 			gt 'gadhouse', 'intro'
@@ -67,10 +63,9 @@ if $ARGS[0] = 'five':
 	end
 	act 'Restart':
 		*clr & cla
-		'This will reset everything and take you back to the begining.'
-		'Are you <i><b>very</i></b> sure you want to start from the begining again?'
-		act 'No, I hit the wrong option!': gt 'intro_sg', 'four'
-		act 'Yes, I''m sure, start over.': killall & gt 'start'
+		'This will reset everything and take you back to the beginning. Are you sure you want to start again?'
+		act 'No': gt 'intro_sg', 'four'
+		act 'Yes': killall & gt 'start'
 	end
 end
 

+ 1 - 7
locations/intro_sg_select_custom.qsrc

@@ -24,14 +24,8 @@ if $ARGS[0] = 'start':
 			gs 'obj_din', 'old'
 		end
 
-		killvar 'class_list_institution'
-		killvar 'class_list_name'
 
-		!!Setting the shcoll classes such that grades can be assigned
-		gs 'intro_functions', 'create_sgclasses'
-
-		!!Set the greades to be average.
-		gs 'intro_functions', 'set_base_sgrades'
+		gs 'intro_functions', 'reset_sgclasses'
 
 		gt $loc, $loc_arg
 	end

+ 16 - 4
locations/intro_uni.qsrc

@@ -93,11 +93,11 @@ if $ARGS[0] = 'degree_choice':
 	gs 'npc_relationship', 'default_family_friends'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/system/1_openings/6_uni/degree_choice.jpg"></center>'
-	'This is where you decide what degree you wish to study. For now, Teaching is the only option, but more will be added in the future.'
+	'This is where you decide what degree you wish to study. For now, Teaching and Nursing are the only options, but more will be added in the future.'
 	
 	act 'Teaching':
-		!!variables for teaching degree
-		$university['enrolled_in']= 'teaching_studies'
+		!! variables for teaching degree
+		$university['enrolled_in'] = 'teaching_studies'
 		gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'general education 101', 3, 2, 'no', 'no', 1, 12
 		gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'teaching methods 101', 3, 2, 'no', 'no', 1, 12
 		gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'learning theories 101', 3, 2, 'no', 'no', 1, 12
@@ -106,6 +106,18 @@ if $ARGS[0] = 'degree_choice':
 		gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'learning theories 101', 35
 		gt 'intro_uni', 'select_electives'
 	end
+	
+	act 'Nursing':
+		!! variables for nursing degree
+		$university['enrolled_in'] = 'nursing'
+		gs 'grades', 'createclass', 'uni_nursing_semester_1', 'patient care 101', 3, 2, 'no', 'no', 1, 12
+		gs 'grades', 'createclass', 'uni_nursing_semester_1', 'anatomy and physiology 101', 3, 2, 'no', 'no', 1, 12
+		gs 'grades', 'createclass', 'uni_nursing_semester_1', 'examination and treatment 101', 3, 2, 'no', 'no', 1, 12
+		gs 'grades', 'grade_award', 'uni_nursing_semester_1', 'patient care 101', 35
+		gs 'grades', 'grade_award', 'uni_nursing_semester_1', 'anatomy and physiology 101', 35
+		gs 'grades', 'grade_award', 'uni_nursing_semester_1', 'examination and treatment 101', 35
+		gt 'intro_uni', 'select_electives'
+	end
 end
 
 if $ARGS[0] = 'select_electives':
@@ -120,7 +132,7 @@ if $ARGS[0] = 'select_electives':
 			'You read about the computer class, which seems to be a basic class that teaches you how to use a computer, the functions of some of the more basic programs and how to troubleshoot the OS if something goes wrong. It seems like a fairly useful class.'
 			act 'Enroll in the computer class':
 				cla
-				'You decide to enrol in the computer class for the first and second semester of this year.'
+				'You decide to enroll in the computer class for the first and second semester of this year.'
 				$university['elective_semester_1_1'] = 'Computers 101'
 				$university['elective_semester_2_1'] = 'Computers 102'
 				act 'Consider other elective classes': gt 'intro_uni', 'select_electives'

+ 10 - 10
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.'

+ 1 - 1
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	
 

+ 1 - 1
locations/pav_complex.qsrc

@@ -84,7 +84,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'Behind the apartments is a row of <a href="exec:minut += 3 & gt ''pav_complex'', ''garages''">garages</a> and storage space for tenants.'
 
-	if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+	if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and cumloc[11] = 0:
 		gs 'mother_chats', 'reconciliation_talk'
 	exit
 	end

+ 1 - 1
locations/pav_market.qsrc

@@ -41,7 +41,7 @@ end
 *nl
 'A rather run-down <a href="exec:minut += 1 & gt ''pav_hotel''">hotel</a> is just across the square, where travelers can spend the night. The manager is always looking for maids among the local young girls. Because of it''s frequent use by the local prostitutes, most people prefer to stay at the middle-class hotel by the main road.'
 
-if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and cumloc[11] = 0:
 	gs 'mother_chats', 'reconciliation_talk'
 exit
 end

+ 7 - 7
locations/pushkin_ballet_res.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = 'hallway':
 	act 'Enter the communal room':  minut += 5 & gt 'pushkin_ballet_res', 'communal_area'
 	act 'Go to the bathroom':  minut += 5 & gt 'pushkin_ballet_class', 'shower'  
 	act 'Go to the kitchen':  minut += 5 & gt 'pushkin_ballet_res', 'kitchen'
-	if week ! 7:
+	if week ! 7 and npc_trust['A3501'] >= 10:
 		!! act 'Visit Maya' :  minut += 5 & gt 'pushkin_ballet_res', 'maya_room'
 	end
 	!!act 'Knock on wardens door' :  minut += 5 & gt 'pushkin_ballet_res', 'warden_room'
@@ -363,7 +363,7 @@ if $ARGS[0] = 'feetcare':
 	minut +=30
 	feet_track = daystart
 	gs 'stat'
-	$setloc['StageTitle'] = 'Feet Soak'
+	$setloc['StageTitle'] = 'Feet Care'
 	$setloc['StageImage'] =  '<<$default_img_path>>ballet_events/feet_soak'
 	gs 'core_library', 'stage_title'
 
@@ -384,7 +384,7 @@ if $ARGS[0] = 'study':
 	minut += 60
 	mod_homework[week] += 1 
 	mod_daily_score[week] += 1
-	$setloc['StageTitle'] = 'Study'
+	$setloc['StageTitle'] = 'Ballet Studies'
 	$setloc['StageImage'] =  '<<$default_img_path>>ballet_residence/study'
 	gs 'stat'
 	gs 'core_library', 'stage_title'
@@ -410,16 +410,16 @@ if $ARGS[0] = 'make_up':
 			pcs_makeup = 5
 		end
 		gs 'stat'
-		$setloc['StageTitle'] = 'Feet Soak'
+		$setloc['StageTitle'] = 'Make Up Practice'
 		$setloc['StageImage'] =  '<<$default_img_path>>/ballet_events/make-up'
 		gs 'core_library', 'stage_title'
 
 		if pcs_makupskl <= 30:
-			'You struggle to master the basics of applying your look, wasting a lot of your expensive make-up. You wonder if you should get help with practicing.'
+			'You struggle to master the basics of applying your look, wasting a lot of your expensive make-up. You begin to wonder if you need to get help with practicing.'
 		elseif pcs_makupskl >= 31 or pcs_makupskl <= 69:
-			'You try to replicate the deft strokes that you was taught in school apply the basic foundation. You struggle briefly with the eyelashes before they settle in place. It takes you a few attempts to finalise the blending of your looks but at the end of your practice you are happy with the results even though it won''t win any awards.'
+			'You try to replicate the deft strokes that you was taught in school as you apply the basic foundations and contouring. You struggle briefly with the eyelashes before they settle in place. It takes you a few attempts to finalise the blending of your final look but at the end of your practice you are happy with the results even though it won''t win any awards.'
 		elseif pcs_makupskl >= 70:
-			'You artfully apply the make-up look with a quick, practiced ease that would leave most girls with envy. The final look is almost flawless and you criticaly review the final result.'
+			'You artfully apply the make-up look with a quick, practiced ease that would leave most girls jealous with envy. The final look is almost flawless and you criticaly review the final result trying to find any imperfections.'
 		else
 			$ballet['error'] += 'Makeup skill failed check'
 		end

+ 1 - 1
locations/pushkin_sq.qsrc

@@ -59,7 +59,7 @@ else
 	'The old theatre that houses a burlesque club is closed now. It is open every day 18:00 - 23:00'
 end
 
-if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and cumloc[11] = 0:
 	gs 'mother_chats', 'reconciliation_talk'
 exit
 end

+ 2 - 2
locations/sentence.qsrc

@@ -550,7 +550,7 @@ if $ARGS[0] = 'punishment':
 	killvar 'temp_fine'
 	killvar 'policeQW_courthearing_dates', 0
 	killvar '$policeQW_courthearing_subjects', 0
-	act 'Leave the court': gt 'city_center'
+	act 'Leave the court': gt 'city_center', 'mom_check'
 end
 
 
@@ -616,7 +616,7 @@ if $ARGS[0] = 'police_arrest2':
 	killvar 'policeQW_courtletter_dates', 0
 	killvar 'policeQW_courtletter_subjects', 0
 
-	act 'Leave the court': gt 'city_center'
+	act 'Leave the court': gt 'city_center', 'mom_check'
 end
 
 

+ 2 - 2
locations/therapist_hotel.qsrc

@@ -534,7 +534,7 @@ if $ARGS[0] = 'event5_submit':
 
 	act 'Accept':
 		*clr & cla
-		therapist['hotel_submit'] = 10
+		therapistQW['hotel_submit'] = 10
 		gs 'arousal', 'vaginal_finger', 15, 'sub'
 		gs 'stat'
 
@@ -852,7 +852,7 @@ if $ARGS[0] = 'event6_submit4':
 	HotelRoom['pav_hotel'] = 0
 	hotelRoomDays['pav_hotel'] = 0
 	therapistQW['hotel_key'] = 3
-	gs 'homes_preperties', 'set_home', 'hotel_therapist'
+	gs 'homes_properties', 'set_home', 'hotel_therapist'
 
 	gt 'pav_hotel'
 

+ 2 - 0
locations/torgcentr.qsrc

@@ -112,6 +112,8 @@ if hour > 12 and hour < 18 and sunWeather = 1 and exhibitionQW >= 5 and KsenyaQW
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/mall2.jpg"></center>'
 					'Makoto gets into the driver seat and starts up the car. "Come on Ksenya, we need to make a stop at the bank before we head back" she says and looks at you as Ksenya goes to the other side of the car. "Nice to have met you, <name>. I hope to see you around" she says and they drive off, leaving you alone in the parking lot.'
+
+					act 'Enter the mall': gt 'torgcentr'
 				end
 			end
 		end

+ 1 - 1
locations/uni_grounds.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'main':
 		end
 	end
 
-	if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+	if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and cumloc[11] = 0:
 		gs 'mother_chats', 'reconciliation_talk'
 	exit
 	end

+ 1 - 1
locations/uni_lessons1.qsrc

@@ -987,7 +987,7 @@ if $ARGS[0] = 'anatomy_and_physiology_101':
 				gs 'exp_gain', 'intel', rand(1,2)
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/question1.jpg"></center>'
 				'Miss Marinova nods approvingly, happy to see her students engaged and trying their best. She happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lesson now.'
-				act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'anatomy_and_physiology '
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'anatomy_and_physiology'
 			end
 			act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'anatomy_and_physiology'
 		end

+ 1 - 1
locations/uni_lessons2.qsrc

@@ -973,7 +973,7 @@ if $ARGS[0] = 'anatomy_and_physiology_102':
 				gs 'exp_gain', 'intel', rand(1,2)
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/question1.jpg"></center>'
 				'Miss Marinova nods approvingly, happy to see her students engaged and trying their best. She happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lesson now.'
-				act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'anatomy_and_physiology '
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'anatomy_and_physiology'
 			end
 			act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'anatomy_and_physiology'
 		end

+ 1 - 1
locations/uni_lessons3.qsrc

@@ -973,7 +973,7 @@ if $ARGS[0] = 'anatomy_and_physiology_201':
 				gs 'exp_gain', 'intel', rand(1,2)
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/question1.jpg"></center>'
 				'Miss Marinova nods approvingly, happy to see her students engaged and trying their best. She happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lesson now.'
-				act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'anatomy_and_physiology '
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'anatomy_and_physiology'
 			end
 			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'anatomy_and_physiology'
 		end

+ 1 - 1
locations/uni_lessons4.qsrc

@@ -973,7 +973,7 @@ if $ARGS[0] = 'anatomy_and_physiology_202':
 				gs 'exp_gain', 'intel', rand(1,2)
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/question1.jpg"></center>'
 				'Miss Marinova nods approvingly, happy to see her students engaged and trying their best. She happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lesson now.'
-				act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'anatomy_and_physiology '
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'anatomy_and_physiology'
 			end
 			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'anatomy_and_physiology'
 		end

+ 1 - 0
locations/uni_lessonsev1.qsrc

@@ -183,6 +183,7 @@ if $ARGS[0] = 'patient_care':
 	elseif temp = 2:
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/teaching_methods/girl_goofing.jpg"></center>'
 		'Today''s lecture is rather boring, so you look around to see if anything exciting is happening. All you see is Vicky making a funny face at you when you glance in her direction.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	elseif temp = 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/general_education/girls_dryhump.jpg"></center>'
 		'During the halftime break, you relax as the class was pretty mentally exhausting and look around to see how others are handling all the information you''re getting bombarded with. The twins start giggling before one of them grabs the other, bends her over the table and starts humping her hard and rough.'

+ 111 - 127
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 Anatomy and Physiology 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':