1
0

15 کامیت‌ها fbdd88864d ... b85d89aebe

نویسنده SHA1 پیام تاریخ
  bgkjdgbizgblzdgbr b85d89aebe [fixed] Forgot to set Katja and vicky's schedule in the last update. 7 ماه پیش
  bgkjdgbizgblzdgbr f10a037850 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 7 ماه پیش
  bgkjdgbizgblzdgbr b96182f3db [fixed/changed] Nush and band members were at the disco when they were on tour. Also made sure Katja and Vicky ara only at the disco when they supposed to. 7 ماه پیش
  Kevin_Smarts 451741893f Merge remote-tracking branch 'Lusticon/master' 7 ماه پیش
  Kevin_Smarts ec238fc807 Merge remote-tracking branch 'Anjuna/master' 7 ماه پیش
  Lusticon dd484c8584 [changed] pain rework 7 ماه پیش
  Kevin_Smarts ed12b6fac7 [fixed] bad syntax 7 ماه پیش
  Kevin_Smarts a9a9a5a7e1 [fixed] typo copy and replaced throughout 7 ماه پیش
  Lusticon 162162ddc4 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 7 ماه پیش
  Kevin_Smarts 2bebbbe7cc [fixed] Name had dashes and not underscores so it didn't work 7 ماه پیش
  Lusticon d5b66edd69 [fixed] end if 7 ماه پیش
  anjuna krokus 915ef6328c [fixed] prevented artem's sleep reflection from firing after selection "yes" 7 ماه پیش
  anjuna krokus ee8e0c8433 [added/fixed] made the blackmail event even more likely (it took a LOT of grinding before it would fire). Fixed a wrong description and added a new variable to simplify the code 7 ماه پیش
  anjuna krokus 0467df550f [fixed] forgot to active the dream events part of blackmailer 7 ماه پیش
  anjuna krokus 3e642e99ed [fixed] experimential trial would continue firing after it had been completed. Also fixed a bug in the haircream 7 ماه پیش

+ 49 - 37
locations/arousal.qsrc

@@ -211,47 +211,59 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		!! ARGS[3] length of inserted object
 		!! ARGS[4] grange of inserted object
 		!! ARGS[5] skill (0-2) aka silavag
-		!! ARGS[6] stimulation time
-		grdif = 0
-		ltdif = 0
+		killvar 'grdif'
+		killvar 'ltdif'
 		!! cap pain to vitality
 		if ARGS[2] < max_sex_pain:
