merge from upstream

glife.qproj

@@ -406,12 +406,6 @@
 		<Location name="korr"/>
 		<Location name="housecall"/>
 	</Folder>
-	<Folder name="House">
-		<Location name="city_house_res_misc"/>
-		<Location name="city_house_res_bedr"/>
-		<Location name="city_house_res_bathr"/>
-		<Location name="city_house_res_kitch"/>
-	</Folder>
 	<Folder name="Block">
 		<Location name="pav_complex"/>
 		<Location name="pav_complexb2"/>
@@ -986,7 +980,6 @@
 		<Location name="uni_lessons"/>
 		<Location name="uni_lessons1"/>
 		<Location name="uni_lessonsev1"/>
-		<Location name="uni_exams1"/>
 		<Location name="uni_library"/>
 		<Location name="unicoursework"/>
 		<Location name="uniutil"/>

locations/arousal.qsrc

@@ -753,6 +753,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 	orgasm_buildup += stim['total']
 
 !! This is determining if Sveta will orgasm
+
 	if $orgasm_or ! 'no' and $ARGS[0] ! 'flashlite' and $ARGS[0] ! 'flash' and orgasm_flag['trigger'] ! 0:
 		if $orgasm_or = 'yes' or $orgasm_or = 'custom':
 			gs 'orgasm', $ARGS[0]

locations/orgasm.qsrc

@@ -3,6 +3,21 @@
 !This is intended to be hidden and the stats and calculations should not appear in game.
 
 
+if hypnoHardToCum = 1 and rand(1,9) > 2 and $orgasm_or ! 'custom':
+	orgasm_buildup -= 70
+	i = rand(0,3)
+	if i = 0:
+		'You feel an orgasm building up, the warmth in you abdomen, the tell tale tingles but it just stops and you feel calm again.'
+	elseif i = 1:
+		'You feel an orgasm building up, but then nothing. Your pussy is still hungry and needy but you feel like you are no closer to release than when you started.'
+	elseif i = 2:
+		'Gradually the pleasurable sensations spread throughout you are close so close, but nothing except even hornier than before.'
+	elseif i = 3:
+		'You moan with pleasure, ridding the edge of an orgasm... but instead of being hit by bliss you just feel an emptiness like your prize was stolen. Why? You need this.'
+	end
+	exit
+end
+
 orgasm_buildup -= 70
 if orgasm_flag['masturbate'] = 1:
 	orgasm_masturbate += 1