-			!! 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 /= max(1,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
+			killvar 'i'
+			:stim_time_loop
+			if stim_time > i:
+				!! 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[i] = (ARGS[4] - ARGS[0])/2
+				ltdif[i] = (ARGS[3] - ARGS[0])/4
+				!! painful intercourse
+				if pain_coeff > rand(0,2):
+					grdif[i] += rand(pain_coeff/2, pain_coeff)
+					ltdif[i] += 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[i] += 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[i] += 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[i] -= rand(ARGS[1]/2, ARGS[1])
+					ltdif[i] -= rand(ARGS[1]/4, ARGS[1]/2)
+				else
+					grdif[i] += max(1, rand(grdif[i]/4, grdif[i]/2)) / max(1,ARGS[5]+1)
+					ltdif[i] += max(1, rand(ltdif[i]/6, ltdif[i]/4)) / max(1,ARGS[5]+1)
+				end
+				!! when skilled, length does not harm PC
+				if ARGS[5] > 0 and ltdif[i] > 0: ltdif[i] /= max(1,ARGS[5]+1)
 
-			!! min\max
-			grdif = max(0, grdif / max(1, (ARGS[0]/6)))
-			ltdif = max(0, ltdif / max(1, (ARGS[0]/6)))
+				!! min\max
+				grdif[i] = max(0, grdif[i] / max(1, (ARGS[0]/6)))
+				ltdif[i] = max(0, ltdif[i] / max(1, (ARGS[0]/6)))
+
+				i += 1+ARGS[5]
+				jump 'stim_time_loop'
+			end
 		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>>' }
+
+        i = arrsize('ltdif')
+        :stim_time_loop2
+        if i > 1:
+            i -= 1
+			grdif += grdif[i]
+			ltdif += ltdif[i]
+            jump 'stim_time_loop2'
+        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>>'}
+
 	}
 	$in_vag = {
 		if arousal_overcall = 0:

+ 17 - 41
locations/blackmailer.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'init_check':
 		temp_prob_chance -= 100
 	end
 
-	if rand(0, temp_prob_chance) >= 2: exit
+	if rand(0, temp_prob_chance) >= 5: exit
 	killvar 'temp_prob_chance'
 
 	gs 'blackmailer', 'init_blackmail', $ARGS[1]
@@ -46,20 +46,22 @@ if $ARGS[0] = 'init_blackmail':
 	else
 		$blackmailQW['init_flashaction'] = $ARGS[1]
 	end
-		
 
 	$blackmailQW['init_flashimage'] = $flash_image
 	$blackmailQW['init_flashloc'] = $loc
 	$blackmailQW['init_flashloc_arg'] = $loc_arg
 
-
-	if strpos($loc, 'park') >= 0:
+	if strpos($loc, 'park') > -1:
+		$blackmailQW['init_flashloc_desc'] = 'in a park'
 		'A flash of light briefly brightens the surrounding trees and you see a shadow darting between the trees. The light of the camera flash prickling on your exposed skin.'
-	elseif strpos($loc, 'church') >= 0:
+	elseif strpos($loc, 'church') > -1:
+		$blackmailQW['init_flashloc_desc'] = 'in a park'
 		'The flash of a camera illuminates the inside of the church, but the source eludes you.'
-	elseif strpos($loc, 'zaprF') >= 0:
+	elseif strpos($loc, 'zaprF') > -1:
+		$blackmailQW['init_flashloc_desc'] = 'while washing cars'
 		'You briefly think a car turned on their headlights, before you realise it was the flash of a camera, the source of which already gone.'
 	else
+		$blackmailQW['init_flashloc_desc'] = ''
 		'You think you notice the flash of a camera from the corner of your eye, but its source is already out of view.'
 	end
 	if exhibitionist_lvl > 0:
@@ -97,7 +99,7 @@ end
 if $ARGS[0] = 'photo_dream1':
 	if blackmailQW['stage'] = 1: blackmailQW['stage'] = 2
 	blackmailQW['dream_day'] = daystart + 3
-	if strpos('panty_pantyrear_bra', $blackmailQW['init_flashtype']):
+	if strpos('panty_pantyrear_bra', $blackmailQW['init_flashaction']):
 		gs 'arousal', 'flashlite', -5
 	else
 		gs 'arousal', 'flash', -5
@@ -106,22 +108,14 @@ if $ARGS[0] = 'photo_dream1':
 
 	'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>.jpg"></center>'
 	$temp_dream_text = 'You dream about getting caught while flashing your '
-	$temp_dream_text += $blackmailQW['init_flashtype']
-	if strpos($loc, 'church') >= 0:
-		$temp_dream_text += ' in a church'
-	elseif strpos($loc, 'park') >= 0:
-		$temp_dream_text += ' in a park'
-	elseif strpos($loc, 'zaprF') >= 0:
-		$temp_dream_text += ' while washing cars'
-	end
+	$temp_dream_text += $blackmailQW['init_flashaction']
+	$temp_dream_text += ' ' + $blackmailQW['init_flashloc_desc']
 	$temp_dream_text += ', your skin prickling from the light of unending camera flashes.'
 
 	$temp_dream_text
 	killvar 'temp_dream_text'
-
 	gs 'dream_events', 'event_end'
 
-
 elseif $ARGS[0] = 'photo_dream2':
 	if blackmailQW['stage'] = 2: blackmailQW['stage'] = 3
 	blackmailQW['dreamday'] = daystart + 3
@@ -142,14 +136,8 @@ elseif $ARGS[0] = 'photo_dream2':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>.jpg"></center>'
 				$temp_dream_text = 'You get a clear look at the picture depicting you flashing your '
-				$temp_dream_text += $blackmailQW['init_flashtype']
-				if strpos($loc, 'church') >= 0:
-					$temp_dream_text += ' in a church'
-				elseif strpos($loc, 'park') >= 0:
-					$temp_dream_text += ' in a park'
-				elseif strpos($loc, 'zaprF') >= 0:
-					$temp_dream_text += ' while washing cars'
-				end
+				$temp_dream_text += $blackmailQW['init_flashaction']
+				$temp_dream_text += ' ' + $blackmailQW['init_flashloc_desc']
 				$temp_dream_text += '.'
 				$temp_dream_text
 				killvar '$temp_dream_text'
@@ -186,14 +174,8 @@ elseif $ARGS[0] = 'photo_dream2':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>.jpg"></center>'
 			$temp_dream_text = 'You grab one of the pictures and see yourself flashing your '
-			$temp_dream_text += $blackmailQW['init_flashtype']
-			if strpos($loc, 'church') >= 0:
-				$temp_dream_text += ' in a church'
-			elseif strpos($loc, 'park') >= 0:
-				$temp_dream_text += ' in a park'
-			elseif strpos($loc, 'zaprF') >= 0:
-				$temp_dream_text += ' while washing cars'
-			end
+			$temp_dream_text += $blackmailQW['init_flashaction']
+			$temp_dream_text += ' ' + $blackmailQW['init_flashloc_desc']
 			$temp_dream_text += '.'
 			$temp_dream_text
 			killvar '$temp_dream_text'
@@ -217,14 +199,8 @@ elseif $ARGS[0] = 'photo_dream2':
 			act 'Buy a newspaper':
 				'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>.jpg"></center>'
 				$temp_dream_text = 'The postmaster distandly hands you a newspaper, and on the front cover you see a picture of yourself flashing your '
-				$temp_dream_text += $blackmailQW['init_flashtype']
-				if strpos($loc, 'church') >= 0:
-					$temp_dream_text += ' in a church'
-				elseif strpos($loc, 'park') >= 0:
-					$temp_dream_text += ' in a park'
-				elseif strpos($loc, 'zaprF') >= 0:
-					$temp_dream_text += ' while washing cars'
-				end
+				$temp_dream_text += $blackmailQW['init_flashaction']
+				$temp_dream_text += ' ' + $blackmailQW['init_flashloc_desc']
 				$temp_dream_text += '.'
 				$temp_dream_text
 				killvar '$temp_dream_text'

+ 0 - 38
locations/cikl.qsrc

@@ -567,44 +567,6 @@ if pregchem > 240:fat += 1
 !!	Pain
 !!------------------------------------------------------------------------------------------------------------
 
-if pain['head'] > 0:     pain['head']      -= max(rand(1,3), rand(pain['head']      /2))
-if pain['hair'] > 0:     pain['hair']      -= max(rand(1,3), rand(pain['hair']      /2))
-if pain['ears'] > 0:     pain['ears']      -= max(rand(1,3), rand(pain['ears']      /2))
-if pain['eyebrows'] > 0: pain['eyebrows']  -= max(rand(1,3), rand(pain['eyebrows']  /2))
-if pain['eyes'] > 0:     pain['eyes']      -= max(rand(1,3), rand(pain['eyes']      /2))
-if pain['cheeks'] > 0:   pain['cheeks']    -= max(rand(1,3), rand(pain['cheeks']    /2))
-if pain['nose'] > 0:     pain['nose']      -= max(rand(1,3), rand(pain['nose']      /2))
-if pain['mouth'] > 0:    pain['mouth']     -= max(rand(1,3), rand(pain['mouth']     /2))
-if pain['lips'] > 0:     pain['lips']      -= max(rand(1,3), rand(pain['lips']      /2))
-if pain['tongue'] > 0:   pain['tongue']    -= max(rand(1,3), rand(pain['tongue']    /2))
-if pain['throat'] > 0:   pain['throat']    -= max(rand(1,3), rand(pain['throat']    /2))
-if pain['neck'] > 0:     pain['neck']      -= max(rand(1,3), rand(pain['neck']      /2))
-if pain['back'] > 0:     pain['back']      -= max(rand(1,3), rand(pain['back']      /2))
-if pain['asscheeks'] > 0:pain['asscheeks'] -= max(rand(1,3), rand(pain['asscheeks'] /2))
-if pain['asshole'] > 0:  pain['asshole']   -= max(rand(1,3), rand(pain['asshole']   /2))
-if pain['hips'] > 0:     pain['hips']      -= max(rand(1,3), rand(pain['hips']      /2))
-if pain['thighs'] > 0:   pain['thighs']    -= max(rand(1,3), rand(pain['thighs']    /2))
-if pain['legL'] > 0:     pain['legL']      -= max(rand(1,3), rand(pain['legL']      /2))
-if pain['legR'] > 0:     pain['legR']      -= max(rand(1,3), rand(pain['legR']      /2))
-if pain['feet'] > 0:     pain['feet']      -= max(rand(1,3), rand(pain['feet']      /2))
-if pain['toes'] > 0:     pain['toes']      -= max(rand(1,3), rand(pain['toes']      /2))
-if pain['shoulders'] > 0:pain['shoulders'] -= max(rand(1,3), rand(pain['shoulders'] /2))
-if pain['armL'] > 0:     pain['armL']      -= max(rand(1,3), rand(pain['armL']      /2))
-if pain['armR'] > 0:     pain['armR']      -= max(rand(1,3), rand(pain['armR']      /2))
-if pain['hands'] > 0:    pain['hands']     -= max(rand(1,3), rand(pain['hands']     /2))
-if pain['fingers'] > 0:  pain['fingers']   -= max(rand(1,3), rand(pain['fingers']   /2))
-if pain['chest'] > 0:    pain['chest']     -= max(rand(1,3), rand(pain['chest']     /2))
-if pain['breasts'] > 0:  pain['breasts']   -= max(rand(1,3), rand(pain['breasts']   /2))
-if pain['nipples'] > 0:  pain['nipples']   -= max(rand(1,3), rand(pain['nipples']   /2))
-if pain['ribs'] > 0:     pain['ribs']      -= max(rand(1,3), rand(pain['ribs']      /2))
-if pain['tummy'] > 0:    pain['tummy']     -= max(rand(1,3), rand(pain['tummy']     /2))
-if pain['pubic'] > 0:    pain['pubic']     -= max(rand(1,3), rand(pain['pubic']     /2))
-if pain['vaginal'] > 0:  pain['vaginal']   -= max(rand(1,3), rand(pain['vaginal']   /2))
-if pain['labia'] > 0:    pain['labia']     -= max(rand(1,3), rand(pain['labia']     /2))
-if pain['clitoris'] > 0: pain['clitoris']  -= max(rand(1,3), rand(pain['clitoris']  /2))
-if pain['urethra'] > 0:  pain['urethra']   -= max(rand(1,3), rand(pain['urethra']   /2))
-if pain['cervix'] > 0:   pain['cervix']    -= max(rand(1,3), rand(pain['cervix']    /2))
-
 if painpub = 2:
 	if painpubday + 5 < daystart:
 		$painpub = 'Your vulva is painfully sore.'

+ 4 - 6
locations/city_experimental_trials_events.qsrc

@@ -480,17 +480,15 @@ end
 if $experimentQW['trial_active'] = 'hair_cream':
 	pcs_hairlng += rand(20, 50)
 	defcurly = rand(0, 1)
+	curly = defcurly
 
 	if experimentQW['trial_duration'] > 1:
 		pcs_haircol = rand(0,22)
-		*nl
-		'You notice that your hair has lengthened and changed in color! This must have been that experimental hair extension shampoo.'
-
 	else
-		pcs_haircol = 23
-		*nl
-		'You notice that your hair has lengthened and changed in color! This must have been that experimental hair extension shampoo.'
+		pcs_haircol = 11
 	end
+	*nl
+	'You notice that your hair has lengthened and changed in color! This must have been that experimental hair extension shampoo.'
 end
 
 

+ 1 - 1
locations/dream_events.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			end
 		end
 
-!!		if blackmailQW['stage'] >= 1 and daystart >= blackmailQW['dreamday']: gs 'blackmailer', 'blackmail_dreams'
+		if blackmailQW['stage'] >= 1 and daystart >= blackmailQW['dreamday']: gs 'blackmailer', 'blackmail_dreams'
 
 		gt 'dream_events', 'mod_sleepevents'
 	end

+ 16 - 16
locations/hotel-anna-sex.qsrc → locations/hotel_anna_sex.qsrc

@@ -87,7 +87,7 @@ if $ARGS[0] = 'les_sex':
 		act 'Suggest a stronger punishment':
 			*clr & cla
 			gs 'stat'
-			AnnaQW['dom'] + = 1
+			AnnaQW['dom'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractic1/Annapract08c.jpg"></center>'
 			'You were told not to interact in the session but Anna directly asked you a question so you have to say something.'
 			'"Oh Sweetie you are naughty, but I agree this slut needs a good caning so that she might learn her place"'
@@ -132,7 +132,7 @@ if $ARGS[0] = 'les_sex2':
 	act '"Pass me the baton"':
 		*clr & cla
 		gs 'stat'
-		AnnaQW['dom'] + = 1
+		AnnaQW['dom'] += 1
 		'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionpractic1/Annapract09aa.mp4"></video></center>'
 		'You walk over to Anna and take the vibrator off her. She unties the woman''s hands and goes and sits in the chair you were just sitting in leaving you to do as you please while still being observed. You think she might be testing or assessing you so you make a show of each action.'
 		'You move the vibrator around testing for more sensitive spots and as she starts to pant heavily you lift it. The woman now free to move her hands just rests them on her body and lets you do whatever you like.'
@@ -186,7 +186,7 @@ if $ARGS[0] = 'dresscontest':
 		act'It was fine last time when you beat Jeanine':
 			*clr & cla 
 			gs 'stat'
-			AnnaQW['dom'] + = 1
+			AnnaQW['dom'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractic1/Annapract12.jpg"></center>'
 			'<font color = blue>"...See? I think it was really useful for our chit chat: practice is a way to learn more faster than theory at this point; that doesn''t mean we have to rush...and as anyone else you have to have the most clear way of thougt about that matter, and that require its amount of time."</font><br><font color = #DC143C>"Well...Jeanine seems quite "disposed" to obey order: i''m pretty sure she''s like that with  peoble with the right attitude."</font>.....<br><font color = blue>"...And you cannot be much more wrong. Uh? So "love" is supposed to have a role in that story uh? Let''s see if there''s something about a 24/7..."</font> Anna doesn''t lose the chance to teach yo something, but she continue to put a sight on the film...<br><font color = #DC143C>"...Mmmm...what do you mean?"</font>'
 			act 'Listen': gt'hotel_anna_sex','dresscontest1'
@@ -218,7 +218,7 @@ if $ARGS[0] = 'dresscontest':
 		act'It was fine until i had to make our deal...':
 			*clr & cla
 			gs 'stat'
-			AnnaQW['dom'] + = 1
+			AnnaQW['dom'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractic1/Annapract12a.jpg"></center>'
 			'<font color = blue>"...Oh that... . You have to understand that i could not break a treatment without consequences: and before you ask no, i''m not referring to consequences about you. Anyway I think it was really useful for our chit chat: practice is a way to learn more faster than theory at this point; that doesn''t mean we have to rush...and as anyone else you have to have the most clear way of thougt about that matter, and that require its amount of time. "</font><br><font color = #DC143C>"Emmm...i''m sorry Anna but...wasn''t that some kind of rush?"</font>.....<br><font color = blue>"...No my dear...not with me. Uh? So "love" is supposed to have a role in that story uh? Let''s see if there''s something about a 24/7..."</font> Anna doesn''t lose the chance to teach yo something, but she continue to put a sight on the film...<br><font color = #DC143C>"...Mmmm...what do you mean?"</font>'
 			act 'Listen': gt'hotel_anna_sex','dresscontest1'
@@ -343,7 +343,7 @@ if $ARGS[0] = 'dresscontest2':
 	act'I cannot deny, i''ve thought what should be being at your place':
 		*clr & cla
 		gs 'stat'
-		AnnaQW['dom'] + = 1
+		AnnaQW['dom'] += 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractic1/Annapract15.jpg"></center>'
 		if IgorevnaBDSM_harness_a = 1:
 			'As your words escape from your mouth, you becoming aware of the flogger that''s linked to the dress...'
@@ -443,7 +443,7 @@ if $ARGS[0] = 'dresscontest3':
 			if IgorevnaBDSM_harness_a = 1:
 				AnnaQW['switch'] + = 1
 			else
-				AnnaQW['dom'] + = 1
+				AnnaQW['dom'] += 1
 			end
 			'<center><img <<$set_imgh>> src="images/pc/clothing/8fetish/67.jpg"></center>'
 			'<font color = #DC143C>"Ummmh...sexy is sexy...but isn''t that a status...?...oh! there you are..."</font> You found the last piece of the set...<br><font color = blue>"...##@@*****#@++!!!..."</font>You hear Anna yelling from the distance...<font color = #DC143C>"...Uh?..."</font>'
@@ -602,7 +602,7 @@ if $ARGS[0] = 'scanning_path':
 			*clr & cla
 			gs 'stat'
 			IgorevnaBDSM_session_slaveM = 1
-			AnnaQW['dom'] + = 1
+			AnnaQW['dom'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractic1/Annapract18.jpg"></center>'
 			'<font color = blue>"...Man uh? Generally speaking they are much more difficult to control expecially at the beginning, but do not worry: once you keep them at the balls they are marvelous. Anyway, we''ll play easy with a loyal servant, so you have nothing to be worried about. Oh! And before you ask: no sex allowed. I forbid my pet to have sex this month...so... well, i''m sure you can deal with that."</font><br><font color = #DC143C>"...''k..."</font><br><font color = blue>"Then it''s settled. Ok let me lead you to the exit..."</font>'
 			act 'Bye Anna': gt'HotelHole'
@@ -611,7 +611,7 @@ if $ARGS[0] = 'scanning_path':
 			*clr & cla
 			gs 'stat'
 			IgorevnaBDSM_session_slaveF = 1
-			AnnaQW['dom'] + = 1
+			AnnaQW['dom'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractic1/Annapract18.jpg"></center>'
 			'<font color = blue>"...Woman uh? Generally speaking they are easier to control expecially at the beginning: but every rules have their own exception ...hehehe. Anyway, we''ll play easy with a loyal servant, so you have nothing to be worried about. Oh! And before you ask: no sex allowed. I forbid my pet to have sex this month...so... well, i''m sure you can deal with that."</font><br><font color = #DC143C>"...''k..."</font><br><font color = blue>"Then it''s settled. Ok let me lead you to the exit..."</font>'
 			act 'Bye bye Anna': gt'HotelHole'
@@ -755,16 +755,16 @@ end
 if $ARGS[0] = 'slaveM':
 	*clr & cla
 	gs 'stat'
-	AnnaQW['dom'] + = 1
+	AnnaQW['dom'] += 1
 	AnnaQW['trust'] + = 1
 	BDSM_Knowledge += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM0.jpg"></center>'
-	'<font color = blue> "...You look good <$pcs_nickname>>..." </font><br><font color = #DC143C> "...Oh thanks. Do you think that pink doesn''t suit with the session?"</font><br><font color = blue> "...Absolutely not: if another color could make you more confident with your self you could use it as a little help. Honestly it doesn''t matter: you could be dress as a farie and nonetheless subs have to obey; no matter what." </font><br><font color = #DC143C> "Got it."</font><br><font color = blue> "Before presentation <<$pcs_nickname>...is there something you would like to ask? Something you may want to improve ... or a last minutes tip?"</font>'
+	'<font color = blue> "...You look good <<$pcs_nickname>>..." </font><br><font color = #DC143C> "...Oh thanks. Do you think that pink doesn''t suit with the session?"</font><br><font color = blue> "...Absolutely not: if another color could make you more confident with your self you could use it as a little help. Honestly it doesn''t matter: you could be dress as a farie and nonetheless subs have to obey; no matter what." </font><br><font color = #DC143C> "Got it."</font><br><font color = blue> "Before presentation <<$pcs_nickname>...is there something you would like to ask? Something you may want to improve ... or a last minutes tip?"</font>'
 	act'Control': 
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM1a.jpg"></center>'
-		'Anna reach the man who''s sitting on the chair, and put her heels on his crotch...<font color = blue> "<<$pcs_nickname> this is worm, worm She is <<$pcs_nickname>, a new Mistress... . Control you said uh? Ok... First of all do not think you can dispose of life and death of the sub: that''s totally forbidden. As you can easy imagine there will be no benefit; that means that also the basic natural needs must be satisfied: eat sleep...etc. Second...it''s not a mind game; with time a sub can easily understand what are Dominant intentions/willing, but no one is a mind reader and anyway orders have to be explicated to be executed. Third...uhmmm...maybe it''s better for you to answer: who do you think have the most powerful control into a BDSM relationship?" </font><br><font color = #DC143C> "..."</font><br><font color = blue> "..." </font>'
+		'Anna reach the man who''s sitting on the chair, and put her heels on his crotch...<font color = blue> "<<$pcs_nickname>> this is worm, worm She is <<$pcs_nickname>>, a new Mistress... . Control you said uh? Ok... First of all do not think you can dispose of life and death of the sub: that''s totally forbidden. As you can easy imagine there will be no benefit; that means that also the basic natural needs must be satisfied: eat sleep...etc. Second...it''s not a mind game; with time a sub can easily understand what are Dominant intentions/willing, but no one is a mind reader and anyway orders have to be explicated to be executed. Third...uhmmm...maybe it''s better for you to answer: who do you think have the most powerful control into a BDSM relationship?" </font><br><font color = #DC143C> "..."</font><br><font color = blue> "..." </font>'
 		act'The Dominant...i think...': 
 			*clr & cla
 			gs 'stat'
@@ -842,7 +842,7 @@ if $ARGS[0] = 'slaveM1':
 			act'...I''ve not finished yet!...': 
 				*clr & cla
 				gs 'stat'
-				AnnaQW['dom'] + = 1
+				AnnaQW['dom'] += 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM3b.jpg"></center>'
 				'It doesn''t matter if you are doing something wrong...despite you start being tired you collect all your strengh in one last big hit.<font color = #DC143C> "...AND THIS!..."</font><br><font color = maroon> "..." </font><br><font color = blue> "...Uhhh...with the right tecnique this could be a KO hit...." </font><br>You stop exausted in disbelif...<font color = #DC143C> "...Impossible...he takes some drugs..."</font><br><font color = blue> "Not allowed...hehehe. Try to catch some of the tecniques about whipping...i cannot let it  without feeling a bit of pain.</font><br> Anna takes the quirt and start her session...<font color = maroon> "MISTRESS!..." </font><br><font color = blue> "See...it''s not the strengh that makes the difference...it''s a matter of tecnique...." </font>   While whipping Anna explain few tips about whipping...you learned something.<font color = blue> "...<<$pcs_nickname>>...why don''t you look under your boots?...I''m sure you''ll find something interesting..." </font> '
 				act'Look': gt'hotel_anna_sex','slaveM2'
@@ -975,7 +975,7 @@ end
 if $ARGS[0] = 'slaveF':
 	*clr & cla
 	gs 'stat'
-	AnnaQW['dom'] + = 1
+	AnnaQW['dom'] += 1
 	AnnaQW['trust'] + = 1
 	BDSM_Knowledge += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF0.jpg"></center>'
@@ -1415,7 +1415,7 @@ if $ARGS[0] = 'librarian5':
 	act'Refuse': 
 		*clr & cla
 		gs 'stat'
-		AnnaQW['dom'] + = 1
+		AnnaQW['dom'] += 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian8a.jpg"></center>'
 		'<font color = blue> "I see. You are ready, come with me." </font>'
 		act'...': gt'hotel_anna_sex','librarian_brat_end'
@@ -1616,7 +1616,7 @@ if $ARGS[0] = 'Anna_dom_session':
 	*clr & cla
 	gs 'stat'
 	AnnaQW['trust'] + = 1
-	AnnaQW['dom'] + = 1
+	AnnaQW['dom'] += 1
 	BDSM_Knowledge += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/dom/dom0.jpg"></center>'
 	'You follow Anna to her room, and she quickly change into a "normal" dress...if you exclude that now she has a collar and some cuffs on...<font color = blue> "Ready!...This should help Ma''am to feel comortable with her role. If Ma''am wish there''s something to see...a short memo for subs like me..." </font>'
@@ -1787,7 +1787,7 @@ if $ARGS[0] = 'Anna_dom_session3':
 		act'Take this!': 
 			*clr & cla
 			gs 'stat'
-			AnnaQW['dom'] + = 1
+			AnnaQW['dom'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/dom/dom7b.jpg"></center>'
 			'<font color = blue> "..."</font><br><font color = #DC143C>"...and this!"</font><br><font color = blue> "..."</font><br><font color = #DC143C>"Not talkative anymore uh?...Again!"</font><br><font color = blue> "<<$pcs_nickname>>...ehmm...we should start..."</font><br><font color = #DC143C>"...who told you to speak! Endure your punishment!"</font> You continue spanking Anna''s butt, but it doesn''t have the effect you were looking for... .<br><font color = blue> "Ok <<$pcs_nickname>>... . You clearly lack in spanking skill..."</font><br><font color = #DC143C>"...Anf pant pant...I''m not lacking...anf anf...i''m tired..."</font><br><font color = blue> "We don''t have a lot o time, we could try another day. Now you shold pose me for the rest; give me a sec..."</font><br><font color = #DC143C>"...Anf pant pant...Whatever...anf anf...the true is that ...anf anf...you cannot resist another minute..."</font><br><font color = blue> "...sure..."</font>'
 			act'Look for Anna': gt'hotel_anna_sex','Anna_dom_session4'

+ 0 - 12
locations/hourly_events.qsrc

@@ -257,18 +257,6 @@ if KGOLpers > 0:
 	if KGMana < KGManaMax: KGMana += 10
 end
 
-!! pain[0] = pain['total'] , pain[1] = pain['damage'] , pain[2] = pain['relief']
-i = arrsize('pain')
-:statpainloop
-if i > 0:
-	i -= 1
-	pain[i] -= rand(0,1)
-	if pain[i] < 0: pain[i] = 0
-
-	jump 'statpainloop'
-end
-
-
 !! Panty happiness gain
 if pcs_mood < 60 and $pantyworntype = 'cats': pcs_mood += 2
 if pcs_mood < 60 and $braworntype = 'cats': pcs_mood += 2

+ 98 - 5
locations/pain.qsrc

@@ -12,6 +12,94 @@ if $ARGS[0] = 'calc':
     if pain['total'] > 100: pain['total'] = 100
     pain['damage'] = pain['total']
 
+    pain['relief'] = 0
+    gs 'drugs', 'pain_relief'
+    if pain['relief'] ! 0:
+        if (pain['total'] / pain['relief']) > 0:
+            pain['total'] = pain['total'] / pain['relief']
+        elseif pain['total'] > 0:
+            pain['total'] = 0
+        end
+    end
+
+    if pain['total'] > 80:
+        if (pcs_health * 5)      >= healthmax: pcs_health = pcs_health * 20 / 100
+        if (pcs_mood * 5)        >= 100: pcs_mood = pcs_mood * 20 / 100
+    elseif pain['total'] > 60:
+        if (pcs_health * 5 / 2)  >= healthmax: pcs_health = pcs_health * 40 / 100
+        if (pcs_mood * 5 / 2)    >= 100: pcs_mood = pcs_mood * 40 / 100
+    elseif pain['total'] > 40:
+        if (pcs_health * 5 / 3)  >= healthmax: pcs_health = pcs_health * 60 / 100
+        if (pcs_mood * 5 / 3)    >= 100: pcs_mood = pcs_mood * 60 / 100
+    elseif pain['total'] > 20:
+        if (pcs_health * 5 / 4)  >= healthmax: pcs_health = pcs_health * 80 / 100
+        if (pcs_mood * 5 / 4)    >= 100: pcs_mood = pcs_mood * 80 / 100
+    elseif pain['total'] > 0:
+        if (pcs_health * 10 / 9) >= healthmax: pcs_health = pcs_health * 90 / 100
+        if (pcs_mood * 10 / 9)   >= 100: pcs_mood = pcs_mood * 90 / 100
+    end
+
+elseif $ARGS[0] = 'manage':
+    !! first initialization
+    if pain['timer'] <= 0 and pain['total'] > 0: pain['timer'] = totminut+10
+
+    if pain['timer'] < totminut and pain['total'] > 0:
+        tmp = max(1, (totminut - pain['timer']) / 10)
+
+        if pain['hair'] > 0:      pain['hair']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['hair']     ) * max(0, insleep)))
+        if pain['head'] > 0:      pain['head']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['head']     ) * max(0, insleep)))
+        if pain['ears'] > 0:      pain['ears']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['ears']     ) * max(0, insleep)))
+        if pain['eyebrows'] > 0:  pain['eyebrows']  -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['eyebrows'] ) * max(0, insleep)))
+        if pain['eyes'] > 0:      pain['eyes']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['eyes']     ) * max(0, insleep)))
+        if pain['cheeks'] > 0:    pain['cheeks']    -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['cheeks']   ) * max(0, insleep)))
+        if pain['nose'] > 0:      pain['nose']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['nose']     ) * max(0, insleep)))
+        if pain['mouth'] > 0:     pain['mouth']     -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['mouth']    ) * max(0, insleep)))
+        if pain['lips'] > 0:      pain['lips']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['lips']     ) * max(0, insleep)))
+        if pain['tongue'] > 0:    pain['tongue']    -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['tongue']   ) * max(0, insleep)))
+        if pain['throat'] > 0:    pain['throat']    -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['throat']   ) * max(0, insleep)))
+        if pain['neck'] > 0:      pain['neck']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['neck']     ) * max(0, insleep)))
+        if pain['shoulders'] > 0: pain['shoulders'] -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['shoulders']) * max(0, insleep)))
+        if pain['armL'] > 0:      pain['armL']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['armL']     ) * max(0, insleep)))
+        if pain['armR'] > 0:      pain['armR']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['armR']     ) * max(0, insleep)))
+        if pain['hands'] > 0:     pain['hands']     -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['hands']    ) * max(0, insleep)))
+        if pain['fingers'] > 0:   pain['fingers']   -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['fingers']  ) * max(0, insleep)))
+        if pain['chest'] > 0:     pain['chest']     -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['chest']    ) * max(0, insleep)))
+        if pain['ribs'] > 0:      pain['ribs']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['ribs']     ) * max(0, insleep)))
+        if pain['breasts'] > 0:   pain['breasts']   -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['breasts']  ) * max(0, insleep)))
+        if pain['nipples'] > 0:   pain['nipples']   -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['nipples']  ) * max(0, insleep)))
+        if pain['tummy'] > 0:     pain['tummy']     -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['tummy']    ) * max(0, insleep)))
+        if pain['back'] > 0:      pain['back']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['back']     ) * max(0, insleep)))
+        if pain['hips'] > 0:      pain['hips']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['hips']     ) * max(0, insleep)))
+        if pain['thighs'] > 0:    pain['thighs']    -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['thighs']   ) * max(0, insleep)))
+        if pain['pubic'] > 0:     pain['pubic']     -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['pubic']    ) * max(0, insleep)))
+        if pain['asscheeks'] > 0: pain['asscheeks'] -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['asscheeks']) * max(0, insleep)))
+        if pain['asshole'] > 0:   pain['asshole']   -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['asshole']  ) * max(0, insleep)))
+        if pain['vaginal'] > 0:   pain['vaginal']   -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['vaginal']  ) * max(0, insleep)))
+        if pain['labia'] > 0:     pain['labia']     -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['labia']    ) * max(0, insleep)))
+        if pain['clitoris'] > 0:  pain['clitoris']  -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['clitoris'] ) * max(0, insleep)))
+        if pain['urethra'] > 0:   pain['urethra']   -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['urethra']  ) * max(0, insleep)))
+        if pain['cervix'] > 0:    pain['cervix']    -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['cervix']   ) * max(0, insleep)))
+        if pain['legL'] > 0:      pain['legL']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['legL']     ) * max(0, insleep)))
+        if pain['legR'] > 0:      pain['legR']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['legR']     ) * max(0, insleep)))
+        if pain['feet'] > 0:      pain['feet']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['feet']     ) * max(0, insleep)))
+        if pain['toes'] > 0:      pain['toes']      -= max(rand(tmp/3, tmp), (rand(tmp/2, tmp) + rand(pain['toes']     ) * max(0, insleep)))
+
+        i = arrsize('pain')
+        :statpainloop
+        if i > 0:
+            i -= 1
+            if pain[i] < 0: pain[i] = 0
+            jump 'statpainloop'
+        end
+
+        gs 'pain', 'calc'
+
+        !! 10 min here, but 30 when just received pain
+        pain['timer'] = totminut+10
+
+        killvar 'tmp'
+        killvar 'i'
+    end
 else
     !For checking pain and when applicable triggering arousal.
     !ARGS[0] magnitude of pain inflicted 1 is very light, 9 is the maximum value in the given way of causing pain
@@ -100,12 +188,17 @@ else
     curpain = (pain[1] * pain[2] * pain[3]) /10
     prevpain = pain[$painPart]
 
-    !! lastpain var can be used elsewhere, do not kill it
-    $lastpain = $painPart
-    lastpain = func( 'shortgs','modul',prevpain,curpain)
+    if arrpos('$ARGS', 'get') >= 0:
+        RESULT = func('shortgs','modul',prevpain,curpain)
+    else
+        !! lastpain var can be used elsewhere, do not kill it
+        $lastpain = $painPart
+        lastpain = func('shortgs','modul',prevpain,curpain)
 
-    pain[$painPart] = lastpain
-    if pain[$painPart] > 100: pain[$painPart] = 100
+        pain[$painPart] = lastpain
+        if pain[$painPart] > 100: pain[$painPart] = 100
+        pain['timer'] = totminut+30
+    end
 
     killvar 'prevpain'
     killvar 'curpain'

+ 32 - 6
locations/pav_disco_classmates.qsrc

@@ -13,6 +13,8 @@ if $ARGS[0] = 'classmates':
 	gs 'arkadi_fyodorov_schedule'
 	gs 'radomir_popov_schedule'
 	gs 'valentin_bogdanov_schedule'
+	gs 'vicky_meynold_schedule'
+	gs 'katja_meynold_schedule'
 	if music_on = 1:
 		$track_loop = 'sound/komb.mp3'
 		volume = 80
@@ -194,9 +196,17 @@ if $ARGS[0] = 'atdisco':
 !!Andrey
 	gs 'pav_disco_classmates', 'atdisco10', 147
 !!Katja
-	gs 'pav_disco_classmates', 'atdisco10', 14
+	if loact['Katja'] = 8:
+		gs 'pav_disco_classmates', 'atdisco10', 14
+	else
+		discoenable['A14'] = 0
+	end
 !!Viktoriya
-	gs 'pav_disco_classmates', 'atdisco10', 15
+	if locat['Vicky'] = 14:
+		gs 'pav_disco_classmates', 'atdisco10', 15
+	else
+		discoenable['A15'] = 0
+	end
 !!Irina
 	gs 'pav_disco_classmates', 'atdisco10', 17
 !!Bella
@@ -278,11 +288,23 @@ if $ARGS[0] = 'atdisco':
 !!Roman
 	gs 'pav_disco_classmates', 'atdisco4', 157
 !!Radomir
-	if locat['A154'] = 25: gs 'pav_disco_classmates', 'atdisco4', 154
+	if locat['A154'] = 25:
+		gs 'pav_disco_classmates', 'atdisco4', 154
+	else
+		discoenable['A154'] = 0
+	end
 !!Valentin
-	if locat['A158'] = 25: gs 'pav_disco_classmates', 'atdisco4', 158
+	if locat['A158'] = 25:
+		gs 'pav_disco_classmates', 'atdisco4', 158
+	else
+		discoenable['A158'] = 0
+	end
 !!Arkadi
-	if locat['A156'] = 25: gs 'pav_disco_classmates', 'atdisco4', 156
+	if locat['A156'] = 25:
+		gs 'pav_disco_classmates', 'atdisco4', 156
+	else
+		discoenable['A156'] = 0
+	end
 !!Nikolai
 	gs 'pav_disco_classmates', 'atdisco4', 185
 !!Lavrenti
@@ -294,7 +316,11 @@ if $ARGS[0] = 'atdisco':
 !!Pauline
 	gs 'pav_disco_classmates', 'atdisco4', 24
 !!Anushka
-	if locat['A144'] = 25: gs 'pav_disco_classmates', 'atdisco4', 144
+	if locat['A144'] = 25:
+		gs 'pav_disco_classmates', 'atdisco4', 144
+	else
+		discoenable['A144'] = 0
+	end
 !!Alyona
 	gs 'pav_disco_classmates', 'atdisco2', 143
 !!Ronnie

+ 1 - 1
locations/sleep_reflections.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'event_check':
 		if anushkaQW['sveta_love'] = 10: $sleep_events_priority[] = 'gs ''sleep_reflections'', ''anushka_love'' '
 	end
 	if daystart >= artemQW['sleep_reflection_day'] + 7:
-		if artemQW['bf'] >= 1: $sleep_events_priority[] = 'gs ''sleep_reflections'', ''artem_love'' '
+		if artemQW['bf'] >= 1 and artemQW['love'] <= 0: $sleep_events_priority[] = 'gs ''sleep_reflections'', ''artem_love'' '
 	end
 end
 

+ 1 - 31
locations/stat.qsrc

@@ -938,37 +938,7 @@ stat['cuni'] += kuni & kuni = 0
 stat['anal_strap_give'] += pegging & pegging = 0
 
 !!Pain calculation
-gs 'pain', 'calc'
-pain['relief'] = 0
-
-gs 'drugs', 'pain_relief'
-
-if pain['relief'] ! 0:
-	if (pain['total'] / pain['relief']) > 0:
-		pain['total'] = pain['total'] / pain['relief']
-	elseif pain['total'] > 0:
-		pain['total'] = 0
-	end
-end
-
-if pain['total'] > 80:
-	if (pcs_health * 5) >= healthmax: pcs_health = pcs_health * 20 / 100
-	if (pcs_mood * 5) >= 100: pcs_mood = pcs_mood * 20 / 100
-elseif pain['total'] > 60:
-	if (pcs_health * 5 / 2) >= healthmax: pcs_health = pcs_health * 40 / 100
-	if (pcs_mood * 5 / 2) >= 100: pcs_mood = pcs_mood * 40 / 100
-elseif pain['total'] > 40:
-	if (pcs_health * 5 / 3) >= healthmax: pcs_health = pcs_health * 60 / 100
-	if (pcs_mood * 5 / 3) >= 100: pcs_mood = pcs_mood * 60 / 100
-elseif pain['total'] > 20:
-	if (pcs_health * 5 / 4) >= healthmax: pcs_health = pcs_health * 80 / 100
-	if (pcs_mood * 5 / 4) >= 100: pcs_mood = pcs_mood * 80 / 100
-elseif pain['total'] > 0:
-	if (pcs_health * 10 / 9) >= healthmax: pcs_health = pcs_health * 90 / 100
-	if (pcs_mood * 10 / 9) >= 100: pcs_mood = pcs_mood * 90 / 100
-end
-
-!!--------------------------pain calculation end--------------------------------
+gs 'pain', 'manage'
 
 !!update skills and attributes to pcs_ from there _lvl values plus adjustments based on condition
 gs 'stat_sklattrib_lvlset'

+ 1 - 1
locations/uni_cafe.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = '':
 				'You see a familiar face sitting at one of the tables having lunch, your former classmate <a href="exec:gt ''uni_cafe'',''artem''">Artem.</a>'
 			end
 		end
-		elseif temp_rand = 5:
+		if temp_rand = 5:
 			if meet_kendra = 1:
 				'You see <a href="exec:gt ''uni_cafe'', ''kendra''">Kendra</a> sitting at one of the tables having lunch.'
 			elseif kendraslave >= 1:

+ 1 - 1
locations/wakeup_events.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			$sleep_events[] = 'gs ''wakeup_events'', ''mother_sextalk'' '
 		end
 
-		if $experimentQW['trial_active'] ! '':
+		if $experimentQW['trial_active'] ! '' and experimentQW['trial_duration'] > 0:
 			$sleep_events_priority[] = 'gs ''wakeup_events'', ''experimental_trials'' '
 		end