浏览代码

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

Insomniac 3 周之前
父节点
当前提交
e564a6cbb2
共有 66 个文件被更改,包括 968 次插入904 次删除
  1. 2 2
      locations/AppearanceSystem.qsrc
  2. 3 1
      locations/Cheatmenu_din.qsrc
  3. 2 0
      locations/Cum_Manage.qsrc
  4. 1 1
      locations/Komp.qsrc
  5. 1 1
      locations/_attributes_coco_outfits.qsrc
  6. 1 1
      locations/albina_house_events.qsrc
  7. 2 0
      locations/albina_starlets_sex.qsrc
  8. 38 7
      locations/arousal.qsrc
  9. 3 0
      locations/body.qsrc
  10. 10 10
      locations/body_desc.qsrc
  11. 1 1
      locations/brother.qsrc
  12. 8 0
      locations/changingroom.qsrc
  13. 10 10
      locations/chessplay.qsrc
  14. 21 21
      locations/city_experimental_trials_pharmacy.qsrc
  15. 1 0
      locations/city_house_res_kitch.qsrc
  16. 1 1
      locations/city_mansion_residence_1.qsrc
  17. 1 1
      locations/city_park.qsrc
  18. 2 2
      locations/city_redlight.qsrc
  19. 1 0
      locations/dachain.qsrc
  20. 12 4
      locations/dinSex.qsrc
  21. 76 44
      locations/dinSex2.qsrc
  22. 7 5
      locations/din_bad.qsrc
  23. 2 0
      locations/gad_gphouse.qsrc
  24. 14 1
      locations/gp_elene_schedule.qsrc
  25. 17 17
      locations/gp_zlatek_schedule.qsrc
  26. 3 3
      locations/gschool_cheerleading.qsrc
  27. 3 3
      locations/gschool_lunch.qsrc
  28. 2 1
      locations/havana_kickboxing.qsrc
  29. 126 126
      locations/hotel_anna_sex.qsrc
  30. 1 1
      locations/igorev.qsrc
  31. 1 1
      locations/internet_mobile.qsrc
  32. 2 2
      locations/intro_city_select.qsrc
  33. 1 1
      locations/intro_sg_select.qsrc
  34. 23 23
      locations/item_cart.qsrc
  35. 18 18
      locations/katja_lake.qsrc
  36. 1 0
      locations/mey_vika_events.qsrc
  37. 1 1
      locations/miroslava_schedule.qsrc
  38. 9 9
      locations/natbel_friend.qsrc
  39. 3 0
      locations/newspaper.qsrc
  40. 2 0
      locations/olu.qsrc
  41. 0 2
      locations/pav_disco.qsrc
  42. 2 0
      locations/pav_parkev.qsrc
  43. 1 1
      locations/pav_pool.qsrc
  44. 22 30
      locations/pod_ezd.qsrc
  45. 2 2
      locations/praiders_garage_chat.qsrc
  46. 1 1
      locations/pushkin_ballet_class.qsrc
  47. 1 1
      locations/radapt.qsrc
  48. 1 1
      locations/saveg.qsrc
  49. 1 1
      locations/saveupdater.qsrc
  50. 9 7
      locations/sex_ev_boy_pillow_talk.qsrc
  51. 25 25
      locations/sex_ev_condoms.qsrc
  52. 3 3
      locations/sex_ev_pillow_talk.qsrc
  53. 1 1
      locations/sex_ev_start.qsrc
  54. 1 1
      locations/sex_ev_stats.qsrc
  55. 22 34
      locations/shop.qsrc
  56. 59 59
      locations/soniahome.qsrc
  57. 4 4
      locations/stat_display.qsrc
  58. 135 180
      locations/stripclub.qsrc
  59. 19 15
      locations/stwork.qsrc
  60. 46 56
      locations/stwork2.qsrc
  61. 80 64
      locations/stwork3.qsrc
  62. 24 13
      locations/telefon.qsrc
  63. 1 1
      locations/therapist_reminder.qsrc
  64. 3 0
      locations/version.qsrc
  65. 69 81
      locations/viktor_sex.qsrc
  66. 3 2
      locations/vladimirQW_meet.qsrc

+ 2 - 2
locations/AppearanceSystem.qsrc

@@ -190,7 +190,7 @@ end
 
 if $ARGS[0] = 'CalcGroomingBonus':
 
-	makeupBonus = pcs_makupskl/5 - 5
+	makeupBonus = pcs_makupskl / 5 - 5
 	if pcs_makeup = 0:
 		makeupBonus = -5
 	elseif pcs_makeup = 1:
@@ -200,7 +200,7 @@ if $ARGS[0] = 'CalcGroomingBonus':
 	elseif pcs_makeup = 6 and bimbolevel >= 2:
 		makeupBonus += 2 * (bimbolevel - 1)
 	elseif pcs_makeup = 7:
-		makeupBonus += pcs_makeupskl / 10 - 50
+		makeupBonus += pcs_makupskl / 10 - 5
 	end
 
 	breathBonus = 5 * pcs_breath

+ 3 - 1
locations/Cheatmenu_din.qsrc

@@ -472,6 +472,7 @@ end
 $cheatmenu['cycle'] = "gs 'Cheatmenu_din', 'cycle'"
 if $ARGS[0] = 'cycle':
 	*clr & cla
+	gs 'obj_din', 'cheattabs'
 	if cycle ! 5:
 		EggRH = 0
 		LutH = 0
@@ -3630,7 +3631,8 @@ if $ARGS[0] = 'items':
 	if showPharmacyItems = 1:
 		'<a href = "exec: showPharmacyItems = 0 & dynamic $cheatmenu[''items'']">Hide Details </a>'
 		*pl 'Morning after pill: <a href="exec:mc_inventory[''morning_after_pill'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''morning_after_pill'']>> </b></a>'
-		*pl 'Condoms: <a href="exec:mc_inventory[''normal_condoms'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''normal_condoms'']>> </b></a>'
+		if preziktype = 1:*pl 'Condoms: <a href="exec:mc_inventory[''normal_condoms'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''normal_condoms'']>> </b></a>'
+		if preziktype ! 1: *pl 'Condoms: <a href="exec:mc_inventory[''equipped_condoms'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''equipped_condoms'']>> </b></a>'
 		*pl 'Pregnancy test: <a href="exec:mc_inventory[''pregnancy_test'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''pregnancy_test'']>> </b></a>'
 		*pl 'Birth control pills: <a href="exec:mc_inventory[''contraceptive_pill'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''contraceptive_pill'']>> </b></a>'
 		*pl 'Antibiotics: <a href="exec:mc_inventory[''antibiotics'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''antibiotics'']>> </b></a>'

+ 2 - 0
locations/Cum_Manage.qsrc

@@ -1053,12 +1053,14 @@ if $ARGS[0] = 'check_innards':
 	RESULT = 0
 
 	if ARGS[1] = 0:
+		if capvag <= 0:capvag = 1
 		if ARGS[2] > 0:
 			RESULT = capvag
 		elseif cumsumvag >= capvag and isprok = 0 and vibratorIN = 0:
 			RESULT = 1
 		end
 	elseif ARGS[1] = 3:
+		if capanus <= 0: capanus = 1
 		if ARGS[2] > 0:
 			RESULT = capanus
 		elseif cumsumass >= capanus and analplugin = 0:

+ 1 - 1
locations/Komp.qsrc

@@ -664,7 +664,7 @@ if $ARGS[0] = 'study':
 	gs 'exp_gain', 'compskl', 1
 	'<center><b>The Institute for Education Measurement</b></center>'
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/study.jpg"></center>'
-	'You spend an hour on the IEM website, reading news articles and educational blogs. You already feel a bit smarter.'
+	'You spend half an hour on the IEM website, reading news articles and educational blogs. You already feel a bit smarter.'
 
 	act 'Leave this website': gt 'komp','browse'
 end

+ 1 - 1
locations/_attributes_coco_outfits.qsrc

@@ -402,7 +402,7 @@ elseif ARGS[1] = 62:
 
 elseif ARGS[1] = 63:
 	CloQuality = 3
-	CloThinness = 6
+	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 4

+ 1 - 1
locations/albina_house_events.qsrc

@@ -1914,7 +1914,7 @@ end
 
 if $ARGS[0] = 'alb_bedroom_shower':
 	if rand(1,2) = 1:
-		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/towel_head2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/towel_head1.jpg"></center>'
 		if rand(1,2) = 1:
 			'You open the door just as another door opens across the room and Albina walks out of the bathroom, towel wrapped about her head and her nude body glistening with moisture. She blinks in surprise, but it only takes a moment for that to fade and give way to a sly smile.'
 			if AlbinaQW['shower_caught'] > 0:

+ 2 - 0
locations/albina_starlets_sex.qsrc

@@ -217,6 +217,7 @@ if $ARGS[0] = 'whore2':
 			gs 'stat'
 
 			act 'Continue':
+				cla
 				'"It''s time for you to get roasted, little lamb!" one of them says after you''ve spent a few minutes sucking their cocks.'
 				'You''re grabbed by the hair and roughly pulled to your feet before you''re thrown onto the bed on all fours. The two men undress and move into position at both ends. "You might be the sweetest thing I''ve ever seen. Even sweeter than that last whore your friend gave us!" one of the men laughs.'
 				'You start thinking of that girl and how she handled these men when a sharp slap to the face brings you back and you notice the cock hanging in front of you. "Get back to work whore!" he shouts.'
@@ -294,6 +295,7 @@ if $ARGS[0] = 'whore2':
 			gs 'stat'
 
 			act 'Continue':
+				cla
 				'"It''s time for you to get roasted, little lamb!" one of them says after you''ve spent a few minutes sucking their cocks.'
 				'You''re grabbed by the hair and roughly pulled to your feet before you''re thrown onto the bed on all fours. The two men undress and move into position at both ends. "You''re definetely the best whore your friend has ever given us!" one of the men laughs.'
 				'You start thinking about what he just said when a sharp slap to the face brings you back and you notice the cock hanging in front of you. "Get back to work, whore!" he shouts.'

+ 38 - 7
locations/arousal.qsrc

@@ -1,6 +1,6 @@
 # arousal
 
-!!{ For checking arousal and when applicable triggering orgasms.
+!{ For checking arousal and when applicable triggering orgasms.
 
 $ARGS[0] the action causing arousal:
 All acts are from Sveta''s perspective and in cases of both giving and receiving, receiving should be used.
@@ -75,7 +75,7 @@ You can also add 'no_orgasm_msg' to the list of themes to prevent any orgasm mes
 }
 
 !!------------------------------------Virginity checks----------------------------------
-!!{
+!{
 	pcs_vag > 0: Hymen broken
 	stat['vaginal'] > 0: Had intercourse with a boy [penis in vagina]
 	stat['think_virgin'] = 0: Had intercourse by penis, strap, dildo and/or fist [could be solo]
@@ -94,7 +94,7 @@ if $ARGS[0] ! 'auto_lube' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $AR
 	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 $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0] ! 'count2' and $ARGS[0] ! 'auto_lube':
 
 	if arrpos('$ARGS', 'unaware') >= 0: temp_unaware = 1
 	if arrpos('$ARGS', 'no_orgasm_msg') >= 0: temp_text = 1
@@ -170,10 +170,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		end
 	end
 
-!!set a magnitude as a random
+	!!set a magnitude as a random
 	stim['mag'] = rand(0,3) + rand(0,3) + rand(0,3)
 
-!! set up pain coefficient
+	!! set up pain coefficient
 	pain_coeff = 0
 	max_sex_pain = (120 - pcs_vital)/2
 
@@ -1261,7 +1261,27 @@ if $ARGS[0] = 'auto_lube':
 			elseif $lube_txt ! '':
 				$lube_txt
 			end
-			gs 'arousal', 'anal_finger', 1
+			!!The following is a copy of the stimulation and arousal gain from anal_finger, this is to avoid  overwriting variables by just calling gs 'arousal', 'anal_finger', 1
+			stim['mag'] = rand(0,3) + rand(0,3) + rand(0,3)
+			count['anal_finger'] = 1
+			stim['act'] = 40
+			if pcs_traits['buttslut_lvl'] = 1:
+				stim['mag'] += 1
+				stim['act'] = 60
+			elseif pcs_traits['buttslut_lvl'] = 2:
+				stim['mag'] += 1
+				stim['act'] = 80
+			elseif pcs_traits['buttslut_lvl'] = 3:
+				stim['mag'] += 1
+				stim['act'] = 100
+			end
+			if cumvol[3] > rand(pcs_ass/2,pcs_ass): gs 'cum_manage', 'cum_decay', rand(2,5)*max(1,stim_time/5)
+			if stim['mag'] > 9: stim['mag'] = 9
+			minut += 1
+			stim['total'] = (stim['mag']*stim['act']*8/10) / 120
+			stim['event'] += stim['total']
+			pcs_horny += stim['total']
+			orgasm_buildup += stim['total']
 			anal_slip += 8
 			ar_anal_lube = 1
 			mc_inventory['lubricant'] -= 1
@@ -1276,7 +1296,18 @@ if $ARGS[0] = 'auto_lube':
 			elseif $lube_txt ! '':
 				$lube_txt
 			end
-			gs 'arousal', 'vaginal_finger', 1
+			!!The following is a copy of the stimulation and arousal gain from vaginal_finger, this is to avoid  overwriting variables by just calling gs 'arousal', 'vaginal_finger', 1
+			stim['mag'] = rand(0,3) + rand(0,3) + rand(0,3)
+			count['vaginal_finger'] = 1
+			stim['mag'] += 1
+			stim['act'] = 80
+			if cumvol[0] > rand(pcs_vag/2,pcs_vag): gs 'cum_manage', 'cum_decay', rand(2,5)*max(1,stim_time/5)
+			if stim['mag'] > 9: stim['mag'] = 9
+			minut += 1
+			stim['total'] = (stim['mag']*stim['act']*8/10) / 120
+			stim['event'] += stim['total']
+			pcs_horny += stim['total']
+			orgasm_buildup += stim['total']
 			vaginal_slip += 8
 			ar_vag_lube = 1
 			mc_inventory['lubricant'] -= 1

+ 3 - 0
locations/body.qsrc

@@ -52,6 +52,9 @@ if $ARGS[0] = 'RegularUpdate':
 	elseif pcs_skin < 0:
 		pcs_skin = 0
 	end
+
+	!! Setting max clit size so as to avoid ridiculous sizes
+	if clit_size > 100: clit_size = 100
 end
 
 if $ARGS[0] = 'UpdateBodyMeasurement':

+ 10 - 10
locations/body_desc.qsrc

@@ -1119,24 +1119,24 @@ if $ARGS[0] = 'clit':
 	if clit_size < 20:
 		$pc_descWordy['clit'] = 'small, oft-hidden'
 		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'small', 'tiny')
-		$clitsize = 'You consider your <a href="exec:view''images/pc/body/clit/clit1.jpg''">clitoris</a> to be of an average size.'
+		$clitsize = 'You consider your <a href="exec:view''images/pc/body/clit/clit1.jpg''">clitoris</a> to be on the small size.'
 	elseif clit_size >= 20 and clit_size < 40:
+		$pc_descWordy['clit'] = 'average, regular sized'
+		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'average', 'regular')
+		$clitsize = 'You feel your <a href="exec:view''images/pc/body/clit/clit2.jpg''">clitoris</a> is pretty average sided.'
+	elseif clit_size >= 40 and clit_size < 60:
 		$pc_descWordy['clit'] = 'big, easily-found'
 		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'large', 'big', 'engorged')
 		$clitsize = 'You feel your <a href="exec:view''images/pc/body/clit/clit2.jpg''">clitoris</a> is somewhat on the large side.'
-	elseif clit_size >= 40 and clit_size < 60:
+	elseif clit_size >= 60 and clit_size < 80:
 		$pc_descWordy['clit'] = 'thick, meaty'
 		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'meaty', 'thick', 'swollen')
-		$clitsize = 'Your <a href="exec:view''images/pc/body/clit/clit3.jpg''">clit</a> is quite large.'
-	elseif clit_size >= 60 and clit_size < 80:
-		$pc_descWordy['clit'] = 'big, practically phallic'
-		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'oversized', 'huge')
-		$clitsize = 'You have a big <a href="exec:view''images/pc/body/clit/clit4.jpg''">clit</a> that resembles a penis.'
+		$clitsize = 'Your <a href="exec:view''images/pc/body/clit/clit4.jpg''">clit</a> is quite large.'
 	else
 		!! If greater or equal to 80
-		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'huge', 'massive', 'cock-like')
-		$pc_descWordy['clit'] = 'enormous, phallic'
-		$clitsize = 'Your <a href="exec:view''images/pc/body/clit/clit5.jpg''">clit</a> is so large it can be mistaken for a penis.'
+		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'oversized', 'huge')
+		$pc_descWordy['clit'] = 'big, practically phallic'
+		$clitsize = 'You have a big <a href="exec:view''images/pc/body/clit/clit5.jpg''">clit</a> that permanently protrudes.'
 	end
 end
 

+ 1 - 1
locations/brother.qsrc

@@ -406,7 +406,7 @@ if $ARGS[0] = 'playfootball':
 		if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
 		gs 'exercise', 'tier1', 60, 'agil', 'vital'
 		gs 'exp_gain', 'run', rand(0, 2)
-		if ftball_lvl < 20: gs 'exp_gain', 'ftball', rand(0, 2)
+		if ftbll_lvl < 50: gs 'exp_gain', 'ftbll', rand(0, 2)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football3.jpg"></center>'
 		'You spend an hour running around, chasing the ball across the field with Kolka and his friends Mishan and Zhendos.'

+ 8 - 0
locations/changingroom.qsrc

@@ -21,6 +21,10 @@ if $ARGS[0] = 'view_swim_list':
 			lastwornpantynumber['swim'] = pantywornnumber
 			$lastwornbratype['swim'] = $braworntype
 			lastwornbranumber['swim'] = brawornnumber
+			$lastwornshoetype['swim'] = $shoeworntype
+			lastwornshoenumber['swim'] = shoewornnumber
+			 
+			gs 'shoes', 'wear', $lastwornshoetype['swim'], lastwornshoenumber['swim']
 		end
 
 		i = 1
@@ -123,6 +127,7 @@ if $ARGS[0] = 'view_swim_list':
 			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
 			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
 			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			gs 'shoes', 'wear', $lastwornshoetype['swim'], lastwornshoenumber['swim']
 			gt $loc, $loc_arg
 		end
 	end
@@ -200,6 +205,7 @@ if $ARGS[0] = 'view_swim_item':
 					gs 'willpower', 'pay', 'self'
 
 					gs 'underwear', 'remove'
+					gs 'shoes', 'strip'
 					gs 'clothing', 'wear', $ARGS[1], ARGS[2]
 
 					gt $loc, $loc_arg
@@ -212,6 +218,7 @@ if $ARGS[0] = 'view_swim_item':
 			'You don''t feel daring enough to wear swimwear this revealing, but if you want to go into the water, you''re going to have to brave it.'
 			act 'Wear':
 				gs 'underwear', 'remove'
+				gs 'shoes', 'strip'
 				gs 'clothing', 'wear', $ARGS[1], ARGS[2]
 
 				gt $loc, $loc_arg
@@ -228,6 +235,7 @@ if $ARGS[0] = 'view_swim_item':
 
 		act 'Wear':
 			gs 'underwear', 'remove'
+			gs 'shoes', 'strip'
 			gs 'clothing', 'wear', $ARGS[1], ARGS[2]
 
 			gt $loc, $loc_arg

+ 10 - 10
locations/chessplay.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'expfame':
 end
 
 if $ARGS[0] = 'game':
-	
+
 	chess_move += 1
 	chess_time = rand(1,3)
 	minut += chess_time
@@ -96,7 +96,7 @@ if $ARGS[0] = 'game':
 		'Stalemate! You have drawn the match against '+$chess_name+'!'
 		'You and '+$chess_name+' could not find a way to win the match.'
 		gs 'chessplay', 'expfame', 1
-		
+
 		act 'Return': gt 'kruchess'
 	elseif chess_GG <= 0:
 		*clr & cla
@@ -104,8 +104,8 @@ if $ARGS[0] = 'game':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/lose' + rand(1,1) + '.jpg"></center>'
 		*nl
 		'Checkmate! You have lost the match against '+$chess_name+'!'
-		gs 'chessplay', 'fame', 0
-		
+		gs 'chessplay', 'expfame', 0
+
 		act 'Return': gt 'kruchess'
 	elseif chess_com <= 0:
 		*clr & cla
@@ -115,7 +115,7 @@ if $ARGS[0] = 'game':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/win' + rand(1,1) + '.jpg"></center>'
 		*nl
 		'Checkmate! You have won the match against '+$chess_name+'!'
-		gs 'chessplay', 'fame', 2
+		gs 'chessplay', 'expfame', 2
 
 		act 'Return': gt 'kruchess'
 	elseif chess_moves >= chess_move_limit:
@@ -125,7 +125,7 @@ if $ARGS[0] = 'game':
 		*nl
 		'Draw! You agree to end the match with '+$chess_name+'.'
 		'You and '+$chess_name+' have both used too many moves and neither could find a way to win the match.'
-		gs 'chessplay', 'fame', 1
+		gs 'chessplay', 'expfame', 1
 
 		act 'Return': gt 'kruchess'
 	elseif total_chess_time >= chess_time_limit:
@@ -135,7 +135,7 @@ if $ARGS[0] = 'game':
 		*nl
 		'Draw! You agree to end the match with '+$chess_name+'.'
 		'You and '+$chess_name+' have both used too much time and neither could find a way to win the match.'
-		gs 'chessplay', 'fame', 1
+		gs 'chessplay', 'expfame', 1
 
 		act 'Return': gt 'kruchess'
 	else
@@ -241,7 +241,7 @@ if $ARGS[0] = 'moves':
 		*nl
 		'You are on move '+str(chess_move)+' out of '+str(chess_move_limit)
 		'You are on minute '+str(total_chess_time)+' out of '+str(chess_time_limit)
-		
+
 		chess_GG -= 1
 		chess_com -= 1
 
@@ -461,7 +461,7 @@ if $ARGS[0] = 'advantage':
 	elseif $ARGS[1] = 'tactical' or $ARGS[1] = 'trap':
 		chess_pos = 1
 		chess_neg = -1
-		chess_adv = 1	
+		chess_adv = 1
 	end
 
 	if $ARGS[2] = 'good':
@@ -484,7 +484,7 @@ if $ARGS[0] = 'advantage':
 			chess_GG = chess_GG - chess_adv - chess_diff
 			chess_com = chess_com + chess_adv + chess_diff
 		elseif chess_ind < chess_neg:
-			'You are more skilled than your opponent and prevent them from capitalizing on their advantage.'			
+			'You are more skilled than your opponent and prevent them from capitalizing on their advantage.'
 		else
 			'You are about equally skilled as your opponent and you lose some advantage.'
 			chess_GG = chess_GG - chess_adv/2 - chess_diff/2

+ 21 - 21
locations/city_experimental_trials_pharmacy.qsrc

@@ -1,27 +1,27 @@
 # city_experimental_trials_pharmacy
 
 if $ARGS[0] = 'counter':
-		'<center><B><font color="maroon">Experimental Pharmacy</font></B></center>'
-		if rand(0, 1) = 0:
-			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\pharmacist1.jpg"></center>'
-			*nl
-			'You approach the pharmacy front desk. The older pharmacist behind the counter looks up at you and gives you a smile.'
-			'"How can I help you?"'
-		else
-			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\pharmacist2.jpg"></center>'
-			*nl
-			'You approach the pharmacy front desk. The middle aged pharmacist behind the counter looks up at you and smiles.'
-			'"How can I help you".'
-		end
+	'<center><B><font color="maroon">Experimental Pharmacy</font></B></center>'
+	if rand(0, 1) = 0:
+		'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\pharmacist1.jpg"></center>'
 		*nl
-
-		if experimentQW['times_participated_1'] = 0 and experimentQW['times_participated_2'] = 0 and experimentQW['times_participated_3'] = 0 and experimentQW['times_participated_4'] = 0 and experimentQW['times_participated_5'] = 0:
-			'"If any of our experimental trials lead to a breakthrough, we will sell the medicine those trials produced here. Currently all of our trials are ongoing so there''s nothing in stock, do check back later. Sign up for a trial, if you want to help us develop medicine for the future."'
-		else
-			act 'Buy something': gt 'city_experimental_trials_pharmacy', 'cart'
-		end
-
-		act 'Go back to the front desk': gt 'city_experimental_trials', 'front_desk'
+		'You approach the pharmacy front desk. The older pharmacist behind the counter looks up at you and gives you a smile.'
+		'"How can I help you?"'
+	else
+		'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\pharmacist2.jpg"></center>'
+		*nl
+		'You approach the pharmacy front desk. The middle aged pharmacist behind the counter looks up at you and smiles.'
+		'"How can I help you".'
+	end
+	*nl
+
+	if experimentQW['times_participated_1'] = 0 and experimentQW['times_participated_2'] = 0 and experimentQW['times_participated_3'] = 0 and experimentQW['times_participated_4'] = 0:
+		'"If any of our experimental trials lead to a breakthrough, we will sell the medicine those trials produced here. Currently all of our trials are ongoing so there''s nothing in stock, do check back later. Sign up for a trial, if you want to help us develop medicine for the future."'
+	else
+		act 'Buy something': gt 'city_experimental_trials_pharmacy', 'cart'
+	end
+
+	act 'Go back to the front desk': gt 'city_experimental_trials', 'front_desk'
 end
 
 
@@ -34,7 +34,7 @@ if $ARGS[0] = 'cart':
 	gs 'themes', 'indoors'
 	gs 'stat'
 
-	act 'Exit shopping cart': gt 'city_experimental_trials_pharmacy', 'counter'
+	act 'Exit shopping cart': gs 'item_cart', 'shopping_var_clear' & gt 'city_experimental_trials_pharmacy', 'counter'
 end
 
 --- city_experimental_trials_pharmacy ---------------------------------

+ 1 - 0
locations/city_house_res_kitch.qsrc

@@ -54,6 +54,7 @@ if $ARGS[0] = 'kitch':
 	dynamic $dritea
 	dynamic $fill_bottle
 	dynamic $edaD
+	dynamic $pranik
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin

+ 1 - 1
locations/city_mansion_residence_1.qsrc

@@ -212,7 +212,7 @@ if $ARGS[0] = 'ykitchen':
 		dynamic $dritea
 		dynamic $fill_bottle
 		dynamic $edaD
-		dynamic $mc_inventory['food_biscuits']
+		dynamic $pranik
 		dynamic $fatdel
 		dynamic $lekarstvo
 		dynamic $vitamin

+ 1 - 1
locations/city_park.qsrc

@@ -222,7 +222,7 @@ if $ARGS[0] = 'luna':
 	*nl
 	'Opening hours are '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+''
 
-	if vladimirQW['stage'] = 0 and hour >= 9 and hour <= 20 and week > 5 and pcs_apprnc > 40:'<a href="exec:gt ''vladimirQW_loc''">There''s a strong looking man staring at you from the fences.</a>.'
+	if vladimirQW['stage'] = 0 and hour >= 9 and hour <= 20 and week > 5 and pcs_hotcat >= 6:'<a href="exec:gt ''vladimirQW_loc''">There''s a strong looking man staring at you from the fences.</a>.'
 
 	act 'Go back to the park':gt 'city_park', 'start'
 

+ 2 - 2
locations/city_redlight.qsrc

@@ -25,9 +25,9 @@ if $ARGS[0] = 'start':
 	'<center><b>Red Light District</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/redlight.jpg"></center>'
 
-	'This small area inside the Industrial District is home to a number of strip clubs and sex shops.'
+	'This small area inside the Industrial District is home to strip clubs, adult stores and other seedy businesses.'
 	if hour >= 18 or hour < 3:
-		'The bright lights and booming music of the <a href="exec:gt ''stripclub'', ''start''">Fuzzy Dice</a> strip club attract men from all over the city.'
+		'The bright lights and booming music of the <a href="exec:gt ''stripclub'', ''start''">Golden Girls</a> strip club attract men from all over the city.'
 	else
 		'The strip club is closed for the day and will reopen at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+'.'
 	end

+ 1 - 0
locations/dachain.qsrc

@@ -121,6 +121,7 @@ if $args[0] = 'dachakit':
 	dynamic $dritea
 	dynamic $fill_bottle
 	dynamic $edaD
+	dynamic $pranik
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin

+ 12 - 4
locations/dinSex.qsrc

@@ -174,8 +174,12 @@ end
 if $ARGS[0] = 'vaginal_sex':
 	frost = 0 &! the sex heats
 	gs 'arousal','vaginal',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
-	vaginal_tightness = 5 + vgrdif + vltdif - pcs_horny / 10
+	grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+	dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], dick, grange, silavag
+	vaginal_tightness = 5 + grdif + ltdif - pcs_horny / 10
 	arousal_modifier = 12 - vaginal_tightness
+	killvar '$get_hole_pain'
+	killvar 'grdif' & killvar 'ltdif'
 	$temp_mens = iif(cycle <= 0,' and a bit of your period leaks from your vagina','')
 	if pcs_vag > 0:
 		if vaginal_tightness >= 30: 
@@ -395,16 +399,20 @@ if $ARGS[0] = 'analsex':
 	*p iif(pcs_ass < 10,'when <<$xe>> tries inserting a third finger you groan in pain. ','<<$xe>> inserts a third finger, very slowly thrusting and wiggling to stretch your anus, ')
 	*p '<<$xe>> pulls <<$xyr>> fingers out of your ass and you feel <<$xyr>> <<$penis_desc>> pushing against your butthole. '
 	gs 'arousal','anal',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
-	*p iif(agrdif + altdif >= 20,'You scream and bite your lip from the sharp pain when <<$xe>> penetrates your ass, ','You moan when <<$xe>> penetrates your ass, ')
+	grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+	dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], dick, grange, silavag
+	*p iif(grdif + ltdif >= 20,'You scream and bite your lip from the sharp pain when <<$xe>> penetrates your ass, ','You moan when <<$xe>> penetrates your ass, ')
 	*p '<<$xe>> stops for a moment, giving your ass time to adjust to <<$xyr>> cock in it. Then he starts to slowly move, pumping your anus.'
 
-	if agrdif + altdif >= rand(25,35):
+	if grdif + ltdif >= rand(25,35):
 		if pcs_makeup > 1:pcs_makeup = 0
 		'You cry and bite your lip when the <<$penis_desc>> begins to thrust in and out of your ass. Your anus feels like it is going to tear apart and all you want is for this torture to be over quickly.'
-	elseif agrdif + altdif < rand(15,25):
+	elseif grdif + ltdif < rand(15,25):
 		pcs_horny += 10
 		'You savor <<$xyr>> cock moving inside you, lightly moaning in rhythm.'
 	end
+	killvar '$get_hole_pain'
+	killvar 'grdif' & killvar 'ltdif'
 	$tmp = iif(sexcontra = 7,'sabotaged ','')
 	*nl 'After some time <<$boydesc>> groans and you feel <<$xyr>> cock pulsing inside you '+iif(protect<>1,'and a pleasant warmth filling your ass. ','and you realized that <<$xe>> ejaculated in the <<$tmp>>condom. ')
 	gs 'cum_call','anus',$boy,1, sexcontra

+ 76 - 44
locations/dinSex2.qsrc

@@ -23,16 +23,20 @@ if $ARGS[0] = 'd_vag_sex_dildo':
 		'You bite your lip in pain while tears stream from your eyes when the dildo enters you, breaking your hymen. You cry out in pain and afterwards reveals a bloody bottle<<$temp_mens>>.'
 		gs 'arousal','vaginal_dildo',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
 	else
+		grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+		dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], dick, grange, silavag
 		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
-		if (vgrdif + vltdif) >= 30: 'You groan in pain when the <<dick>>cm dildo enters your pussy. Tears flow from your eyes and between your legs feels as if you drove in a red-hot rod<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= 20 and (vgrdif + vltdif) < 30: 'You bite your lip in pain when the <<dick>> cm dildo enters your pussy.  You feel pain between your legs<<$temp_mens>>.'
+		if (grdif + ltdif) >= 30: 'You groan in pain when the <<dick>>cm dildo enters your pussy. Tears flow from your eyes and between your legs feels as if you drove in a red-hot rod<<$temp_mens>>.'
+		if (grdif + ltdif) >= 20 and (grdif + ltdif) < 30: 'You bite your lip in pain when the <<dick>> cm dildo enters your pussy.  You feel pain between your legs<<$temp_mens>>.'
 		if cycle <= 0: $temp_mens = ', even though' + $temp_mens
-		if (vgrdif + vltdif) >= 12 and (vgrdif + vltdif) < 20: 'You flinch at the sudden pain when the <<dick>>cm dildo enters your pussy, but the pain between your legs slowly calms down and becomes quite tolerable. You are trying to be excited while moving the <<dick>>cm dildo inside your pussy <<$temp_mens>>, you don''t want it to go out.'
-		if (vgrdif + vltdif) >= 7 and (vgrdif + vltdif) < 12: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo<<$temp_mens>>.'
-		if (vgrdif + vltdif) >=  2 and (vgrdif + vltdif) < 7: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling subsides and feels nice until the end<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= -3 and (vgrdif + vltdif) < 2: 'You''re startled by a pleasant sensation, when your pussy ravishly starts taking the dildo. Between your legs becomes very warm, and you feel a pleasant sensation, when a strong <<dick>>cm dildo moves back and forth in your wet pussy<<$temp_mens>>. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling descends on you and your entire body is covered in hot waves of orgasm. You start giving out involuntarily shouts of pleasure while ravishing the dildo.'
-		if (vgrdif + vltdif) <  -3: 'You feel the dildo penetrating your pussy. Between your legs feels nice, but the <<dick>>cm dildo is a bit too small for your pussy. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling slightly subsides and remains steady until the end <<$temp_mens>>.'
+		if (grdif + ltdif) >= 12 and (grdif + ltdif) < 20: 'You flinch at the sudden pain when the <<dick>>cm dildo enters your pussy, but the pain between your legs slowly calms down and becomes quite tolerable. You are trying to be excited while moving the <<dick>>cm dildo inside your pussy <<$temp_mens>>, you don''t want it to go out.'
+		if (grdif + ltdif) >= 7 and (grdif + ltdif) < 12: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo<<$temp_mens>>.'
+		if (grdif + ltdif) >=  2 and (grdif + ltdif) < 7: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling subsides and feels nice until the end<<$temp_mens>>.'
+		if (grdif + ltdif) >= -3 and (grdif + ltdif) < 2: 'You''re startled by a pleasant sensation, when your pussy ravishly starts taking the dildo. Between your legs becomes very warm, and you feel a pleasant sensation, when a strong <<dick>>cm dildo moves back and forth in your wet pussy<<$temp_mens>>. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling descends on you and your entire body is covered in hot waves of orgasm. You start giving out involuntarily shouts of pleasure while ravishing the dildo.'
+		if (grdif + ltdif) <  -3: 'You feel the dildo penetrating your pussy. Between your legs feels nice, but the <<dick>>cm dildo is a bit too small for your pussy. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling slightly subsides and remains steady until the end <<$temp_mens>>.'
 		gs 'arousal','vaginal_dildo',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
+		killvar '$get_hole_pain'
+		killvar 'grdif' & killvar 'ltdif'
 	end
 	killvar '$temp_mens'
 end
@@ -41,16 +45,20 @@ end
 if $ARGS[0] = 'd_strapon_vag':
 	frost = 0
 	if pcs_vag > 0:
+		grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+		dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], dick, grange, silavag
 		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
-		if (vgrdif + vltdif) >= 30: 'You groan in pain when <<$boydesc>> penetrates you. Tears flow from your eyes and it feels like someone drove a red-hot rod into your vagina. You cry and moan while <<$xyr>> fake <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= 20 and (vgrdif + vltdif) < 30: 'You bite your lip in pain when <<$boydesc>> enters you, it is very painful. You frown and moan in pain while <<$xyr>> fake <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
+		if (grdif + ltdif) >= 30: 'You groan in pain when <<$boydesc>> penetrates you. Tears flow from your eyes and it feels like someone drove a red-hot rod into your vagina. You cry and moan while <<$xyr>> fake <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
+		if (grdif + ltdif) >= 20 and (grdif + ltdif) < 30: 'You bite your lip in pain when <<$boydesc>> enters you, it is very painful. You frown and moan in pain while <<$xyr>> fake <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
 		if cycle <= 0: $temp_mens = ' even though' + $temp_mens
-		if (vgrdif + vltdif) >= 12 and (vgrdif + vltdif) < 20: 'You wince at the sudden pain when <<$boydesc>> enters you, it hurts but gradually becames quite tolerable. You are trying to get aroused while fake <<$xyr>> <<dick>> centimeter dick fucks your pussy<<$temp_mens>>, but you did not succeed.'
-		if (vgrdif + vltdif) >= 7 and (vgrdif + vltdif) < 12: 'You are startled by the feeling that your pussy is stretching when <<$boydesc>> enters you. It feels good when rubber <<$xyr>> <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
-		if (vgrdif + vltdif) >=  2 and (vgrdif + vltdif) < 7: 'You are startled by the feeling that your pussy is stretching as <<$boydesc>> enters you. It feels good when <<$xyr>> <<dick>> centimeter rubber dick fucks your pussy. Gradually, a pleasant warmth and some pulsations start building up in your stomach, then the feeling decreases a little and remains like that until the end<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= -3 and (vgrdif + vltdif) < 2: 'You flinch from a pleasant feeling when your pussy is stretched by <<$xyr>> dick. It feels good when <<$xyr>> <<dick>> centimeter fake dick fucks your pussy<<$temp_mens>>. Gradually, a pleasant warmth and some pulsations start building up in your stomach, then the feeling becomes unbearable and your entire body is covered with hot waves of orgasm as you scream with pleasure.'
-		if (vgrdif + vltdif) <  -3: 'You feel <<$xyr>> fake penis enter your pussy. This gives you a nice tingling feeling between your legs, but <<$xyr>> <<dick>> cm rubber dick is significantly less than what your pussy needs. It is not big enough for you. Gradually a pleasant warmth and some pulsations start building up in your stomach. Then the feeling decreases a little and remaines like that until the end<<$temp_mens>>.'
+		if (grdif + ltdif) >= 12 and (grdif + ltdif) < 20: 'You wince at the sudden pain when <<$boydesc>> enters you, it hurts but gradually becames quite tolerable. You are trying to get aroused while fake <<$xyr>> <<dick>> centimeter dick fucks your pussy<<$temp_mens>>, but you did not succeed.'
+		if (grdif + ltdif) >= 7 and (grdif + ltdif) < 12: 'You are startled by the feeling that your pussy is stretching when <<$boydesc>> enters you. It feels good when rubber <<$xyr>> <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
+		if (grdif + ltdif) >=  2 and (grdif + ltdif) < 7: 'You are startled by the feeling that your pussy is stretching as <<$boydesc>> enters you. It feels good when <<$xyr>> <<dick>> centimeter rubber dick fucks your pussy. Gradually, a pleasant warmth and some pulsations start building up in your stomach, then the feeling decreases a little and remains like that until the end<<$temp_mens>>.'
+		if (grdif + ltdif) >= -3 and (grdif + ltdif) < 2: 'You flinch from a pleasant feeling when your pussy is stretched by <<$xyr>> dick. It feels good when <<$xyr>> <<dick>> centimeter fake dick fucks your pussy<<$temp_mens>>. Gradually, a pleasant warmth and some pulsations start building up in your stomach, then the feeling becomes unbearable and your entire body is covered with hot waves of orgasm as you scream with pleasure.'
+		if (grdif + ltdif) <  -3: 'You feel <<$xyr>> fake penis enter your pussy. This gives you a nice tingling feeling between your legs, but <<$xyr>> <<dick>> cm rubber dick is significantly less than what your pussy needs. It is not big enough for you. Gradually a pleasant warmth and some pulsations start building up in your stomach. Then the feeling decreases a little and remaines like that until the end<<$temp_mens>>.'
 		gs 'arousal','vaginal_strap',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
+		killvar '$get_hole_pain'
+		killvar 'grdif' & killvar 'ltdif'
 	else
 		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
 		pcs_horny = 0
@@ -69,15 +77,19 @@ if $ARGS[0] = 'd_vag_sex_bottle':
 
 	if pcs_vag > 0:
 		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
-		if (vgrdif + vltdif) >= 30: 'You groan in pain when the <<dick>> cm dildo enters your pussy. Tears flow from your eyes and between your legs feels as if you drove in a red-hot rod<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= 20 and (vgrdif + vltdif) < 30: 'You bite your lip in pain when the <<dick>> cm dildo enters your pussy.  You feel pain between your legs<<$temp_mens>>.'
+		grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+		dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], dick, grange, silavag
+		if (grdif + ltdif) >= 30: 'You groan in pain when the <<dick>> cm dildo enters your pussy. Tears flow from your eyes and between your legs feels as if you drove in a red-hot rod<<$temp_mens>>.'
+		if (grdif + ltdif) >= 20 and (grdif + ltdif) < 30: 'You bite your lip in pain when the <<dick>> cm dildo enters your pussy.  You feel pain between your legs<<$temp_mens>>.'
 		if cycle <= 0: $temp_mens = ', even though' + $temp_mens
-		if (vgrdif + vltdif) >= 12 and (vgrdif + vltdif) < 20: 'You flinch at the sudden pain when the <<dick>>cm dildo enters your pussy, but the pain between your legs slowly calms down and becomes quite tolerable. You are trying to be excited while moving the <<dick>> cm dildo inside your pussy <<$temp_mens>>, you don''t want it to go out.'
-		if (vgrdif + vltdif) >= 7 and (vgrdif + vltdif) < 12: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo<<$temp_mens>>.'
-		if (vgrdif + vltdif) >=  2 and (vgrdif + vltdif) < 7: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling subsides and feels nice until the end of<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= -3 and (vgrdif + vltdif) < 2: 'You''re startled by a pleasant sensation, when your pussy ravishly starts taking the dildo. Between your legs becomes very warm, and you feel a pleasant sensation, when a strong <<dick>> cm dildo moves back and forth in your wet pussy<<$temp_mens>>. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling descends on you and your entire body is covered in hot waves of orgasm. You start giving out involuntarily shouts of pleasure while ravishing the dildo.'
-		if (vgrdif + vltdif) <  -3: 'You feel the dildo penetrating your pussy. Between your legs feels nice, but the <<dick>>cm dildo is a bit too small for your pussy. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling slightly subsides and remains steady until the end of<<$temp_mens>>.'
+		if (grdif + ltdif) >= 12 and (grdif + ltdif) < 20: 'You flinch at the sudden pain when the <<dick>>cm dildo enters your pussy, but the pain between your legs slowly calms down and becomes quite tolerable. You are trying to be excited while moving the <<dick>> cm dildo inside your pussy <<$temp_mens>>, you don''t want it to go out.'
+		if (grdif + ltdif) >= 7 and (grdif + ltdif) < 12: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo<<$temp_mens>>.'
+		if (grdif + ltdif) >=  2 and (grdif + ltdif) < 7: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling subsides and feels nice until the end of<<$temp_mens>>.'
+		if (grdif + ltdif) >= -3 and (grdif + ltdif) < 2: 'You''re startled by a pleasant sensation, when your pussy ravishly starts taking the dildo. Between your legs becomes very warm, and you feel a pleasant sensation, when a strong <<dick>> cm dildo moves back and forth in your wet pussy<<$temp_mens>>. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling descends on you and your entire body is covered in hot waves of orgasm. You start giving out involuntarily shouts of pleasure while ravishing the dildo.'
+		if (grdif + ltdif) <  -3: 'You feel the dildo penetrating your pussy. Between your legs feels nice, but the <<dick>>cm dildo is a bit too small for your pussy. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling slightly subsides and remains steady until the end of<<$temp_mens>>.'
 		gs 'arousal','vaginal_dildo',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
+		killvar '$get_hole_pain'
+		killvar 'grdif' & killvar 'ltdif'
 	else
 		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
 		pcs_horny = 0
@@ -109,18 +121,22 @@ if $ARGS[0] = 'd_analsex_dildo':
 
 	'You pull your fingers out of your ass and place the dildo near your hole.'
 
-	if (agrdif + altdif) >= 20:'You scream and bite your lip after a sharp pain when the <<dick>>cm dildo enters your ass.'
-	if (agrdif + altdif) <  20:'You moan when the <<dick>>cm dildo enters your ass.'
+	grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+	dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], dick, grange, silavag
+	if (grdif + ltdif) >= 20:'You scream and bite your lip after a sharp pain when the <<dick>>cm dildo enters your ass.'
+	if (grdif + ltdif) <  20:'You moan when the <<dick>>cm dildo enters your ass.'
 
 	'You stop for a moment, giving your ass time to adjust to the dildo inside it, and then start to slowly move, stretching your anus.'
 	
-	if (agrdif + altdif) >= 30:
+	if (grdif + ltdif) >= 30:
 		if pcs_makeup > 1:pcs_makeup = 0
 		'You feel like your anus is stretching when the dildo enters you. You start to moan rhythmically in unison with the <<dick>>cm dildo''s movements inside you.'
-	elseif (agrdif + altdif) >= 20 and (agrdif + altdif) < 30:
+	elseif (grdif + ltdif) >= 20 and (grdif + ltdif) < 30:
 		pcs_horny += 10
 		'You moan in pleasure while the dildo moves inside your ass.'
 	end
+	killvar '$get_hole_pain'
+	killvar 'grdif' & killvar 'ltdif'
 	gs 'arousal','anal_dildo', ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
 end
 
@@ -133,17 +149,21 @@ if $ARGS[0] = 'd_strapon_anal':
 	if pcs_ass >= 10:'<<$xec>> starts to stretch your anus using three fingers.'
 	*p '<<$boydesc>> pulls <<$xyr>> fingers out of your ass and you feel '
 	if rand(0,1)=0: '<<$xyr>> fake cock near your hole.' else '<<$xem>> pushing <<$xyr>> fake cock into your hole.'
-	if (agrdif + altdif) >= 20:'You scream and bite your lip from a sharp pain when <<$xyr>> fake <<dick>> centimeter dick enters your ass.'
-	if (agrdif + altdif) <  20:'You moan when <<$xyr>> <<dick>>cm rubber dick enters your ass.'
+	grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+	dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], dick, grange, silavag
+	if (grdif + ltdif) >= 20:'You scream and bite your lip from a sharp pain when <<$xyr>> fake <<dick>> centimeter dick enters your ass.'
+	if (grdif + ltdif) <  20:'You moan when <<$xyr>> <<dick>>cm rubber dick enters your ass.'
 	'<<$boydesc>> stops for a moment, giving your ass time to adjust to <<$xyr>> cock inside it. Then <<$xe>> starts to slowly move, stretching your anus.'
 
-	if (agrdif + altdif) >= 30:
+	if (grdif + ltdif) >= 30:
 		if pcs_makeup > 1:pcs_makeup = 0
 		'You cry and bite your lip when the <<dick>> centimeter fake cock begins to fuck your ass with full force!. Your ass feels like it is on fire and all you want is for this torture to be over quickly.'
-	elseif (agrdif + altdif) >= 20 and (agrdif + altdif) < 30:
+	elseif (grdif + ltdif) >= 20 and (grdif + ltdif) < 30:
 		pcs_horny += 10
 		'You feel like your anus is stretching when <<$xyr>> fake shaft enters you. You start to moan rhythmically in unison with <<$xyr>> fake cock''s movements inside of you.'
 	end
+	killvar '$get_hole_pain'
+	killvar 'grdif' & killvar 'ltdif'
 	gs 'arousal','anal', ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
 end
 
@@ -172,16 +192,20 @@ if $ARGS[0] = 'd_analsex_bottle':
 
 	'You stopped for a moment, giving your ass time to adjust to the bottle neck inside it, and then start to slowly move, stretching your anus.'
 
-	if (agrdif + altdif) >= 20:'You scream and bite your lip from a sharp pain when the bottle enters your ass.'
-	if (agrdif + altdif) <  20:'You moan when the bottle enters your ass.'
+	grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+	dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], dick, grange, silavag
+	if (grdif + ltdif) >= 20:'You scream and bite your lip from a sharp pain when the bottle enters your ass.'
+	if (grdif + ltdif) <  20:'You moan when the bottle enters your ass.'
 
-	if (agrdif + altdif) >= 30:
+	if (grdif + ltdif) >= 30:
 		if pcs_makeup > 1:pcs_makeup = 0
 		'You feel like your anus is stretching when the bottle enters you. You start to moan rhythmically in unison with the bottle''s movements inside of you.'
-	elseif (agrdif + altdif) >= 20 and (agrdif + altdif) < 30:
+	elseif (grdif + ltdif) >= 20 and (grdif + ltdif) < 30:
 		pcs_horny += 10
 		'You moan in pleasure when the bottle moves inside your ass.'
 	end
+	killvar '$get_hole_pain'
+	killvar 'grdif' & killvar 'ltdif'
 	gs 'arousal','anal_dildo', ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
 end
 
@@ -193,31 +217,39 @@ if $ARGS[0] = 'doublepenetration':
 	frost = 0
 	TotPain = 0
 	if pcs_vag > 0:
-		if (vgrdif + vltdif) >= 30: TotPain +=4 & 'You groan in pain when <<$boydesc1>> penetrates you, tears flow from your eyes and it feels like someone drove a red-hot rod into your vagina.'
-		if (vgrdif + vltdif) >= 20 and (vgrdif + vltdif) < 30: TotPain +=3 & 'You bite your lip in pain when <<$boydesc1>> enters you, it is very painful.'
-		if (vgrdif + vltdif) >= 12 and (vgrdif + vltdif) < 20: TotPain +=2 & 'You wince at the sudden pain when <<$boydesc1>> enters, it hurts but gradually it becomes quite tolerable.'
-		if (vgrdif + vltdif) >= 7 and (vgrdif + vltdif) < 12: TotPain +=1 & 'You are startled by the feeling of your pussy stretching when <<$boydesc1>> enters you.'
-		if (vgrdif + vltdif) >=  2 and (vgrdif + vltdif) < 7: 'You are startled by the feeling of your pussy stretching as <<$boydesc1>> enters you.'
-		if (vgrdif + vltdif) >= -3 and (vgrdif + vltdif) < 2: 'You flinch from a pleasant feeling when your pussy is stretched by <<$xyr1>> dick.'
-		if (vgrdif + vltdif) <  -3: 'You feel <<$xyr1>> penis entering your pussy. This gives you a nice tingling feeling between your legs, but <<$xyr>> <<dick>> cm dick is significantly smaller than what your pussy needs.'
+		grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+		dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], dick, grange, silavag
+		if (grdif + ltdif) >= 30: TotPain +=4 & 'You groan in pain when <<$boydesc1>> penetrates you, tears flow from your eyes and it feels like someone drove a red-hot rod into your vagina.'
+		if (grdif + ltdif) >= 20 and (grdif + ltdif) < 30: TotPain +=3 & 'You bite your lip in pain when <<$boydesc1>> enters you, it is very painful.'
+		if (grdif + ltdif) >= 12 and (grdif + ltdif) < 20: TotPain +=2 & 'You wince at the sudden pain when <<$boydesc1>> enters, it hurts but gradually it becomes quite tolerable.'
+		if (grdif + ltdif) >= 7 and (grdif + ltdif) < 12: TotPain +=1 & 'You are startled by the feeling of your pussy stretching when <<$boydesc1>> enters you.'
+		if (grdif + ltdif) >=  2 and (grdif + ltdif) < 7: 'You are startled by the feeling of your pussy stretching as <<$boydesc1>> enters you.'
+		if (grdif + ltdif) >= -3 and (grdif + ltdif) < 2: 'You flinch from a pleasant feeling when your pussy is stretched by <<$xyr1>> dick.'
+		if (grdif + ltdif) <  -3: 'You feel <<$xyr1>> penis entering your pussy. This gives you a nice tingling feeling between your legs, but <<$xyr>> <<dick>> cm dick is significantly smaller than what your pussy needs.'
+		killvar '$get_hole_pain'
+		killvar 'grdif' & killvar 'ltdif'
 	else
 		pcs_horny = 0
 		pcs_mood -= 15
 		TotPain +=4
 		'You bite your <<$pc_desc[''lips'']>> lips in pain and tears start to flow from your eyes when <<$boydesc1>> penetrates you, breaking your hymen.'
 	end
-	if (agrdif + altdif) >= 20: TotPain +=1 & 'You scream and bite your lip from a sharp pain when <<$xyr2>> <<dick2>> centimeter dick enters your ass.'
-	if (agrdif + altdif) <  20:'You moan when <<$xyr2>> <<dick2>> centimeter dick enters your ass.'
+	grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+	dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], dick, grange, silavag
+	if (grdif + ltdif) >= 20: TotPain +=1 & 'You scream and bite your lip from a sharp pain when <<$xyr2>> <<dick2>> centimeter dick enters your ass.'
+	if (grdif + ltdif) <  20:'You moan when <<$xyr2>> <<dick2>> centimeter dick enters your ass.'
 	'<<$boydesc2>> stops for a moment, giving your ass time to adjust to <<$xyr2>> cock inside it. He then starts to slowly move, stretching your anus.'
 
-	if (agrdif + altdif) >= 30:
+	if (grdif + ltdif) >= 30:
 		if pcs_makeup > 1:pcs_makeup = 0
 		'You cry and bite your lip when the <<dick2>>cm cock begins to fuck your ass.'
 		TotPain +=1
-	elseif (agrdif + altdif) >= 20 and (agrdif + altdif) < 30:
+	elseif (grdif + ltdif) >= 20 and (grdif + ltdif) < 30:
 		pcs_horny += 10
 		'You feel like your anus is stretching when <<$xyr2>> penis enters you. You start to moan rhythmically in unison with <<$xyr2>> cock''s movements inside of you.'
 	end
+	killvar '$get_hole_pain'
+	killvar 'grdif' & killvar 'ltdif'
 
 	if totPAIN = 0:
 		'Feelings merge together when you move inside two members in contact with each other through a thin opening sharing your vagina filled <<dick1>> centimeter and a member of your <<$anustipe>> anus filled <<dick2>> centimeter member. Your abdomen burns as if pleasant sunlight was spreading heat throughout your body.'

+ 7 - 5
locations/din_bad.qsrc

@@ -133,10 +133,12 @@ if $ARGS[0] = 'd_bag':
 	end
 !! Hair options
 	*nl
-	if (mc_inventory['travel_mirror'] =  1 or mc_inventory['comb'] =  1) and pcs_hairbsh = 0:
-		'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
-	elseif (mc_inventory['travel_mirror'] =  1 or mc_inventory['comb'] =  1) and pcs_hairbsh = 1:
-		'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
+	if mc_inventory['travel_mirror'] =  1 or mc_inventory['comb'] =  1:
+		if pcs_hairbsh = 0:
+			'There''s a hairbrush in your purse. <a href="exec: minut += min(15, max(1, pcs_hairlng / 80)) & pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
+		else
+			'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
+		end
 	end
 	if pcs_hairbsh > 0 and pcs_hairlng > 80 and hbraids = 0:
 		*nl
@@ -243,7 +245,7 @@ if $ARGS[0] = 'd_bag':
 	*nl
 	if $pursepantytype ! '' or $pursebratype ! '': 'You also have '+iif($pursepantytype ! '','<a href="exec:view''<<func(''$panty_image'', $pursepantytype, pursepantynumber)>>''">a pair of panties</a>','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','<a href="exec:view''<<func(''$bra_image'', $pursebratype, pursebranumber)>>''">a bra</a>','')+' in your purse, which you can put on in the nearest bathroom.'
 	if photographyEv >= 2: 'You have <a href="exec:gt''camera'',''start''">a camera</a> in your purse.'
-	if mc_inventory['newspaper'] = 1: newspaperVars['dbag'] = 1 & act 'Read your newspaper': gt 'newspaper', 'start'
+	if mc_inventory['newspaper'] = 1: act 'Read your newspaper': newspaperVars['dbag'] = 1 & gt 'newspaper', 'start'
 
 	act 'Return':gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
 	'</td></tr></table></center>'

+ 2 - 0
locations/gad_gphouse.qsrc

@@ -169,6 +169,7 @@ if $ARGS[0] = 'kitchen':
 	dynamic $dritea
 	dynamic $fill_bottle
 	dynamic $edaD
+	dynamic $pranik
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin
@@ -798,6 +799,7 @@ if $ARGS[0] = 'old_main':
 	dynamic $dritea
 	dynamic $fill_bottle
 	dynamic $edaD
+	dynamic $pranik
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin

+ 14 - 1
locations/gp_elene_schedule.qsrc

@@ -156,7 +156,7 @@ if $ARGS[0] = 'getLocation':
 	elseif locat['A31'] / 10 = 11:
 		$npcLocation['A31'] = 'Your grandmother is in her livingroom'
 	elseif locat['A31'] / 10 = 12:
-		$npcLocation['A31'] = 'Your grandmother is in her kitcher'
+		$npcLocation['A31'] = 'Your grandmother is in her kitchen'
 
 	elseif locat['A31'] / 10 = 20:
 		$npcLocation['A31'] = 'Your grandmother is in her garden'
@@ -172,4 +172,17 @@ if $ARGS[0] = 'getLocation':
 end
 
 
+if $ARGS[0] = 'get_locarg':
+	gs 'gp_elene_schedule', 'update_locat'
+
+	if locat['A31'] / 100 = 1:
+		$locat['A31_loc'] = 'gad_gphouse'
+		$locat['A31_arg'] = 'start'
+	else
+		$locat['A31_loc'] = 'gad_gpyard'
+		$locat['A31_arg'] = 'start'
+	end
+end
+
+
 --- gp_elene_schedule ---------------------------------

+ 17 - 17
locations/gp_zlatek_schedule.qsrc

@@ -196,23 +196,23 @@ if $ARGS[0] = 'getLocation':
 	elseif locat['A32'] / 10 = 11:
 		$npcLocation['A32'] = 'Your grandfather is in his livingroom'
 	elseif locat['A32'] / 10 = 12:
-		$npcLocation['A32'] = 'Your grandfather is in his kitcher'
-
-	elseif locat['A31'] / 10 = 20:
-		$npcLocation['A31'] = 'Your grandfather is in his garden'
-	elseif locat['A31'] / 10 = 21:
-		$npcLocation['A31'] = 'Your grandfather is bathing in his sauna'
-	elseif locat['A31'] / 10 = 22:
-		$npcLocation['A31'] = 'Your grandfather is at his stables'
-
-	elseif locat['A31'] / 10 = 30:
-		$npcLocation['A31'] = 'Your grandfather is out and about in Gadukino'
-	elseif locat['A31'] / 10 = 31:
-		$npcLocation['A31'] = 'Your grandfather is at his church'
-	elseif locat['A31'] / 10 = 32:
-		$npcLocation['A31'] = 'Your grandfather is fishing at the river'
-	elseif locat['A31'] / 10 = 33:
-		$npcLocation['A31'] = 'Your grandfather is at the field'
+		$npcLocation['A32'] = 'Your grandfather is in his kitchen'
+
+	elseif locat['A32'] / 10 = 20:
+		$npcLocation['A32'] = 'Your grandfather is in his garden'
+	elseif locat['A32'] / 10 = 21:
+		$npcLocation['A32'] = 'Your grandfather is bathing in his sauna'
+	elseif locat['A32'] / 10 = 22:
+		$npcLocation['A32'] = 'Your grandfather is at his stables'
+
+	elseif locat['A32'] / 10 = 30:
+		$npcLocation['A32'] = 'Your grandfather is out and about in Gadukino'
+	elseif locat['A32'] / 10 = 31:
+		$npcLocation['A32'] = 'Your grandfather is at his church'
+	elseif locat['A32'] / 10 = 32:
+		$npcLocation['A32'] = 'Your grandfather is fishing at the river'
+	elseif locat['A32'] / 10 = 33:
+		$npcLocation['A32'] = 'Your grandfather is at the field'
 
 	end
 end

+ 3 - 3
locations/gschool_cheerleading.qsrc

@@ -147,7 +147,7 @@ if $ARGS[0] = 'tryouts':
 		cheerleadingQW['grupTipe'] = grupTipe
 		'The other girls grow silent and just stare at you as you enter and Albina walks up to you with a cold glare on her face. "You''re mistaken if you think I''m even going to give someone like <i>you</i> a chance. Now fuck off," she says while pointing to the door.'
 		'Christina laughs as she walks up to you. "Oh my god, does this specimen actually think she can become a cheerleader? Isn''t there some '+iif(gopnik_slut = 1,'dirty gopnik cock waiting for you somewhere to suck it?','drugs waiting somewhere for you to snort them?')+'" she asks mockingly, which causes Bella to let out a loud laugh.'
-	    'You clench your fist. You want to beat the smug smile off her face, but there''s nothing you can do except leave, the sounds of mocking laughter following you down the corridor.'
+		'You clench your fist. You want to beat the smug smile off her face, but there''s nothing you can do except leave, the sounds of mocking laughter following you down the corridor.'
 		act 'Leave': gt 'gschool_grounds', 'main'
 	else
 		'After school, you head to the PE hall to try out for the cheerleading team'+iif(cheerleadingQW['try_count'] > 1, ' again','')+', taking your place amongst the group of hopeful girls already here. Albina is standing with Vicky, Christina, Lina, Lariska and Bella, as well as a few other girls from other classes who you don''t recognise that round out the squad. They are all inspecting you and talking amongst themselves.'
@@ -222,7 +222,7 @@ if $ARGS[0] = 'afterschool_practice':
 	*clr & cla
 	cheerleadingQW['day'] = daystart
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/gymdoors.jpg"></center>'
-    'You''re standing next to the doors leading to the PE hall. You have cheerleading practice at '+func('time', 'get_time_string', 14, 15, cheatVars['time_format'])+' and should go and change if you don''t want to be late.'
+	'You''re standing next to the doors leading to the PE hall. You have cheerleading practice at '+func('time', 'get_time_string', 14, 15, cheatVars['time_format'])+' and should go and change if you don''t want to be late.'
 	*nl
 	if cheerleadingQW['skipped'] = 0:
 		'You recall how angry Albina was at that Karine girl who skipped practice. It probably wouldn''t be a good idea to do it yourself.'
@@ -725,7 +725,7 @@ if $ARGS[0] = 'shower':
 					'Christina finishes dressing and flips you off behind Albina''s back as she leaves. Albina follows a few minutes later, grumbling about having to babysit the two of you as she walks out, leaving you alone in the locker room. Punches would definitely have been thrown had she not intervened...'
 					act 'Get dressed': gt 'gschool_grounds', 'change_room'
 				end
-		    end
+			end
 
 
 		elseif rand(0,4) = 0 and cheerleadingQW['quest_stage'] = 3 and npc_sex['A23'] >= 1:

+ 3 - 3
locations/gschool_lunch.qsrc

@@ -558,14 +558,14 @@ if $ARGS[0] = 'rolan_meet':
 				'He gazes at you curiously. "Huh? The dream doesn''t usually talk back... What in the...?"'
 				*nl
 				'"Hey! I''m not a dream! Why on the Earth would Leninade wake up you? It''s just a soda."'
-				'"Okay, wow, for a cration of my imagination, you sure are pretty dumb..."'
+				'"Okay, wow, for a creation of my imagination, you sure are pretty dumb..."'
 				'You slap at his arm.'
-				'"Hey! I really felt that! You are real! But, why are speaking to me?"'
+				'"Hey! I really felt that! You are real! But, why are you speaking to me?"'
 				'"Are you for real? If that is Leninade, then why is the color different? You''re lying; this is alcohol!" You grab the glass and smell it. While it certainly doesn''t smell good, you don''t actually smell any alcohol. "Huh, what is this?"'
 				*nl
 				'He snatches his glass back from you. "I already told you, it''s Leninade. It just has some coffee and tea mixed in with it."'
 				'If he mixes those three drinks together... "You must really need the energy. Why don''t you eat the food here instead, Mister..." Dammit! You''ve forgotten his name already!'
-				'"Matveev, Rolan Matveev. I can understand a girl not liking a drink like this. What you would you know about needing energy for work, Miss..."'
+				'"Matveev, Rolan Matveev. I can understand a girl not liking a drink like this. What would you know about needing energy for work, Miss..."'
 				'"<<$pcs_lastname>>, <<$pcs_firstname>> <<$pcs_lastname>>... Anyway, you didn''t answer my question: Why don''t you eat here like everyone else?"'
 				'"Well, Miss <<$pcs_lastname>>, I don''t trust the cook. She never lets me enter the kitchen."'
 				'"Well, if something were wrong with the food, you''d see a lot of people in the hospital. I think you''re being paranoid." The bell rings. "I have to go. See you around, Mr. Matveev!"'

+ 2 - 1
locations/havana_kickboxing.qsrc

@@ -202,8 +202,9 @@ if $ARGS[0] = 'sta':
 	if temp_kickboxVars['time'] = 6:
 		cla
 		temp_kickboxVars['time'] = 0
-		temp_kickboxVars['round'] += 1
 		'The bell rings indicating the end of round <<temp_kickboxVars[''round'']>>.'
+		temp_kickboxVars['round'] += 1
+
 		if temp_kickboxVars['round'] <= temp_kickboxVars['max_rounds']:
 			act 'Back to the corner':
 				*clr & cla

+ 126 - 126
locations/hotel_anna_sex.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'les_sex':
 	minut += 5
 	gs 'stat'
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/Annapract06.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract06.jpg"></center>'
 	if AnnaQW['dress'] = 1:
 		'Leaving your clothes in the room you follow Anna next door.'
 	else
@@ -22,7 +22,7 @@ if $ARGS[0] = 'les_sex':
 	act'...':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/Annapract07.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract07.jpg"></center>'
 		'Anna turns the woman around and exposes her breasts to the woman who''s smile broadens. Anna quite suddenly becomes deadly serious.'
 		'"Although understandable, I did not give you permission to smile." She practically shouts at the woman.'
 		'"You are embarrassing me in front of my friend and that is not right. You deserve a small punishment, don''t you agree <<$pcs_nickname>>?"'
@@ -32,7 +32,7 @@ if $ARGS[0] = 'les_sex':
 			*clr & cla
 			gs 'stat'
 			AnnaQW['sub'] += 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/Annapract08a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract08a.jpg"></center>'
 			'You were told not to interact in the session but Anna directly asked you a question so you have to say something.'
 			'You decide to play along and not upset the session so you meekly agree.'
 			'Anna spends some time verbally abusing the woman and making a show of her dominant position. The woman is sheepish and completely compliant, you might think she could not enjoy such treatment but also remember how happy she was to see Anna.'
@@ -46,7 +46,7 @@ if $ARGS[0] = 'les_sex':
 			act'TMI':
 				*clr & cla
 				gs 'stat'
-				'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionpractice/Annapract08a.mp4"></video></center>'
+				'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract08a.mp4"></video></center>'
 				'Anna pumps and pumps and pumps. The woman''s mouth must now be completely full and she is drooling and even gagging on the rubber cock. Despite the clear discomfort a few moans escape her mouth, while tears roll down her cheeks.'
 				'Still she seems to accept her fate. You are stunned at this, you knew there was sex and sexual games but this is mostly pain and humiliation yet the warmth between your own legs reminds you is very sexual too.'
 				'Eventually Anna relents. "43 pumps, a new record slut. Have you spent the last month practicing at a glory hole?" Still gagged and her mouth overly full there is no way for the woman to give an answer.'
@@ -59,7 +59,7 @@ if $ARGS[0] = 'les_sex':
 		act 'Suggest a spanking':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/Annapract08b.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract08b.jpg"></center>'
 			'You were told not to interact in the session but Anna directly asked you a question so you have to say something.'
 			'"A splendid idea Sweetie." Anna seems happy with this suggestion.'
 			'Anna spends some time verbally abusing the woman and making a show of her dominant position. The woman is sheepish and completely compliant, you might think she could not enjoy such treatment but also remember how happy she was to see Anna.'
@@ -73,7 +73,7 @@ if $ARGS[0] = 'les_sex':
 			act'Keep watching':
 				*clr & cla
 				gs 'stat'
-				'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionpractice/Annapract08b.mp4"></video></center>'
+				'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract08b.mp4"></video></center>'
 				'After a few strokes at full strength Anna stops to pick up a belt. "Of course your hand can only hit so hard Sweetie. Sometimes you need to make a point."'
 				'With this she starts to hit the woman with the belt quickly turning her butt bright red. You are shocked how hard and how much she hit this woman for such a minor transgression.'
 				'"Don''t worry Sweetie, the butt is naturally cushioned and can take a much more serve beating before it would welt or cut. You have to be much more careful with a cane or whip though."'
@@ -88,7 +88,7 @@ if $ARGS[0] = 'les_sex':
 			*clr & cla
 			gs 'stat'
 			AnnaQW['dom'] += 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/Annapract08c.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/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"'
 			'Anna spends some time verbally abusing the woman and making a show of her dominant position. The woman is sheepish and completely compliant, you might think she could not enjoy such treatment but also remember how happy she was to see Anna.'
@@ -102,7 +102,7 @@ if $ARGS[0] = 'les_sex':
 			act'...':
 				*clr & cla
 				gs 'stat'
-				'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionpractice/Annapract08c.mp4"></video></center>'
+				'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract08c.mp4"></video></center>'
 				'Anna continues to cane the woman as visible welts start to form. you are shocked how hard and how much she hit this woman for such a minor transgression.'
 				'"Don''t worry Sweetie, the butt is naturally cushioned and can take a much more serve beating before it would welt too much or cut."'
 				'She turns back to the woman, "I hope you learned your lesson Slut now get on that chair before I have to use a whip on you."'
@@ -117,7 +117,7 @@ end
 
 if $ARGS[0] = 'les_sex2':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/Annapract09.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract09.jpg"></center>'
 	'Anna binds the woman to the chair by tying her arms behind her and legs together using some ropes, after that she wedges a vibrator on her pussy and turns it on.'
 	'"I know Sweetie, the floor will be a mess but if this slut doesn''t cum her brains out she''ll spend all day tomorrow thinking about sex when she should be serving her Mistress. We have to think about our reputations here, it would not look good if we returned her all horny."'
 	'"Unless we just edged her all night until her brain melts." Anna turns of the vibrator as she says this.'
@@ -134,7 +134,7 @@ if $ARGS[0] = 'les_sex2':
 		AnnaQW['trust'] += 1
 		*clr & cla
 		gs 'stat'
-		'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionpractice/Annapract09aa.mp4"></video></center>'
+		'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionpractice/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.'
 		'You edge her once more and Anna rolls her eyes at you making it clear you might be milking the situation a bit much. So you use the sensitive spots you remember from your probing and bring the woman to a final squirting orgasm.'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'les_sex2':
 	act 'Let the woman do it herself':
 		*clr & cla
 		gs 'stat'
-		'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionpractice/Annapract09ac.mp4"></video></center>'
+		'<center><video autoplay loop src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract09ac.mp4"></video></center>'
 		'Anna unties the woman and hands her the vibrator which she pressed against her pussy still craving another orgasm despite the clear fatigue you see in her body.'
 		'Anna walks over to stand next to the chair you are seated on and you ask her, "How can she still crave more?"'
 		'Anna laughs, "When you don''t get any release for weeks or even months at a time you take every opportunity you can when you are given permission."'
@@ -195,13 +195,13 @@ if $ARGS[0] = 'Anna_path_choice':
 	elseif IgorevnaBDSM_session_librarian = 2:
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/Annahurt.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/annahurt.jpg"></center>'
 		'<font color = #DC143C>"Anna..."</font>You start speak, not sure about what to say, when Anna interrupt you....<br<font color = blue> "I''ve thought a lot about what could have i missed to gain your trust. Trust is the base of every relationship, in or outside a BDSM contest: it doesn''t matter what''s the purpose of gaining trust, even building a sincere friendship couldn''t be done without trust." </font> Anna pause for a moment...<font color = blue> "I cannot find a real lack in my behaviour..." </font> You would say something but don''t...<font color = blue> "Nonetheless, relationship comes for both part; I must have my guilt. I''ll continue to search into myself what could i''ve miss... . I hope you will do the same... ." </font>'
 		act'Wait Anna...(penitent)':
 			*clr & cla
 			gs 'stat'
 			AnnaQW['trust'] += 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/Annahurt.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/annahurt.jpg"></center>'
 			'<font color = #DC143C> "...You...you''ve done nothing wrong. It''s my fault, i trust you but doing a session was a bit of a shock for me..."</font>...Anna let you speak...<font color = #DC143C>"...Is there something i could do, to run things between us as nothing happened? I mean before i ruined everything with my stupid answer..."</font><br><font color = blue> "As i said, and as you know, trust is the basic. There''s no better way than a session to see the trust we have on each other. It cannot be with you on the Dom side this time..." </font>'
 			act'I understand, and your frienship has a great value for me. I''m ready to start if you agree.': gt 'hotel_anna', 'Anna_sub_hurt'
 			act'Sorry Anna, i''m not ready for this.':
@@ -211,7 +211,7 @@ if $ARGS[0] = 'Anna_path_choice':
 				Anna_trust = 0
 			!	IgorevnaBDSM -= 1
 			!	minut += 61
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/Annahurt.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/annahurt.jpg"></center>'
 				'You don''t have, or you dont''s want to add something else...it doesn''t matter. Anna speak: <font color = blue> "I''m an open person <<$pcs_firstname>>, and it''s not usual for me to close the door to someone else; nonetheless, due to the reason of our arguments and the need i have to know if i can trust you. We shouldn''t continue futher till we both are agree. I won''t spen time trying to convince you to show you trust me at least to a basic level; it''s up to you and your will. About me, my door will be open ..." </font>'
 				act'You dont have much to say...': gt'pav_hotel'
 			end
@@ -222,14 +222,14 @@ if $ARGS[0] = 'Anna_path_choice':
 			IgorevnaBDSM_session_librarian = 3
 		!	IgorevnaBDSM -= 1
 		!	minut += 61
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/Annahurt.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/annahurt.jpg"></center>'
 			'You have nothing to say, and that could have hurt Anna more than before; probably it wasn''t your intention, or probably that''s the reason...it doesn''t matter. Anna fill the empty silence this time...it could be the last. <font color = blue> "...I never had an intention toward you <<$pcs_firstname>> either good or bad. I looked at you as a person with knowledge thirst who could has some benefit from whatever kind of relationship you were looking for...a simple word of comfort, or even a scold if necessary... . That''s why it''s useless for us to continue our session: if there''s no trust in each other, why should we continue see each other? I''m an open person <<$pcs_firstname>>, and it''s not usual for me to close the door to someone else; nonetheless, due to the reason of our arguments and the need i have to know if i can trust you we shouldn''t continue futher till we both are agree. There''s only one way possible to know if we both agree to that: a session between me and you, with Dom role precluded for you for obvious reasons. " </font> There''s really not much to add...'
 			act'...': gt'pav_hotel'
 		end
 	elseif IgorevnaBDSM_session_librarian = 3:
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/Annahurt.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/annahurt.jpg"></center>'
 		'You spoke about an hour with Anna, but you made no progress with her. At the end she lead you to the exit. <font color = blue> "I need to know if i can trust you if you want to continue... ." </font>'
 		act'I understand, and your frienship has a great value for me. I''m ready to start if you agree.': gt 'hotel_anna', 'Anna_sub_hurt'
 		act'Sorry Anna, i''m not ready for this.':
@@ -240,14 +240,14 @@ if $ARGS[0] = 'Anna_path_choice':
 	else
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start0N.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start0n.jpg"></center>'
 		'<font color = blue> "Choices choices...!" </font>'
 		act 'Ehmm...Anna...go easy on me...': gt 'hotel_anna', 'Anna_sub_session'
 		act 'Oh...you will love it...': gt 'hotel_anna_sex', 'Anna_dom_session'
 		act'Mmmmm....mmmm....i''m not sure...what do you suggest me?':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start0Na.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start0na.jpg"></center>'
 			'<font color = blue> "Hehehe...<<$pcs_nickname>>, it''s not the we are on the cafe''..." </font><br><font color = #DC143C> "No...but...if i chose something i pleclude the other and the contrary...i don''t know...and we don''t have the time to do both...right?"</font><br><font color = blue> "It''s true that we don''t have the time rigth now to do both, but you won''t preclude nothing on the long term...well if that''s your intention... . Ummmhh...let me help you. Do you like my bum? Would you like the chance to squeeze it a little while giving me a good spanking? Or maybe you prefer to feel a soft flog that crawl on your butt..."</font><br>Anna is teasing you to know what could be better for you...your answer will lead you to the right choice...if something could be wrong... . But your though run to something else...<font color = #DC143C> "Oh! I see...but....mmmm...emmhh...what about boobs?"</font><br><font color = blue> "Uhmmm...I don''t think you will be able to fine "tune" them...yet... . And remember: no sex allowed."</font>'
 			act 'Well...how could the flog be "soft"?...': gt 'hotel_anna', 'Anna_sub_session'
 			act 'Well...you really have a great bum...': gt 'hotel_anna_sex', 'Anna_dom_session'
@@ -270,24 +270,24 @@ if $ARGS[0] = 'slaveM':
 	AnnaQW['dom'] += 1
 	AnnaQW['trust'] += 1
 	BDSM_Knowledge += 1
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM0.jpg"></center>'
+	'<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>'
 	act'Control':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM1a.jpg"></center>'
+		'<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>'
 		act'The Dominant...I think...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM1a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem1a.jpg"></center>'
 			'<font color = blue>"...And you cannot be much more far from the truth..."</font><br><font color = #DC143C> "...Are you kidding me?"</font><br><font color = blue> "Absolutely not: think a little. Who can stop the session when he/she want?" </font><br><font color = #DC143C> "...I see...but...sub cannot decide..."</font><br><font color = blue> "... they don''t have a word on what the session should be, but they will preserve the most important decision: to continue or not, even a contract. I don''t need to explain that this will ends all the benefits for both parts and that relationship is so broken at this point that nothing will restore it. I only want you to quickly focus on one thing and then we''ll start with the warm up: you can see that being a Dom could be difficult. A Dom should never overstep the limits so subs will have no real reason to stop...the fail of the relationship should never be due to the Dominant. You''ll eventually have some other chance to focus on that...shall we start?" </font> You nod...'
 			act'Warm up...': gt 'hotel_anna_sex', 'slaveM1'
 		end
 		act'The sub...I think...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM1a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem1a.jpg"></center>'
 			'<font color = blue>"...Exactly <<$pcs_nickname>>, subs have no word on what the session should be, but they will preserve the most important decision: to continue or not, even a contract. I don''t need to explain that this will ends all the benefits for both parts and that relationship is so broken at this point that nothing will restore it. I only want you to quickly focus on one thing and then we''ll start with the warm up: you can see that being a Dom could be difficult. A Dom should never overstep the limits so subs will have no real reason to stop...the fail of the relationship should never be due to the Dominant. You''ll eventually have some other chance to focus on that...shall we start?" </font> You nod...'
 			act'Warm up...': gt 'hotel_anna_sex', 'slaveM1'
 		end
@@ -295,14 +295,14 @@ if $ARGS[0] = 'slaveM':
 	act'Obedience':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM1b.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem1b.jpg"></center>'
 		'<font color = blue> "<<$pcs_nickname>> this is worm, worm She is <<$pcs_nickname>>, a new Mistress... . Obedience you said uh?</font> Without stop speaking Anna bend the man''s back with her knees...<font color = blue> Well there''s a lot to talk about that, we''ll limits for the moment... . I can quickly tell you that''s the result the Dom usually look for and obtain through Discipline: one of the basic of BDSM. Discipline, in short, stand on two pillars: to private for something, for example restriction, or to give something, for example a punishment. There''s also the reward system, but for the moment we''ll stop here...i''d like to start if you don''t mind..." </font><br><font color = #DC143C> "Wait...you said that obedience is what Dominant "usually" is looking for in a sub...what else could you want from a sub?"</font><br><font color = blue> "Well there are situation where Dominant isn''t looking for obedience. For example a sub who''s looking for a Dom, but Dom is full of obedient subs but lack in subbie workers...or within a couple to fullfill one part wish to be dominated...etc. Nothing incredible to be honest...it''s more for completness... . Shall we start?" </font> You nod'
 		act'Warm up...': gt 'hotel_anna_sex', 'slaveM1'
 	end
 	act'Punishment':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM1c.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem1c.jpg"></center>'
 		'<font color = blue> "Punishment you said uh? Ok: show your ass and stop breathing." </font>Anna look at the man and give him an order. The man execute...<br><font color = #DC143C> "...Oh...well...i assume this is part of the punishment...but really: does she has to stop breating? "</font><br><font color = blue> "Uh? Honestly...that''s a little reward...it likes breath play. By the way, <<$pcs_nickname>> this is worm, worm She is <<$pcs_nickname>>, a new Mistress... . Punishment punishment...well: we''ll have fun! I can add something to your theory anyway... Not only punishment is used to dicipline a sub; you know a masochist love being punished...what you don''t know is that there''s a state called subspace that subs search while being punished: it''s an altered status that enhance all sub''s sensations...but we don''t have enough time right now to speak about it; and the existance of the so called painslut...subbies that can cum with punishment...again...we should really start right now. We''ll eventually return to those arguments...when you are ready order it to breath again...i don''t want it to cum..." </font>'
 		act'"worm...start breath."': gt 'hotel_anna_sex', 'slaveM1'
 	end
@@ -310,7 +310,7 @@ if $ARGS[0] = 'slaveM':
 		*clr & cla
 		gs 'stat'
 		Anna_see_abrat += 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM1d.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem1d.jpg"></center>'
 		'<font color = blue> "Right to the point uh? Do not forget you don''t have to rush things." </font><br><font color = #DC143C> "Ok...ok...he''s your toy afterall..."</font><br><font color = blue> "By the way, <<$pcs_nickname>> this is worm, worm She is <<$pcs_nickname>>, a new Mistress... . We can start..." </font>Anna start to pull down the man''s pants...<br><font color = #DC143C> "...Hey...it''s shaved..."</font><br><font color = blue> "...Well it''s a worm but it''s registered as a human being...yet... . You know the bear problem..." </font><br><font color = #DC143C> "I mean his butt..."</font><br><font color = blue> "Oh! its butt...well...BDSM session usually has actors play in "blend" modality, expecially subs. To be honest it''s almost a not written rule: only Dominant can let intimate area unshaved...that''s according personal a taste of course. While subbie should be always being shaved: the deep the relationship the silkiest (skin has to be silk) have to be skin. Into a M/s relationship, intimate cannot be less than silk at contact. Anyway, for completeness, any treatment that will have permanet effect must have both agreement, like the electrolisys body depilation. But stop talking..."  </font>'
 		act'Warm up...': gt 'hotel_anna_sex', 'slaveM1'
 	end
@@ -319,17 +319,17 @@ end
 if $ARGS[0] = 'slaveM1':
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem2.jpg"></center>'
 	'The session start, Anna start flogging the man back but she doesn''t lose the chance to speak you...<font color = blue> "I''ll take care of the warm up...i''m not sure you can properly take care of it right now....anyway, you can stay and look for the whipping if you want. If for whatever reason you don''t feel to whip it just let me know...i''ll find something you''ll be able to do... . its skin it''s quite trained, that''s true, but maybe it''s too much for you right now..." </font>'
 	act'...Maybe you are right...':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM3a.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem3a.jpg"></center>'
 		'<font color = blue> "...As you wish; do not worry about te time you''ll need to learn...ok let me check."</font> Anna pass her hand on the man''s back...<br><font color = #DC143C> "...What are you looking for?"</font><br><font color = blue> "Temperature and consistancy mainly...yes...they are good. Both are a good check to look for to see if it''s ready for the whipping session..." </font><br>Anna let you check quickly these check...<font color = #DC143C> "Got it..."</font>'
 		act'...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM3b.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem3b.jpg"></center>'
 			'<font color = blue> "worm: not a single word." </font> After the order the whipping begin....<font color = blue> "...Never hit...the head...if not with a rigid tool...and eyes are uncovered..." </font> During the whipping Anna continue to speak you, you were able to learn some about the tecnique she''s using. It ends that''s not easy as it can seems to hit properly with a whip, a quirt in that case, and the effectivness of the session is based more on the tecnique rather than in the strengh...<br><font color = #DC143C> "...Woah....! It''s kind ...i have to read some "Whipping course for beginners"..."</font><br><font color = blue> "...Hehehe...you''ll learn eventually...let me finish...in the meantime....why don''t you look under your boots?..." </font>'
 			act'...': gt 'hotel_anna_sex', 'slaveM2'
 		end
@@ -337,17 +337,17 @@ if $ARGS[0] = 'slaveM1':
 	act'What? Losing the fun part? No way...pass me! Pass me!':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM3c.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem3c.jpg"></center>'
 		'<font color = blue> "Hehehe...all yours Miss Whippie..." </font>Anna pass you the quirt you were planned to use...; with a satisfied and intimidating smile, you approach the man...<br><font color = #DC143C> "...Now i''ll fuck the shit out of you..."</font><br>The man, not allowed to answer, stay in the position...<font color = blue> "...Brrr scary...hehehe..." </font> You are not sure if Anna is mocking you or trying to encourage you to beat him hard...you quickly glance at her... <br><font color = blue> "...<<$pcs_nickname>>...not the head." </font>....and you are ready to start your session...'
 		act'I''ll make him beg me to stop...!':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM3d.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem3d.jpg"></center>'
 			'You launch yourself against the poor man''s back as a fury...Anna look silently at the session...<br><font color = #DC143C> "...Take this....and this...."</font><br><font color = blue> "...Mmmm..." </font><br><font color = #DC143C> "...you will ...regret... this day..."</font> ...But the man seems to well tollerate your whipping, not a single word escape from his mouth... . Exhausted you have to take a rest...<br><font color = blue> "...Do you want to hear its squitting...? Or do you prefer to pass next stage?" </font>'
 			act'What''s wrong with him? Is he mute?':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM3b.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem3b.jpg"></center>'
 				'It doesn''t takes too much that you realize that something is going wrong... so you decide to pass the whip to Anna.<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'
 			end
@@ -355,7 +355,7 @@ if $ARGS[0] = 'slaveM1':
 				*clr & cla
 				gs 'stat'
 				AnnaQW['dom'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM3b.jpg"></center>'
+				'<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'
 			end
@@ -366,24 +366,24 @@ end
 if $ARGS[0] = 'slaveM2':
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM4.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem4.jpg"></center>'
 	'The boots end with some kind of bottle cap at the heel made of little pins...they are not thin like needles but you assume they are really painful...<font color = #DC143C> "That seems "heavy"...are you sure he can tollerate that?"</font><br><font color = blue> "Of course...it likes it. But please <<$pcs_nickname>>...do not refer to it as a person...really... . it''s not more than a mat. About that...why don''t you clean your boots?..." </font> '
 	act'Let me try it...':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM4a.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem4a.jpg"></center>'
 		'You jump on the mat following Anna''s advice...<font color = maroon> "...Mmmmm....mmmmm...." </font><br><font color = #DC143C> "I think this is really painful..."</font><br><font color = blue> "...Normally... . But it has a deep fetish for boots and feet...those are pleasure moans... . I know i know...you never heard about a moaning mat..."</font> Anna doesn''t lose the chance to degrade the poor man... . Satisfied with the results she offer you to continue the session...<font color = blue> "Well, bottom is done. Now the upper...let''s go sit on the sofa...do you want to try my boot-o-matic?"</font>'
 		act'Sure!':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM5a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem5a.jpg"></center>'
 			'The man starts the work...this time he seems really eager to clean the boots.<font color = maroon> "...Mmmmm....sniff...mmmmm...." </font><br><font color = #DC143C> "...Hey scum! Do not pass the knee..."</font> Not sure about his behaviour you take the quirt on your hand as to defend your self... <br><font color = maroon> "...Mmmmm....sniff...mmmmm....sniff sniff....mmmmm!...." </font><br><font color = blue> "...Hehehe...I think it really likes your feet..." </font><br><font color = #DC143C> "...he better be careful, i''ve learned something from you now..."</font><br><font color = blue> "Do not worry <<$pcs_nickname>>...it will never try something stupid. Did i told you that it crave for feet? it know everything about feet...one day you should try its pedicure: it''s better than a pro." </font>'
 			act'...': gt 'hotel_anna_sex', 'slaveM3'
 		end
 		act'I''ll pass this time...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM5b.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem5b.jpg"></center>'
 			'<font color = blue> "...Oh well...as you wish...but let me say: you don''t know what you are missing. "</font><br>You look the man, he lick and kiss Anna''s feet with such devotion that it seems more than an order to obey.<font color = maroon> "...Mmmmm....sniff...mmmmm....sniff sniff....mmmmm!...." </font><br><font color = blue> "...and there...good worm...as always..." </font><br><font color = maroon> "...Mmmmm....sniff...mmmmm....sniff sniff....mmmmm!...." </font><br><font color = #DC143C> "Is he...moaning?"</font><br><font color = blue> "Oh yes... . Did i told you that it craves for feet? it know everything about feet...one day you should try its pedicure: it''s better than a pro." </font>'
 			act'...': gt 'hotel_anna_sex', 'slaveM3'
 		end
@@ -391,19 +391,19 @@ if $ARGS[0] = 'slaveM2':
 	act'Please Anna, go first...you sure worked harder than me...':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM4b.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem4b.jpg"></center>'
 		'Anna doesn''t lose time and jump on the poor man''s back...<font color = maroon> "...Mmmmm....mmmmm...." </font><br><font color = #DC143C> "I think this is really painful..."</font><br><font color = blue> "...Normally... . But it has a deep fetish for boots and feet...those are pleasure moans... . I know i know...you never heard about a moaning mat..."</font> Anna doesn''t lose the chance to degrade the poor man... . Satisfied with the results she offer you to continue the session...<font color = blue> "Well, bottom is done. Now the upper...let''s go sit on the sofa...it will come with us to clean the upper of our boots...if you''d like it of course..."</font>'
 		act'Sure...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM5a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem5a.jpg"></center>'
 			'The man starts the work...this time he seems really eager to clean the boots.<font color = maroon> "...Mmmmm....sniff...mmmmm...." </font><br><font color = #DC143C> "...Hey scum! Do not pass the knee..."</font> Not sure about his behaviour you take the quirt on your hand as to defend your self... <br><font color = maroon> "...Mmmmm....sniff...mmmmm....sniff sniff....mmmmm!...." </font><br><font color = blue> "...Hehehe...I think it really likes your feet..." </font><br><font color = #DC143C> "...he better be careful, i''ve learned something from you now..."</font><br><font color = blue> "Do not worry <<$pcs_nickname>>...it will never try something stupid. Did i told you that it crave for feet? it know everything about feet...one day you should try its pedicure: it''s better than a pro." </font>'
 			act'...': gt 'hotel_anna_sex', 'slaveM3'
 		end
 		act'Thanks Anna, I don''t need it right now..':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM5b.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem5b.jpg"></center>'
 			'<font color = blue> "...Oh well...as you wish...but let me say: you don''t know what you are missing. "</font><br>You look the man, he lick and kiss Anna''s feet with such devotion that it seems more than an order to obey.<font color = maroon> "...Mmmmm....sniff...mmmmm....sniff sniff....mmmmm!...." </font><br><font color = blue> "...and there...good worm...as always..." </font><br><font color = maroon> "...Mmmmm....sniff...mmmmm....sniff sniff....mmmmm!...." </font><br><font color = #DC143C> "Is he...moaning?"</font><br><font color = blue> "Oh yes... . Did i told you that it craves for feet? it know everything about feet...one day you should try its pedicure: it''s better than a pro." </font>'
 			act'...': gt 'hotel_anna_sex', 'slaveM3'
 		end
@@ -411,19 +411,19 @@ if $ARGS[0] = 'slaveM2':
 	act'Rise and ask Anna for help':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM4c.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem4c.jpg"></center>'
 		'You rise on the poor man with sadistic intention...<font color = maroon> "...Mmmmm...mmmmm...mmmmm!..." <br><font color = #DC143C> " Uh? What''s that...a matslut?..."</font><br><font color = blue> "Well ... you are near to the truth..."</font><br><font color = #DC143C> "Well...i dont like it. ...Anna Anna! A fly!..."</font><br><font color = blue> "Oh...there...no. There...yes...no...here it is!...."</font> You both push deep your heels on the poor man''s back for sometimes...tired and with the boots finally "cleaned"...<font color = blue>"...Now the upper...let''s go sit on the sofa...do you want to try my boot-o-matic?"</font>'
 		act'Sure!':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM5a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem5a.jpg"></center>'
 			'The man starts the work...this time he seems really eager to clean the boots.<font color = maroon> "...Mmmmm....sniff...mmmmm...." </font><br><font color = #DC143C> "...Hey scum! Do not pass the knee..."</font> Not sure about his behaviour you take the quirt on your hand as to defend your self... <br><font color = maroon> "...Mmmmm....sniff...mmmmm....sniff sniff....mmmmm!...." </font><br><font color = blue> "...Hehehe...I think it really likes your feet..." </font><br><font color = #DC143C> "...he better be careful, i''ve learned something from you now..."</font><br><font color = blue> "Do not worry <<$pcs_nickname>>...it will never try something stupid. Did i told you that it crave for feet? it know everything about feet...one day you should try its pedicure: it''s better than a pro." </font>'
 			act'...': gt 'hotel_anna_sex', 'slaveM3'
 		end
 		act'I don''t want him near to me...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM5b.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem5b.jpg"></center>'
 			'<font color = blue> "...Oh well...as you wish...but let me say: you don''t know what you are missing. "</font><br>You look the man, he lick and kiss Anna''s feet with such devotion that it seems more than an order to obey.<font color = maroon> "...Mmmmm....sniff...mmmmm....sniff sniff....mmmmm!...." </font><br><font color = blue> "...and there...good worm...as always..." </font><br><font color = maroon> "...Mmmmm....sniff...mmmmm....sniff sniff....mmmmm!...." </font><br><font color = #DC143C> "Is he...moaning?"</font><br><font color = blue> "Oh yes... . Did i told you that it craves for feet? it know everything about feet...one day you should try its pedicure: it''s better than a pro." </font>'
 			act'...': gt 'hotel_anna_sex', 'slaveM3'
 		end
@@ -433,17 +433,17 @@ end
 if $ARGS[0] = 'slaveM3':
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM6.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem6.jpg"></center>'
 	'<font color = blue> "...Well <<$pcs_nickname>>, we almost finished. You can go change; come back when you''ve done, I have to feed a worm." </font><br><font color = #DC143C> "Sure let me go change..."</font> You left the room to come back once you changed back in your clothes; the man is on the floor eating from a plate of premade salad without hands...as a worm...of course.<font color = blue> "Please <<$pcs_nickname>>, take a seat and rest your feet..." </font> '
 	act'"Poor wormy..."':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM6a.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem6a.jpg"></center>'
 		'You look at the man''s skin, and feel a little guilty for the bruises. <font color = maroon> "...Mmmmm...sniff sniff...mmmmm...." </font><br><font color = blue> "Do not worry <<$pcs_nickname>>, i can assure you that if something is too hard it stop moaning before using the safe word..."</font><br><font color = maroon> "...Mmmmm...sniff sniff...mmmmm...." </font> As the matter of fact the man continue to moan as nothing was marked on his skin; but the sight of his back doesn''t allow you to push your feet and sometimes you try to rise your feet a little, thinking that you could give him some relief... . At the end of the dinner Anna order the man to clean the mess; immediately the man execute the order, taking the dishes and putting them in the trash...'
 		act'...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM7.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem7.jpg"></center>'
 			'You both follow the man to control him on his duty when suddenly Anna squeeze tha man''s balls in her hands...<font color = blue>"That''s what "keep someone at the balls" means... . Ok <<$pcs_nickname>>, now i have to take care of the aftercare, we finished for today. Let me lead you to the exit."</font> '
 			act 'See you Anna and thanks.': gt'pav_hotel'
 		end
@@ -451,13 +451,13 @@ if $ARGS[0] = 'slaveM3':
 	act'Light':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM6b.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem6b.jpg"></center>'
 		'As you enter Anna make you the sign to sit...<font color = maroon> "...Mmmmm...sniff...mmmmm...sniff...mmmmm!...." </font><br><font color = blue> "Do not worry <<$pcs_nickname>>, i can assure you that it''s more than happy to stay under two wonderful Mistresses. If something is too hard it stop moaning before using the safe word..."</font><br><font color = maroon> "...Mmmmm...sniff...mmmmm...sniff...mmmmm!!!...." </font><br><font color = #DC143C> "If you insist..."</font> The dinner continue without accidents; at the end Anna order the man to clean the mess; immediately the man execute the order, taking the dishes and putting them in the trash...'
 		act'...':
 			*clr & cla
 			gs 'stat'
 			BDSM_Knowledge += 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM7.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem7.jpg"></center>'
 			'You both follow the man to control him on his duty when suddenly Anna squeeze tha man''s balls in her hands...<font color = blue>"That''s what "keep someone at the balls" means... . Ok <<$pcs_nickname>>, now i have to take care of the aftercare, we finished for today. Let me lead you to the exit."</font> '
 			act 'See you Anna and thanks.': gt'pav_hotel'
 		end
@@ -466,17 +466,17 @@ if $ARGS[0] = 'slaveM3':
 		*clr & cla
 		gs 'stat'
 		Anna_see_abrat += 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM6c.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem6c.jpg"></center>'
 		'As you enter Anna make you the sign to sit; she doesn''t have to tell you twice that you immediately sit and push your feet on the man''s back. Despite the bruises you feel a sadistic impulse an start to push as hard as you can...<font color = maroon> "...Mmmmm...oo...sniff...ooooh... mmmmm!...." </font><br><font color = blue>"Ummh...<<$pcs_nickname>>...go easy on it ok?"</font><br><font color = #DC143C>"Do not worry, i''m avoiding the damaged zones...hey...wasn''t "it" resistant afterall?"</font> Then you turn toward "worm"<font color = #DC143C>"...I bet you feel it...am i wrong?"</font> ...and keep pushing....<br><font color = blue>"Well it''s not that...it''s that i didn''t allow it to..."</font><br><font color = maroon> "...UOOOH...MMMMHH...AAAAFFFF...sniff sniff!....UAAAA....OOOHHHH....snort...." </font>...'
 		act'...(what the f...?)...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM6d.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem6d.jpg"></center>'
 			'<font color = blue>"...cum..."</font>. You stop pushing harder, realizing what happened...suddenly there''s only silence; but it doesn''t last long.<font color = blue>"...yOU!"</font>. For a moment your blood freeze in your vein, but you are not the target of Anna''s anger...<br><font color = maroon> "...s-sorry...M-mistress..." </font><br><font color = blue>"WHY?"</font><br><font color = maroon> "...M-mistress''s... <<$pcs_nickname>> ...feet...flower...smell...worm...love..." </font><br><font color = blue>"...I see...but that doesn''t change things. Clean your mess with your tongue: now."</font><br><font color = #DC143C>"I''m sorry Anna...is this my fault?"</font><br><font color = blue>"...It seems it has a great weakness for your feet...i wonder what else could you make it do without cleaning them..."</font><br><font color = #DC143C>"What?"</font> <br><font color = maroon> "...Mmmmm...oo...sniff...ooooh... mmmmm!...." </font><br><font color = blue>"NO! Stop it! Don''t worry <<$pcs_nickname>>...i''m just wondering. Better let it finish...it''s starting again it seems..."</font> You both left worm finishing its duties...'
 			act'...':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM7.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slavem7.jpg"></center>'
 				'Once everything is cleaned, you both follow the man to control him on his duty...<font color = blue>"It was interesting isn''t it?..."</font>...Suddenly Anna grabs the man''s balls...<font color = blue> "...even if someone will regret for it..." </font><br><font color = #DC143C>"...Well...it''s something you don''t see everyday..."</font><br><font color = blue> "You can bet on it...hehehe. Ok <<$pcs_nickname>>, let me lead to the exit, we''ve done for today. I have to take care of "someone"...oh! If you decide to not clean your feet for a week...give me a call...i can make some tests." </font><br><font color = #DC143C>"ANNA!"</font><br><font color = blue> "Ok ok...message received. See you my dear." </font> You quickly exchange your greetings and you leaves for your way.'
 				act 'leave': gt'pav_hotel'
 			end
@@ -490,26 +490,26 @@ if $ARGS[0] = 'slaveF':
 	AnnaQW['dom'] += 1
 	AnnaQW['trust'] += 1
 	BDSM_Knowledge += 1
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF0.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef0.jpg"></center>'
 	'You both changes into your clothes... . Anna is pratically naked, but it''s not a big news at this point... .<font color = blue> "...Here...light this...it will help creating a good environment..." </font><br><font color = #DC143C> "...It can help...thanks Anna. You know, i was hoping for Jeanine...and now i cannot see her in the face neither...it''s kind of making me nervous..."</font><br><font color = blue>"Don''t worry my dear everything will go smooth i assure you; the mask is for the roleplay...you''ll eventually see her again in the future... . Ok let''s start...do you want to speak first? You know presentation, how much fun we''ll have today...and so on..."</font>'
 	act'Let Anna...':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF1a.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef1a.jpg"></center>'
 		'You let Anna do the intro...<font color = blue> "...Well slut...you got two Mistress today: <<$pcs_nickname>> this is our slut...; slut this is <<$pcs_nickname>>. Today we''ll share you...and we''ll have a lot of fun. My friend here could take some decision, but as our contract there will be no sex without both agreement, and if for whatever remote decision you could be agree remember that i''m not: so be a good pet and i could reward you. Clear?" </font><br><font color = #DC143C> "..."</font><br><font color = blue> "All right, let''s pose this bitch...she could fall..." </font>'
 		act'Ok...': gt 'hotel_anna_sex', 'slaveF1'
 	end
 	act'Poke Anna':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF1b.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef1b.jpg"></center>'
 		'You ask for Anna''s attention...<font color = blue> "Sure <<$pcs_nickname>>, the scene is all yours." </font><br><font color = #DC143C> "I don''t know who''s under that mask, but believe me: you are not safe from humiliation if that''s why you wear it. I cannot fuck you according your Mistress, but i know a lot of other way to degrade bitch like you: so if you don''t want to run away crying in shame be a good girl and all of us will have fun. My name is <<$pcs_nickname>> and you should be verushka. Remember my name, you''ll hear it again."</font> You look at Anna waiting for her approval...<br><font color = blue> "Ummhh...so and so...the last part...you aren''t looking for a job you know? Ok, it wasn''t bad anyway...you should work on that again, but it''s positive in the complex. Now help me posing this slut...she could fall..." </font>'
 		act'...': gt 'hotel_anna_sex', 'slaveF1'
 	end
 	act'Double tease':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF1c.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef1c.jpg"></center>'
 		'<font color = #DC143C> "Mind if i join in the middle?"</font><br><font color = blue> "Of course not...let me start. <<$pcs_nickname>> this is our slut...; slut this is <<$pcs_nickname>>. ...you got two Mistress today: do you know what does that means?..."</font><br><font color = #DC143C> "...No? I''ll refresh your situation: we''ll have a lot of fun! And you are our toy...so be ready because you''ll have to double your effort."</font><br><font color = blue> "...And do not think you''ll have your reward: sex is forbidden today. If for whatever reason your pussy will be wet without permission, i''ll chast you for a month: is that clear?" </font> You have nothing to add... .<font color = blue> "...Ok then we can start. <<$pcs_nickname>>, would you be so kind to help me posing this slut? I don''t want her to fall..." </font>'
 		act'Sure...': gt 'hotel_anna_sex', 'slaveF1'
 	end
@@ -518,25 +518,25 @@ end
 if $ARGS[0] = 'slaveF1':
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef2.jpg"></center>'
 	'You spend a couple of minutes helping Anna posing the  girl; the boots she''s wearing doesn''t allow her to stand on her own for more than few minutes, that''s why you linked her armcuffs to a big ring pending from the ceiling. <font color = blue> "...Oh...almost forget; slut: you can speak. But control yourself, i''ve got a litthe headache." </font><br>"T-thank you Mistress; this slut will speak only if necessary."<br><font color = blue> "Ok <<$pcs_nickname>>, we''ll focus mainly on the warm up today. I know we want to have fun; anyway, without warm up, the fun itself it''s a pure fury discharge. I want you to learn how to last longer...do not worry too much about making mistake, slutushka is really easy to warm up...that''s why i called her for that task. Ready?" </font>'
 	act'Anna Anna! Let me! Let me!':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF3a.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef3a.jpg"></center>'
 		'You start with the crop Anna gave you, and immediately you start to feel good...it''s a shame you have to restrain yourself you think, but that''s the task Anna gave you and you don''t want to displease her... . You alternate the beats between the buttcheeck, and they slowly start becoming red.<font color = blue> "...Yes...keep going...let the feeling spread on her butt..."</font><br>The girl start to struggle her legs..."....Mmmm...."<br><font color = blue> "...a little more...a little more..."</font><br>..."....Mm-miss...mmmh...."<br><font color = blue> "Hehehe here''s my painslut...do you want me to make her cum?"</font>'
 		act'Deny':
 			*clr & cla
 			gs 'stat'
 			BDSM_Knowledge += 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF4a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef4a.jpg"></center>'
 			'<font color = #DC143C>"What?"</font> You stop the beating...<br><font color = blue> "I can make her cum, right now; she''s a painslut a masochist that can cum with pain...and to be honest a peculiar one, she can cum from pain even during the warm up... . What do you say?"</font><br><font color = #DC143C>"NO! she didn''t earn her reward!"</font><br><font color = #DC143C>"Then continue for a while..."</font>'
 			act'Finish...': gt 'hotel_anna_sex', 'slaveF2'
 		end
 		act'Allow':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF4b.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef4b.jpg"></center>'
 			'<font color = #DC143C>"Sure!"</font> You stop the beating and Anna take your place; she gave her few beats and then...<br>"...Ahhh...M-mistereeesss...t-thaaan...mmm...M-mistereeesss.....". Few slaps and you see for the first time someone cumming from beating ...<br><font color = blue> "Hehehe ...she''s a peculiar one, she can cum from pain even during the warm up...hehehe..."</font><br><font color = #DC143C>"That''s ...wonderful... ."</font><br><font color = blue>"It''s not for everybody, that''s for sure. Ok, let''s her cool off a little...we''ll continue in a minute."</font>'
 			act'Let her cool off...': gt 'hotel_anna_sex', 'slaveF2'
 		end
@@ -544,20 +544,20 @@ if $ARGS[0] = 'slaveF1':
 	act'I''d like to learn looking at you Anna, if that''s ok...':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF3b.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef3b.jpg"></center>'
 		'<font color = blue> "There''s no problem..."</font> Anna grip her flog and start to beat the girl; her beat are not full of strength, and it seems she''s trying to cover the whole butt...<font color = blue> "...when warming up, try to not forget the area you can probably hit for mistake during the session...expand a little the zone you beat so..."</font><br>The girl start to struggle her legs..."....Mmmm...."<br><font color = blue> "...a little more...a little more..."</font><br>..."....Mm-miss...mmmh...."<br><font color = blue> "Hehehe here''s my painslut...do you want me to make her cum?"</font>'
 		act'Deny':
 			*clr & cla
 			gs 'stat'
 			BDSM_Knowledge += 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF4a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef4a.jpg"></center>'
 			'<font color = #DC143C>"What?"</font> You stop the beating...<br><font color = blue> "I can make her cum, right now; she''s a painslut a masochist that can cum with pain...and to be honest a peculiar one, she can cum from pain even during the warm up... . What do you say?"</font><br><font color = #DC143C>"NO! she didn''t earn her reward!"</font><br><font color = #DC143C>"Then continue for a while..."</font>'
 			act'Finish...': gt 'hotel_anna_sex', 'slaveF2'
 		end
 		act'Allow':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF4b.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef4b.jpg"></center>'
 			'<font color = #DC143C>"Sure!"</font> You stop the beating and Anna take your place; she gave her few beats and then...<br>"...Ahhh...M-mistereeesss...t-thaaan...mmm...M-mistereeesss.....". Few slaps and you see for the first time someone cumming from beating ...<br><font color = blue> "Hehehe ...she''s a peculiar one, she can cum from pain even during the warm up...hehehe..."</font><br><font color = #DC143C>"That''s ...wonderful... ."</font><br><font color = blue>"It''s not for everybody, that''s for sure. Ok, let''s her cool off a little...we''ll continue in a minute."</font>'
 			act'Let her cool off...': gt 'hotel_anna_sex', 'slaveF2'
 		end
@@ -565,20 +565,20 @@ if $ARGS[0] = 'slaveF1':
 	act'Double fun!':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF3c.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef3c.jpg"></center>'
 		'You stop Anna for a moment...<font color = blue> "Uh?"</font><br><font color = #DC143C>"Why don''t we split the butt? I''ll take the right and you the left..."</font> Anna agree your proposal, and now you are working in tandem on the girl''s butt...<br>..."....Mm-miss...mmmh...."<br><font color = blue>"Hehehe...she love it! Don''t stop <<$pcs_nickname>>..."</font> <br>..."...this...slllluuu..... Mm-miss...mmmh.... cuuummm....p-pppllll..."<br><font color = blue>"You hear her...do you want her to relief?"</font>'
 		act'Deny':
 			*clr & cla
 			gs 'stat'
 			BDSM_Knowledge += 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF4a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef4a.jpg"></center>'
 			'<font color = #DC143C>"What?"</font> You stop the beating...and so Anna<br><font color = blue> "I can make her cum, right now; she''s a painslut a masochist that can cum with pain...and to be honest a peculiar one, she can cum from pain even during the warm up... . What do you say?"</font><br><font color = #DC143C>"NO! she didn''t earn her reward!"</font><br><font color = #DC143C>"Then continue for a while..., but don''t rise the strengh...hehehe"</font>'
 			act'Finish...': gt 'hotel_anna_sex', 'slaveF2'
 		end
 		act'Allow':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF4b.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef4b.jpg"></center>'
 			'<font color = #DC143C>"Sure!"</font> You stop the beating and left the work to Anna; she gave her few beats then... <br>"...Ahhh... M-mistereeesss... t-thaaan...mmm...M-mistereeesss.....". Few slaps and you see for the first time someone cumming from beating ...<br><font color = blue> "Hehehe ...she''s a peculiar one, she can cum from pain even during the warm up...hehehe..."</font><br><font color = #DC143C>"That''s ...wonderful... ."</font><br><font color = blue>"It''s not for everybody, that''s for sure. Ok, let''s her cool off a little...we''ll continue in a minute."</font>'
 			act'Let her cool off...': gt 'hotel_anna_sex', 'slaveF2'
 		end
@@ -588,19 +588,19 @@ end
 if $ARGS[0] = 'slaveF2':
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF5.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef5.jpg"></center>'
 	'You help Anna free the girl, her legs wasn''t able to keep her in a standing position so you gently pose her on the floor... <font color = blue> "Tower." </font> The girl execute what seems to be an order; she stand on her knees with her legs closed and her hand on them...<font color = blue> "you know what to do." </font> Immediately the girl start removing Anna''s shoes...you look Anna with a big question mark on your face... .<font color = blue> "This is a pose for subbie...we use sign and pose to fast comunicate with subbie, we''ll see something about them eventually. Anyway, you can use the language with the same result of course." </font> You nod...<font color = blue> "And now, one of the greatest sign of obedience: foot worhship.</font>'
 	act'...':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF6a.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef6a.jpg"></center>'
 		'<font color = blue> "Worhshipping Master/Mistress feet, has a mean underlying with a very deep bond. It means that sub''s life stay under the owner feet...that also means that the owner has to be careful to not break something so delicate...remember my words <<$pcs_nickname>>" </font> You nod, looking carefully at the devotion the girl made to accomplish Mistress wishes...'
 		act'...': gt 'hotel_anna_sex', 'slaveF3'
 	end
 	act'Mmmm...it''s hot in there...':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF6b.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef6b.jpg"></center>'
 		'<font color = blue> "Worhshipping Master/Mistress feet, has a mean underlying with a very deep bond. It means that sub''s life stay under the owner feet...that also means that the owner has to be careful to not break something so delicate...remember my words <<$pcs_nickname>>" </font>You look the girl and her devotion...she seems to enjoy the worhship...<br><font color = #DC143C>"...Mmmm...i''d like that too...do you think you could lend me her for a moment?....mmmm..."</font><br>Without controlling the situation you start to touch your breast aroused by the sight...<font color = blue> "...If you stop touching yourself...maybe...hehehe..." </font>'
 		act'...Ok...ok...': gt 'hotel_anna_sex', 'slaveF4'
 	end
@@ -610,7 +610,7 @@ if $ARGS[0] = 'slaveF2':
 		Anna_slave_stuck = 1
 		Anna_see_abrat += 1
 		Anna_trust -= 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF6c.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef6c.jpg"></center>'
 		'<font color = blue> "Worhshipping Master/Mistress feet, has a mean underlying with a very deep bond. It means that sub''s life stay under the owner feet...that also means that the owner has to be careful to not break something so delicate...remember my words <<$pcs_nickname>>" </font><br><font color = #DC143C>"..."</font><br><font color = blue> "...<<$pcs_nickname>>...are you listening?..."</font>'
 		act'...Let''s see...i''m curious...': gt 'hotel_anna_sex', 'slaveF3'
 	end
@@ -620,17 +620,17 @@ if $ARGS[0] = 'slaveF3':
 	if Anna_slave_stuck ! 1:
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF7.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef7.jpg"></center>'
 		'The girl seems to not be tired of licking and kissing her Mistress feet...<font color = blue> "...Mmmm...it''s relaxing; she has a big devotion for feet you know?...You have to know that feet could be a very arousing zone...she cannot live without... . Do you want to try? Do not pay attention at the beginning...it could be a little tickling..." </font>'
 		act'"Sure!"':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF8.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef8.jpg"></center>'
 			'It seems she doesnn''t want to leave Anna''s feet but immediately Anna scold her...<font color = blue> "slut! you hear your Mistress."</font>'
 			act'...':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF9.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef9.jpg"></center>'
 				'Verushka now lay on the floor and accept your foot on her mouth...the tickling let you push your foot as reflex into her mouth but she doesn''t seems to be bother by that...<font color = blue> "...Mmmm...let''s see...hey! you really like <<$pcs_nickname>>''s feet. i knew it...you are dripping..."</font> Anna remove the girl''s panties and start to tease the girl''s cunt... .<br><font color = #DC143C>"...mmmffh!...Anna! you said no sex..."</font><br><font color = blue> "...it''s not sex...i have to control her cunt''s reaction to your feet... . And it''s a big one from what i can feel...ok enough for today. <<$pcs_nickname>>, you can go change...i''m sorry but i cannot leave her right now; you know the way."</font> You thanks Anna for the experience and gave her a quick hug; an intoxicating scent comes fill the air...you know this smell and you think you understand why she cannot lead you this time...'
 				act 'leave': gt'pav_hotel'
 			end
@@ -638,12 +638,12 @@ if $ARGS[0] = 'slaveF3':
 		act'"No thanks Anna...i could pee from tickling right now..."':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF8.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef8.jpg"></center>'
 			'<font color = blue> "slut! you hear your Mistress. Continue what you are doing..."</font><br>"Thank You Mistress!...kiss! kiss!..."'
 			act'...':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF9a.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef9a.jpg"></center>'
 				'Verushka doesn''t stop and continue for all the session to kiss and lick Anna''s feet... . You and Anna speak about some doubts you have, if Anna found some lack in your knowledge she immediately gave you the right sight on the matter. The evening ends without particular events; you learn something about the session you had expecially about warm up and foot worhship... . <font color = blue> "...Mmmm...you can go change...i''m sorry but i cannot leave her right now; you know the way."</font> You thanks Anna for the experience and gave her a quick hug; an intoxicating scent comes from Anna...you think you understand why she cannot lead you this time...'
 				act 'leave': gt'pav_hotel'
 			end
@@ -651,22 +651,22 @@ if $ARGS[0] = 'slaveF3':
 	else
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF7a.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef7a.jpg"></center>'
 		'You push the girls head on Anna''s foot...<font color = blue> "...<<$pcs_nickname>>! What the..." </font><br><font color = #DC143C>"...You didn''t said i couldn''t do that..."</font><br><font color = blue> "...Neither I didn''t said you could do that!...and yOU!..."</font> ...Anna turns to the poor girl that''s now stucked on her foot.<br><font color = blue>"Is that your fault?"</font> The girl shake her head not able to answer...<br><font color = blue>"...I see. ...<<$pcs_nickname>>!"</font><br><font color = #DC143C>...''...shit! I hope i''m not in a trouble... '' ... "...Y-yes?..."</font> <br><font color = blue> "...Unwrap your shoes pass them around this slut''s neck and pull as hard as you can when i told you."</font>'
 		act'"..."':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF8a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef8a.jpg"></center>'
 			'Anna could be scaring when she want...and you don''t think this is the time to see how much she could be...<br><font color = #DC143C>"Sorry Anna...i didn''t want to end in this situation... . "</font> But Anna doesn''t answer you and give a cold glance to the girl; ...you execute Anna''s order and wait for her to give you the signal...<br><font color = blue>"Uhhmmff! You were a bad girl <<$pcs_nickname>>...but it wasn''t your fault. "someone" didn''t train her; she should be able to do that and more...and clearly it''s not. Help me pulling and we are odd."</font> Anna''s word are a big relief for you...you can feel that she''s really upset right now...<font color = blue>"Ready? One two...three!"</font>'
 			act'Pull':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF9a.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef9a.jpg"></center>'
 				'POP! The girl, finally unstucked, immediately reach for Anna''s feet..."Please...Mistress...kiss kiss...forgiveness...kiss kiss..."<br><font color = #DC143C>"Pheewww...for a moment i''ve thought the worst for her..."</font>'
 				act'...':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF8.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef8.jpg"></center>'
 					'But Anna immediately stop the girl from coming too near....<font color = blue> "NO!"</font>"Please...Mistress...kiss kiss...please...kiss kiss..."<br><font color = blue>"Sure...continue begging i''m reaaaly curious..."</font> You can catch the rethorical tone in Anna''s words...<br>"...kiss kiss...kiss kiss..."...and so the girl; she keeps kissing Anna''s feet but stop complaining... . <br><font color = blue>"Uhhmmmf! I had to lower her jaw, remember: Safe Sane and Consensual. Also she likes breathplay...so there was nothing to be worried."</font> There''s electricity in the air and Anna seems all but happy that it ends without problems; you do not dare to ask...<font color = blue> "You can go <<$pcs_nickname>>, i have to deal with something."</font> You think you don''t want to be here right now, and quickly say goodbye.'
 					act 'leave': gt'pav_hotel'
 				end
@@ -678,12 +678,12 @@ end
 if $ARGS[0] = 'slaveF4':
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF8.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef8.jpg"></center>'
 	'It seems she doesnn''t want to leave Anna''s feet but immediately Anna scold her...<font color = blue> "slut! you hear your Mistress."</font>'
 	act'...':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slaveF9.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/female/slavef9.jpg"></center>'
 		'Verushka now lay on the floor and accept your foot on her mouth...the girl doesn''t seems to displease it, and that''s heat up your crotch even more...you have to use your control to not touching yourself in front of the girls right now.<font color = blue> "...Mmmm...let''s see...hey! you really like <<$pcs_nickname>>''s feet. I knew it...you are dripping...and... uh?...sniff sniff...oh! it seems you are not alone..."</font> Anna remove the girl''s panties and start to tease the girl''s cunt... .<br><font color = #DC143C>"...A-anna! what are you doing?..."</font><br><font color = blue> "Oh that...don''t worry...i have to control her cunt''s reaction to your feet...almost big as yours to her from what i can smell...sniff sniff..."</font><br>You deeply blush at Anna''s words...<font color = #DC143C>"...Anna! Stop it! That''s not true!..."</font><br><font color = blue>"...Agree...better stop. I can control myself but i''m not totally sure about you...we finished for today..."</font><br><font color = #DC143C>"Anna!"</font><br><font color = blue>"Oh...come on...<<$pcs_nickname>>, you know i like to tease you....hehehe... . Now if you excuse me i have to take care of verushka...we''ll see next time, you know the way."</font>'
 		act 'Uuhhmmmfff!!!': gt'pav_hotel'
 	end
@@ -696,21 +696,21 @@ if $ARGS[0] = 'librarian':
 	AnnaQW['trust'] += 1
 	BDSM_Knowledge += 1
 	Anna_librarian_brat = 0
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian0.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian0.jpg"></center>'
 	'<font color = blue> "...That''s the dress...see...you are not naked... ."</font> Anna start "dressing" up you...the dress consist in a skirt and a shirt(camisole)...problems start when she start putting a set of restrain on you: a couple of cuffs for both arms and ankle both linked between them... .<font color = blue> "...the gag should help you. Believe me it''s more easy at the beginning to understand that''s no speaking is allowed unless asked for..."</font><br><font color = #DC143C>...'' a deal is a deal ...great <<$pcs_nickname>>! didn''t you have something better to say? ''...</font><br><font color = blue> "...last a couple of neutral glasses...hope you don''t mind..."</font><br><font color = #DC143C>...'' so glasses could be a problem and all Pushkin''s steel and leather no? ''...</font><br><font color = blue> "Wonderful!...Now <<$pcs_nickname>>: go and fetch me the books from "Abrasion " to "Acucullophilia "...schnell schnell!"</font>'
 	act'...What does she wants?...':
 		*clr & cla
 		gs 'stat'
 		Anna_librarian_brat += 1
 		Anna_see_abrat += 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian1.jpg"></center>'
 		'<font color = blue> "...Well? What are you waiting for? Didn''t i gave you an order?"</font><br><font color = #DC143C>...'' ...what? dis she call me to bring her some books?... ''...</font><br><font color = blue> "If i were you i should start being worried...or maybe that''s what you are looking for..."</font><br><font color = #DC143C>...'' ...WHAT?...no no no ...i''m going i''m going...''...</font>'
 		act'...': gt 'hotel_anna_sex', 'librarian1'
 	end
 	act'Better move...':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian1a.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian1a.jpg"></center>'
 		'<font color = #DC143C>...'' ...i should go...the contract spoke about punishment...and I don''t want to discover what Anna has planned...''...</font> You move toward a big pile of books; it doesn''t seem the only one and some other book stand both on the desk or the floor. Finally you found what Anna was looking for....<font color = #DC143C>...'' ...and how should i move those books? ...''...</font> You create a new pile on the desk with what you are supposed to bring to Anna...<font color = #DC143C>...'' ...she lock me on purpose. Funny Anna, really funny...''...</font>'
 		act'...': gt 'hotel_anna_sex', 'librarian1'
 	end
@@ -720,12 +720,12 @@ if $ARGS[0] = 'librarian1':
 	if Anna_librarian_brat = 1:
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian2a.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian2a.jpg"></center>'
 		'You move toward a big pile of books; it doesn''t seem the only one and some other book stand both on the desk or the floor. Finally you found what Anna was looking for....<font color = #DC143C>...'' ...and how should i move those books? ...''...</font> You create a new pile on the desk with what you are supposed to bring to Anna...<font color = #DC143C>...'' ...she lock me on purpose... also the collar is blocking me from using my neck completely...''...</font>'
 	else
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian2.jpg"></center>'
 		'You return to Anna with your pile between your chin and your hands...it''s like trying to walk on a rope between two trees...but you managed to do your task at the end. <font color = blue> "...Move them on the desk. Now bring me all you can find about "Adult Babies Roleplay" and "Age Play". " Move.</font> Again you move toward the big pile and collect what Anna is looking for...'
 	end
 
@@ -734,7 +734,7 @@ if $ARGS[0] = 'librarian1':
 		gs 'stat'
 		Anna_librarian_brat += 1
 		Anna_see_abrat += 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian3.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian3.jpg"></center>'
 		'RUUMBLE!!! <font color = blue>"<<$pcs_nickname>>!"</font><br><font color = #DC143C>...'' ...shit! I have to recollect them before she arrive!...''...</font> RUUMBLE!!! ...but it seems it''s not your lucky day... .<font color = #DC143C>...'' ...shit! ....shit shit shit!...''...</font>'
 		if Anna_librarian_brat = 2:
 			'<font color = blue>"<<$pcs_nickname>>! What are you doing? Are you trying to be the "brat" of the year?"</font>...<font color = blue>"...go sit and study or read or whatever...i don''t need you to make some disaster."</font>'
@@ -748,7 +748,7 @@ if $ARGS[0] = 'librarian1':
 		*clr & cla
 		gs 'stat'
 		AnnaQW['trust'] += 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian3a.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian3a.jpg"></center>'
 		if Anna_librarian_brat = 1:
 			'<font color = blue>"Leave them on the desk and go sit and study or read or whatever...i don''t need you right now."</font>'
 		else
@@ -761,7 +761,7 @@ end
 if $ARGS[0] = 'librarian2':
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian4.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian4.jpg"></center>'
 	'You go sit on the desk with your gear on; there''s nothing interesting to do and you have to spend your time. You could follow Anna''s advice or try to forget for a moment why you are locked and gagged sitting on a desk....'
 
 	act'...''...I didn''t came here to study!...''....':
@@ -770,12 +770,12 @@ if $ARGS[0] = 'librarian2':
 		gs 'stat'
 		Anna_librarian_brat += 1
 		Anna_see_abrat += 2
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian5.jpg"></center>'
 		'<font color = #DC143C>...'' ...no way i''m study...how could i be able to do some work with the gear on...it''s all Anna''s fault!...''...</font><br><font color = blue> "...<<$pcs_nickname>>! Come here...."</font><br><font color = #DC143C>...'' ...WHAT?...''...</font>You try to hide what you were doing and launch the paper on a trash nearby...The only results is that Anna comes to take you and drag you by the hear.<br><font color = blue> "When i call you are expected to RUN!"</font> While she''s walking you to her desk she notice a paper on the trash can...<br><font color = #DC143C>...'' ...SHITSHITSHITSHITSHITSHITSHIT!...''...</font>'
 		act'...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian5a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian5a.jpg"></center>'
 			if Anna_librarian_brat = 3:
 				'<font color = blue>"Let me see what are you doing....OH!"</font><br><font color = #DC143C>...''......''...</font><br><font color = blue>"...I''ve got no word... . <<$pcs_nickname>>! This is the last warning: you are on the edge. MOVE!"</font>'
 			else
@@ -788,13 +788,13 @@ if $ARGS[0] = 'librarian2':
 		*clr & cla
 		gs 'stat'
 		AnnaQW['trust'] += 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian5.jpg"></center>'
 		!if storyline...:
 		'You spen some times doing some math exercise...<font color = blue> "...<<$pcs_nickname>>! Come here...."</font>'
 		act'...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian5b.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian5b.jpg"></center>'
 			!if storyline...:
 			'<font color = blue>"Let me see what are you doing....uh? What''s that? Nah...listen: The hyperbola:x^2/a^2-y^2/b^2=1 has the two asymptotes y= +/-(b/a)x The equation for the union of these two lines is x^2/a^2-y^2/b^2=0.Similarly, the hyperboloid x^2/a^2-y^2/b^2-z^2/c^2=1 is said to have the asymptotic cone x^2/a^2-y^2/b^2-z^2/c^2=1. The distance between the hyperboloid and cone approaches 0 as the distance from the origin approaches infinity.More generally, let us consider a surface that has an implicit equation P_d(x,y,z)+P_{d-2}(x,y,z)+...P_{0}=0, where the P_{i} are homogeneous polynomials of degree i and P_{d-1}=0. Then the equation P_{d}(x,y,z)=0 defines a cone which is centered at the origin. It is called an asymptotic cone, because the distance to the cone of a point of the surface tends to zero when the point on the surface tends to infinity. So..."</font><br><font color = #DC143C>...'' ...I think i''m stuck on bottle caps...''...</font><font color = blue> "Hope this is helpful, ok now i have to pose you: come with me."</font>'
 			act'...': gt 'hotel_anna_sex', 'librarian3'
@@ -805,7 +805,7 @@ end
 if $ARGS[0] = 'librarian3':
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian6.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian6.jpg"></center>'
 	if Anna_librarian_brat = 0:
 		'<font color = blue> "...Now, i''m going to change you to pose you for the night. You will not stay here of course, it''s to show you how to pose subs when their service are not needed. Then, i''ll give you a little spank: pay attention it''s not caused by your bad behaviour, it''s a reminder spank for what the Dominat could miss when not spending the time with the sub... ." </font><br><font color = #DC143C>...'' ...we never spoke about that!...''...</font><font color = blue> "...but i''m pretty sure you won''t need it, you were such a good girl that i could decide to skip it...we''ll see..."</font>'
 	elseif Anna_librarian_brat = 3:
@@ -820,12 +820,12 @@ if $ARGS[0] = 'librarian3':
 		gs 'stat'
 		Anna_librarian_brat += 2
 		Anna_see_abrat += 5
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian7a.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian7a.jpg"></center>'
 		'</font><br><font color = #DC143C>...'' ...now or never!...''...</font><br><font color = blue> "NO! NO! NO!" </font>'
 		act'...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian10.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian10.jpg"></center>'
 			'Anna is upset and she bind you to the chair....<font color = blue> "...NOW IT''S A CHALLENGE! TRY THAT AGAIN!" </font>'
 			act'...''...shit! it''s in my crotch!... ''...': gt 'hotel_anna_sex', 'librarian5'
 		end
@@ -834,13 +834,13 @@ if $ARGS[0] = 'librarian3':
 		*clr & cla
 		gs 'stat'
 		AnnaQW['trust'] += 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian7.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian7.jpg"></center>'
 		'You sit on the floor bounded with ropes trying to find a comfortable position; it''s not easy but you have to endure...<font color = blue> "Good girl, i see you find a good place. Wait for me to finish." </font>'
 		if Anna_librarian_brat = 0:
 			act'After some time...':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/AnnalibrarianGG0.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrariangg0.jpg"></center>'
 				'You wait patiently on the floor; when Anna arrives she free you from the gear and left you in your underwear... .<font color = blue> "...OTK: over the knee... . Put your belly on my knees, <<$pcs_nickname>>, we pratically finished." </font><br><font color = #DC143C>"...A-anna...is that really necessary...i-i''ve done what you asked..."</font><br><font color = blue> "...I know...i know..." </font>'
 				act'???':
 					*clr & cla
@@ -860,7 +860,7 @@ if $ARGS[0] = 'librarian5':
 	*clr & cla
 	Anna_librarian_redemption = 0
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian0.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian0.jpg"></center>'
 	if Anna_librarian_brat = 5:
 		'Anna doesn''t say a word... . She approach you and put a plate on the floor, the she start to free you. She only breath while she''s removing piece by piece the gears; <font color = blue> "..." </font><br><font color = #DC143C>...''...she''s mad, i can feel it...shit!...maybe...''...</font> It''s clear even without words what she''s expecting from you...'
 	elseif Anna_librarian_brat = 2 or Anna_librarian_brat = 3:
@@ -881,14 +881,14 @@ if $ARGS[0] = 'librarian5':
 		end
 		Anna_librarian_redemption = 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian8.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian8.jpg"></center>'
 		'<font color = blue> "..." </font> You think it''s the best for yourself to follow Anna''s wish... . The plate has cream and strawberry, and honestly they taste good...if only you could eat them in another situation you could taste them better... . <font color = blue> "There''s something on my boot." </font>'
 		if Anna_librarian_brat >= 1:
 			act'Lick her boots':
 				*clr & cla
 				Anna_librarian_brat -= 1
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian8b.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian8b.jpg"></center>'
 				'<font color = #DC143C>"..."</font><br><font color = blue> "Good girl." </font> You lick Anna''s boots hoping to lowering enough the punishment it''s expecting you... .'
 				act'...': gt 'hotel_anna_sex', 'librarian_brat_end'
 			end
@@ -896,20 +896,20 @@ if $ARGS[0] = 'librarian5':
 			act'Oh! Sorry Anna...':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian8b.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian8b.jpg"></center>'
 				'<font color = #DC143C>"..."</font><br><font color = blue> "...Uhmmm..." </font> You are not sure why you are licking her boots, but it''s not unpleasant as at the beginning... . Of course it''s not easy without using your hands, and some spot is clearly visible...<font color = #DC143C>"...Sorry Anna...it''s not easy..."</font><br><font color = blue> "Ma''am." </font><br><font color = #DC143C>"..."</font><br><font color = blue> "..." </font>'
 				act'...Sorry Ma''am...':
 					*clr & cla
 					gs 'stat'
 					AnnaQW['sub'] += 1
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian8b.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian8b.jpg"></center>'
 					'You do your best to not disappoint Anna and eagerly clean her boots till they are shiny...<font color = blue> "...That''s it. Follow me." </font>'
 					act'...': gt 'hotel_anna_sex', 'librarian_brat_end'
 				end
 				act'Stop humiliating yourself.':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian8a.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian8a.jpg"></center>'
 					'You accomplished your task at the end but you weren''t disposed to humilate yourself more than what you did till this moment...and the punishment is waiting for you. Maybe you were good enough to please Anna''s wish that she forget the whole situation...maybe...<font color = blue> "...Follow me." </font>'
 					act'...': gt 'hotel_anna_sex', 'librarian_brat_end'
 				end
@@ -919,7 +919,7 @@ if $ARGS[0] = 'librarian5':
 		act'refuse':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian8a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian8a.jpg"></center>'
 			'<font color = blue> "No? Ok, i won''t force you... . Now follow me." </font> Was a good idea to stop the chance Anna gave you?'
 			act'...': gt 'hotel_anna_sex', 'librarian_brat_end'
 		end
@@ -928,7 +928,7 @@ if $ARGS[0] = 'librarian5':
 		*clr & cla
 		gs 'stat'
 		AnnaQW['dom'] += 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian8a.jpg"></center>'
+		'<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'
 	end
@@ -938,7 +938,7 @@ if $ARGS[0] = 'librarian5':
 			gs 'stat'
 			Anna_librarian_brat += 1
 			Anna_see_abrat += 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian8a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian8a.jpg"></center>'
 			'<font color = blue> "You are not smart...are you?" </font> You were so focused on your escaping plans that you didn''t notice that you still had the collar on you and Anna put a leash on it. As the results you fall on the ground on your hands and kness...<font color = blue> "Move." </font>'
 			act'...': gt 'hotel_anna_sex', 'librarian_brat_end'
 		end
@@ -948,7 +948,7 @@ end
 if $ARGS[0] = 'librarian_end':
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian11.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian11.jpg"></center>'
 	if Anna_librarian_redemption ! 1:
 		if Anna_librarian_brat = 0:
 			'<font color = blue> "...Let me say: great performance, you''ve done your work. See...it wasn''t difficult afterall." </font><br><font color = #DC143C>"Well...neither it was easy ...with all the stuff blocking me...."</font><br><font color = blue> "But you kept your concentration, and you search for the best solution when possible. I''m quite pleased as the matter of fact." </font><br><font color = #DC143C>"If you say so...."</font><br><font color = blue> "Believe me...it was your first time, and some little mistake could always happen; it''s easy for newbie to fail some request both for unexperience or intentional purpose. That''s not the case... . And thanks <<$pcs_nickname>> you spare me a little of work. Let me lead you to the exit, it''s time for you to go." </font>'
@@ -983,12 +983,12 @@ if $ARGS[0] = 'librarian_end':
 		act'...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian2.jpg"></center>'
 			'She carefuly move toward you, and give you a quick hug...just the time to whisper in your hear:<font color = blue> "Let it flow." </font>After that she return to sit... . Now she''s looking at you, you got her attention but she doesn''t add a single word; while all you want is to shout at her all your pain, you lost your barrier and tears start to flow....<br><font color = #DC143C>"...why?...how could you do that to me?..."</font><br><font color = blue> "...Did you lost your trust in me <<$pcs_nickname>>?" </font> Anna knows the answer, but she want to hear that from you<br><font color = #DC143C>"...how could i trust you?...after...after..."</font>You are hiding the truth from yourself...it comes to your mind that she stop, she didn''t finished your punishment...was that only mercy? You wonder <font color = #DC143C>"......"</font><br><font color = blue> "Follow me <<$pcs_nickname>>, it''s time to stop your pain." </font>Again Anna stand up, she give you another hug and both move in the main room...'
 			act'...':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian12.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian12.jpg"></center>'
 				'Anna help you lay on the sofa with your belly down... <font color = blue> "I''ll be gentle <<$pcs_nickname>>...you aren''t the only one with a thin skin, you know?"</font><br><font color = #DC143C>"N-no?...and...who?....AHHHHHAAAAHHHNNNNA!...."</font><br><font color = blue>"...I''m sorry <<$pcs_nickname>>...i had to expose your butt..."</font> Anna distract your attention to expose your butt, knowing it could be really sensible...<font color = blue>"It''s cold at the beginning...it will end soon..." </font><br>You feel something slowly falling along your skin...<font color = #DC143C>"...SSSSHHH...AAHHH...AHHH...AAHH...Aah...aa..."</font><br><font color = blue>"I''m sure you feel better soon...it''s a good cream, that help a little with the pain."</font><br><font color = #DC143C>"...I-i..."</font>The cold change to heat...but it''s not pain...it''s similar to pleasure; you wonder how''s that possible, but you are mainly focused on Anna''s hands....<font color = #DC143C>"...A-anna..."</font><br><font color = blue>"Ssssh...You make your part in that too, but it''s not the time to speak about it."</font> Once your butt finish to catch the cream Anna help you to dress and lead you to the exit.'
 				act'Leave': gt'pav_hotel'
 			end
@@ -997,7 +997,7 @@ if $ARGS[0] = 'librarian_end':
 		act'...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian12.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian12.jpg"></center>'
 			if Anna_librarian_brat = 2 or Anna_librarian_brat = 3:
 				'You lay on the sofa as suggested and Anna arrived almost the same time as you... . She pull out a tube of cream, then she expose your butt leaving the underwear on place. <font color = blue>"...it''s not really necessary, but it''s easier to understand that way what "we care of each other" means. It start cold, but you''ll feel a pleasurable hot sensation after a little. There we are..." </font><br>You feel the cream slowly falling along your skin...<font color = #DC143C>"...Sshhh aaahh...aahh...aah?..."</font>...Anna''s hands catch the drops falling and start spreading the cream on your butt; you don''t know how but you don''t feel pain anymore.<font color = #DC143C>"...how is that possible?..."</font><br><font color = blue> "Big secret! Hehehe...it''s a good cream, that help a little with the pain. You make your part in that too, but it''s not the time to speak about it."</font> Once your butt finish to catch the cream Anna help you to dress and lead you to the exit.'
 			elseif Anna_librarian_brat = 4 or Anna_librarian_brat = 5:
@@ -1014,9 +1014,9 @@ if $ARGS[0] = 'librarian_brat_end':
 	*clr & cla
 	gs 'stat'
 	if Anna_librarian_brat ! 6:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian9a.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian9a.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/AnnalibrarianBG0.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarianbg0.jpg"></center>'
 	end
 
 	if Anna_librarian_brat = 0:
@@ -1041,7 +1041,7 @@ if $ARGS[0] = 'librarian_brat_end':
 		act'...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian9.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian9.jpg"></center>'
 			'<font color = blue> "...OTK: over the knee... . Put your belly on my knees, <<$pcs_nickname>>, we pratically finished." </font><br><font color = #DC143C>"...A-anna...go easy..."</font>As promised the session doesn''t last long and Anna gave you no more than few slap...you don''t feel discomfort...and you found the situation a little arousing. <br><font color = blue> "...Uhmmm...that could be a problem. You got a delicate skin... . Anyway, we''ve done; come see me when you finish dress your self... ." </font>'
 			act '...': gt 'hotel_anna_sex', 'librarian_end'
 		end
@@ -1049,7 +1049,7 @@ if $ARGS[0] = 'librarian_brat_end':
 		act'...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian9.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian9.jpg"></center>'
 			'<font color = blue> "...OTK: over the knee... . Put your belly on my knees, <<$pcs_nickname>>." </font><br><font color = #DC143C>"...A-anna...go easy..."</font> The session doesn''t last long; Anna slap your butt for less than two minutes...you don''t feel a real discomfort...your butt is a little red but Anna stop before you start to feel real pain... .<br><font color = blue> "...Uhmmm...that could be a problem. You got a delicate skin... . Anyway, we''ve done, and those few slaps should help you improve your performance; come see me when you finish dress your self... ." </font>'
 			act '...': gt 'hotel_anna_sex', 'librarian_end'
 		end
@@ -1057,12 +1057,12 @@ if $ARGS[0] = 'librarian_brat_end':
 		act'...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian9.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian9.jpg"></center>'
 			'<font color = blue> "...OTK: over the knee... . Put your belly on my knees, <<$pcs_nickname>>." </font><br><font color = #DC143C>"..."</font> Anna spank your butt for less than a couple of minutes...you don''t feel a real discomfort...your butt is a little red but Anna stop before you start to feel real pain... .<br><font color = blue> "...Uhmmm...that could be a problem. Let see... . That''s was a little warm up <<$pcs_nickname>>...you earned two strokes." </font><br><font color = #DC143C>"...But...but..."</font><font color = blue> "Don''t be a childish...move move. Put your hands on the chair and bend over." </font>'
 			act'Bend over':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian9b.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian9b.jpg"></center>'
 				'<font color = #DC143C>"...A-anna...go easy..."</font><br><font color = blue> "...One!"</font>Slap!<br><font color = #DC143C>"...Aaaaahhh!...i''ve learned!..."</font><br><font color = blue> "I know. ...and two!"</font>Slap!<br><font color = #DC143C>"...Aaaaahhh!...i''ve learned! i''ve learned!...please!..."</font><br><font color = blue> "...Uhmmm...we''ve done; come see me when you finish dress your self... ." </font>'
 				act '...': gt 'hotel_anna_sex', 'librarian_end'
 			end
@@ -1071,17 +1071,17 @@ if $ARGS[0] = 'librarian_brat_end':
 		act'...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian9.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian9.jpg"></center>'
 			'<font color = blue> "...OTK: over the knee... . Put your belly on my knees, <<$pcs_nickname>>." </font><br><font color = #DC143C>"..."</font> Anna start spanking your butt...you can feel each stroke she gave you and you are sure that pain is near to come when finally Anna stop... .<br><font color = blue> "...Uhmmm...that could be a problem. Let see... . That''s was a little warm up <<$pcs_nickname>>...you earned four strokes." </font><br><font color = #DC143C>"...But...but..."</font><br><font color = blue> "Yes "butt" "butt", now move we don''t have the whole day: put your hands on the chair and bend over." </font>'
 			act'...':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian9b.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian9b.jpg"></center>'
 				'<font color = #DC143C>"...A-anna...go easy..."</font><br><font color = blue> "...One!"</font>Slap!<br><font color = #DC143C>"...Aaaaahhh!...i''ve learned!..."</font><br><font color = blue> "I know. ...and two!"</font>Slap!<br><font color = #DC143C>"...Aaaaahhh!...i''ve learned! i''ve learned!...please!..."</font><br><font color = blue> "...Not yet... three!." </font>Slap!'
 				act'AAAHHHH! SHIIIIT!':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian9c.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian9c.jpg"></center>'
 					'<font color = blue> "...Language young lady...four!"</font>Slap!<br><font color = #DC143C>"...Aaaaahhh!...i''ve learned! i''ve learned!...i''ll be a good girl!...please stop!..."</font><br><font color = blue> "That''s for sure. ...Uhmmm...we''ve done; <<$pcs_nickname>> please, come see me when you finish dress your self... ." </font> You feel your butt pulsating in pain...you don''t know how much you could be able to resist...'
 					act '...': gt 'hotel_anna_sex', 'librarian_end'
 				end
@@ -1091,27 +1091,27 @@ if $ARGS[0] = 'librarian_brat_end':
 		act'...':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian9.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian9.jpg"></center>'
 			'<font color = blue> "...OTK: over the knee... . Put your belly on my knees, move." </font><br>You start to feel the fear growing in you...maybe it wasn''t a good idea to bring Anna to madness...<font color = #DC143C>"...I''m sorry Anna..."</font> But Anna doesn''t answer; as you assume the position she start spanking your butt...you can feel each stroke she gave you and you are sure that pain is near to come when finally Anna stop... .<br><font color = blue>"...Uhmmm...that could be a problem. We''ll see... . "</font><br><font color = #DC143C>"...P-please?..."</font> <br><font color = blue> "Too late: put your hands on the chair and bend over." </font>'
 			act'...':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian9b.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian9b.jpg"></center>'
 				'You can''t do nothing else than obey...<font color = #DC143C>"..."</font><br><font color = blue>"This is the first, you have to take care of the others...One!"</font>Slap!<br><font color = #DC143C>"...Aaaaahhh!..."</font><br><font color = blue> "Count."</font>Slap!<br><font color = #DC143C>"...Aaaaahhh!...twoooo! i''ve learned! i''ve learned!...please!..."</font> Slap!'
 				act'AAAHHHH! THREEE!!! SHIIIIT!':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian9c.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian9c.jpg"></center>'
 					'<font color = blue> "...Language young lady..."</font>Slap!<br><font color = #DC143C>"...Aaaaahhh! Four!...i''ve learned! i''ve learned!...i''ll be a good girl!...please stop!..."</font><br><font color = blue> "...not yet...and your left side need attention too..."</font>'
 					act'...endure...':
 						*clr & cla
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/AnnalibrarianBG1.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarianbg1.jpg"></center>'
 						'Slap!<font color = #DC143C>"...AAAAAHHHH!!!! Five!...p-please Anna!...p-please i beg you!..."</font><br><font color = blue> "...Uhhmmm, you are far from fifteen..."</font>...'
 						act'...R-r...r-e...r-re....':
 							*clr & cla
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/AnnalibrarianBG2.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarianbg2.jpg"></center>'
 							'<font color = blue> "Ssshh...Don''t say it <<$pcs_nickname>>, there''s no need; we finished. Stay silent, i need silence right now..."</font>...<br><font color = #DC143C>"...sniff sniff...it''s fresh...sniff sniff..."</font><br><font color = blue> "I would rather say the contrary..."</font><br><font color = #DC143C>"...sniff ...w-what''s that?...and...sniff...why?...aren''t you mad with me?...sniff..."</font><br><font color = blue> "It''s my face...you feel fresh because your butt is hot. And no, i''m not mad with you anymore."</font><br><font color = #DC143C>"...A-anna?..."</font><br><font color = blue>"Tell me <<$pcs_nickname>>"</font><br><font color = #DC143C>"...W-why your face is on my butt?..."</font><br><font color = blue>"Because you are near your limit, and i want to feel how much you could have last; hand are sensible but not as lips or face, and since I think that lips could be inappropriate, face is the only thing left..."</font><br><font color = #DC143C>"..."</font><font color = blue>"I''ll wait for you at my desk, come see me when you finish dress yourself... ." </font>'
 							act '...': gt 'hotel_anna_sex', 'librarian_end'
 						end
@@ -1140,7 +1140,7 @@ if $ARGS[0] = 'Anna_dom_session':
 		act'Look for Anna':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/dom/Dom3.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/dom/dom3.jpg"></center>'
 			'<font color = blue>"Maid on request Ma''am."</font><br><font color = #DC143C>"What''s that?"</font><br><font color = blue>"A maid uniorm Ma''am."</font><br><font color = #DC143C>"Are you serious?"</font><br><font color = blue>"Is there something wrong Ma''am? It has the feather too..."</font><br><font color = #DC143C>"Did i have to do all by myself? Bafh! We are lucky i work here from time to time..."</font>'
 			act 'Bring Anna her uniform': gt 'hotel_anna_sex', 'Anna_dom_session1'
 		end
@@ -1159,7 +1159,7 @@ if $ARGS[0] = 'Anna_dom_session':
 			act'Look for Anna':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/dom/Dom3a.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/dom/dom3a.jpg"></center>'
 				'<font color = blue>"Maid on request Ma''am."</font><br><font color = #DC143C>"What''s that?"</font><br><font color = blue>"A maid uniorm Ma''am."</font><br><font color = #DC143C>"Are you serious?"</font><br><font color = blue>"Is there something wrong Ma''am? Should i take the feather too?..."</font><br><font color = #DC143C>"Did i have to do all by myself? Bafh! We are lucky i work here from time to time..."</font>'
 				act 'Bring Anna her uniform': gt 'hotel_anna_sex', 'Anna_dom_session1'
 			end
@@ -1430,7 +1430,7 @@ if $ARGS[0] = 'Anna_dom_brat':
 						act'...':
 							*clr & cla
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/Annalibrarian12.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/librarian/annalibrarian12.jpg"></center>'
 							'You lay on the sofa as Anna told you, she arrived almost the same time as you... .<font color = blue>"We care of each other <<$pcs_nickname>>: do not forget. Now rise your skirt." </font><br><font color = #DC143C>"...SSSH...AAHHH... i cannot...it hurts..."</font><br><font color = blue>"My my, like a baby... . You know...i saw worst case than yours, with a skin much more delicated...".</font><br><font color = #DC143C>"...what do you...SSSH...AAH!..."</font> Distracting you Anna was able to lift your skirt; you feel the air on your butt that remind of your pain...suddenly something is slowly falling along your skin; it''s a cream Anna put on you. She catch the drops and start spreding them on your butt...<font color = #DC143C>"...AAH!...Ah ...ah?..."</font> It seems there''s no more space for the pain; the initial cold of the cream start becoming heat... .<font color = #DC143C>"...I''m sorry Anna...really..."</font><br><font color = blue>"Sssh!".</font> You try to speak, but she didn''t answer; she''s focused on her task and continue the massage till your skin finish the cream.<br><font color = #DC143C>"...Anna...are you mad with me?"</font><br><font color = blue>"I used to give a goodbye spank when i finish the massage...do you need one?".</font><br><font color = #DC143C>"..."</font> You catch the rethorical in Anna''s word, and silence was the best answer...<br><font color = blue>"...Now go home <<$pcs_nickname>>, and reflect on what you did."</font>'
 							act'Leave': gt'pav_hotel'
 						end

+ 1 - 1
locations/igorev.qsrc

@@ -197,7 +197,7 @@ end
 
 !!this one shows up if they go to the sisters room and Sveta is not dating Igor and does not know he cross dresses.
 if $ARGS[0] = 'din_sisterkom':
-	if IgorQW['Lover'] = 1: gt 'igorev', 'din_sisterkom_krossdress'
+	if IgorQW['Lover'] = 1: gt 'igorsex', 'din_sisterkom_krossdress'
 	*clr & cla
 	'<center><b><font color = maroon>Igor''s sister''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/komsister.jpg"></center>'

+ 1 - 1
locations/internet_mobile.qsrc

@@ -64,7 +64,7 @@ if subscription['free'] = 0: subscription['free'] = 1
 if $ARGS[0] = 'top_up_metered':
 	subscription[$ARGS[1]] += ARGS[2]
 	subscription['<<$ARGS[1]>>-date'] = day
-	if $ARGS[1] = 'metered_calls': subscription['<<$ARGS[1]>>-sms_limit'] += ARGS[3]
+	if $ARGS[1] = 'metered_calls': subscription['metered_calls-sms_limit'] += ARGS[3]
 	if subscription['<<$ARGS[1]>>-type'] = 0:  subscription['<<$ARGS[1]>>-type'] = 2
 end
 

+ 2 - 2
locations/intro_city_select.qsrc

@@ -1476,7 +1476,7 @@ if $ARGS[0] = 'outcast':
 	pcs_inhib		-= 5
 
 	! Other
-	pcs_makeupskl	-= 5
+	pcs_makupskl	-= 5
 
 	!!----- APPEARANCE -----!!
 	pcs_hairlng		-= 100
@@ -1548,7 +1548,7 @@ elseif $ARGS[0] = 'uglyduckling':
 		willpowermax 	-= 5
 
 		! Other
-		pcs_makeupskl	-= 10
+		pcs_makupskl	-= 10
 
 		!!----- APPEARANCE -----!!
 		pcs_eyesize	-= 1

+ 1 - 1
locations/intro_sg_select.qsrc

@@ -1776,7 +1776,7 @@ elseif $ARGS[0] = 'uglyduckling':
 		willpowermax 	-= 20
 
 		! Other
-		pcs_makeupskl	-= 10
+		pcs_makupskl	-= 10
 
 		!!----- APPEARANCE -----!!
 		pcs_skin	-= 500

+ 23 - 23
locations/item_cart.qsrc

@@ -18,30 +18,30 @@ if $ARGS[0] = 'shoppping_aisle':
 	i = 1
 	:loopshopping_cart
 		!! if item is uninitialized (has blank name) - skip it
-		if $item_curr_aisle['<<i>>'] = '': i += 1 & jump 'loopshopping_cart'
-
-		$temp_bcolor = func('themes', 'alt_color', $temp_bcolor)
-		$item_line = '<TR bgcolor='+$temp_bcolor+'>'
-		$item_line += '<TD align="left"><<$item_curr_aisle[''<<i>>'']>></TD>'
-		$cart_tmp = $var_curr_aisle['<<i>>']
-		$item_line += '<TD><<mc_inventory[''<<$cart_tmp>>'']>></TD>'
-		$item_line += '<TD><<quantity_curr_aisle[''<<i>>'']>></TD>'
-		$item_line += '<TD><<cost_curr_aisle[''<<i>>'']>></TD>'
-		if cart_curr_quantity['<<i>>'] > 0:
-			$item_line += '<TD valign="center" align="center" width="6%"><a href="exec:gt ''item_cart'', ''remove'', <<i>>, 10"><img src="images/system/ui/less<<$icon_selector>>.png" height="<<icon_height>>"></a></TD>'
-			$item_line += '<TD valign="center" align="center" width="6%"><a href="exec:gt ''item_cart'', ''remove'', <<i>>, 1"><img src="images/system/ui/less<<$icon_selector>>.png" height="<<icon_height>>"></a></TD>'
-		else
-			$item_line += '<TD></TD><TD></TD>'
-		end
-		$item_line += '<TD align="center"><<cart_curr_quantity[''<<i>>'']>></TD>'
-		if max_curr_aisle['<<i>>'] > cart_curr_quantity['<<i>>'] + mc_inventory['<<$cart_tmp>>'] or max_curr_aisle['<<i>>'] = 0:
-			$item_line += '<TD valign="center" align="center" width="6%"><a href="exec:gt ''item_cart'', ''add'', <<i>>, 1"><img src="images/system/ui/more<<$icon_selector>>.png" height="<<icon_height>>"></a></TD>'
-			$item_line += '<TD valign="center" align="center" width="6%"><a href="exec:gt ''item_cart'', ''add'', <<i>>, 10"><img src="images/system/ui/more<<$icon_selector>>.png" height="<<icon_height>>"></a></TD>'
-		else
-			$item_line += '<TD align="center" colspan="2" width="6%">Max</TD>'
+		if $item_curr_aisle['<<i>>'] ! '':
+			$temp_bcolor = func('themes', 'alt_color', $temp_bcolor)
+			$item_line = '<TR bgcolor='+$temp_bcolor+'>'
+			$item_line += '<TD align="left"><<$item_curr_aisle[''<<i>>'']>></TD>'
+			$cart_tmp = $var_curr_aisle['<<i>>']
+			$item_line += '<TD><<mc_inventory[''<<$cart_tmp>>'']>></TD>'
+			$item_line += '<TD><<quantity_curr_aisle[''<<i>>'']>></TD>'
+			$item_line += '<TD><<cost_curr_aisle[''<<i>>'']>></TD>'
+			if cart_curr_quantity['<<i>>'] > 0:
+				$item_line += '<TD valign="center" align="center" width="6%"><a href="exec:gt ''item_cart'', ''remove'', <<i>>, 10"><img src="images/system/ui/less<<$icon_selector>>.png" height="<<icon_height>>"></a></TD>'
+				$item_line += '<TD valign="center" align="center" width="6%"><a href="exec:gt ''item_cart'', ''remove'', <<i>>, 1"><img src="images/system/ui/less<<$icon_selector>>.png" height="<<icon_height>>"></a></TD>'
+			else
+				$item_line += '<TD></TD><TD></TD>'
+			end
+			$item_line += '<TD align="center"><<cart_curr_quantity[''<<i>>'']>></TD>'
+			if max_curr_aisle['<<i>>'] > cart_curr_quantity['<<i>>'] + mc_inventory['<<$cart_tmp>>'] or max_curr_aisle['<<i>>'] = 0:
+				$item_line += '<TD valign="center" align="center" width="6%"><a href="exec:gt ''item_cart'', ''add'', <<i>>, 1"><img src="images/system/ui/more<<$icon_selector>>.png" height="<<icon_height>>"></a></TD>'
+				$item_line += '<TD valign="center" align="center" width="6%"><a href="exec:gt ''item_cart'', ''add'', <<i>>, 10"><img src="images/system/ui/more<<$icon_selector>>.png" height="<<icon_height>>"></a></TD>'
+			else
+				$item_line += '<TD align="center" colspan="2" width="6%">Max</TD>'
+			end
+			$item_line += '</TR>'
+			*p $item_line
 		end
-		$item_line += '</TR>'
-		*p $item_line
 		i += 1
 	if i <= item_idx:jump 'loopshopping_cart'
 	'</table></center>'

+ 18 - 18
locations/katja_lake.qsrc

@@ -139,7 +139,7 @@ if $ARGS[0] = 'lake_activities':
 				if will_cost <= pcs_willpwr:
 					act 'Go in the nude!':
 						*clr & cla
-						gs 'willpower', 'pay', 'selft'
+						gs 'willpower', 'pay', 'self'
 						if PCloSwimwear = 0 and $clothingworntype ! 'nude':
 							$lastwornclothingtype['swim'] = $clothingworntype
 							lastwornclothingnumber['swim'] = clothingwornnumber
@@ -234,7 +234,7 @@ if $ARGS[0] = 'sauna_time':
 					if will_cost <= pcs_willpwr:
 						act 'Go in the nude!':
 							*clr & cla
-							gs 'willpower', 'pay', 'selft'
+							gs 'willpower', 'pay', 'self'
 							if PCloSwimwear = 0 and $clothingworntype ! 'nude':
 								$lastwornclothingtype['swim'] = $clothingworntype
 								lastwornclothingnumber['swim'] = clothingwornnumber
@@ -272,7 +272,7 @@ if $ARGS[0] = 'sauna_time':
 			if will_cost <= pcs_willpwr:
 				act 'Go in the nude!':
 					*clr & cla
-					gs 'willpower', 'pay', 'selft'
+					gs 'willpower', 'pay', 'self'
 					if PCloSwimwear = 0 and $clothingworntype ! 'nude':
 						$lastwornclothingtype['swim'] = $clothingworntype
 						lastwornclothingnumber['swim'] = clothingwornnumber
@@ -532,7 +532,7 @@ if $ARGS[0] ='winter_activities':
 					'You smile tiredly as the crowd returns to their own skating, but there is more than a good share of wonderment at your demonstration. In general, you must say that it has been a great time, but it is time to look for something else to do.'
 
 					act 'Continue':npc_rel['A14'] += 5 & npc_rel['A141'] += 5 & gs 'exp_gain', 'stren', 1 & gs 'exp_gain', 'agil', 1 & gs 'exp_gain', 'react', 1 & gs 'exp_gain', 'icesktng', 1 & grupvalue[1] += 10 & grupvalue[2] += 5 & gt 'katjaEv','kathan'
-				
+
 				elseif dummy >50:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS4.jpg"></center>'
 					'"Oh god! <<$pcs_nickname>>! Oh god! What are you doing to me! Oh god!"'
@@ -541,7 +541,7 @@ if $ARGS[0] ='winter_activities':
 					'Smiling, she grabs your hand and pulls, taking the lead and skating towards the crowd, this time without flourishing moves. You both enjoy some well-deserved distraction from your everyday problems.'
 					'And that is how you pass the next half hour. Skating, giggling and in general just showing off, before it is time to look for something else to do.'
 
-					act 'Continue':npc_rel['A14'] += 1 & gt 'katjaEv','kathan'	
+					act 'Continue':npc_rel['A14'] += 1 & gt 'katjaEv','kathan'
 
 				else
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS3.jpg"></center>'
@@ -552,7 +552,7 @@ if $ARGS[0] ='winter_activities':
 					'You hold each other, laughing, as you try to dance over the ice and in general, have a great time on this winter day, showing off and being "cool" and "pretty", things that a "popularity" conscientious Katja enjoys. Of course, the fact that the two of you are having a great time is a bonus, but after a great half hour, you are both a little weary and decide that it is time to look for something else to do.'
 
 					act 'Continue':npc_rel['A14'] += 1 & gt 'katjaEv','kathan'
-				end	
+				end
 			end
 		end
 	end
@@ -622,7 +622,7 @@ if $ARGS[0] = 'hockey_match':
 	'"Seriously, your boyfriend sucks, and you''re only embarrassing yourselves!"'
 	'Some girls next to you appear less than thrilled with the Meynold''s spirited cheering. Katja appears offended, while Vicky playfully sticks her tongue out before resuming her cheers. On the other side, the other girls scoff at your group and, after deeming your little gang "childish," return their focus to the match. Hm... Maybe you should do something.'
 
-	
+
 	act 'Who cares? Continue watching the match.':
 		*clr & cla
 		menu_off = 1
@@ -1007,7 +1007,7 @@ if $ARGS[0] = 'ivan_interaction':
 			cla
 			npc_rel['A14'] += 1
 			npc_rel['A3'] += 1
-			minut += 10 
+			minut += 10
 			pcs_mood += 10
 			gs 'stat'
 			'"Hey Ivan! Why not sit with Katja and me for a while?"'
@@ -1021,12 +1021,12 @@ if $ARGS[0] = 'ivan_interaction':
 			cla
 			npc_rel['A14'] += 1
 			npc_rel['A3'] += 1
-			minut += 10  
+			minut += 10
 			gs 'stat'
 			'Talking with Ivan, King of the Lone Wolves, is an uphill battle. He is evidently not interested in the sort of things Katja likes to talk about and would probably prefer to jump back into his swimming. Alas, Ivan is too polite to just tell you to fuck off, and that is a weakness you and Katja can exploit.'
 			'After some pestering, Ivan finally resigns to sit with you and pass the time in "civilized" conversation. The minutes pass, with him primarily listening to your endless rants, but after a while, between Katja''s shyness and Ivan''s apathy, silence falls over the three of you, leaving your little trio observing the lake in tranquillity.'
 			'"Ehm... Girls, I must return to my training."'
-			'You blink. Ivan''s words take you by surprise and before you or Katja can say something, he quickly returns to the lake. Time to look for something else to do.'			
+			'You blink. Ivan''s words take you by surprise and before you or Katja can say something, he quickly returns to the lake. Time to look for something else to do.'
 		end
 
 		if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
@@ -1117,7 +1117,7 @@ if $ARGS[0] = 'ivan_interaction':
 								'"Ok Katja, relax. We have done this before. Ivan isn''t going to hurt you."'
 								'The girl closes her eyes, relaxes and raises a leg over the bench to give Ivan better access to her asshole. A moan escapes her lips as the jock slowly pushes his cock beyond the closely guarded aperture.'
 								'"Uff! Fuck! <<$pcs_nickname>>! Ivan! It''s... It''s big!"'
-								'You silence her moans with a kiss and lead a hand towards her crotch so you can begin to finger her really wet and hot cunt as Ivan slowly fucks her asshole, the room quickly filling with a mix of excited moans and painful grunts coming from between your linked tongues.'									
+								'You silence her moans with a kiss and lead a hand towards her crotch so you can begin to finger her really wet and hot cunt as Ivan slowly fucks her asshole, the room quickly filling with a mix of excited moans and painful grunts coming from between your linked tongues.'
 							end
 							if npc_ass['A14'] < dick: npc_ass['A14'] += 1
 							if npc_ass['A14']*2 < dick: npc_ass['A14'] += 1
@@ -1362,7 +1362,7 @@ if $ARGS[0] = 'saune_time':
 
 					act 'Ice dipping!':
 						*clr & cla
-						gs 'willpower', 'pay', 'force'					
+						gs 'willpower', 'pay', 'force'
 						gs 'stat'
 						gt 'katja_lake','ice_dipping'
 					end
@@ -1532,9 +1532,9 @@ if $ARGS[0] = 'sauna_sex1':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS11.jpg"></center>'
 				'"You want more Katja? Ok, but first..."'
 				'You rise and caress Katja''s flaming red hair. She appears overwhelmed by lust, and, understanding your unspoken request, she readily gets up from her seat and kneels, making way for you to take her spot. Her eager gaze conveys an insatiable desire.'
-				'"<<$pcs_nickname>>... how do you make me want to do this so much?"' 
-				'Katja spreads your legs so she has free access to your pussy, and with a deep sigh, begins to give you small loving kisses all over your thighs. You sit back and attempt to relax, biting your lips as the burning sensation in your cunt becomes greater with Katja''s slow performance.' 
-				'"Katja! Just... Fuck! Use your tongue!"' 
+				'"<<$pcs_nickname>>... how do you make me want to do this so much?"'
+				'Katja spreads your legs so she has free access to your pussy, and with a deep sigh, begins to give you small loving kisses all over your thighs. You sit back and attempt to relax, biting your lips as the burning sensation in your cunt becomes greater with Katja''s slow performance.'
+				'"Katja! Just... Fuck! Use your tongue!"'
 				'The redhead obeys your demand and licks your pussy passionately, her cold tongue causing your body to tremble in pleasure. Your voice can''t be contained and soon, moans fill the sauna, announcing to those beyond the debauched act occurring within, but it''s not enough. You grab Katja by the hair and make her kiss you.'
 
 				act 'You devour each other':gt 'katja_lake','sauna_sex2'
@@ -1576,9 +1576,9 @@ if $ARGS[0] = 'sauna_sex1':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS11.jpg"></center>'
 			'"You want more Katja? Ok, but first..."'
 			'You rise and caress Katja''s flaming red hair. She appears overwhelmed by lust, and, understanding your unspoken request, she readily gets up from her seat and kneels, making way for you to take her spot. Her eager gaze conveys an insatiable desire.'
-			'"<<$pcs_nickname>>... how do you make me want to do this so much?"' 
-			'Katja spreads your legs so she has free access to your pussy, and with a deep sigh, begins to give you small loving kisses all over your thighs. You sit back and attempt to relax, biting your lips as the burning sensation in your cunt becomes greater with Katja''s slow performance.' 
-			'"Katja! Just... Fuck! Use your tongue!"' 
+			'"<<$pcs_nickname>>... how do you make me want to do this so much?"'
+			'Katja spreads your legs so she has free access to your pussy, and with a deep sigh, begins to give you small loving kisses all over your thighs. You sit back and attempt to relax, biting your lips as the burning sensation in your cunt becomes greater with Katja''s slow performance.'
+			'"Katja! Just... Fuck! Use your tongue!"'
 			'The redhead obeys your demand and licks your pussy passionately, her cold tongue causing your body to tremble in pleasure. Your voice can''t be contained and soon, moans fill the sauna, announcing to those beyond the debauched act occurring within, but it''s not enough. You grab Katja by the hair and make her kiss you.'
 			act 'You devour each other':gt 'katja_lake','sauna_sex2'
 		end

+ 1 - 0
locations/mey_vika_events.qsrc

@@ -1463,6 +1463,7 @@ if $ARGS[0] = 'gym0':
 
 		act 'Decline':
 			cla
+			mey_vika['gym_day'] = daystart
 			'"I''m sorry, Vicky. I just came back from a run."Sure, no problem..." Vicky replies irritated, slamming the door.'
 
 			act 'Continue on': gt 'mey_home', 'start'

+ 1 - 1
locations/miroslava_schedule.qsrc

@@ -181,7 +181,7 @@ if $ARGS[0] = 'update_locat':
 	else
 		if npc_known['A60'] = 0 and locat['A60'] ! 10 and locat['A60'] ! 30:				locat['A60'] = 30		& ! Sveta and Mira aren''t friends yet.
 		if MiraVars['QW'] > 15 and locat['A60_prost'] and hour >= 16 and hour < 20:			locat['A60'] = 80		& ! Prostitution
-		if locat['A60'] = 61 and (MiraVars['meadow'] = 2 or MiraVars['meadow'] = 5):		locat['A60'] = 60		& ! If meadow not unlocked -> Forest edge
+		if locat['A60'] = 61 and (MiraVars['meadow'] ! 2 or MiraVars['meadow'] ! 5):		locat['A60'] = 60		& ! If meadow not unlocked -> Forest edge
 		if locat['A60'] = 51 and (sunweather = 0 or temper < 15 or month < 5 or month > 9):	locat['A60'] = 10		& ! Winter = No Beach
 		if locat['A60'] = 42 and (MiraVars['QW'] = 0 or npc_drunk['A60'] > 0):				locat['A60'] = 10		& ! drunk or doesn''t know the guys
 		if (locat['A60'] / 10) = 2 and grandpaQW['chore_herd_cattle'] = 1 and $loc = 'gad_field' and npc_rel['A60'] >= 15 and (npc_QW['A63'] < 13 or MiraVars['QW'] >= 10 or MiraVars['had_sex'] > 1): locat['A60'] = 70		& ! Mira visits in the field if she was planning to visit you either way.

+ 9 - 9
locations/natbel_friend.qsrc

@@ -1332,7 +1332,7 @@ if $ARGS[0] = 'city_date1_mall':
 				*clr & cla
 				minut += 140
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/hands.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/Hands.jpg"></center>'
 				'Your food and drink soon arrives and you start eating and chatting whilst occasionally holding hands across the table.'
 				'"Well Natasha this is shaping up to be a great weekend. Anyway back to your question about my jobs." You stop momentarily.'
 
@@ -1498,7 +1498,7 @@ if $ARGS[0] = 'city_date1_jobs_model2':
 
 			act 'Yeah that''s me':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/hands.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/Hands.jpg"></center>'
 !If Sveta doesn''t run at St. P.
 				if temp_runner = 0:
 					'"Well... Yes Natasha, I didn''t want to say anything as I really don''t want that known as it''d just cause problems but yes I do it because the money is good. Maybe I''ll stop soon, I''ll have to think about that. I''m sorry I lied to you initially, that wasn''t nice!"'
@@ -1560,7 +1560,7 @@ if $ARGS[0] = 'city_date1_fashionblog':
 
 		act 'Start undressing':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/Kissing_games/natasha43.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha43.jpg"></center>'
 			'You arrive back at the hotel and enter your room and immediately guide Natasha to the bed and after a passionate kiss you start pulling her dress down. "I''ve been wanting to do that for a while now, good thing we were in a public place earlier or you''d never have finished your meal!"'
 
 			gs 'arousal', 5, 'kiss', 'foreplay'
@@ -1568,7 +1568,7 @@ if $ARGS[0] = 'city_date1_fashionblog':
 
 			act 'Get down to business':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/Kissing_games/natasha44.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha44.jpg"></center>'
 				'You pull her dress down and she steps out of it then sits back on the bed.'
 				'Wasting no time you crawl over to her and push her down onto her back and start massaging her breasts.'
 
@@ -1577,7 +1577,7 @@ if $ARGS[0] = 'city_date1_fashionblog':
 
 				act 'Lick her':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/Kissing_games/natasha45.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha45.jpg"></center>'
 					'With your dress now loosely around your waist you turn your attention to Natasha''s pussy as she pulls her panties to the side for you.'
 					'As you start alternately licking and flicking your tongue in and out of her clit she starts moaning and you start tasting her juices which start flowing freely.'
 
@@ -1586,7 +1586,7 @@ if $ARGS[0] = 'city_date1_fashionblog':
 
 					act 'Natasha takes control':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/Kissing_games/natasha46.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha46.jpg"></center>'
 						'She''s really gets into it and takes over pushing you down on the bed then immediately climbing on top of you.'
 						'Looking down at you with a mixture of love and lust she straddles your leg and starts riding it as she strokes your body.'
 						'It doesn''t take long before she cums on your thigh soaking it with her juices.'
@@ -1596,7 +1596,7 @@ if $ARGS[0] = 'city_date1_fashionblog':
 
 						act '69':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/Kissing_games/natasha47.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha47.jpg"></center>'
 							'She leaves you lying on the bed and completely climbs on top of you presenting her pussy to your eager mouth.'
 							'As you get to work on her you feel Natasha sliding her tongue slowly up and down and flicking it inside you as she sucks up your juices that are flowing out by now.'
 							'Suddenly and almost without warning the dam bursts and you reach a toe curling orgasm squirting into her mouth and soaking her face with your juices.'
@@ -1612,7 +1612,7 @@ if $ARGS[0] = 'city_date1_fashionblog':
 								NatBelQW['FriendLover'] = 8
 								gs 'stat'
 
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/Kissing_games/natasha48.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha48.jpg"></center>'
 								'You both slowly come down from your high and sit back on the bed cuddling and kissing each other as you both catch your breath.'
 								'Eventually you are able to speak. "Well that was definitely worth the wait! I''m glad you''re my <i>girlfriend</i>, you''d have been wasted on guys!"'
 								'Natasha simply responds by kissing you and playing with you, kisses which you return.'
@@ -1627,7 +1627,7 @@ if $ARGS[0] = 'city_date1_fashionblog':
 									minut += 5
 									gs 'stat'
 
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/Kissing_games/natasha49.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha49.jpg"></center>'
 									'You both get washed, do your teeth and climb into bed after a long day.'
 									'Flopping down on the bed Natasha gives you a final kiss and a after a quick cuddle closes her eyes falling asleep almost immediately.'
 

+ 3 - 0
locations/newspaper.qsrc

@@ -46,6 +46,8 @@ end
 
 if $ARGS[0] = 'start':
 	temp_np_page = 0
+	menu_off = 1
+	gs 'stat'
 	gs 'newspaper', 'view'
 end
 
@@ -59,6 +61,7 @@ if $ARGS[0] = 'view':
 		if newspaperVars['dbag'] = 0:
 			gt $menu_loc, $menu_arg
 		else
+			newspaperVars['dbag'] = 0
 			gs 'din_bad', 'd_bag'
 		end
 	end

+ 2 - 0
locations/olu.qsrc

@@ -594,6 +594,8 @@ if $ARGS[0] = 'anyaolusvet':
 							'Olu waves back to her. "Bye." Then he glances to you and you say. "I should really get going as well, talk to you later ok." He nods to that and you head out shortly after your sister. You see her going down the starts just as you walk out the door.'
 							gs 'arousal', 'foreplay', 5, 'group'
 							gs 'cum_call', 'face', 'A55', 1
+							cumspclnt = 1
+							gs 'cum_cleanup'
 							gs 'arousal', 'end'
 							gs 'stat'
 							act 'Leave': gt 'pod_ezd', 'etaj_4'

+ 0 - 2
locations/pav_disco.qsrc

@@ -100,7 +100,6 @@ if $ARGS[0] = '':
 				gs 'fame', 'pav', 'sex', 5
 				pcs_mood -= 40
 				gs 'stat'
-				'<center><b><font color="maroon">Disco</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/cumface1.jpg"></center>'
 				'As you head out on the dance floor, a guy walks up to you, notices the cum still splattered on you and points at you. "Check out this cocksucker! Hey guys, this chick has cum smeared all over her face!" The ones standing near him come closer. "Did you forget to swallow, slut?" Your cheeks blush with shame and you quickly head for the exit.'
 				act 'Leave': gt 'pav_commcenter'
@@ -114,7 +113,6 @@ if $ARGS[0] = '':
 				frost = 0
 				gs 'stat'
 				if alko = 0:
-					'<center><b><font color="maroon">Disco</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/dance.jpg"></center>'
 					if $pantyworntype = 'none' and PCloSkirt > 2:
 						inhib_exp += 1

+ 2 - 0
locations/pav_parkev.qsrc

@@ -685,6 +685,7 @@ if $ARGS[0] = 'gopboys':
 	'Vitek, Dan, Lavrenti, Niko, Roman, Arkadi, Vasily and Pauline are sitting at a picnic table, drinking beers and smoking cigarettes and weed. They''re getting wasted and having a good time, laughing and messing around.'
 	act 'Move away':gt 'pav_park', 'deeper_park'
 	act 'Join them':
+		cla
 		'You walk over to them. "Hey guys."'
 		if grupTipe = 5:
 			'They give you a look of disgust. "Get lost, loser!"'
@@ -754,6 +755,7 @@ if $ARGS[0] = 'gopniks':
 	'Vitek, Dan, Lavrenti, Roman, Arkadi, Niko, Valentin, Radomir, Vasily, Pauline, Lena, Lera, Anushka and Alyona are all sitting at a picnic table, drinking beers and smoking cigarettes & weed. They''re getting wasted and having a good time, laughing and messing around.'
 	act 'Move away': gt 'pav_park', 'deeper_park'
 	act 'Join them':
+		cla
 		'You walk over to them. "Hey guys."'
 		if grupTipe = 5:
 			'They give you a look of disgust. "Get lost, loser!"'

+ 1 - 1
locations/pav_pool.qsrc

@@ -180,7 +180,7 @@ if $ARGS[0] = 'lockerfemale':
 !!	end
 
 	if (pcs_makeup = 1 or cosmetic_tattoo > 0) and PCloswimwear = 1:
-		act 'Enter the pool area': gs 'shoes', 'strip' & gt 'pav_pool', 'pool'
+		act 'Enter the pool area': gt 'pav_pool', 'pool'
 	else
 		*nl
 		if PCloswimwear = 0: 'You need to put some swimwear on first if you want to go into the pool.'

+ 22 - 30
locations/pod_ezd.qsrc

@@ -573,9 +573,7 @@ if $ARGS[0] = 'floor4_events':
 		gs 'willpower', 'voyeur', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Hide and watch them (<<will_cost>> Willpower)':
-				*clr & cla
 				gs 'willpower', 'pay', 'self'
-				gs 'stat'
 				gt 'pod_ezd', 'lena_show'
 			end
 		else
@@ -1556,52 +1554,46 @@ end
 
 if $ARGS[0] = 'lena_show':
 	menu_off = 1
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_1.jpg"></center>'
-	'As you walk around a corner in the stairwell, you see Yelena Kotov, a girl from your class. She''s taking off her panties in front of several guys. If her brother Vitek could see this, he''d probably be beating the crap out of them right now; he''s really protective of his sister.'
 	gs 'arousal', 'erotic_nudity', 3
 	gs 'stat'
+	*clr & cla
+
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_2.jpg"></center>'
+	'Lena turns her back to the guys next, and pulls up her skirt slightly. She shows off her well-toned ass, slowly wagging it as she asks seductively over her shoulder, "Do you like what you see, boys?"'
+	gs 'arousal', 'erotic', 3
+	gs 'stat'
 	act 'Leave': gt 'pod_ezd', 'etaj_4'
-	act 'Hide and watch them':
+	act 'Continue':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_2.jpg"></center>'
-		'Lena turns her back to the guys next, and pulls up her skirt slightly. She shows off her well-toned ass, slowly wagging it as she asks seductively over her shoulder, "Do you like what you see, boys?"'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_3.jpg"></center>'
+		'One of the guys has a lewd grin on his face as he gets an idea, and tells Lena to strike a pose as he pulls his phone out of his pocket. He begins to take photos of Lena, while the other guys encourage her to show more.'
 		gs 'arousal', 'erotic', 3
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_4'
 		act 'Continue':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_3.jpg"></center>'
-			'One of the guys has a lewd grin on his face as he gets an idea, and tells Lena to strike a pose as he pulls his phone out of his pocket. He begins to take photos of Lena, while the other guys encourage her to show more.'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_4.jpg"></center>'
+			'Lena really gets into it, posing seductively for the camera now while she lets her skirt ride up a little more. You can tell the stares of the guys turn her on a lot, and you realize Vitek''s little sister is not as innocent as she looks.'
 			gs 'arousal', 'erotic', 3
 			gs 'stat'
 			act 'Leave': gt 'pod_ezd', 'etaj_4'
 			act 'Continue':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_4.jpg"></center>'
-				'Lena really gets into it, posing seductively for the camera now while she lets her skirt ride up a little more. You can tell the stares of the guys turn her on a lot, and you realize Vitek''s little sister is not as innocent as she looks.'
-				gs 'arousal', 'erotic', 3
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_5.jpg"></center>'
+				'Lena spreads her legs further, really showing off her pussy to the camera now. The guys are getting quite aroused, and a few of them are rubbing their groins uncomfortably.'
+				gs 'arousal', 'erotic_nudity', 3
 				gs 'stat'
-				act 'Leave': gt 'pod_ezd', 'etaj_4'
+				act 'Leave': gs 'arousal', 'end' & gt 'pod_ezd', 'etaj_4'
 				act 'Continue':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_5.jpg"></center>'
-					'Lena spreads her legs further, really showing off her pussy to the camera now. The guys are getting quite aroused, and a few of them are rubbing their groins uncomfortably.'
-					gs 'arousal', 'erotic_nudity', 3
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_6.jpg"></center>'
+					'Lena turns her back to the guys again, her skirt pulled up so far now that she''s showing off all her holes to the camera.'
+					'Then she decides the photo shoot is over, and asks them, "So boys, who wants to go first?"'
+					'While the guys enthusiastically gather around her you realize you should probably go, before someone notices you.'
+					gs 'arousal', 'erotic', 3
+					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave': gs 'arousal', 'end' & gt 'pod_ezd', 'etaj_4'
-					act 'Continue':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_6.jpg"></center>'
-						'Lena turns her back to the guys again, her skirt pulled up so far now that she''s showing off all her holes to the camera.'
-						'Then she decides the photo shoot is over, and asks them, "So boys, who wants to go first?"'
-						'While the guys enthusiastically gather around her you realize you should probably go, before someone notices you.'
-						gs 'arousal', 'erotic', 3
-						gs 'arousal', 'end'
-						gs 'stat'
-						act 'Leave': gt 'pod_ezd', 'etaj_4'
-					end
+					act 'Leave': gt 'pod_ezd', 'etaj_4'
 				end
 			end
 		end

+ 2 - 2
locations/praiders_garage_chat.qsrc

@@ -1771,7 +1771,7 @@ if $ARGS[0] = 'chat_niko1':
 				'"Now that you mention it, I have seen a few of those around. Let me tell you about them," he sarcastically responds.'
 				'You shake your head before getting up and walking away.'
 			else
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/Movies/Restroom/Men/Gang/fight.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/Restroom/Men/Gang/fight.jpg"></center>'
 				'Not having much to talk about, you decide to start up a casual conversation with Niko. "Is there anything new around here? It''s been kind of a drag lately."'
 				'He pulls out his phone and shows you a picture of two guys fighting in what looks like an alley behind a club. "Look at these assholes. Can you believe that these dipshits were fighting over a stripper?"'
 				'You tilt your head in surprise. "All of that over a stripper? Was she dating one of them?"'
@@ -1780,7 +1780,7 @@ if $ARGS[0] = 'chat_niko1':
 				'Niko nods his head. "Exactly what I thought. There are some girls worth fighting for, girls like you, but those trashy girls aren''t worth the time they take up. What a bunch of idiots..." He continues shaking his head as the party wraps up.'
 			end
 		elseif VK = 3:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/Strela/vadimbely.jpg"></center>'
 			'Not having much to talk about, you decide to start up a casual conversation with Niko. "Is there anything new around here? It''s been kind of a drag lately."'
 			'He pulls out his phone and shows you a picture of a really tough looking man. "Check out this guy. Do you know who he is?"'
 			'Not recognizing the man, you shake your head. "No, but he looks really tough."'

+ 1 - 1
locations/pushkin_ballet_class.qsrc

@@ -364,7 +364,7 @@ if $ARGS[0] = 'makeup':
 	gs 'themes', 'indoors'
 	! set stats for make up gain - makupskl_lvl
 	gs 'exp_gain', 'intel', rand(1,2)
-	gs 'exp_gain', 'makeupskl', rand(1,2)
+	gs 'exp_gain', 'makupskl', rand(1,2)
 	makupskl_lvl += rand(1, 3)
 	!pcs_makeup = 4
 	gs 'shortgs', 'setloc', 'pushkin_ballet_class', $ARGS[0]

+ 1 - 1
locations/radapt.qsrc

@@ -864,7 +864,7 @@ if $ARGS[0] = 'firstvisit':
 		minut += 1
 		gs 'stat'
 		'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/Radislav.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/radislav.jpg"></center>'
 		'There''s a small coat rack with several coats hanging from it, a large mirror just down the hall and a few paintings hanging on the wall. Other than that, the hall is empty and very clean.'
 		*nl
 		'As you follow Radomir down the hall, a young man steps out from one of the doorways. He looks a lot like Radomir, but is at least five or six years older than him, half dozen or more centimeters taller, and ten to fifteen kilograms heavier.'

+ 1 - 1
locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 9
 version_revision = 4
-version_patch = 0
+version_patch = 1
 --- saveg ---------------------------------
 

+ 1 - 1
locations/saveupdater.qsrc

@@ -3623,7 +3623,7 @@ if temp_current_save_version < 00090304:
 end
 
 
-if temp_current_save_version < 00090400:
+if temp_current_save_version < 00090401:
 
 
 

+ 9 - 7
locations/sex_ev_boy_pillow_talk.qsrc

@@ -438,7 +438,7 @@ if $ARGS[0] = 'boy_pube_talk_first':
 !!	if ($npc_like_pubestyle[$boy] ! '' and $npc_like_pubestyle[$boy] ! $pube_style['word']) or ($npc_like_pubestyle[$boy] = 'none' and $npc_know_pubes[$boy] ! $pube_style['word']):gt'sex_ev_pillow_talk', 'boy_pubes_changed'
 
 	if $pube_style['word'] = 'shaved':
-		if $npc_like_pubestyle[$boy] = $pube_style['word']:
+		if npc_pref_values['hair_pubes_shaven'] > 0:
 			!! this determines if you''ve already had this conversation before
 			'"I love how sexy your pussy is," <<$npc_firstname[$boy]>> says, admiringly running his fingers across the smooth skin of your pubic area.'
 			gs 'sex_ev_boy_pillow_talk', 'boy_likes_pubes2'
@@ -495,7 +495,7 @@ if $ARGS[0] = 'boy_pube_talk_first':
 			gs 'sex_ev_boy_pillow_talk', 'pubes_other_lovers'
 		end
 	elseif $pube_style['word'] = 'stubble':
-		if $npc_like_pubestyle[$boy] = 'shaved':
+		if npc_pref_values['hair_pubes_shaven'] > 0:
 			!! this determines if you''ve already had this conversation before
 			'"You forget to shave today?" <<$npc_firstname[$boy]>> says eyeing your stubbly pussy.'
 			gs 'sex_ev_boy_pillow_talk', 'boy_likes_pubes2'
@@ -551,7 +551,7 @@ if $ARGS[0] = 'boy_pube_talk_first':
 			gs 'sex_ev_boy_pillow_talk', 'pubes_other_lovers2'
 		end
 	elseif $pube_style['word'] = 'trimmed':
-		if $npc_like_pubestyle[$boy] = $pube_style['word']:
+		if npc_pref_values['hair_pubes_trimmed'] > 0:
 			!! ^^ this determines if you''ve already had this conversation before
 			if $npc_know_pubeshape[$boy] = $pube_style['shape']:
 				'"I still can''t get over how sexy your bush is," <<$npc_firstname[$boy]>> says, looking admiringly at your neatly trimmed pussy hair.'
@@ -604,7 +604,7 @@ if $ARGS[0] = 'boy_pube_talk_first':
 	elseif $pube_style['word'] = 'bush' or $pube_style['word'] = 'untrimmed':
 	!! full bush talk
 	!! find real number later
-		if $npc_like_pubestyle[$boy] = $pube_style['word']:
+		if npc_pref_values['hair_pubes_bush'] > 0 or npc_pref_values['hair_pubes_untrimmed'] > 0:
 			!! this determines if you''ve already had this conversation before
 			'"I still can''t get over how sexy your bush is," <<$npc_firstname[$boy]>> says, looking admiringly at your furry pussy.'
 			gs 'sex_ev_boy_pillow_talk', 'boy_likes_pubes2'
@@ -910,7 +910,9 @@ end
 
 if $ARGS[0] = 'boy_likes_pubes':
 !!	if $pube_style['word'] = 'bush' or $pube_style['word'] = 'untrimmed':
-		$npc_like_pubestyle[$boy] = $pubestyle
+		!$npc_like_pubestyle[$boy] = $pubestyle
+		!! Not sure how to do this
+
 		act 'Good to know':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/after/pillow_talk3.mp4"></video></center>'
@@ -1066,7 +1068,7 @@ end
 
 
 if $ARGS[0] = 'pubes_other_lovers':
-	if $npc_like_pubestyle[$boy] ! '':
+	if npc_pref_values['hair_pubes_shaven'] > 0 or npc_pref_values['hair_pubes_trimmed'] > 0 or npc_pref_values['hair_pubes_bush'] > 0 or npc_pref_values['hair_pubes_untrimmed'] > 0:
 		act 'My ex liked it':
 			cla & *nl
 			'"My ex preferred it this way," you shrug. "Why do you ask?"'
@@ -1112,7 +1114,7 @@ end
 
 if $ARGS[0] = 'boy_pube_talk_followup':
 	if $pube_style['word'] = 'shaved':
-		if $npc_like_pubestyle[$boy] = 'shaved':
+		if npc_pref_values['hair_pubes_shaven'] > 0:
 			if $npc_know_pubes[$boy] ! 'shaved':
 
 			else

+ 25 - 25
locations/sex_ev_condoms.qsrc

@@ -139,7 +139,7 @@ if $ARGS[0] = 'condom_wait':
 				end
 			end
 
-			if mc_inventory['normal_condoms'] > 0:
+			if mc_inventory['equipped_condoms'] > 0:
 				act'Get a condom from your bag':
 					cla & *nl
 					'"Wait!" you yelp and scramble for your bag to pull out a condom, holding it between you. "You need to use a condom. Please?"'
@@ -157,7 +157,7 @@ if $ARGS[0] = 'pc_condom_use_stats':
 	sex_ev['pc_condoms_used'] += 1
 	sex_ev['must_fuck'] = 1
 	sex_ev['condom_check'] = 1
-	mc_inventory['normal_condoms'] -= 1
+	mc_inventory['equipped_condoms'] -= 1
 	if npc_no_condoms[$boy] > 0: sex_ev['pc_insist_condom'] = 1
 end
 
@@ -176,7 +176,7 @@ if $ARGS[0] = 'pc_use_lube_vag':
 end
 
 if $ARGS[0] = 'pc_need_condoms':
-	if mc_inventory['normal_condoms'] > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Use your condoms':
 			sex_ev['pc_wants_condoms'] = 1
 			cla & *nl
@@ -187,7 +187,7 @@ if $ARGS[0] = 'pc_need_condoms':
 end
 
 if $ARGS[0] = 'pc_condoms':
-	if mc_inventory['normal_condoms'] > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Pull out a condom':
 			sex_ev['using_pc_condoms'] = 1
 			cla & *nl
@@ -239,7 +239,7 @@ if $ARGS[0] = 'pc_condoms2':
 end
 
 if $ARGS[0] = 'pc_use_condoms':
-	if mc_inventory['normal_condoms'] > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Put a condom on him':
 			gs 'sex_ev_condoms', 'pc_condom_use_stats'
 			cla & *clr
@@ -583,12 +583,12 @@ if $ARGS[0] = 'npc_out_of_condoms':
 	end
 	gs 'sex_ev_after', 'no_condom_end'
 	gs 'sex_ev_condoms', 'pc_skip_the_condom'
-	if mc_inventory['normal_condoms'] > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Use one of your condoms':
 			gs 'sex_ev_condoms', 'pc_condom_use_stats'
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
-			iif(mc_inventory['normal_condoms'] = 1, '"That''s okay, I''ve got one."', '"That''s okay, I''ve got some."')
+			iif(mc_inventory['equipped_condoms'] = 1, '"That''s okay, I''ve got one."', '"That''s okay, I''ve got some."')
 			'You reach into your bag and pull out a condom, rolling it onto his cock.'
 			gs 'sex_ev_sex', 'position_choose'
 		end
@@ -598,7 +598,7 @@ if $ARGS[0] = 'npc_out_of_condoms':
 			gs 'sex_ev_condoms', 'pc_condom_use_stats'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/misc/condom_mouth.mp4"></video></center>'
-			iif(mc_inventory['normal_condoms'] = 1, '"That''s okay, I''ve got one."', '"That''s okay, I''ve got some."')
+			iif(mc_inventory['equipped_condoms'] = 1, '"That''s okay, I''ve got one."', '"That''s okay, I''ve got some."')
 			'You reach into your bag and pull out a condom, rolling it onto his cock with your mouth.'
 			gs 'sex_ev_sex', 'position_choose'
 		end
@@ -932,7 +932,7 @@ if $ARGS[0] = 'insist_need_condom':
 			gs 'sex_ev_condoms', 'pc_use_condoms'
 		else
 			'"Ugh, <i>fine</i>..." he sighs. "But I don''t have any. Do you?"'
-			if mc_inventory['normal_condoms'] = 0:
+			if mc_inventory['equipped_condoms'] = 0:
 				'"No..." you say, a little embarrassed. "I thought you would."'
 				if npc_no_condoms[$boy] > 0:
 					if npc_no_condoms_know[$boy] = 1:
@@ -1127,7 +1127,7 @@ if $ARGS[0] = 'no_condom1':
 				gs 'sex_ev_virgin', 'no_condom_offer'
 			elseif sex_ev['danger_day'] = 1 and npc_childfree[$boy] > 0:
 				sex_ev['condom'] = 1
-				if sex_ev['using_pc_condoms'] = 1 and mc_inventory['normal_condoms'] > 0:
+				if sex_ev['using_pc_condoms'] = 1 and mc_inventory['equipped_condoms'] > 0:
 					'"What the fuck! Why didn''t you say so!" he says, immediately taking the condom from you and clumsily rolling the little rubber onto his cock.'
 					gs 'sex_ev_condoms', 'pc_condom_use_stats'
 					if $sex_ev['position'] ! 'miss' or $sex_ev['position'] ! 'doggy' or $sex_ev['position'] ! 'cowgirl': $sex_ev['position'] = 'miss'
@@ -1139,7 +1139,7 @@ if $ARGS[0] = 'no_condom1':
 			elseif rand(1,10) < 8:
 				sex_ev['condom'] = 1
 				sex_ev['pc_insist_condom'] = 1
-				if sex_ev['using_pc_condoms'] = 1 and mc_inventory['normal_condoms'] > 0:
+				if sex_ev['using_pc_condoms'] = 1 and mc_inventory['equipped_condoms'] > 0:
 					'"Ugh, fine," <<$npc_firstname[$boy]>> grumbles, taking the condom from you and clumsily rolling the little rubber onto his cock.'
 					gs 'sex_ev_condoms', 'pc_condom_use_stats'
 					if $sex_ev['position'] ! 'miss' or $sex_ev['position'] ! 'doggy' or $sex_ev['position'] ! 'cowgirl': $sex_ev['position'] = 'miss'
@@ -1239,7 +1239,7 @@ if $ARGS[0] = 'no_condom2':
 end
 
 if $ARGS[0] = 'no_condom2.1':
-	if mc_inventory['normal_condoms'] > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'I''ve got some':
 			cla & *clr
 			gs 'sex_ev_condoms', 'pc_condom_use_stats'
@@ -1620,7 +1620,7 @@ if $ARGS[0] = 'reenable_condoms2':
 		'"That''s fair," <<$npc_firstname[$boy]>> nods. "So do you want to use mine or yours today?"'
 		act'Yours':
 			cla & *nl
-			if mc_inventory['normal_condoms'] = 0:
+			if mc_inventory['equipped_condoms'] = 0:
 				'"Yours," you say. "I don''t have any on me today."'
 				'<<$npc_firstname[$boy]>> nods again and reaches for a condom from his nightstand while you wait, happy that this didn''t have to be a big deal.'
 			else
@@ -1630,7 +1630,7 @@ if $ARGS[0] = 'reenable_condoms2':
 			act'Continue':gs 'sex_ev_condoms', 'npc_condom_use'
 		end
 
-		if mc_inventory['normal_condoms'] > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			act'Mine':
 				cla & *nl
 				'"Mine," you smile, happy that this didn''t have to be a big deal.'
@@ -1652,7 +1652,7 @@ if $ARGS[0] = 'reenable_condoms3':
 				cla & *nl
 				'"This isn''t up for debate," you insist. "It''s condoms or we can''t fuck anymore."'
 				'"Ugh, fine. But you need to bring them. I don''t have any."'
-				if mc_inventory['normal_condoms'] = 0:
+				if mc_inventory['equipped_condoms'] = 0:
 					act'Uh oh':
 						cla & *nl
 						'"Uhh..."'
@@ -1987,7 +1987,7 @@ if $ARGS[0] = 'need_condoms_today':
 				gs 'sex_ev_condoms', 'no_condom2'
 			end
 		end
-		if mc_inventory['normal_condoms'] > 0:
+		if mc_inventory['equipped_condoms'] > 0:
 			act'Use yours':
 				sex_ev['using_pc_condoms'] = 1
 				cla & *nl
@@ -2134,7 +2134,7 @@ if $ARGS[0] = 'pc_dangerous_day_condom_insist2':
 		gs 'sex_ev_condoms', 'npc_condom_put_on'
 	elseif npc_no_condoms[$boy] > 0 and npc_childfree[$boy] = 1:
 		'"Ugh fine..." he sighs. "But I don''t have any. We need to use yours."'
-		if mc_inventory['normal_condoms'] = 0:
+		if mc_inventory['equipped_condoms'] = 0:
 			'"I don''t have any..." you say reluctantly. "I thought you would."'
 			if npc_no_condoms_know[$boy] = 1:
 				'"I can''t imagine why you''d think that," he replies dryly. "You know I don''t use them."'
@@ -2155,7 +2155,7 @@ if $ARGS[0] = 'pc_dangerous_day_condom_insist2':
 		act'Ask to use his':
 			cla & *clr
 			$sex_ev['bed_room']
-			if mc_inventory['normal_condoms'] > 0:
+			if mc_inventory['equipped_condoms'] > 0:
 				'"Could we use yours?" you ask and he immediately reaches over to grab one.'
 			else
 				'"I don''t have any on me. Can we use yours?" you ask and he immediately reaches over to grab one.'
@@ -2175,7 +2175,7 @@ if $ARGS[0] = 'pc_dangerous_day2':
 			act'Ask to use his':
 				cla & *clr
 				$sex_ev['bed_room']
-				if mc_inventory['normal_condoms'] > 0:
+				if mc_inventory['equipped_condoms'] > 0:
 					'"Could we use yours?" you ask and he immediately reaches for one.'
 				else
 					'"I don''t have any on me. Can we use yours?" you ask.'
@@ -2653,8 +2653,8 @@ end
 
 if $ARGS[0] = 'virgin_condom_pc_ask1':
 	gs 'willpower', 'sex', 'resist', 'medium'
-	if will_cost <= pcs_willpwr and (mc_inventory['normal_condoms'] + mc_inventory['normal_condoms'] > 0):
-!!	if mc_inventory['normal_condoms'] + mc_inventory['normal_condoms'] > 0:
+	if will_cost <= pcs_willpwr and (mc_inventory['equipped_condoms'] > 0):
+!!	if mc_inventory['equipped_condoms'] > 0:
 
 		act'Pull out a condom (<<will_cost>> Willpower)':
 			cla & *clr
@@ -2775,15 +2775,15 @@ if $ARGS[0] = 'virgin_condom_ask2':
 		gs'sex_ev_condoms', 'virgin_condom2'
 	end
 
-	if mc_inventory['normal_condoms'] > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Get one from your bag':
 			sex_ev['using_pc_condoms'] = 1
 			gs 'sex_ev_condoms', 'pc_condom_use_stats'
 			cla & *clr
 			$sex_ev['bed_room']
-			if mc_inventory['normal_condoms'] > 1:
+			if mc_inventory['equipped_condoms'] > 1:
 				'"That''s okay, I''ve got some."'
-			elseif mc_inventory['normal_condoms'] = 1:
+			elseif mc_inventory['equipped_condoms'] = 1:
 				'"That''s okay, I''ve got one."'
 			end
 			if LudaQW['free_condoms'] = 1:
@@ -2915,7 +2915,7 @@ if $ARGS[0] = 'virgin_no_condom_shock1':
 end
 
 if $ARGS[0] = 'virgin_npc_doesnt_condom':
-	if mc_inventory['normal_condoms'] > 0:
+	if mc_inventory['equipped_condoms'] > 0:
 		act'Use one of your condoms':
 			'"Fine! Here!" You fish through your bag and pull one out handing it to him.'
 			'While he rolls it on, you make sounds of annoyance, glaring at him.'

+ 3 - 3
locations/sex_ev_pillow_talk.qsrc

@@ -494,9 +494,9 @@ if $ARGS[0] = 'ran_out_of_condoms':
 			sex_ev['keep_it_up'] = 1
 			cla & *clr
 			gs'sex_ev_pillow_talk', 'pillow_picture1'
-			if sex_ev['out_of_condoms'] >= 1 and mc_inventory['normal_condoms'] = 0 and sex_ev['pc_condom_count'] ! 0 and sex_ev['condoms_used'] = 0:
+			if sex_ev['out_of_condoms'] >= 1 and mc_inventory['equipped_condoms'] = 0 and sex_ev['pc_condom_count'] ! 0 and sex_ev['condoms_used'] = 0:
 				'"I can''t believe how many condoms we went through," you say, looking around in awe at the discarded rubber sleeves littering the room. "You used up my <i>whole</i> stash!"'
-			elseif sex_ev['out_of_condoms'] >= 1 and mc_inventory['normal_condoms'] = 0 and sex_ev['pc_condom_count'] ! 0:
+			elseif sex_ev['out_of_condoms'] >= 1 and mc_inventory['equipped_condoms'] = 0 and sex_ev['pc_condom_count'] ! 0:
 				'"I can''t believe we used <i>all</i> our condoms," you say, looking around in awe at the discarded rubber sleeves littering the room. "Your stash and mine!"'
 			else
 				'"I can''t believe we used <i>all</i> your condoms," you say, looking around in awe at the discarded rubber sleeves littering the room.'
@@ -511,7 +511,7 @@ if $ARGS[0] = 'ran_out_of_condoms':
 			$sex_ev['convo'] = 'used_all_condoms'
 			cla & *clr
 			gs'sex_ev_pillow_talk', 'pillow_picture1'
-			if sex_ev['out_of_condoms'] >= 1 and mc_inventory['normal_condoms'] = 0 and sex_ev['condoms_used'] = sex_ev['fuck_count']:
+			if sex_ev['out_of_condoms'] >= 1 and mc_inventory['equipped_condoms'] = 0 and sex_ev['condoms_used'] = sex_ev['fuck_count']:
 				'"You really need to buy more condoms," you sigh. "It really puts a damper on things if we can''t fuck safely."'
 				if npc_argumentative[$boy] > 0:
 					gs'sex_ev_pillow_talk', 'condom_buy_fight'

+ 1 - 1
locations/sex_ev_start.qsrc

@@ -474,7 +474,7 @@ if $ARGS[0] = 'fb_invited_start':
 				act'Undress':gt 'sex_ev_start', 'undress'
 			end
 		end
-		if mc_inventory['normal_condoms'] > 0 and npc_bareback[$boy] = 0:
+		if mc_inventory['equipped_condoms'] > 0 and npc_bareback[$boy] = 0:
 			act'I brought condoms':
 				pc_buy_condoms[$boy] = 2
 				cla & *nl

+ 1 - 1
locations/sex_ev_stats.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'starting_stats':
 	sex_ev['starting_sweat'] = pcs_sweat
 	sex_ev['orgasm'] = orgasm
 	sex_ev['orgasm_limit'] = orgasm + 6
-    sex_ev['pc_condom_count'] = mc_inventory['normal_condoms']
+    sex_ev['pc_condom_count'] = mc_inventory['equipped_condoms']
 	sex_ev['start_time'] = totminut
 	sex_ev['start_hour'] = hour
 	if $start_type[1] ! 'nomagic': sex_ev['magik'] = pcs_magik

+ 22 - 34
locations/shop.qsrc

@@ -148,7 +148,7 @@ if $shoplocation = 'main':
 		end
 	end
 
-	act 'Leave the store': minut += 3 & gt $loc
+	act 'Leave the store': minut += 3 & gs 'item_cart', 'shopping_var_clear' & gt $loc
 	exit
 end
 
@@ -170,17 +170,16 @@ if $shoplocation = 'ATM':
 
 		'<br>ATM Deposit Fee: 100 <b>₽</b>'
 
-		if bankAccount = 1 and money > 0:
+		if money > 0:
 			act 'Deposit money into your bank account':
 				cla
 				menu_off = 1
 				minut += 5
-				gs 'stat'
 
-				gs 'bank', 'deposit_cash'
+				gs 'bank', 'deposit_cash', 100
 
+				gs 'stat'
 				'"Is there anything else I can do for you?"'
-
 				act 'Move away': gt 'shop', 'start'
 			end
 		end
@@ -190,30 +189,19 @@ if $shoplocation = 'ATM':
 		else
 			act 'Withdraw money from the ATM':
 				cla
+				menu_off = 1
 				minut += 5
 
-				kartaOUT = input ("How much money do you want to withdraw?")
-				if kartaOUT <= 0 or kartaOUT > karta:
-					'<br>Invalid operation.'
-				else
-					karta -= kartaOUT
-					money += kartaOUT
-					if karta > bankDebtLimit:
-						'<br>You withdraw <<kartaOUT>> <b>₽</b>. You have <<karta - bankDebtLimit>> <b>₽</b> left in your bank account.'
-					elseif karta = 0:
-						'<br>You withdraw <<kartaOUT>> <b>₽</b>. You have no money left in your bank account.'
-					else
-						'<br>You withdraw <<kartaOUT>> <b>₽</b>. <font color="red">Your bank account is overdrawn by <b><<bankDebtLimit - karta>> ₽</b>.</font>'
-					end
-				end
+				gs 'bank', 'withdraw_cash', 0
 
 				gs 'stat'
+				'"Is there anything else I can do for you?"'
 				act 'Move away': gt 'shop', 'start'
 			end
 		end
 	end
 
-	act 'Move away':gt 'shop', 'start'
+	act 'Move away': gt 'shop', 'start'
 end
 
 if $shoplocation = 'grocery':
@@ -423,7 +411,7 @@ if $shoplocation = 'clothing':
 		exit
 
 	else
-		'Women''s panties and bras 300<b>₽</b> each'
+		'Women''s panties and bras 300 <b>₽</b> each'
 		gs 'stat'
 		gs 'themes', 'indoors'
 
@@ -572,7 +560,7 @@ if $shoplocation = 'megafon':
 		killvar '$temp_home'
 
 	else
-		$line = '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; ">Monthly internet subscription for <<price>><b>₽</b> at your <<$home[''display'']>>. Automatically renews every month</td>'
+		$line = '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; ">Monthly internet subscription for <<price>> <b>₽</b> at your <<$home[''display'']>>. Automatically renews every month</td>'
 
 		if bankAccount = 0:
 			$line += '<td style="padding-left: 10px; padding-right: 10px;">No bank account</td></tr>'
@@ -629,7 +617,7 @@ if $shoplocation = 'megafon':
 	$title = '<center><h4>Mobile Internet Subscription</h4></center>'
 	price = 1200
 	if subscription['mobile'] = 1:
-		$line = '<tr><td align="center">You have an active mobile internet subscription that will renew next month on day <<subscription[''mobile-date'']>> for <<price>><b>₽</b></td></tr>'
+		$line = '<tr><td align="center">You have an active mobile internet subscription that will renew next month on day <<subscription[''mobile-date'']>> for <<price>> <b>₽</b></td></tr>'
 
 	else
 		if subscription['metered_mobile'] > 0:
@@ -638,7 +626,7 @@ if $shoplocation = 'megafon':
 			discount_left = max(price - discount, 0)
 			$line = '<tr><td align="center">You still a have <b><<subscription[''metered_mobile'']>> ₽</b> balance for your metered mobile internet which gives you a <<discount>> <b>₽</b> discount</td></tr>'
 		end
-		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; ">Monthly mobile internet subscription for'+iif(discount > 0, ' <s><<price>></s><<price-discount>>', ' <<price>>')+'<b>₽</b>. Automatically renews every month</td>'
+		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; ">Monthly mobile internet subscription for ' + iif(discount > 0, '<s><<price>></s><<price-discount>>', '<<price>>') + ' <b>₽</b>. Automatically renews every month</td>'
 
 		if bankAccount = 0:
 			$line += '<td style="padding-left: 10px; padding-right: 10px;">No bank account</td></tr>'
@@ -666,7 +654,7 @@ if $shoplocation = 'megafon':
 		$line += '<tr><td align="left"><b>3000 minutes</b> (50 hours) of mobile internet for 695 <b>₽</b></td></tr>'
 
 	else
-		$line = '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; "><b>300 minutes</b> (5 hours) of mobile internet for 80<b>₽</b></td>'
+		$line = '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; "><b>300 minutes</b> (5 hours) of mobile internet for 80 <b>₽</b></td>'
 
 		if money > 80:
 			$line += '<td style="padding-left: 10px; padding-right: 10px;"><a href="exec: gs ''internet_mobile'', ''top_up_metered'', ''metered_mobile'', 300 & money -= 80 & minut += 10 & gt ''shop'' ">Pay with cash</a></td>'
@@ -682,7 +670,7 @@ if $shoplocation = 'megafon':
 			$line += '<td style="padding-left: 10px; padding-right: 10px;">Insufficient balance</td></tr>'
 		end
 
-		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; "><b>600 minutes</b> (10 hours) of mobile internet for 155<b>₽</b></td>'
+		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; "><b>600 minutes</b> (10 hours) of mobile internet for 155 <b>₽</b></td>'
 
 		if money > 155:
 			$line += '<td style="padding-left: 10px; padding-right: 10px;"><a href="exec: gs ''internet_mobile'', ''top_up_metered'', ''metered_mobile'', 600 & money -= 155 & minut += 10 & gt ''shop'' ">Pay with cash</a></td>'
@@ -698,7 +686,7 @@ if $shoplocation = 'megafon':
 			$line += '<td style="padding-left: 10px; padding-right: 10px;">Insufficient balance</td></tr>'
 		end
 
-		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; "><b>1200 minutes</b> (20 hours) of mobile internet for 295<b>₽</b></td>'
+		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; "><b>1200 minutes</b> (20 hours) of mobile internet for 295 <b>₽</b></td>'
 
 		if money > 295:
 			$line += '<td style="padding-left: 10px; padding-right: 10px;"><a href="exec: gs ''internet_mobile'', ''top_up_metered'', ''metered_mobile'', 1200 & money -= 295 & minut += 10 & gt ''shop'' ">Pay with cash</a></td>'
@@ -714,7 +702,7 @@ if $shoplocation = 'megafon':
 			$line += '<td style="padding-left: 10px; padding-right: 10px;">Insufficient balance</td></tr>'
 		end
 
-		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; "><b>3000 minutes</b> (50 hours) of mobile internet for 695<b>₽</b></td>'
+		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; "><b>3000 minutes</b> (50 hours) of mobile internet for 695 <b>₽</b></td>'
 
 		if money > 695:
 			$line += '<td style="padding-left: 10px; padding-right: 10px;"><a href="exec: gs ''internet_mobile'', ''top_up_metered'', ''metered_mobile'', 3000 & money -= 695 & minut += 10 & gt ''shop'' ">Pay with cash</a></td>'
@@ -748,7 +736,7 @@ if $shoplocation = 'megafon':
 			discount_left = max(price - discount, 0)
 			$line += '<tr><td align="center">You have <b><<subscription[''metered_calls'']>>₽</b> for mobile calls and text messages which gives you a <<discount>> <b>₽</b> discount</td></tr>'
 		end
-		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left;">Monthly mobile subscription that allows you to make calls and send text messages for'+iif(discount > 0, '<b><s><<price>></s></b> <span color="red"><b><<price-discount>></b></span>', ' <b><<price>></b>')+'<b>₽</b> Automatically renews every month</td>'
+		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left;">Monthly mobile subscription that allows you to make calls and send text messages for ' + iif(discount > 0, '<b><s><<price>></s></b> <span color="red"><b><<price-discount>></b></span>', '<b><<price>></b>') + ' <b>₽</b> Automatically renews every month</td>'
 
 
 		if bankAccount = 0:
@@ -771,7 +759,7 @@ if $shoplocation = 'megafon':
 		$line += '<tr><td>You have an active mobile subscription with unlimited minutes and texts, you can''t buy extra minutes</td></tr>'
 
 	else
-		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left;">60<b>₽</b> call pack for your mobile phone that gives you 60 minutes of calltime and 120 text messages</td>'
+		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left;">60 <b>₽</b> call pack for your mobile phone that gives you 60 minutes of calltime and 120 text messages</td>'
 
 		if money >= 60:
 			$line += '<td style="padding-left: 10px; padding-right: 10px;"><a href="exec: gs ''internet_mobile'', ''top_up_metered'', ''metered_calls'', 60, 120 & money -= 60 & minut += 10 & gt ''shop'' ">Pay with cash</a></td>'
@@ -787,7 +775,7 @@ if $shoplocation = 'megafon':
 			$line += '<td style="padding-left: 10px; padding-right: 10px;">Insufficient balance</td></tr>'
 		end
 
-		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left;">115<b>₽</b> call pack for your mobile phone that gives you 120 minutes of calltime and 240 text messages</td>'
+		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left;">115 <b>₽</b> call pack for your mobile phone that gives you 120 minutes of calltime and 240 text messages</td>'
 
 		if money >= 115:
 			$line += '<td style="padding-left: 10px; padding-right: 10px;"><a href="exec: gs ''internet_mobile'', ''top_up_metered'', ''metered_calls'', 120, 240 & money -= 115 & minut += 10 & gt ''shop'' ">Pay with cash</a></td>'
@@ -803,7 +791,7 @@ if $shoplocation = 'megafon':
 			$line += '<td style="padding-left: 10px; padding-right: 10px;">Insufficient balance</td></tr>'
 		end
 
-		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left;">170<b>₽</b> call pack for your mobile phone that gives you 180 minutes of calltime and 360 text messages</td>'
+		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left;">170 <b>₽</b> call pack for your mobile phone that gives you 180 minutes of calltime and 360 text messages</td>'
 		if money >= 170:
 			$line += '<td style="padding-left: 10px; padding-right: 10px;"><a href="exec: gs ''internet_mobile'', ''top_up_metered'', ''metered_calls'', 180, 360 & money -= 170 & minut += 10 & gt ''shop'' ">Pay with cash</a></td>'
 		else
@@ -818,7 +806,7 @@ if $shoplocation = 'megafon':
 			$line += '<td style="padding-left: 10px; padding-right: 10px;">Insufficient balance</td></tr>'
 		end
 
-		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left;">225<b>₽</b> call pack for your mobile phone that gives you 240 minutes of calltime and 480 text messages</td>'
+		$line += '<tr><td style="padding-left: 10px; padding-right: 10px; align: left;">225 <b>₽</b> call pack for your mobile phone that gives you 240 minutes of calltime and 480 text messages</td>'
 
 		if money >= 225:
 			$line += '<td style="padding-left: 10px; padding-right: 10px;"><a href="exec: gs ''internet_mobile'', ''top_up_metered'', ''metered_calls'', 240, 480 & money -= 225 & minut += 10 & gt ''shop'' ">Pay with cash</a></td>'
@@ -836,7 +824,7 @@ if $shoplocation = 'megafon':
 	end
 
 	'<<$title>><<$tables>><<$line>><<$tablec>>'
-	'<center>You have <b><<subscription[''metered_calls'']>> minutes</b> for mobile calls and <<subscription[''sms_limit'']>> text messages</center>'
+	'<center>You have <b><<subscription[''metered_calls'']>> minutes</b> for mobile calls and <b><<subscription[''sms_limit'']>> text messages</b></center>'
 
 	killvar 'title'
 	killvar 'line'

+ 59 - 59
locations/soniahome.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'home':
 	*clr & cla
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/house_front.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/house_front.jpg"></center>'
 	'You approach Sonia''s house, walking up the pathway through a small well-cared garden with various flowers and shrubs towards a grey, wooden-clad house, which is equally well-cared for.'
 	if hour >= 22:
 		'It would be rude to even knock on the door at this time. Sonia is probably asleep, so you decide against it and lower your hand.'
@@ -40,7 +40,7 @@ if $ARGS[0] = 'home':
 		'You go to Sonia''s house and knock on the door.'
 		if soniaQW['hate'] = 1:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/tkachenko.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/tkachenko.jpg"></center>'
 			if soniaQW['tkachenko'] = 0:
 				soniaQW['tkachenko'] = 1
 				'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Hello. Can I help you?" she asks.'
@@ -56,7 +56,7 @@ if $ARGS[0] = 'home':
 			*clr & cla
 			if daystart >= soniaQW['fallday'] + 7:
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/tkachenko.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/tkachenko.jpg"></center>'
 				if soniaQW['tkachenko'] = 0:
 					soniaQW['tkachenko'] = 1
 					'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Hello. Can I help you?" she asks.'
@@ -71,22 +71,22 @@ if $ARGS[0] = 'home':
 				end
 			elseif soniaQW['fallenangel'] = 1:
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/tkachenko.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/tkachenko.jpg"></center>'
 				'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. Then frowns and sighs holding the door open. "Sonia is in her room, I don''t know what is wrong with that girl but she won''t leave her room anymore." Once you enter she closes the door.'
 				act 'Go to Sonia''s room': gt 'soniahome', 'sonia_chat_special'
 			else
 				temprand = rand(1,4)
 				if temprand = 1:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/tkachenko.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/tkachenko.jpg"></center>'
 					'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Sonia isn''t here, but she should be home later. You can call her then," she says before politely closing the door, not inviting you in.'
 					act 'Leave': gt 'pav_residential'
 				elseif temprand = 2:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/tkachenko.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/tkachenko.jpg"></center>'
 					'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Hello again, <<$pcs_firstname>>. Sonia is in her room."'
 					'"Thank you, Mrs Ivanko," you politely reply to keep her happy, and she lets you in before closing the door behind you.'
 					act 'Enter':  gt 'soniahome', 'hallway'
 				elseif temprand = 3:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/shulyov.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/shulyov.jpg"></center>'
 					if soniaQW['shulyov'] = 0:
 						soniaQW['shulyov'] = 1
 						if pcs_hotcat >= 6:
@@ -171,7 +171,7 @@ if $ARGS[0] = 'home':
 			end
 		elseif rand(0,3) = 0:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/tkachenko.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/tkachenko.jpg"></center>'
 			if soniaQW['tkachenko'] = 0:
 				soniaQW['tkachenko'] = 1
 				'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Hello. Can I help you?" she asks.'
@@ -185,7 +185,7 @@ if $ARGS[0] = 'home':
 			act 'Leave': gt 'pav_residential'
 		elseif rand(0, 2) = 0:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/tkachenko.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/tkachenko.jpg"></center>'
 			if soniaQW['tkachenko'] = 0:
 				soniaQW['tkachenko'] = 1
 				'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Hello. Can I help you?" she asks.'
@@ -200,7 +200,7 @@ if $ARGS[0] = 'home':
 			act 'Enter':  gt 'soniahome', 'hallway'
 		elseif rand(0,1) = 0:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/shulyov.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/shulyov.jpg"></center>'
 			if soniaQW['shulyov'] = 0:
 				soniaQW['shulyov'] = 1
 				if pcs_hotcat >= 6:
@@ -243,7 +243,7 @@ if $ARGS[0] = 'hallway':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Hallway</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/hall.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/hall.jpg"></center>'
 	'You enter a small bright hallway with a door to the lounge on your right and a staircase at the end leading to the bedrooms and bathroom upstairs. There''s also a door to the kitchen in front of you.'
 	act 'Leave': gt 'pav_residential'
 	act 'Go to Sonia''s bedroom': gt 'soniahome', 'sonia_room'
@@ -263,7 +263,7 @@ if $ARGS[0] = 'bathroom':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Bathroom</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/bathroom.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/bathroom.jpg"></center>'
 	'You enter the bathroom, which is fully tiled with a grey-and-white colour scheme. Whilst reasonably small, it''s very tastefully decorated. It''s a fairly typical bathroom, but this might be the cleanest one you''ve ever been in. It looks practically brand new and smells lovely.'
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
@@ -298,7 +298,7 @@ if $ARGS[0] = 'kitchen':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/kitchen.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/kitchen.jpg"></center>'
 	'As you enter the kitchen, you notice that whilst it isn''t large, it''s very tastefully done and has everything needed. It also has a dining table adjacent to it for family meals.'
 	act 'Go to the hallway': gt 'soniahome', 'hallway'
 	act 'Look in the fridge': gt 'soniahome', 'fridge'
@@ -451,7 +451,7 @@ if $ARGS[0] = 'livingroom':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Living room</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/living_room.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/living_room.jpg"></center>'
 	'You walk into a small but comfortable lounge which is very clean and tidy. You see the TV in the corner and a cozy family settee on the opposite wall facing a fireplace, giving the room a warm and comfortable look.'
 	act 'Leave': gt 'soniahome', 'hallway'
 end
@@ -464,7 +464,7 @@ if $ARGS[0] = 'soniaparents':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Sonia''s parent''s room</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/parents_bedroom.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/parents_bedroom.jpg"></center>'
 	'You look into Sonia''s parents'' bedroom and see that, as with the rest of the house, it''s spotless, tidy and tastefully decorated, making the most of the available space. There''s a wardrobe to your right and the bed on the left, with a chest of drawers and a beautiful fireplace.'
 
 	if hour < 7 or hour > 22:
@@ -477,7 +477,7 @@ if $ARGS[0] = 'soniaparents':
 			*clr & cla
 			minut += 10
 			'<center><b><font color = maroon>Sonia''s parent''s room</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/momsdrawer.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/momsdrawer.jpg"></center>'
 			'You snoop around, opening drawers and looking in the closet. Even though you hope to find something, you don''t see anything interesting. The room is perfectly organized, with each drawer containing a type of clothing neatly folded up. Other than that, there seems to be nothing of interest.'
 			act 'Leave': gt 'soniahome', 'hallway'
 		end
@@ -492,7 +492,7 @@ if $ARGS[0] = 'soniabrother':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Shulyov''s room</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/hall.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/hall.jpg"></center>'
 	'You try the door but it is locked.'
 	act 'Leave': gt 'soniahome', 'hallway'
 end
@@ -506,14 +506,14 @@ if $ARGS[0] = 'sonia_room':
 	gs 'stat'
 	'<center><b><font color = maroon>Sonia''s bedroom</font></b></center>'
 	if soniaQW['fallenangel'] = 1:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/soniacrying.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/soniacrying.jpg"></center>'
 		'The first thing you notice about her room is <a href="exec:gt ''soniahome'', ''sonia_chat_special''">Sonia</a> is lying on her bed crying. The next thing you notice is that it''s spotless and orderly. Nothing is out of place. There is a dresser against one wall with several things neatly placed on it, with pictures on the wall above it. The bed is near the center of the room against one wall, and the bed is made with a body pillow leaning against the other pillows. Above the bed is a short string of lights, while a small makeup table with all the makeup lined up in a very orderly fashion sits against another wall.'
 	elseif soniaQW['fallenangel'] <= 3:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_room.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_room.jpg"></center>'
 		'The first thing you notice about her room is that it''s spotless and orderly. Nothing is out of place. There is a dresser against one wall with several things neatly placed on it, with pictures on the wall above it. The bed is near the center of the room against one wall, and the bed is made with a body pillow leaning against the other pillows. Above the bed is a short string of lights, while a small makeup table with all the makeup lined up in a very orderly fashion sits against another wall.'
 		'<a href="exec:gt ''soniahome'', ''sonia_chat''">Sonia</a> is lying on her bed looking sad, depressed and miserable, at least she is not still crying.'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_room.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_room.jpg"></center>'
 		'The first thing you notice about her room is that it''s spotless and orderly. Nothing is out of place. There is a dresser against one wall with several things neatly placed on it, with pictures on the wall above it. The bed is near the center of the room against one wall, and the bed is made with a body pillow leaning against the other pillows. Above the bed is a short string of lights, while a small makeup table with all the makeup lined up in a very orderly fashion sits against another wall.'
 		'<a href="exec:gt ''soniahome'', ''sonia_chat''">Sonia</a> is lying on her bed relaxing.'
 	end
@@ -544,14 +544,14 @@ if $ARGS[0] = 'sonia_chat_special':
 	minut += 5
 	gs 'stat'
 	'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/soniacrying.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/soniacrying.jpg"></center>'
 	'You go over and sit on the bed next to Sonia, you lean in a comfort her as best you can. She cries for several more minutes before she stops and looks at you, with puffy eyes and a tear stained face. "Why are you here?"'
 	act 'I wanted to see how you were':
 		*clr & cla
 		gs 'npc_relationship', 'modify', 'A25', 'like'
 		minut += 5
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/soniacrying.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/soniacrying.jpg"></center>'
 		'You give her a hug. "I wanted to see how you were and remind you, you still have a friend."'
 		'She hugs you back fiercely and starts crying again for several more minutes, before she stops again. "Thank you, you don''t know how much that means to me." You talk about what happened to her and what has been going on at school, from time to time she starts crying again, before she finally says. "I just don''t know what I am going to do."'
 		if grupTipe = 4:
@@ -561,7 +561,7 @@ if $ARGS[0] = 'sonia_chat_special':
 				gs 'npc_relationship', 'modify', 'A25', 'like'
 				gs 'stat'
 				'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/soniacrying.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/soniacrying.jpg"></center>'
 				'"I will try to protect you from the other gopniks but you''ve got to start standing up for yourself too." You tell her firmly.'
 				'She smiles sadly. "I know you would try but we both know you can''t be everywhere and there is way more of them than us two."'
 				'You promise to figure something out, get some of the others to agree, you talk for a while more and finally, she says. "I... I need to be alone again, I just can''t think or talk about this right now, please understand." You assure here you do understand, making her smile to you. Then you make your goodbyes and leave.'
@@ -575,7 +575,7 @@ if $ARGS[0] = 'sonia_chat_special':
 			minut += 5
 			gs 'stat'
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/soniacrying.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/soniacrying.jpg"></center>'
 			'"I will help you get through this." You tell her firmly.'
 			'She smiles sadly. "How?"'
 			'You shrug a bit. "I don''t know, but one bad night does not define you. We will just convince the others, we will find a way for them to accept you again."'
@@ -587,7 +587,7 @@ if $ARGS[0] = 'sonia_chat_special':
 			minut += 5
 			gs 'stat'
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/soniacrying.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/soniacrying.jpg"></center>'
 			'"Just accept it." You tell her.'
 			'She looks shocked. "What? Accept being seen as the town slut?"'
 			'You shrug a bit. "Look you wanted to walk on the wild side right?" She frowns but nods. "Ok, and you were enjoying yourself until, well your rep was ruined right?"'
@@ -605,7 +605,7 @@ if $ARGS[0] = 'sonia_chat_special':
 				minut += 5
 				gs 'stat'
 				'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/soniacrying.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/soniacrying.jpg"></center>'
 				'"You know you''re not the only one in this mess; just look at me!" You tell her.'
 				'That brings a smile to her face You grin back at her as you continue. "Hey, I''m happy to see you can still smile but that''s my reputation you''re grinning at!"'
 				'"Oh! I''m sorry <<$pcs_nickname>>, I didn''t mean too..." She trails off.'
@@ -615,7 +615,7 @@ if $ARGS[0] = 'sonia_chat_special':
 					soniaQW['redemp'] = 1
 					gs 'stat'
 					'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/soniacrying.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/soniacrying.jpg"></center>'
 					'She looks a bit confused so you explain. "Look my reputation is in the gutter too and I''m fed up with getting picked on so how about we help each other and work together so we can rejoin a clique and improve our lives at school?"'
 					'Sonia looks thoughtful for a moment. "Yeah I guess we could do that but I don''t think it will be that easy."'
 					'You nod in agreement. "I didn''t say it would but it can be done if we help each other and stay determined."'
@@ -633,7 +633,7 @@ if $ARGS[0] = 'sonia_chat1':
 	minut += 2
 	gs 'stat'
 	'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 	'You sit on the bed next to Sonia and look around her room as she starts chatting about something she recently read about in a magazine.'
 	act 'Stop talking': gt 'soniahome', 'sonia_room'
 	act 'Make small talk':
@@ -641,7 +641,7 @@ if $ARGS[0] = 'sonia_chat1':
 		minut += 5
 		gs 'npc_relationship', 'modify', 'A25', 'like'
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'You talk with Sonia about various things, mostly about fashion, your mutual friends, or school in general.'
 		act 'Stop talking': gt 'soniahome', 'sonia_room'
 		act 'Keep talking': gt 'soniahome', 'sonia_chat1'
@@ -650,7 +650,7 @@ if $ARGS[0] = 'sonia_chat1':
 		*clr & cla
 		gs 'npc_relationship', 'modify', 'A25', 'like'
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'"So, what have you been up to lately?" you ask.'
 		'She sighs dramatically. "Mostly trying to find some fun and avoid my parents. I think I''ll hang myself if I hear one more speech about how a proper young lady has to act." She ends with a giggle.'
 		'You smile at her. "Well, don''t do that. You have too pretty of a neck to bruise." You both laugh at that. "But seriously, I understand. My mom is insanely overbearing as well."'
@@ -662,7 +662,7 @@ if $ARGS[0] = 'sonia_chat1':
 		*clr & cla
 		minut += 15
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'She often wears older clothes, but she somehow always manages to make them work and look stylish. "How do you manage to always look so nice?"'
 		'She smiles. "You mean for someone that has cheaper clothes?" You''re about to protest that you didn''t mean it that way when she stops you. "I learned to sew. At first, it was just to fix tears and later alter clothes so they fit better and look nicer. You would be surprised what you can do with a little effort." She goes on to talk about how she goes about turning fairly plain looking clothes into stylish ones.'
 		act 'Stop talking':  gt 'soniahome', 'sonia_room'
@@ -673,7 +673,7 @@ if $ARGS[0] = 'sonia_chat1':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 			'"What''s going on with you and the gopniks?" you ask.'
 			'"I''m just tired of being the good girl. I want to cut loose, get a little wild and have some fun. What''s wrong with that?" she replies.'
 			'You sit in silence, wondering if you should push things. "Yeah, but you can''t really trust those guys," you meekly reply.'
@@ -687,7 +687,7 @@ if $ARGS[0] = 'sonia_chat1':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 			'"So. I met your brother," you state matter of factly.'
 			'"Oh god, don''t fall for anything he says. He''s a total horn dog to the point I can''t count the number of ''girlfriends'' he''s had. He just uses them for sex and tosses them aside, yet they keep coming back to him. Do yourself a favor and stay away from him," she says in a serious tone. You just nod in response, not sure what you could possibly say back to her.'
 			act 'Stop talking':  gt 'soniahome', 'sonia_room'
@@ -698,7 +698,7 @@ if $ARGS[0] = 'sonia_chat1':
 		*clr & cla
 		minut += 5
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'"What are your plans for after school?" you ask.'
 		'She looks at you with a smile. "I''ve got good grades, more than enough to get into the university in Saint Petersburg. I''m planning to enrol there after school and study fashion design, but my parents want me to become a doctor or a lawyer or get a business degree or something like that."'
 		'Before you can say anything, she turns to you. "What about you? What are your plans for the future?"'
@@ -706,7 +706,7 @@ if $ARGS[0] = 'sonia_chat1':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 			'"I''m not sure, but I guess I have a few options," you tell her.'
 			'She nods. "Oh. Well, I guess you still have some time left to make up your mind..." she says. She sounds unsure though, as if she doesn''t believe it herself.'
 			'You''re not sure what more to say about it, so you decide to change the subject.'
@@ -717,7 +717,7 @@ if $ARGS[0] = 'sonia_chat1':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 			'You get a little excited. "I''m planning to attend the university too. At least now I''ll know someone there."'
 			'She grins happily. "Maybe we should think about being roommates when we go? As you said, then we would know someone and we already get along. Let''s talk about it some more when the time comes."'
 			act 'Stop talking':  gt 'soniahome', 'sonia_room'
@@ -748,7 +748,7 @@ if $ARGS[0] = 'sonia_chat1':
 				minut += 5
 				gs 'stat'
 				'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 				'You sigh in a way only hopeless romantics do. "Hopefully I can find that special someone and get married soon."'
 				'She smiles, seeing the signs of love. "If he makes you happy, then I''m happy for you."'
 				'You''re not sure what more to say on the topic and decide to change the subject.'
@@ -761,7 +761,7 @@ if $ARGS[0] = 'sonia_chat1':
 		*clr & cla
 		minut += 5
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'You don''t even know if she''s a virgin or not and don''t know if you should even ask, but you''re curious. "Do you have a boyfriend or girlfriend?"'
 		'She shakes her head. "Nope, but I would like to find the right guy. Until then, I just want to have a little fun."'
 		act 'Ask if she has ever dated':
@@ -769,7 +769,7 @@ if $ARGS[0] = 'sonia_chat1':
 			minut += 5
 			gs 'npc_relationship', 'modify', 'A25', 'like'
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 			'You nod in understanding. "So have you ever... You know. Dated a guy?"'
 			'She blushes when she realizes what you''re really asking. "A few times, but nothing too serious until a few months ago. While on vacation with my family, I met this boy... and it was magical. We spent all our time together and one night... Well, we did it..." she giggles.'
 			*nl
@@ -785,7 +785,7 @@ if $ARGS[0] = 'sonia_chat1':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 			'You smile at her reassuringly. "I''m sure you''ll find the right guy, or girl."'
 			'She giggles. "I kind of already did..."'
 			'You looked surprised. "Well? Who is it?"'
@@ -839,7 +839,7 @@ end
 
 if $ARGS[0] = 'boyfriend_chat':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 	'"I have a boyfriend you know," you tell her.'
 	'She grins at you. "Right. Who are you dating again?"'
 	if NikoVolkovQW >= 5:
@@ -939,7 +939,7 @@ end
 
 if $ARGS[0] = 'tell_about_generic_boyfriend':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 	'"I have a boyfriend you know," you tell her.'
 	'She grins at you. "Right. Who are you dating again?"'
 	'"<<$ARGS[1]>>," you tell her.'
@@ -958,7 +958,7 @@ if $ARGS[0] = 'sonia_chat2':
 	soniaQW['fallenangel'] = 3
 	gs 'stat'
 	'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 	'You sit on the bed next to Sonia, she looks at you and gives you a weak smile. You can tell she is still sad and depressed but at least she is not crying anymore at least not at this moment. You know if you want to chat you will have to lead the conversation.'
 	act 'Stop talking':  gt 'soniahome', 'sonia_room'
 	act 'Make small talk':
@@ -966,7 +966,7 @@ if $ARGS[0] = 'sonia_chat2':
 		minut += 5
 		gs 'npc_relationship', 'modify', 'A25', 'like'
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'You talk with Sonia about various things, mostly about fashion, your mutual friends, or school in general. She does her best to talk back to you, a few times you can see her eyes water up when talking about friends or school.'
 		act 'Stop talking':  gt 'soniahome', 'sonia_room'
 		act 'Keep talking': gt 'soniahome', 'sonia_chat2'
@@ -975,7 +975,7 @@ if $ARGS[0] = 'sonia_chat2':
 		*clr & cla
 		gs 'npc_relationship', 'modify', 'A25', 'like'
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'"So, what have you been up to lately?" you ask.'
 		'She sighs and shrugs. "Trying to make the best of my new reality, since everyone picks on me, I do my best to avoid everyone." She says with a frown.'
 		'You give her an encouraging smile. "You just got to make it till the end of the school year and then you can go to the University and this will all just be a bad memory."'
@@ -987,7 +987,7 @@ if $ARGS[0] = 'sonia_chat2':
 		*clr & cla
 		minut += 15
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'She often wears older clothes, but she somehow always manages to make them work and look stylish. "How do you manage to always look so nice?"'
 		'She gives you a sad smile. "You mean for someone that has cheaper clothes?" You''re about to protest that you didn''t mean it that way when she stops you. "I learned to sew. At first, it was just to fix tears and later alter clothes so they fit better and look nicer. You would be surprised what you can do with a little effort." She goes on to talk about how she goes about turning fairly plain looking clothes into stylish ones.'
 		act 'Stop talking':  gt 'soniahome', 'sonia_room'
@@ -998,7 +998,7 @@ if $ARGS[0] = 'sonia_chat2':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 			'"Are the gopniks still hassling you?" you ask.'
 			'She looks like she is about to cry for a moment when you bring them up but then she gets herself under control. "Not as bad as it was... I have gotten a bit better at avoiding them and I think they are starting to get bored with me... " she replies.'
 			'You sit in silence, wondering if you should push things. "Yeah, they can be total assholes."'
@@ -1012,7 +1012,7 @@ if $ARGS[0] = 'sonia_chat2':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 			'"So. I met your brother," you state matter of factly. She suddenly bursts into tears. You give her a hug. "What''s wrong? what did I say?"'
 			'She sobs for a bit before catching her breath. "He... he says this is all my fault and that I deserved it." You do your best to comfort her but After a while of just holder her she asks you to leave so she can be alone.'
 			act 'Leave': gt 'pav_residential'
@@ -1022,7 +1022,7 @@ if $ARGS[0] = 'sonia_chat2':
 		*clr & cla
 		minut += 5
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'"What are your plans for after school?" you ask.'
 		'She looks at you with a smile. "Moving far away from here. I still got good grades, more than enough to get into the university in Saint Petersburg. I''m planning to enroll there after school and study fashion design, but my parents want me to become a doctor or a lawyer or get a business degree or something like that."'
 		'Before you can say anything, she turns to you. "What about you? What are your plans for the future?"'
@@ -1030,7 +1030,7 @@ if $ARGS[0] = 'sonia_chat2':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 			'"I''m not sure, but I guess I have a few options," you tell her.'
 			'She nods. "Oh. Well, I guess you still have some time left to make up your mind..." she says. She sounds unsure though, as if she doesn''t believe it herself.'
 			'You''re not sure what more to say about it, so you decide to change the subject.'
@@ -1041,7 +1041,7 @@ if $ARGS[0] = 'sonia_chat2':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 			'You get a little excited. "I''m planning to attend the university too. At least now I''ll know someone there."'
 			'She grins happily. "Maybe we should think about being roommates when we go? As you said, then we would know someone and we already get along. Let''s talk about it some more when the time comes."'
 			act 'Stop talking':  gt 'soniahome', 'sonia_room'
@@ -1077,7 +1077,7 @@ if $ARGS[0] = 'sonia_chat3':
 	soniaQW['fallenangel'] += 1
 	gs 'stat'
 	'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 	'You sit on the bed next to Sonia, she looks at you and gives you a weak smile. You can tell she is still sad and depressed but at least she is not crying anymore at least not at this moment.'
 	act 'Stop talking': gt 'soniahome', 'sonia_room'
 	act 'Make small talk':
@@ -1085,7 +1085,7 @@ if $ARGS[0] = 'sonia_chat3':
 		minut += 5
 		gs 'npc_relationship', 'modify', 'A25', 'like'
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'You talk with Sonia about various things, mostly about fashion, your mutual friends, or school in general. When you talk about fashion she livens up for a bit, school she has her moments but bring up friends she reminds you, you are her only friend left which kinda kills the mood so you decide to change the topic.'
 		act 'Stop talking': gt 'soniahome', 'sonia_room'
 		act 'Keep talking': gt 'soniahome', 'sonia_chat3'
@@ -1094,7 +1094,7 @@ if $ARGS[0] = 'sonia_chat3':
 		*clr & cla
 		gs 'npc_relationship', 'modify', 'A25', 'like'
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'"So, what have you been up to lately?" you ask.'
 		'She sighs and shrugs. "Enduring, I have started to get used to all the teasing and bullying and I am getting better at avoiding the gopniks after school, so things are better, not great but better.." She says with a frown.'
 		'You give her an encouraging smile. "You just got to make it till the end of the school year and then you can go to the University and this will all just be a bad memory."'
@@ -1106,7 +1106,7 @@ if $ARGS[0] = 'sonia_chat3':
 		*clr & cla
 		minut += 15
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'She often wears older clothes, but she somehow always manages to make them work and look stylish. "I am still just amazed by your sense of style you can just make anything look good."'
 		'She brightens up a bit. "Thanks, I have actually been getting a lot better, since I never go out and have nothing else to do. I just stay in my room mostly and work on new outfits." She goes on to talk about how she finds old clothes in the market and experiments making new clothes out of them.'
 		act 'Stop talking': gt 'soniahome', 'sonia_room'
@@ -1117,7 +1117,7 @@ if $ARGS[0] = 'sonia_chat3':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 			'"Are the gopniks still hassling you?" you ask.'
 			'She looks like she is about to cry for a moment when you bring them up but then she gets herself under control. "Not as bad as it was... I have gotten a bit better at avoiding them and I think they are starting to get bored with me... " she replies.'
 			'You sit in silence, wondering if you should push things. "Yeah, they can be total assholes."'
@@ -1130,7 +1130,7 @@ if $ARGS[0] = 'sonia_chat3':
 		*clr & cla
 		minut += 5
 		'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'"What are your plans for after school?" you ask.'
 		'She looks at you with a smile. "Moving far away from here. I still got good grades, more than enough to get into the university in Saint Petersburg. I''m planning to enroll there after school and study fashion design, but my parents want me to become a doctor or a lawyer or get a business degree or something like that."'
 		'Before you can say anything, she turns to you. "What about you? What are your plans for the future?"'
@@ -1138,7 +1138,7 @@ if $ARGS[0] = 'sonia_chat3':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 			'"I''m not sure, but I guess I have a few options," you tell her.'
 			'She nods. "Oh. Well, I guess you still have some time left to make up your mind..." she says. She sounds unsure though, as if she doesn''t believe it herself.'
 			'You''re not sure what more to say about it, so you decide to change the subject.'
@@ -1149,7 +1149,7 @@ if $ARGS[0] = 'sonia_chat3':
 			*clr & cla
 			minut += 5
 			'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 			'You get a little excited. "I''m planning to attend the university too. At least now I''ll know someone there."'
 			'She grins happily. "Maybe we should think about being roommates when we go? As you said, then we would know someone and we already get along. Let''s talk about it some more when the time comes."'
 			act 'Stop talking': gt 'soniahome', 'sonia_room'

+ 4 - 4
locations/stat_display.qsrc

@@ -833,15 +833,15 @@ else
 		$temp_tooltip[0] = 'Normal'
 	elseif PCloInhibit < 25:
 		$temp_stat_clothes_msg[2] += 'a slightly revealing <<$temp_clo_type>>'
-		$temp_tooltip[0] = 'Slightly revealing <<$temp_clo_type>>'
+		$temp_tooltip[0] = 'Slightly revealing'
 		$temp_clo_style[2] = 's'
 	elseif PCloInhibit < 30:
 		$temp_stat_clothes_msg[2] += 'a revealing <<$temp_clo_type>>'
-		$temp_tooltip[0] = 'Revealing <<$temp_clo_type>>'
+		$temp_tooltip[0] = 'Revealing'
 		$temp_clo_style[2] = 's'
 	else
 		$temp_stat_clothes_msg[2] += 'a very revealing <<$temp_clo_type>>'
-		$temp_tooltip[0] = 'Very revealing <<$temp_clo_type>>'
+		$temp_tooltip[0] = 'Very revealing'
 		$temp_clo_style[2] = 's'
 	end
 
@@ -860,7 +860,7 @@ else
 	$stat_clothes_tooltip = ''
 	if arrsize('$temp_tooltip') = 1:
 		$stat_clothes_tooltip = '<<$temp_tooltip[0]>> <<$temp_clo_type>>.'
-	elseif arrsize('$temp_tooltip') > 1:
+	else
 		temp_sd_i = 1
 		temp_sd_max_i = 5
 		:tooltip_loop1

+ 135 - 180
locations/stripclub.qsrc

@@ -61,6 +61,9 @@ end
 
 if $ARGS[0] = 'employee_entrance':
 	act 'Head around to the back':
+		cla
+		act 'Leave': gt 'city_redlight', 'start'
+		act 'go back to the front': gt 'stripclub', 'start'
 		!! Possible to recognize that Sveta is working a stripper shift that night?
 		if strip_club['stripwork'] = 1:
 			'"Evening, <<$pcs_strippername>>. Good crowd tonight," the bouncer says with a smile.'
@@ -70,7 +73,7 @@ if $ARGS[0] = 'employee_entrance':
 			'"Evening, <<$pcs_nickname>>. Good crowd. Should be a busy bar tonight," the bouncer says with a smile.'
 			'You give him a nod as he stands aside and lets you enter.'
 			act 'Head to the bar': frost = 0 & gt 'stwork3', 'start'
-		elseif (strip_club['stripwork'] = 1 or strip_club['stripwork1'] = 1) or (strip_club['stripbarwork'] = 1 or strip_club['stripbarwork1'] = 1):
+		elseif strip_club['stripwork'] = 1 or strip_club['stripbarwork'] = 1 or strip_club['stripbarwork1'] = 1:
 			'"Decided to pay us a visit on your night off?" the bouncer asks.'
 			'You nod and he stands aside to let you in.'
 			if strip_club['stripwork'] = 1: '"I''m sure the customers won''t recognize you with clothes on," he says with a smile.'
@@ -263,7 +266,7 @@ if $ARGS[0] = 'bar':
 		minut += 5
 		gs 'beverage', 'afterdrink'
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/bar.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub_bar.jpg"></center>'
 		'You order a glass of water and take a seat at the bar to drink it, taking in the sights of the club as you do.'
 		act 'Leave': gt 'stripclub', 'main_floor'
 	end
@@ -276,7 +279,7 @@ if $ARGS[0] = 'bar':
 			gs 'drugs', 'alcohol', 'beer'
 			gs 'beverage', 'afteralcohol'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/bar.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub_bar.jpg"></center>'
 			'You order a bottle of beer and take a seat at the bar to drink it, taking in the sights of the club as you do.'
 			act 'Leave': gt 'stripclub', 'main_floor'
 		end
@@ -290,7 +293,7 @@ if $ARGS[0] = 'bar':
 			gs 'drugs', 'alcohol', 'vodka'
 			gs 'beverage', 'afteralcohol'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/bar.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub_bar.jpg"></center>'
 			'You order a shot of vodka and gulp it down, feeling it burn down your throat as you place the empty glass back on the bartop.'
 			act 'Leave': gt 'stripclub', 'main_floor'
 		end
@@ -304,7 +307,7 @@ if $ARGS[0] = 'bar':
 			gs 'drugs', 'alcohol', 'wine'
 			gs 'beverage', 'afteralcohol'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/bar.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub_bar.jpg"></center>'
 			'You order a glass of wine and take a seat at the bar to drink it, taking in the sights of the club as you do.'
 			act 'Leave': gt 'stripclub', 'main_floor'
 		end
@@ -335,7 +338,7 @@ if $ARGS[0] = 'private_dance':
 		if money >= 2000: act 'Accept': gt 'stripclub', 'private_sex'
 		act 'Leave': gt 'stripclub', 'main_floor'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/private_dance2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/private_dance.jpg"></center>'
 		'You order a private dance and two girls lead you to a private room. They push you down into the chair and start dancing around you in a very erotic manner as they strip each other. You feel your heart starting to race and your pussy growing slightly wet.'
 		act 'Finish': gt 'stripclub', 'main_floor'
 	end
@@ -344,7 +347,7 @@ end
 if $ARGS[0] = 'striptease':
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub6.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sveta_show3.jpg"></center>'
 	'The stage is lit up and music booms as a girl walks out before a strenuous male audience.'
 
 	act 'Watch the show':
@@ -356,7 +359,7 @@ if $ARGS[0] = 'striptease':
 		else
 			*clr & cla
 			gs 'stat'
-			'<center><video autoplay loop src="images/.mp4"></video></center>'
+			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/stripclub_show1.mp4"></video></center>'
 			'The girl on stage starts her performance, slowly stripping down as she dances on the pole. The men in the crowd throw fistfuls of rubles on the stage while hooting and hollering.'
 
 			if money >= 100:
@@ -365,8 +368,8 @@ if $ARGS[0] = 'striptease':
 					pcs_horny += 5
 					minut += 5
 					money -= 100
-					'<center><video autoplay loop src="images/.mp4"></video></center>'
-					'You stick 100 <b>₽</b> in her thong and she invitingly starts wiggling her hips and shaking her breasts in front of you. You feel yourself slowly getting excited.'
+					'<center><video autoplay loop src="images/locations/city/redlight/stripclub/stripclub_show2.mp4"></video></center>'
+					'You stick 100 <b>₽</b> in her thong and she invitingly starts shaking her ass and swinging around the pole in front of you. You feel yourself slowly getting excited.'
 					'The girl soon finishes her show and gathers up her clothing and tips before walking off stage as the men cheer at her.'
 					act 'Move away': gt 'stripclub', 'main_floor'
 				end
@@ -376,7 +379,7 @@ if $ARGS[0] = 'striptease':
 				*clr & cla
 				pcs_horny += 5
 				minut += 5
-				'<center><video autoplay loop src="images/.mp4"></video></center>'
+				'<center><video autoplay loop src="images/locations/city/redlight/stripclub/stripclub_show2.mp4"></video></center>'
 				'You feel yourself slowly getting excited as you watch the girl perform until she finally peels off her thong and does one final spin on the pole before gathering up her clothing and tips and walking off stage as the men cheer at her.'
 				act 'Move away': gt 'stripclub', 'main_floor'
 			end
@@ -399,7 +402,7 @@ if $ARGS[0] = 'private_sex':
 	gs 'arousal', 'cuni', 15, 'lesbian', 'group'
 	$orgasm_or = 'yes'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/priv3.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/private_dance_sex.jpg"></center>'
 	'The girls lead you away from the stage and into a private booth. Before you know it, they''ve taken off your clothes and have you spreading your legs as one of them licks your pussy, quickly and expertly bringing you to orgasm while the other girl continues to caress your body.'
 	act 'Finish': gt 'stripclub', 'main_floor'
 	act 'More': gt 'stripclub', 'private_sex1'
@@ -407,14 +410,13 @@ end
 
 if $ARGS[0] = 'private_sex1':
 	*clr & cla
-	privpicrand = rand(4,7)
 	girl += 2
 	lesbian += 1
 	gs 'arousal', 'cuni', 15, 'lesbian', 'group'
 	$orgasm_or = 'yes'
 	gs 'arousal', 'end'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/priv<<privpicrand>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/private_dance_sex.jpg"></center>'
 	'The other girl lets out a sigh and gently pushes her friend away. "You''ve already made her cum. I want in on the action now," she says and starts eating you out, quickly bringing you to orgasm a second time. When you recover, you notice that you''re now alone in the room.'
 	act 'Finish': gt 'stripclub', 'main_floor'
 end
@@ -432,7 +434,11 @@ end
 if $ARGS[0] = 'hire1':
 	*clr & cla
 	'<center><b><font color="maroon">Strip Club</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub.jpg"></center>'
+	if (month >= 11 and month <= 12) or (month >= 1 and month <= 3):
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_winter.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_summer.jpg"></center>'
+	end
 	'"Hey," you say to the bouncer. "I want to get a job here. Can I see the manager?"'
 	if pcs_hotcat > 5:
 		'"Hrmph," he grunts. "ID?"'
@@ -466,7 +472,7 @@ end
 
 if $ARGS[0] = 'hire2':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/manager_office.jpg"></center>'
 	minut += 15
 	gs 'stat'
 	if strip_club['stripbarwork'] = 1 or strip_club['stripbarwork1'] = 1:
@@ -481,9 +487,11 @@ if $ARGS[0] = 'hire2':
 		'"You could say that," you smile.'
 		act 'Continue': gt 'stripclub', 'hire3'
 	else
-		'You enter the manager''s office and see a rather imposing middle aged man in an expensive looking suit sitting behind a desk. "Yes? How can I help you?"'
-		'You give him a smile which he doesn''t return. "Are you Sasha? I was told to ask you if I could get a job here?"'
-		'"That''s me," he nods before he looks you over. "Are you at least 18 years old? I had a visit from the police last week, and they found an underage girl working here. I was fortunate enough that the officers could be bribed."'
+		'You enter the manager''s very well decorated office and see a rather imposing middle aged man in an expensive looking suit sitting behind a desk. "Yes? How can I help you?"'
+		'You give him a smile which he doesn''t return as you walk over to the desk. When you reach it, you''re surprised to see a half naked girl getting off her knees from behind the desk and grabbing some tissues to wipe what looks like cum from her enormous breasts. She then puts her tight fitting corset back on and the man hands her some money before smacking her ass. "Those tits were as good as always, Opal," he grins.'
+		'She smiles at him before brushing past you and out of the room, seemingly not caring that you just walked in on her presumably giving her boss a titfuck.'
+		'"Are you Sasha?" you ask, trying to ignore what you just saw. "I was told to ask you if I could get a job here?"'
+		'"That''s me," he nods and zips his pants up before he looks you over. "Are you at least 18 years old? I had a visit from the police last week, and they found an underage girl working here. I was fortunate enough that the officers could be bribed, but I don''t wish for a repeat visit."'
 	end
 
 	if age >= 18 or fakepassport = 1:
@@ -508,8 +516,7 @@ if $ARGS[0] = 'hire2':
 		end
 
 		act 'Can''t I bartend?':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/office.jpg"></center>'
+			cla
 			'"Do I have to be a waitress? Can''t I tend bar?"'
 			'"That''s an important position that''s highly coveted. If you want that, you''ll have to work up to it. I need to know I can trust you. So stripping or waitressing?"'
 			'"Waitress I guess," you shrug in disappointment.'
@@ -524,7 +531,7 @@ end
 
 if $ARGS[0] = 'hire3':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/manager_office.jpg"></center>'
 	minut += 15
 	gs 'stat'
 	'"Do you have any experience working in a bar?" he asks as he hands your passport back to you.'
@@ -582,8 +589,8 @@ if $ARGS[0] = 'stripper_tryout1':
 	act 'Panic':
 		cla & *nl
 		'A chill runs through your spine.'
-		'"<i>What?</i>"'
-		'"Oh, for fuck''s sake. Not another one..." He rolls his eyes. "If you want to be a stripper, then people are going to see you naked. Which means <i>I</i> have to see you naked to make sure you''re hot enough to dance in my club and won''t pussy out <i>just like this</i>. Now get those clothes off or fuck off."'
+		'"<i>What?</i>" you blurt out in surprise.'
+		'He rolls his eyes. "Oh, for fuck''s sake. Not another one... If you want to be a stripper, then people are going to see you naked. Which means <i>I</i> have to see you naked to make sure you''re hot enough to dance in my club and won''t pussy out <i>just like this</i>. Now get those clothes off or fuck off."'
 		act 'Strip': gt 'stripclub', 'stripper_tryout2'
 	end
 
@@ -641,10 +648,13 @@ if $ARGS[0] = 'stripper_tryout2':
 		'He frowns at the sight of your tiny breasts.'
 		'"Shame about the tits."'
 	end
-	if func('pcs_has_attr', 'body_ass_big'):
-		'He spins you round and inspects your ass.'
-		'"Nice bubble butt," he says as his hand paws at your rear. "This will earn you extra tips for sure."'
+	if func('pcs_has_attr', 'body_ass_bubble'):
+		'He spins you round and inspects your huge ass.'
+		'"Great ass, girl," he says as he paws at your rear. "You''ll be the talk of the club!"'
 		if (year = 2017 and month > 8): '"I think Amber might actually have a rival for best ass in the club."'
+	elseif func('pcs_has_attr', 'body_ass_big'):
+		'He spins you round and inspects your shapely ass.'
+		'"Nice ass," he says as his hand paws at your rear. "This will earn you extra tips for sure."'
 	elseif func('pcs_has_attr', 'body_ass_flat'):
 		'He spins you round and inspects your ass.'
 		'"Hhhm..." he says. "You should do some squats and pad this out. The customers need something to look at."'
@@ -674,13 +684,13 @@ end
 
 if $ARGS[0] = 'stripper_accept1':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/manager_office.jpg"></center>'
 	'You dance sensually and he''s clearly smitten by you before he asks you to sit down.'
 	'"Our business hours are between 18:00 and 03:00. We operate two six hour shifts. 18:00 to midnight, 21:00 to 03:00. Shift priority is first come first serve. Whiteboard with the schedule is backstage."'
 	'He pulls some papers out of a cabinet behind him.'
 	'"Any tips you get are yours, but we''re not paying you hourly. Think of it as an incentive to perform well. If a customer wants a lap dance it''s 1000 <b>₽</b> a dance. You get 40% and the rest goes to the club. Some clients may want to pay extra for further ''entertainment'', but this isn''t a brothel. If you want to turn tricks, then go and stand on the corner outside. Otherwise call Viktor. Now sign here."'
 	act 'Change your mind':
-		*clr & cla
+		cla
 		gs 'stat'
 		'"On second thought, I don''t know if I can do this," you say hesitantly.'
 		'"Ugh, another fucking flake." He rolls his eyes before throwing the papers into a drawer and slamming it shut. "Come back when you''re ready to get serious. Until then, get the fuck out."'
@@ -688,14 +698,12 @@ if $ARGS[0] = 'stripper_accept1':
 	end
 
 	act 'Sign':
-		*clr & cla
+		cla
 		if strip_club['stripbarwork'] = 1: strip_club['stripbarwork'] = 0
 		if strip_club['stripbarwork1'] = 1: strip_club['stripbarwork1'] = 0
-
 		strip_club['stripwork'] = 1
 		!! Needs a block of sorts that will prevent the player from immediately being able to start work
 		gs 'stat'
-		!! IMAGE HERE
 		'You think about it for a minute and smile at him as you accept his offer.'
 		'The manager leads you to the dressing room and tells a woman responsible for the costumes that you''re going to join the club. He also introduces you to the chief of security, who takes your picture and makes you sign some documents.'
 		if $pcs_strippername = '':
@@ -733,13 +741,13 @@ if $ARGS[0] = 'albina_first_dance1':
 	minut += 15
 	AlbinaQW['seen_strip'] = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub4.jpg"></center>'
+	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/stripclub_show1.mp4"></video></center>'
 	if AlbinaQW['Friends'] = 2:
 		'"Give it up for the fine piece of ass that is AAMMMBBERRR!" the DJ announces over the speakers and the crowd loudly cheers.'
-		'Your jaw drops as the girl struts onto the stage to loud cheers. Is that Albina?!'
+		'Your jaw drops as the girl struts onto the stage to loud cheers, shaking her ass for the crowd. Is that Albina?!'
 	else
-		'"Give it up for the fine piece of ass that is AAMMMBBERRR!" the DJ announces over the speakers and the crowd loudly cheers.'
-		'As you look up at the girl on stage, you can''t help but notice that she looks familiar... You look closer and notice that it''s Albina!'
+		'"Give it up for the fine piece of ass that is AAMMMBBERRR!" the DJ announces over the speakers and the crowd loudly cheers as a girl struts onto the stage and starts shaking her ass.'
+		'As you look up at the stage, you can''t help but notice that she looks familiar... You look closer and notice that it''s Albina!'
 	end
 	if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
 		'She smiles when she sees you and dances up close to you, wiggling her bubble butt in your face.'
@@ -748,21 +756,22 @@ if $ARGS[0] = 'albina_first_dance1':
 			*clr & cla
 			pcs_horny += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub4.jpg"></center>'
+			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/albina_show.mp4"></video></center>'
 			'You watch in silence as Albina entices the crowd with her moves as she strips down to the music, shaking her ass in their faces as they throw piles of rubles onto the stage. She occasionally struts over and dances in front of you, causing the men to throw even more money on the stage so she''ll return her attention to them.'
-			'She finishes her show by teasingly tugging off her g-string, much to the delight of the patrons around you who ogle at her naked body as she gathers her clothing and tips before strutting off stage without even looking in your direction.'
+			'She finishes her show by teasingly tugging at her g-string and slowly peeling it off, much to the delight of the patrons around you, who ogle and cheer at her as she rolls around naked on the stage. She then gathers her clothing and tips before strutting off stage without even looking in your direction.'
 			'A few minutes later, she walks out onto the floor and immediately grabs you by the arm before dragging you into a private room.'
 			act 'Go with her': gt 'stripclub', 'albina_confront'
 		end
 
 		if money >= 100:
 			act 'Give her 100 <b>₽</b>':
-				cla
+				*clr & cla
 				money -= 100
 				minut += 5
 				gs 'stat'
+				'<center><video autoplay loop src="images/locations/city/redlight/stripclub/albina_show.mp4"></video></center>'
 				'You throw 100 <b>₽</b> onto the stage in front of her and she gives you a wink before moving back into the middle of the stage, enticing the crowd with her moves as they throw piles of rubles onto the stage.'
-				'She finishes her show by teasingly tugging at her g-string before slowly peeling it off, much to the delight of the patrons around you, who ogle at her naked body as she gathers her clothes and tips up before strutting off the stage as the men hoot and holler.'
+				'She finishes her show by teasingly  tugging at her g-string and slowly peeling it off, much to the delight of the patrons around you, who ogle and cheer at her as she rolls around naked on the stage. She then gathers her clothes and tips up before strutting off the stage as the men hoot and holler.'
 				'A few minutes later, she walks out onto the floor and immediately grabs you by the arm before dragging you into a private room.'
 				act 'Go with her': gt 'stripclub', 'albina_confront'
 			end
@@ -775,21 +784,22 @@ if $ARGS[0] = 'albina_first_dance1':
 			pcs_horny += 5
 			minut += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub4.jpg"></center>'
+			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/albina_show.mp4"></video></center>'
 			'You watch in silence as Albina entices the crowd with her moves as she strips down to the music, shaking her ass in their faces as they throw piles of rubles onto the stage.'
-			'She finishes her show by teasingly tugging off her g-string, much to the delight of the patrons around you who ogle at her naked body as she gathers her clothing and tips before strutting off stage without even looking in your direction.'
+			'She finishes her show by teasingly tugging at her g-string and slowly peeling it off, much to the delight of the patrons around you, who ogle and cheer at her as she rolls around naked on the stage. She then gathers her clothing and tips before strutting off stage without even looking in your direction.'
 			'A few minutes later, she walks out onto the floor and immediately grabs you by the arm before dragging you into a private room.'
 			act 'Go with her': gt 'stripclub', 'albina_confront'
 		end
 
 		if money >= 100:
 			act 'Give her 100 <b>₽</b>':
-				cla
+				*clr & cla
+				'<center><video autoplay loop src="images/locations/city/redlight/stripclub/albina_show.mp4"></video></center>'
 				money -= 100
 				minut += 5
 				gs 'stat'
 				'You throw 100 <b>₽</b> onto the stage in front of her, but she just rolls her eyes and moves over to dance in front of a group of men offering her far more generous tips.'
-				'She finishes her show by teasingly tugging off her g-string, much to the delight of the patrons around you who ogle at her naked body as she gathers her clothing and tips before strutting off stage without even looking in your direction.'
+				'She finishes her show by teasingly tugging at her g-string and slowly peeling it off, much to the delight of the patrons around you, who ogle and cheer at her as she rolls around naked on the stage. She then gathers her clothing and tips before strutting off stage without even looking in your direction.'
 				'A few minutes later, she walks out onto the floor and immediately grabs you by the arm before dragging you into a private room.'
 				act 'Go with her': gt 'stripclub', 'albina_confront'
 			end
@@ -802,7 +812,7 @@ if $ARGS[0] = 'albina_recurrent_dance':
 	pcs_horny += 5
 	minut += 15
 	gs 'stat'
-	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/albina_show.mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/stripclub_show1.mp4"></video></center>'
 	'You smile when you see Albina strutting up to start her show.'
 	if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
 		'She smiles when she sees you and dances up close to you as she strips, wiggling her bubble butt in your face.'
@@ -827,7 +837,7 @@ if $ARGS[0] = 'albina_recurrent_dance':
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/albina_show.mp4"></video></center>'
 			'You watch in silence as Albina entices the crowd with her moves as she strips down to the music, shaking her ass in their faces as they throw piles of rubles onto the stage. She occasionally struts over and dances in front of you, causing the men to throw even more money on the stage so Albina will return her attention to them.'
-			'She finishes her show by teasingly tugging off her g-string, much to the delight of the patrons around you who ogle at her naked body as she gathers her clothing and tips before strutting off stage without even looking in your direction.'
+			'She finishes her show by teasingly tugging at her g-string and slowly peeling it off, much to the delight of the patrons around you, who ogle and cheer at her as she rolls around naked on the stage. She then gathers her clothing and tips before strutting off stage without even looking in your direction.'
 			act 'Move away': gt 'stripclub', 'main_floor'
 		end
 	else
@@ -853,7 +863,7 @@ if $ARGS[0] = 'albina_recurrent_dance':
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/albina_show.mp4"></video></center>'
 			'You watch in silence as Albina entices the crowd with her moves as she strips down to the music, shaking her ass in their faces as they throw piles of rubles onto the stage.'
-			'She finishes her show by teasingly tugging off her g-string, much to the delight of the patrons around you who ogle at her naked body as she gathers her clothing and tips before strutting off stage without even looking in your direction.'
+			'She finishes her show by teasingly tugging at her g-string and slowly peeling it off, much to the delight of the patrons around you, who ogle and cheer at her as she rolls around naked on the stage. She then gathers her clothing and tips before strutting off stage without even looking in your direction.'
 			act 'Move away': gt 'stripclub', 'main_floor'
 		end
 	end
@@ -866,157 +876,102 @@ if $ARGS[0] = 'albina_confront':
 	if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
 		'"What are you doing here, <<$pcs_nickname>>?" she asks.'
 		'"What are <i>you</i> doing here?" you retort and she smiles.'
-		'"What does it look like? Stripping is easy money, you know?" A sly grin then appears on her face. "Maybe I can interest you in a private dance?"'
-		if money >= 1000:
-			act 'Yes':
+		'"Exactly what it looks like. Mama won''t cover all my expenses and I needed to make my own money, so I decided to make use of my skills and get a job working the poles here."'
+		*nl
+		'"Do you enjoy it?" you ask and she shrugs.'
+		'"It''s not too bad. I make a ton of cash and security help out with the creeps who get too hands on. Just don''t tell anyone I work here."'
+		'"Your secret''s safe with me," you wink and she smiles.'
+		'"Thanks <<$pcs_nickname>>, but I need to get back to work," she says before she leaves the room.'
+		act 'Return to the floor': gt 'stripclub', 'main_floor'
+	else
+		'"What the fuck are you doing here, <<$pcs_nickname>>?!" she asks sternly.'
+		'"<i>Me<i>? What are <i>you</i> doing here?" you retort and she rolls her eyes.'
+		'"I''m their new cleaner, but they asked me to fill in for one of the girls tonight. What does it look like I''m doing, you fucking idiot?! I don''t know or care why you came here, but don''t expect a private dance from me."'
+		'"I wasn-" you start to reply, but she cuts you off.'
+		'"Whatever. I need to get back to work," she says before leaving the room.'
+		act 'Return to the floor': gt 'stripclub', 'main_floor'
+	end
+end
+
+if $ARGS[0] = 'albina_dance':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/private_room.jpg"></center>'
+	'You hand over the money and are taken to one of the private rooms, where you take a seat and wait for Albina to arrive.'
+	if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
+		if AlbinaQW['special_lapdance'] = 0:
+			'Albina walks into the room and her face lights up when she sees you. "<<$pcs_nickname>>! I should have known that it was you!"'
+			'All you can do is grin as she seductively struts over to you. "What if we make this dance more interesting?"'
+			'"Oh?" you ask while raising an eyebrow.'
+			'"Let''s do it on the stage in front of everyone!" she grins.'
+			act 'Agree':
 				*clr & cla
 				minut += 10
 				pcs_horny += 5
+				money -= 1000
+				AlbinaQW['special_lapdance'] = 1
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
-				'"Yes!" you reply a little too enthusiastically. "1000 <b>₽</b>, right?"'
-				'She waves her hand. "It''s on the house, this one time anyway. You want my services in the future, then you have to pay like everyone else. Also, no telling anyone I work here."'
-				'You nod and Albina pushes you into the chair before music starts playing and she starts her show. She seductively dances while slowly peeling her clothes off, all while giving you a teasing smile.'
-				'Once down to her thong, she climbs into your lap and starts grinding against you as her perky breasts jiggle in your face. You''re feeling rather aroused by the time she finishes by bending over in front of you and tugging off her thong.'
-				'The song then ends and a naked Albina smiles before sitting in your lap.'
-				if week = 6:
-					if hour < 23:
-						'"I can tell you enjoyed that <<$pcs_nickname>>, and I did too, but I need to get back to work."'
-						'You nod and she gets dressed again before she walks you back out onto the floor.'
-						act 'Return to the floor': gt 'stripclub', 'main_floor'
-					else
-						'"I can tell you enjoyed that <<$pcs_nickname>>, and I did too. My shift''s almost over, so why don''t you walk me home?"'
-						act 'Sure':
-							cla
-							'"Sure," you nod and she starts getting dressed again before walking you back out onto the floor.'
-							'"Just wait for me out here. I won''t be long," Albina says before disappearing backstage. You take a seat and scroll through your phone until she returns and you head out together.'
-							act 'Wait for Albina': gt 'albina_uni', 'walk_home'
-						end
-
-						act 'No thanks':
-							cla
-							'"Sorry, but I need to get going," you reply and she just shrugs.'
-							'"Suit yourself, but remember; no more free shows."'
-							'She gathers up her clothes and gets dressed before heading back out onto the floor.'
-							act 'Return to the floor': gt 'stripclub', 'main_floor'
-						end
-					end
-				else
-					'"I can tell you enjoyed that <<$pcs_nickname>>, and I did too, but I need to get back to work."'
-					'You nod and she gets dressed again before she walks you back out onto the floor.'
-					act 'Return to the floor': gt 'stripclub', 'main_floor'
-				end
+				'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/alb_lapdance.jpg"></center>'
+				'The DJ announces a special performance by Amber and Albina leads you out onto the stage. She pushes you down onto a chair placed on the stage and music starts playing as she starts her show. She seductively dances and twerks while slowly peeling her clothes off, all while giving you and the cheering audience a teasing smile and wiggling her hips.'
+				'Once down to her g-string, she climbs into your lap and starts grinding against you as her perky breasts jiggle in your face. You''re feeling rather aroused by the time she finishes by bending over in front of you and tugging the skimpy thong down her legs, much to the joy of the men in the crowd. You notice her pussy is a little wet; it seems she''s enjoying this as much as you.'
+				'The song ends and a naked Albina smiles while wiggling her naked ass at you. The men whistle and holler as you give her a firm smack on the ass.'
+				*nl
+				'Her show over, she gathers up her clothes and tips before strutting off the stage as the men continue cheering, leaving you to climb off the stage.'
+				act 'Return to the floor': gt 'stripclub', 'main_floor'
+			end
+		
+			act 'Refuse':
+				cla
+				minut += 10
+				pcs_horny += 5
+				money -= 1000
+				gs 'stat'
+				'You shake your head. "No, I just want a private dance if that''s okay."'
+				'She nods. "Sure. Just sit back and enjoy the show."'
+				'She pushes you down onto the chair and music starts playing as she starts her show. She seductively dances and twerks while slowly peeling her clothes off, all while giving you a teasing smile and wiggling her hips.'
+				'Once down to her g-string, she climbs into your lap and starts grinding against you as her perky breasts jiggle in your face. You''re feeling rather aroused by the time she finishes by bending over in front of you and tugging the skimpy thong down her legs. You notice her pussy is a little wet; it seems she''s enjoying this as much as you.'
+				'The song ends and a naked Albina smiles and wiggles her naked ass at you before she gathers up her clothes and gets dressed. She winks at you before strutting out of the room, leaving you to return to the main area.'
+				act 'Return to the floor': gt 'stripclub', 'main_floor'
 			end
 		else
-			act 'No money':
+			'Albina walks into the room and her face lights up when she sees you. "<<$pcs_nickname>>! I should have known that it was you!"'
+			'All you can do is grin as she seductively struts over to you. "Want to get back on stage for another ''special'' show?"'
+			act 'Agree':
 				*clr & cla
 				minut += 10
 				pcs_horny += 5
+				money -= 1000
+				AlbinaQW['special_lapdance'] = 1
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
-				'"I don''t have any money," you reply.'
-				'"Then why are you here?" she asks with a puzzled stare. "Never mind, this is on the house this one time. You want my services in the future, then you have to pay like everyone else. Also, no telling anyone I work here."'
-				'You nod and Albina pushes you into the chair before music starts playing and she starts her show. She seductively dances while slowly peeling her clothes off, all while giving you a teasing smile.'
-				'Once down to her g-string, she climbs into your lap and starts grinding against you as her perky breasts jiggle in your face. You''re feeling rather aroused by the time she finishes by bending over in front of you and tugging off her thong.'
-				'The song ends and a naked Albina smiles before sitting in your lap.'
-				if week = 6:
-					if hour < 23:
-						'"I can tell you enjoyed that <<$pcs_nickname>>, and I did too, but I need to get back to work."'
-						'You nod and she gets dressed again before she walks you back out onto the floor.'
-						act 'Return to the floor': gt 'stripclub', 'main_floor'
-					else
-						'"I can tell you enjoyed that <<$pcs_nickname>>, and I did too. My shift''s almost over, so why don''t you walk me home?"'
-						act 'Sure':
-							cla
-							'"Sure," you nod and she starts getting dressed again before walking you back out onto the floor.'
-							'"Just wait for me out here. I won''t be long," Albina says before disappearing backstage. You take a seat and scroll through your phone until she returns and you head out together.'
-							act 'Wait for Albina': gt 'albina_uni', 'walk_home'
-						end
-
-						act 'No thanks':
-							cla
-							'"Sorry, but I need to get going," you reply and she just shrugs.'
-							'"Suit yourself, but remember; no more free shows."'
-							'She gathers up her clothes and gets dressed before heading back out onto the floor.'
-							act 'Return to the floor': gt 'stripclub', 'main_floor'
-						end
-					end
-				else
-					'"I can tell you enjoyed that <<$pcs_nickname>>, and I did too, but I need to get back to work."'
-					'You nod and she gets dressed again before she walks you back out onto the floor.'
-					act 'Return to the floor': gt 'stripclub', 'main_floor'
-				end
+				'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/alb_lapdance.jpg"></center>'
+				'The DJ announces a special performance by Amber and Albina leads you out onto the stage. She pushes you down onto a chair placed on the stage and music starts playing as she starts her show. She seductively dances and twerks while slowly peeling her clothes off, all while giving you and the cheering audience a teasing smile and wiggling her hips.'
+				'Once down to her g-string, she climbs into your lap and starts grinding against you as her perky breasts jiggle in your face. You''re feeling rather aroused by the time she finishes by bending over in front of you and tugging the skimpy thong down her legs, much to the joy of the men in the crowd. You notice her pussy is a little wet; it seems she''s enjoying this as much as you.'
+				'The song ends and a naked Albina smiles while wiggling her naked ass at you. The men whistle and holler as you give her a firm smack on the ass.'
+				*nl
+				'Her show over, she gathers up her clothes and tips before strutting off the stage as the men continue cheering, leaving you to climb off the stage.'
+				act 'Return to the floor': gt 'stripclub', 'main_floor'
 			end
-		end
-
-		act 'No thanks':
-			*clr & cla
-			minut += 2
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
-			'"No thanks," you reply. "I need to get going."'
-			if week = 6:
-				if hour < 23:
-					'She just shrugs. "Your loss. I need to get back to work."'
-					'She walks you back out onto the floor, leaving you behind in the room.'
-					act 'Return to the floor': gt 'stripclub', 'main_floor'
-				else
-					'"Your loss. My shift is almost over, so why don''t you walk me home?"'
-					act 'Sure':
-						cla
-						'"Sure," you nod and she walks you back out onto the floor.'
-						'"Just wait for me out here. I won''t be long," Albina says before disappearing backstage. You take a seat and scroll through your phone until she returns in her normal clothes and you head out together.'
-						act 'Wait for Albina': gt 'albina_uni', 'walk_home'
-					end
-
-					act 'No thanks':
-						cla
-						'"Sorry, but I need to get going," you reply and she just shrugs.'
-						'"Suit yourself, but remember; no more free shows."'
-						'She gathers up her clothes and gets dressed before heading back out onto the floor.'
-						act 'Return to the floor': gt 'stripclub', 'main_floor'
-					end
-				end
-			else
-				'"I can tell you enjoyed that <<$pcs_nickname>>, and I did too, but I need to get back to work."'
-				'You nod and she gets dressed again before she walks you back out onto the floor.'
+		
+			act 'Refuse':
+				cla
+				minut += 10
+				pcs_horny += 5
+				money -= 1000
+				gs 'stat'
+				'You shake your head. "No, I just want a private dance if that''s okay."'
+				'She nods. "Sure. Just sit back and enjoy the show."'
+				'She pushes you down onto the chair and music starts playing as she starts her show. She seductively dances and twerks while slowly peeling her clothes off, all while giving you a teasing smile and wiggling her hips.'
+				'Once down to her g-string, she climbs into your lap and starts grinding against you as her perky breasts jiggle in your face. You''re feeling rather aroused by the time she finishes by bending over in front of you and tugging the skimpy thong down her legs. You notice her pussy is a little wet; it seems she''s enjoying this as much as you.'
+				'The song ends and a naked Albina smiles and wiggles her naked ass at you before she gathers up her clothes and gets dressed. She winks at you before strutting out of the room, leaving you to return to the main area.'
 				act 'Return to the floor': gt 'stripclub', 'main_floor'
 			end
 		end
 	else
-		'"What the fuck are you doing here, <<$pcs_nickname>>?!" she asks sternly.'
-		'"<i>Me<i>? What are <i>you</i> doing here?" you retort and she rolls her eyes.'
-		'"I''m their new cleaner, but they asked me to fill in for one of the girls tonight. What does it look like I''m doing, you fucking idiot?! I don''t know or care why you came here, but don''t expect a private dance from me."'
-		'"I wasn-" you start to reply, but she cuts you off.'
-		'"Whatever. I need to get back to work," she says before leaving the room.'
-		act 'Return to the floor': gt 'stripclub', 'main_floor'
-	end
-end
-
-if $ARGS[0] = 'albina_dance':
-	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
-	'You hand over the money and are taken to one of the private rooms, where you take a seat and wait for Albina to arrive.'
-	if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
 		*clr & cla
-		minut += 10
-		pcs_horny += 5
-		money -= 1000
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
-		'Her face lights up when she walks into the room. "<<$pcs_nickname>>! I should take it as a compliment if you want a dance from me."'
-		'All you can do is grin as she seductively struts over to you. "Well then, we better get this show started..."'
-		'Music starts playing and she starts her show. She seductively dances and twerks while slowly peeling her clothes off, all while giving you a teasing smile.'
-		'Once down to her g-string, she climbs into your lap and starts grinding against you as her perky breasts jiggle in your face. You''re feeling rather aroused by the time she finishes by bending over in front of you and tugging the skimpy thong down her legs. You notice her pussy is a little wet; it seems she''s enjoying this as much as you.'
-		'The song ends and a naked Albina smiles while wiggling her naked ass at you.'
-		*nl
-		'Her show over, she gathers up her clothes and starts getting dressed before strutting out of the room, leaving you to walk back out to the main area.'
-		act 'Return to the floor': gt 'stripclub', 'main_floor'
-	else
-		cla
 		minut += 2
+		money -= 100
 		gs 'stat'
-		'A few minutes later, Albina walks in and rolls her eyes when she sees you. "I''m not giving you of all people a fucking lapdance!" She throws your money on the floor. "Here''s your refund. Now fuck off before I call security."'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
+		'A few minutes later, Albina walks in and rolls her eyes when she sees you. "I''m not giving you of all people a fucking lapdance!" She throws your money on the floor. "Here''s your refund, minus a small fee for wasting my time of course. Now fuck off before I call security!"'
 		'She crosses her arms and glares at you intently until you leave the room.'
 		act 'Return to the floor': gt 'stripclub', 'main_floor'
 	end

+ 19 - 15
locations/stwork.qsrc

@@ -114,7 +114,7 @@ if $ARGS[0] = 'set_perform_acts':
 					gt 'stwork2', 'strip_show_start'
 				else
 					*clr & cla
-					!! IMAGE
+					'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/backstage.jpg"></center>'
 					'You start climbing the steps to the stage when a shout from behind makes you stop.'
 					'"You''re gonna go on stage like that?"'
 					'Turning, you see all the other strippers snickering at you.'
@@ -170,6 +170,8 @@ end
 
 if $ARGS[0] = 'set_shift_over_act':
 	act 'Shift over':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor.jpg"></center>'
 		'Your shift is over, so you prepare to leave for the night.'
 
 		if $clothingworntype = 'nude':
@@ -196,7 +198,7 @@ if $ARGS[0] = 'set_shift_over_act':
 			act 'Leave': gt 'stripclub', 'start'
 		else
 			strip_club['guard_hookup'] = 0
-			'You finish getting dressed and pack up your belonginsg before heading out the back door. Viktor is waiting for you outside.'
+			'You finish getting dressed and pack up your belongings before heading out the back door. Viktor is waiting for you outside.'
 			if strip_club['guard_sex'] = 0:
 				'"I''ve been looking forward to this. I want to know just what kind of minx you are!"'
 				'You smile and give him a kiss. "Well, why don''t we find out?"'
@@ -330,9 +332,9 @@ if $ARGS[0] = 'guard':
 	gs 'stat'
 	if strip_club['guard_meet'] = 0:
 		strip_club['guard_meet'] = 1
-		!! IMAGE
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor.jpg"></center>'
 		if $clothingworntype = 'nude':
-			'The guard at the door is an older man, an imposing mountain of muscle who grins as you approach him. "Hey girl, I can''t let you outside like that, even if you do look good naked," he jokes.'
+			'Standing guard at the door is a bald man with a beard, a towering mountain of muscle who grins as you approach him. "Hey girl, I can''t let you outside like that, even if you do look good naked," he jokes.'
 
 			act 'Flirt with him':
 				cla
@@ -411,7 +413,7 @@ if $ARGS[0] = 'guard':
 
 	elseif strip_club['guard_flirt'] < 2:
 		if $clothingworntype = 'nude':
-			!! IMAGE
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor.jpg"></center>'
 			'Viktor grins as you approach. "Hey <<$pcs_strippername>>. Looking as sexy as ever."'
 			if strip_club['guard_flirt'] = 0:
 				act 'Flirt with him':
@@ -437,7 +439,7 @@ if $ARGS[0] = 'guard':
 					gs 'stat'
 					'He''s pretty good looking for his age and you can tell he''s interested in you, so you decide to have some fun with him. You turn and wiggle your naked ass at him.'
 					'He grins at you while checking you out and you can''t help but smile as you see a bulge clearly forming in his pants.'
-					if pcs_butt > 12: '"Damn, that''s a fine looking ass! No wonder the boss hired you."'
+					if func('pcs_has_attr', 'body_ass_bubble') or func('pcs_has_attr', 'body_ass_big'): '"Damn, that''s a fine looking ass! No wonder the boss hired you."'
 					'You finish your show and turn back to face him. "Maybe I''ll offer you something other than a simple tease next time..." you whisper seductively while placing your hand on his chest.'
 					'All he does is grin as you wink at him before walking away, making sure to add some extra sway to your hips as you do.'
 					act 'Move away': gt 'stwork', 'start'
@@ -460,7 +462,7 @@ if $ARGS[0] = 'guard':
 				act 'Move away': gt 'stwork', 'start'
 			end
 		else
-			!! IMAGE
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor.jpg"></center>'
 			'Viktor grins as you approach. "Hey <<$pcs_strippername>>. Looking as sexy as ever."'
 			if strip_club['guard_flirt'] = 0:
 				act 'Flirt with him':
@@ -485,7 +487,7 @@ if $ARGS[0] = 'guard':
 					gs 'stat'
 					'He''s pretty good looking for his age and you can tell he''s interested in you, so you decide to have some fun with him. You turn and wiggle your ass at him.'
 					'He grins at you while checking you out and you can''t help but smile as you see a bulge clearly forming in his pants.'
-					if pcs_butt > 12: '"Damn, that''s a fine looking ass! No wonder the boss hired you."'
+					if func('pcs_has_attr', 'body_ass_bubble') or func('pcs_has_attr', 'body_ass_big'): '"Damn, that''s a fine looking ass! No wonder the boss hired you."'
 					'You finish your show and turn back to face him. "Maybe I''ll offer you something other than a simple tease next time..." you whisper seductively while placing your hand on his chest.'
 					'All he does is grin as you wink at him before walking away, making sure to add some extra sway to your hips as you do.'
 					act 'Move away':gt 'stwork', 'start'
@@ -509,7 +511,7 @@ if $ARGS[0] = 'guard':
 		end
 	else
 		if strip_club['guard_sex'] = 0:
-			!! IMAGE
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor.jpg"></center>'
 			'Viktor grins as you approach. "Hey <<$pcs_strippername>>. Looking as sexy as ever."'
 			if stat['think_virgin'] = 1 and stat['vaginal'] = 0:
 				cla
@@ -649,7 +651,7 @@ if $ARGS[0] = 'rest':
 		AlbinaQW['working_stripclub'] = 1
 		minut += 2
 		gs 'stat'
-		!!IMAGE
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/makeup.jpg"></center>'
 		'A girl wearing an eye-catching corset and skimpy g-string is sitting at one of the mirrors touching up her heavy layer of makeup. You don''t think you''ve seen her before, so you walk over to introduce yourself.'
 		'"Hey, I''m-" you start, but stop when the girl turns to look at you. It''s Albina!'
 		if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
@@ -671,7 +673,7 @@ if $ARGS[0] = 'rest':
 		*clr & cla
 		minut += 2
 		gs 'stat'
-		!!IMAGE
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/makeup.jpg"></center>'
 		'A scantily-clad Albina is sitting at one of the mirrors touching up her heavy layer of makeup.'
 		if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
 			'She smiles when she sees you and invites you to sit and chat with her as she finishes getting ready. Once her makeup is ready, she adjusts her corset and gives her hair a small ruffle before bidding you farewell and strutting out of the room.'
@@ -680,7 +682,7 @@ if $ARGS[0] = 'rest':
 			'She just glares at you and turns her attention back to the mirror. Finishing her makeup, she adjusts her corset and gives her hair a small ruffle before strutting out of the room.'
 			act 'Return to dressing room': gt 'stwork', 'start'
 		end
-	elseif rand(0,2) = 0 and strip_club['seen_ruby_drugs'] = 0:
+	elseif rand(0,2) = 1 and strip_club['seen_ruby_drugs'] = 0:
 		*clr & cla
 		strip_club['seen_ruby_drugs'] = 1
 		minut += 2
@@ -689,19 +691,21 @@ if $ARGS[0] = 'rest':
 		'You see a red haired girl sitting at one of the mirrors. She looks a little jumpy as she rolls up a ruble bill before she suddenly leans over and snorts what you assume to be drugs up her nose. She blissfully slumps back in her chair before she spots you in the mirror.'
 		'"The fuck are you looking at, bitch? Mind your own fucking business!" she snarls as she shoves you aside and struts out of the room.'
 		'That must have been Ruby. You''ve heard the other strippers talking about her having a serious drug problem.'
-	elseif rand(0,2) = 0 and strip_club['seen_ruby_drugs'] = 1:
+		act 'Return to dressing room': gt 'stwork', 'start'
+	elseif rand(0,2) = 1 and strip_club['seen_ruby_drugs'] = 1:
 		*clr & cla
 		minut += 2
 		gs 'stat'
 		'<center><video autoplay loop src="images/locations/city/redlight/stripclub/snort.mp4"></video></center>'
 		'You catch Ruby preparing a line of cocaine on the table in front of her before she quickly snorts it and slumps back in her chair.'
 		'You shake your head before leaving her to it.'
+		act 'Return to dressing room': gt 'stwork', 'start'
 	else
 		*clr & cla
 		minut += 2
 		gs 'stat'
-		!!IMAGE
-		'One of your fellow strippers is touching up her makeup at one of the mirrors. She smiles at you before strutting out of the room.'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/makeup.jpg"></center>'
+		'One of your fellow strippers is touching up her hair and makeup at one of the mirrors. She smiles at you before strutting out of the room.'
 		act 'Return to dressing room': gt 'stwork', 'start'
 	end
 end

+ 46 - 56
locations/stwork2.qsrc

@@ -9,11 +9,10 @@ if $ARGS[0] = 'strip_show_start':
 	strip_club['bra_number'] = brawornnumber
 	$strip_club['panty_type'] = $pantyworntype
 	strip_club['panty_number'] = pantywornnumber
-
 	countmoney = 1
 	gs 'stat'
 	'<center><b><font color="maroon">Stage</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub_stage.jpg"></center>'
 	'You''re ready to go as the music starts. It''s now or never.'
 	gs 'stwork2', 'strip_hub2', 1
 end
@@ -24,13 +23,11 @@ if $ARGS[0] = 'strip_show_end':
 	gt 'stwork', 'start'
 end
 
-
 if $ARGS[0] = 'strip_hub':
 	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">Stage</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub1.jpg"></center>'
-
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub_stage.jpg"></center>'
 	if strip_club['strip_tips'] < 10:
 		$pubhot = 'booing you. "Get this stupid cow off the stage!" you hear someone shout.'
 	elseif strip_club['strip_tips'] < 20:
@@ -132,8 +129,6 @@ if $ARGS[0] = 'strip_hub2':
 	act 'Leave the stage': gt 'stwork2', 'strip_show_end'
 end
 
-
-
 if $ARGS[0] = 'set_customer_mood':
 	if func('pcs_has_attr', 'OR', 'body_bmi_overweight', 'body_bmi_obese'):
 		if rand(0,100) >= 60:
@@ -185,7 +180,7 @@ if $ARGS[0] = 'set_customer_mood_pole':
 			'"Hey hippopotamus, stomp back to the swamp where you came from!"'
 			strip_club['cust_boos'] += 1
 			strip_club['strip_tips'] -= 40
-			if rand(0, 100) >= 75:
+			if rand(0,100) >= 75:
 				fingal += rand(2,5)
 				gs 'pain', 4, 'cheeks', 'Slam'
 				gs 'stat'
@@ -200,8 +195,6 @@ if $ARGS[0] = 'set_customer_mood_pole':
 	end
 end
 
-
-
 if $ARGS[0] = 'dance_clothed':
 	*clr & cla
 	minut += 5
@@ -210,9 +203,8 @@ if $ARGS[0] = 'dance_clothed':
 	gs 'exp_gain', 'dancero', rand(1,2)
 	strip_club['strip_tips'] += rand(pcs_dancero, 5 * pcs_dancero) / 10
 	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclo' + rand(1,3) + '.jpg"></center>'
-	'You dance seductively around the pole in the center of the stage.'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sveta_clothed1.jpg"></center>'
+	'You dance seductively around the pole at the center of the stage.'
 	gs 'stwork2', 'set_customer_mood'
 	'The men are starting to call for you to strip, so you''d better give them what they want.'
 
@@ -229,19 +221,19 @@ if $ARGS[0] = 'strip_clothes':
 	gs 'fame', 'city', 'stripping', rand(1,2)
 	strip_club['strip_tips'] += rand(pcs_dancero, 5 * pcs_dancero) / 7
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclo' + rand(1,3) + '.jpg"></center>'
-	'You start moving seductively around the pole in the center of the stage.'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sveta_clothed1.jpg"></center>'
+	'You start moving seductively around the pole at the center of the stage.'
 	gs 'stwork2', 'set_customer_mood'
 
 	act 'Take off your top':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclo' + rand(4,5) + '.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sveta_clothed2.jpg"></center>'
 		if strip_club['cust_angry'] = 0:
 			pcs_mood += 5
-			'Urged on by the audience, you take off your blouse and let it drop to the stage while you keep teasing them.'
+			'Urged on by the audience, you take off your top and let it drop to the stage while you keep teasing them.'
 		else
 			pcs_mood -= 5
-			'Ignoring the comments from the audience, you take off your blouse and let it drop to the stage while you keep teasing them.'
+			'Ignoring the comments from the audience, you take off your top and let it drop to the stage while you keep teasing them.'
 		end
 
 		if PCloSkirt > 0:
@@ -255,13 +247,13 @@ if $ARGS[0] = 'strip_clothes':
 		act 'Take off your <<$temp_bottom_desc>>':
 			gs 'clothing', 'strip'
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclo' + rand(6,7) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sveta_clothed3.jpg"></center>'
 			if strip_club['cust_angry'] = 0:
 				pcs_mood += 5
-				'The positive responses make you smile as you unzip your <<$temp_bottom_desc>> and let <<$temp_bottom_desc[1]>> drop to your ankles before kicking <<$i[1]>> off and lying down on the stage, rolling around and looking several customers straight in the eyes. Some of them throw some bills your way, and you take care to pay them some extra attention.'
+				'The positive responses make you smile as you unzip your <<$temp_bottom_desc>> and let <<$temp_bottom_desc[1]>> drop to your ankles before kicking <<$i[1]>> off and looking several customers straight in the eye as you roll around on the stage in your underwear. Some of them throw some bills your way, so you make sure to some extra attention to them.'
 			else
 				pcs_mood -= 5
-				'The negative comments make you feel a bit uncomfortable as you unzip your <<$temp_bottom_desc>> and let <<$temp_bottom_desc[1]>> drop to your ankles before kicking <<$i[1]>> off and lying down on the stage, rolling around and looking several customers straight in the eyes.'
+				'The negative comments make you feel a bit uncomfortable as you unzip your <<$temp_bottom_desc>> and let <<$temp_bottom_desc[1]>> drop to your ankles before kicking <<$i[1]>> off, looking several customers straight in the eye as you roll around on the stage in your underwear.'
 			end
 			killvar '$temp_bottom_desc'
 			gs 'stat'
@@ -281,15 +273,14 @@ if $ARGS[0] = 'strip_bra':
 	gs 'fame', 'city', 'stripping', rand(1,2)
 	strip_club['strip_tips'] += rand(pcs_dancero, 5 * pcs_dancero) / 5
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund' + rand(1,3) + '.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sveta_show1.jpg"></center>'
 	'You start moving seductively around the pole in the center of the stage wearing just your underwear.'
 	gs 'stwork2', 'set_customer_mood'
 
 	act 'Take off your bra':
 		*clr & cla
 		gs 'bras', 'remove'
-		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund' + rand(4,6) + '.jpg"></center>'
-
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sveta_show2.jpg"></center>'
 		if strip_club['cust_angry'] = 0:
 			pcs_mood += 5
 			'Urged on by the audience, you slowly take off your bra and let it drop to the stage as you keep teasing them.'
@@ -315,21 +306,20 @@ if $ARGS[0] = 'strip_panties':
 	gs 'fame', 'city', 'stripping', rand(1,2)
 	strip_club['strip_tips'] += rand(pcs_dancero, 5 * pcs_dancero) / 5
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund9.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sveta_show3.jpg"></center>'
 	'You dance seductively in just your panties, teasing the crowd.'
 	gs 'stwork2', 'set_customer_mood'
 
 	act 'Strip out of your panties':
 		*clr & cla
 		gs 'panties', 'remove'
-		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund' + rand(10,12) + '.jpg"></center>'
-
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sveta_show4.jpg"></center>'
 		if strip_club['cust_angry'] = 0:
 			pcs_mood += 5
-			'The positive responses make you smile even broader as you playfully drop your panties to your ankles before kicking them off. You look several customers straight in the eyes as you do so. Some of them throw some bills your way, and you take care to pay them some extra attention.'
+			'The positive responses make you smile even broader as you playfully drop your panties to your ankles before kicking them off. You look several customers straight in the eye as you do and some of them throw some bills your way, so you make sure to pay some extra attention to them.'
 		else
 			pcs_mood -= 5
-			'The negative comments make you feel a bit uncomfortable as you playfully drop your panties to your ankles before kicking them off. You look several customers straight in the eyes as you do so.'
+			'The negative comments make you feel a bit uncomfortable as you playfully drop your panties to your ankles before kicking them off. You look several customers straight in the eye as you do so.'
 		end
 		gs 'arousal', 'flash', -15
 		gs 'stat'
@@ -347,7 +337,7 @@ if $ARGS[0] = 'dance_nude':
 	gs 'fame', 'city', 'stripping', rand(1,2)
 	strip_club['strip_tips'] += rand(pcs_dancero, 5 * pcs_dancero) / 3
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund' + rand(13,14) + '.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sveta_show5.jpg"></center>'
 	gs 'stwork2', 'set_customer_mood'
 
 	if strip_club['cust_boos'] < 2:
@@ -363,11 +353,11 @@ if $ARGS[0] = 'dance_nude':
 		act 'Leave the stage': gt 'stwork2', 'strip_show_end'
 	else
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund' + rand(13,14) + '.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sveta_show5.jpg"></center>'
 		pcs_mood -= 5
 		'Even being completely naked doesn''t seem to get any positive responses.'
-		'All you can hear is mockery as you try to continue your act. The cutting remarks keep coming however, and you''re soon close to tears.'
-		'Before the music stops, you start collecting your meager tips and clothes and flee backstage.'
+		'All you can hear is mockery as you try to continue your act, the cutting remarks soon bringing you close to tears.'
+		'Before the music even stops, you start collecting your meager tips and clothes and flee backstage.'
 		gs 'arousal', 'flash', -20
 		gs 'arousal', 'end'
 		strip_club['lapdance_chance'] = 0
@@ -390,7 +380,7 @@ if $ARGS[0] = 'pole_underwear':
 	!pcs_hairbsh = 0
 	strip_club['strip_tips'] += rand(pcs_dancpol, 5 * pcs_dancpol) / 3
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/strippole.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pole_panties.jpg"></center>'
 	'You grab hold of the pole and acrobatically slide around it in your underwear.'
 	gs 'stwork2', 'set_customer_mood_pole'
 
@@ -410,7 +400,7 @@ if $ARGS[0] = 'pole_panties':
 	!pcs_hairbsh = 0
 	strip_club['strip_tips'] += rand(pcs_dancpol, 5 * pcs_dancpol) / 3
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund' + rand(7,8) + '.jpg">"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pole_topless.jpg">"></center>'
 	'You grab hold of the pole and acrobatically slide around it in your panties.'
 	gs 'stwork2', 'set_customer_mood_pole'
 
@@ -421,7 +411,7 @@ if $ARGS[0] = 'manager_bonus':
 	*clr & cla
 	minut += 2
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/.jpg">"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/manager_office.jpg">"></center>'
 	'The security guard ushers you into Sasha''s office before closing the door behind you. Sasha smiles at you as he sits behind his desk.'
 	if strip_club['manager_bonus'] = 0:
 		'"I heard that you''ve had a pretty good night, <<$pcs_strippername>>. How about a little bonus to top it off?" he asks.'
@@ -450,7 +440,7 @@ if $ARGS[0] = 'manager_bonus':
 				money += 500
 				strip_club['manager_bonus'] = 1
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum17.jpg">"></center>'
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum13.jpg">"></center>'
 				'He finally finishes and releases his grip on your head, allowing you pull yourself off of his cock. You gasp for air and wipe the saliva from your mouth before looking up to see him grinning down at you as you slowly jerk his cock in your hand.'
 				'"Good job <<$pcs_strippername>>, you more than earned this." He counts out a wad of cash and hands it to you. "Keep up the good work and there will be more bonuses in the future."'
 				'You just smile at him before getting up and taking the money. After counting it, the manager sends you on your way with a slap on the ass. Heading out into the hallway, the security guard flashes you a knowing smile as you hurry back to the dressing room.'
@@ -483,7 +473,7 @@ if $ARGS[0] = 'manager_bonus':
 				*clr & cla
 				money += 500
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum17.jpg">"></center>'
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum13.jpg">"></center>'
 				'He finally finishes and releases his grip on your head, allowing you pull yourself off of his cock. You gasp for air and wipe the saliva from your mouth before looking up to see him grinning down at you as he counts your money.'
 				'"Nice work, <<$pcs_strippername>>. Good to see you aren''t afraid of performing in front of an audience. Maybe a career in porn is in your future?"'
 				'You just smile at him before getting up and taking the money. Heading out into the hallway, the security guard flashes you a knowing smile as you hurry back to the dressing room.'
@@ -501,7 +491,7 @@ if $ARGS[0] = 'manager_bonus':
 				*clr & cla
 				money += 500
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum17.jpg">"></center>'
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum13.jpg">"></center>'
 				'He finally finishes and releases his grip on your head, allowing you pull yourself off of his cock. You gasp for air and wipe the saliva from your mouth before looking up to see him grinning down at you as he counts your money.'
 				'"Nice work, <<$pcs_strippername>>. It''s nice to see young girls with a good work ethic," he laughs.'
 				'You just smile at him before getting up and taking the money. Heading out into the hallway, the security guard flashes you a knowing smile as you hurry back to the dressing room.'
@@ -560,7 +550,7 @@ end
 
 if $ARGS[0] = 'pr1':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pr1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/private_dance1.jpg"></center>'
 	'You''re dancing for a bachelor party that are set up in one of the private rooms. They''re all quite drunk and rowdy, one of the men slapping the waitress on the ass as she places their drinks on the table. She takes the wad of cash he hands her and quickly scurries out of the room.'
 	'The men cheer when they see you and start crowding around you while offering you wads of cash. "Hey Sergey, your stripper is here!"'
 	'The groom to be looks at you with a drunken smile. "Show us what you''ve got, girl!" Music starts playing as the lights dim and you seductively walk over to the pole in the room.'
@@ -569,20 +559,20 @@ if $ARGS[0] = 'pr1':
 		*clr & cla
 		minut += 5
 		gs 'stat'
-		'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4.mp4"></video></center>'
+		'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_pole.mp4"></video></center>'
 		'You climb onto the pole and start erotically dancing on it, his friends drunkenly hollering and catcalling as you smile at them.'
 		act 'Continue':
 			*clr & cla
 			minut += 5
 			gs 'stat'
-			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4a.mp4"></video></center>'
+			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_pole1.mp4"></video></center>'
 			'Now warmed up, you slowly expose your breasts as you continue dancing on the pole. You''re soon stripped down to just your panties as you smile at the groom.'
 
 			act 'Give him a lap dance':
 				*clr & cla
 				minut += 5
 				gs 'stat'
-				'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie1.mp4"></video></center>'
+				'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_grind.mp4"></video></center>'
 				'You climb off the pole and seductively walk over to the groom, his friends cheering as you climb into his lap. You can feel his rock hard cock bulging beneath you.'
 				'You spend a few minutes rocking your hips and grinding against him before you stand and wiggle your ass in his face. It takes all his willpower for him not to spank you before you slowly bend over and teasingly tug at your panties before you wiggle out of them, the room erupting in cheers as your panties drop to your ankles.'
 				'After this, you climb back into his lap and start grinding your naked body against him, the bulge in his crotch now at straining point as sweat beads on his forehead.'
@@ -591,21 +581,21 @@ if $ARGS[0] = 'pr1':
 					*clr & cla
 					minut += 5
 					gs 'stat'
-					'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie1.mp4"></video></center>'
+					'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_grind.mp4"></video></center>'
 					'You continue to rock your hips and grind against him while shaking your breasts in his face until the music stops, his friends giving him approving, if somewhat jealous, nods and smiles as you finish your performance.'
 					'"I''m so glad I let you guys talk me into coming to the city tonight! This is the perfect last night of freedom!" he says with a huge grin.'
 					'"It was the least we could do! Gotta remind you of what you''ll be giving up with that ball and chain going around your leg next week!" his friend cackles.'
 
 					act 'Time to leave':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/private_room.jpg"></center>'
 						'One of the men looks at his watch and tells the others that their time is up. As you climb off your client''s lap and gather your clothes, the man approaches you.'
 						'"Great show, girl. So great in fact, that you left our friend rather ''tensed up''. If we pay you an extra 2000 <b>₽</b>, would you give him a ''happy ending'' to his night?" he asks loud enough for everyone to hear. The groom gives you a drunk smile.'
 
 						act 'Agree':
 							*clr & cla
 							money += 2000
-							'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4b.mp4"></video></center>'
+							'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_bj.mp4"></video></center>'
 							'You agree and the groom''s friends all leave while giving him fist bumps and knowing smiles.'
 							'Once they''re gone, you approach the man and smile. "Let''s see what I''m dealing with here..." you whisper seductively as you run your hand over his crotch.'
 							'You unbutton his pants and pull his rock hard cock out before slowly jerking it in your hand. "My, my. Someone enjoyed the show," you giggle as you get on your knees in front of him.'
@@ -640,8 +630,8 @@ end
 
 if $ARGS[0] = 'pr2':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pr2.jpg"></center>'
-	'The man you''re dancing for is mesmerized by you and can''t stop touching himself. After a while, he asks you if he can cum on your face for 2000 <b>₽</b>.'
+	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_grind.mp4"></video></center>'
+	'The man you''re dancing for is mesmerized by you and you feel his rock hard cock straining in his pants as you grind against him. After a while, he says he''s close and asks you if he can cum on your face for 2000 <b>₽</b>.'
 	minut += 10
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if pcs_willpwr < will_cost:
@@ -675,7 +665,7 @@ end
 if $ARGS[0] = 'pr3':
 	*clr & cla
 	minut += 10
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pr3.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/private_dance3.jpg"></center>'
 	'It''s a bit different dancing for a woman. It''s not often you have the pleasure of doing it, so you''re feeling a bit more frisky than usual. As you finish the dance, she gives you a kiss, and you start making out. She stops and offers you 1000 <b>₽</b> to eat her out.'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if pcs_willpwr < will_cost:
@@ -712,7 +702,7 @@ if $ARGS[0] = 'pr4':
 	minut += 10
 	money += 500
 	gs 'stat'
-	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie1.mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_grind.mp4"></video></center>'
 	'You enter one of the private rooms where your customer is waiting. He looks extremely nervous and is fidgeting in his chair.'
 	'You smile and approach him. "Any special requests?" you ask in your most seductive voice.'
 	*nl
@@ -731,7 +721,7 @@ end
 
 if $ARGS[0] = 'pr5':
 	*clr & cla
-	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie2.mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_double.mp4"></video></center>'
 	if rand (0,2) = 0 and locat['A23'] = 21 and AlbinaQW['working_stripclub'] = 1 and npc_rel['A23'] >= 70:
 		'You approach the private room where your client is waiting and hear two voices behind the door. As you enter, Albina greets you at the door.'
 		'"This guy''s going to be a pain in the fucking ass..." she whispers as you step inside. Behind her, an overweight patron in a suit claps his hands excitedly. "Ah! She''s here! Now we can really get the party started!"'
@@ -757,7 +747,7 @@ if $ARGS[0] = 'pr6':
 	*clr & cla
 	minut += 10
 	money += 2000
-	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie3.mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_dance6.mp4"></video></center>'
 	'Your client is sitting alone in the largest of the private rooms, a room where private group parties are normally held. Instead, it''s just you and him in a big empty space tonight, an echo chamber full of nothing but loud music, club lighting and a bit of shared loneliness between two strangers.'
 	'The patron doesn''t say much as you grind your naked body against him, but he watches you intently. With no special requests given, you run through a typical dance routine, slinking and sliding your body over him as alluringly as possible. Once your time is up, he gives you a smile and stands up before leaving the room.'
 	'After he closes the door behind him and you gather your things, a security guard cracks open the door and hands you a wad of cash. "This is from your client. You must have made a good impression since he wouldn''t shut up about you. Nice work."'
@@ -769,7 +759,7 @@ end
 if $ARGS[0] = 'pr7':
 	*clr & cla
 	minut += 10
-	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4.mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_pole.mp4"></video></center>'
 	'You meet your patron in one of the back rooms with a more lush setting than many of the others. Red velvet curtains and mirrors line the walls, and multiple poles surround the outskirts of the room, allowing for many girls to serve many customers at once. Tonight though, it''s just you and one other man.'
 	'You feel relatively safe knowing there''s a security guard right outside the door, but the way the man''s eyes pierce your own makes your heart race. There''s definitely more than meets the eye with him.'
 	'Still, you''re here to do a job, and you start dancing for him as seductively as possible. After a few minutes, he tosses a handful of bills at you. "Let''s see some skin, girl!" he exclaims.'
@@ -777,7 +767,7 @@ if $ARGS[0] = 'pr7':
 	act 'Show him some skin':
 		*clr & cla
 		minut += 5
-		'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4a.mp4"></video></center>'
+		'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_pole1.mp4"></video></center>'
 		'You expose your breasts as you sway and rock seductively around the pole, occasionally giving him a small smile and leaning in his direction. You then arch your back, giving him a full view of your ass.'
 		'"Like what you see?" you coo in his direction. His bulge is clearly visible now, even more so as he lewdly rubs it while watching you.'
 		'"I do, and I want more. How much to get you over here to take care of this with that pretty little mouth of yours?"'
@@ -785,7 +775,7 @@ if $ARGS[0] = 'pr7':
 		act 'Decline':
 			*clr & cla
 			money += 500
-			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4a.mp4"></video></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/private_room.jpg"></center>'
 			'"Sorry, no touching. House rules."'
 			'Your customer huffs and nods, tossing a few more bills at your feet and downing the remainder of his drink.'
 			'"Yeah yeah, I get it. See you around, girl."'
@@ -802,7 +792,7 @@ if $ARGS[0] = 'pr7':
 			gs 'cum_call', 'mouth_swallow', $npcID
 			money += 2000
 			gs 'stat'
-			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4b.mp4"></video></center>'
+			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_bj.mp4"></video></center>'
 			'You look at the customer. He''s a bit older, but seems decent enough. And he smells washed, unlike some of the guys who roll through the club.'
 			'"2000 <b>₽</b>," you reply and bite your lip seductively.'
 			'"This better be one hell of a blowjob!" he says before tossing the money at you. He quickly stands, tugging his massively thick cock from his pants and dropping them to the floor. He''s already rock hard from your striptease, and per your agreement, it''s inside your mouth within seconds. His fat cock fills every inch of space between your lips, and just taking it inside causes the swollen tip to press into the entrance of your throat as you start sucking and bobbing your head up and down.'

+ 80 - 64
locations/stwork3.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'first_shift':
 		*clr & cla
 		minut += 5
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub_interior.jpg"></center>'
 		'You walk out into the club and are greeted by loud music, bright lights and scenes of rowdy men and half naked girls. You follow Ivanna to the bar, where she introduces you to the other staff.'
 		if week < 5:
 			'"This is Lev, our weekday bartender," she says and the man behind the bar waves at you.'
@@ -229,15 +229,13 @@ end
 
 if $ARGS[0] = 'events1':
 	*clr & cla
-
-	strip_club['rand'] = rand(0, 8)
+	strip_club['rand'] = rand(0,9)
 	if strip_club['rand'] = 0:
 		'<center><img <<$set_imgh>> src="images/.jpg"></center>'
 		'Serving a table at one of the private booths, you see two intimidating men sitting with a girl who looks like she''s high on something, and probably a little drunk as well. She crawls under the table as one of the men glares at you.'
 		'"Just put the drinks down and leave. You didn''t see anything."'
 		'You quickly do as you''re told and hurry away.'
 		act 'Leave': gt 'stwork3', 'shift_end'
-
 	elseif strip_club['rand'] = 1:
 		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/serve.jpg"></center>'
 		'You serve a table with two men watching the show on stage. They both drunkenly slap and grope your ass as you serve them their drinks.'
@@ -258,49 +256,62 @@ if $ARGS[0] = 'events1':
 			'You stuff it away and smile sweetly at the men, putting some sway in your hips as you walk away.'
 			act 'Leave': gt 'stwork3', 'shift_end'
 		end
-	elseif strip_club['rand'] = 2 and pcs_hotcat >= 6:
+	elseif strip_club['rand'] = 2:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/waitress_client.jpg"></center>'
-		'You serve a man sitting at a table in a private booth. He looks at you appreciatively. "Hey girl, want to keep me company?"'
-		'You notice the bulge in his pants.'
-
-		act 'Leave':
-			cla
-			gs 'stat'
-			'You quickly serve the man his drink and leave the booth as quickly as you can.'
-			act 'Leave': gt 'stwork3', 'shift_end'
-		end
-
-		act 'Sit next to him':
-			cla
-			'You sit next to the man and look at him, waiting to see what he''ll do when he suddenly grabs your hand and places it on his crotch.'
-			act 'Leave': gt 'stwork3', 'shift_end'
+		if pcs_hotcat >= 6:
+			'You serve a man sitting at a table in a private booth. He grins at you as you notice the bulge in his pants.'
+			'"Hey hot stuff, want to keep me company?"'
+		
+			act 'Leave':
+				cla
+				gs 'stat'
+				'You quickly serve the man his drink and leave the booth as quickly as you can.'
+				act 'Leave': gt 'stwork3', 'shift_end'
+			end
 
-			gs 'willpower', 'sex', 'resist', 'hard'
-			if pcs_willpwr < will_cost:
-				act 'Unbutton his pants (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			else
-				act 'Unbutton his pants (<<will_cost>> Willpower)':
-					*clr & cla
-					gs 'willpower', 'pay', 'force'
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/waitress_work_2.jpg"></center>'
-					'The man smiles as you undo his pants and grasp his rock hard cock in your hand. It twitches in anticipation.'
+			act 'Sit next to him':
+				cla
+				'You sit next to the man and look at him, waiting to see what he''ll do when he suddenly grabs your hand and places it on his crotch.'
+				act 'Leave': gt 'stwork3', 'shift_end'
 
-					act 'Jerk him off':
+				gs 'willpower', 'sex', 'resist', 'hard'
+				if pcs_willpwr < will_cost:
+					act 'Unbutton his pants (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				else
+					act 'Unbutton his pants (<<will_cost>> Willpower)':
 						*clr & cla
-						guy += 1
-						money += 500
-						gs 'arousal', 'hj', 5, 'sub', 'prostitution'
+						gs 'willpower', 'pay', 'force'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/waitress_work_hj.jpg"></center>'
-						'Clasping your fingers around his shaft, you start discreetly jerking him off as he watches the girl stripping on stage. A few seconds later, the man groans as he blows his load over your hand.'
-						'Once he''s finished, you wipe your hand with a tissue and he gives you 500 <b>₽</b> as he grins at you.'
-						'You smile at him before leaving the booth.'
-						act 'Leave': gt 'stwork3', 'shift_end'
+						'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/waitress_work_2.jpg"></center>'
+						'You take a quick look around, but the club is too noisy and dark for anyone to take notice. The man smiles as you undo his pants and grasp his rock hard cock in your hand. It twitches in anticipation.'
+
+						act 'Jerk him off':
+							*clr & cla
+							guy += 1
+							money += 500
+							gs 'arousal', 'hj', 5, 'sub', 'prostitution'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/waitress_work_hj.jpg"></center>'
+							'Clasping your fingers around his shaft, you start discreetly jerking him off as he watches the girl stripping on stage. A few seconds later, the man groans as he blows his load over your hand.'
+							'Once he''s finished, you wipe your hand with a tissue and he gives you 500 <b>₽</b> as he grins at you.'
+							'You smile at him before leaving the booth.'
+							act 'Leave': gt 'stwork3', 'shift_end'
+						end
 					end
 				end
 			end
+		else
+			'You serve a man sitting at a table in a private booth, who motions for you to move aside.'
+			'"Just put that down and leave! You''re blocking my view of the hot chick on stage!"'
+			'Feeling a little insulted, you quickly serve the man his drink and leave the booth as quickly as you can.'
+			act 'Leave': gt 'stwork3', 'shift_end'
 		end
+	elseif strip_club['rand'] = 3:
+		pcs_horny += 5
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pole_topless.jpg"></center>'
+		'Heading back to the bar, you catch a glimpse of one of the strippers dancing half naked on the pole as she performs on the stage. Her appearance leaves little to the imagination.'
+		act 'Continue': gt 'stwork3', 'shift_end'
 	elseif strip_club['rand'] = 4:
 		pcs_horny += 5
 		gs 'stat'
@@ -327,16 +338,16 @@ if $ARGS[0] = 'events1':
 		if AlbinaQW['seen_strip'] = 0 and locat['A23'] = 21:
 			AlbinaQW['seen_strip'] = 1
 			gs 'stat'
-			!! IMAGE
-			'You see one of the strippers prowling the floor in search of any clients wanting a lap dance. When she gets closer, you''re stunned to see that it''s Albina!'
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripper_bar.jpg"></center>'
+			'You see one of the strippers sitting half naked on the bar, teasing a man by groping her breasts. As you get closer, you''re stunned to see that it''s Albina!'
 			if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
 				'She looks equally surprised to see you. "<<$pcs_nickname>>?! You didn''t tell me you worked here!"'
-				'"I could say the same about you!" you chuckle and she smiles as a middle aged man approaches and asks her for a dance.'
+				'"I could say the same about you!" you chuckle and she smiles as the middle aged man she was teasing asks her for a dance.'
 				'"We''ll talk about this some other time, yeah?" she winks at you before seductively leading the man to one of the private rooms.'
 				act 'Get back to work': gt 'stwork3', 'shift_end'
 			else
 				'She looks surprised, yet annoyed to see you. "Ugh, you''re working here as well?" she moans. "At least you''re not a stripper and can stay out of my way."'
-				'A middle aged man approaches and asks her for a dance. She uses the opportunity to avoid you, quickly leading the man to one of the private rooms.'
+				'The middle aged man she''s teasing then asks her for a dance and she uses the opportunity to avoid you, quickly leading the man to one of the private rooms.'
 				act 'Get back to work': gt 'stwork3', 'shift_end'
 			end
 		elseif AlbinaQW['seen_strip'] = 1 and locat['A23'] = 21:
@@ -345,18 +356,18 @@ if $ARGS[0] = 'events1':
 			'Your break over, you get back to work serving the crowd of thirsty patrons.'
 
 			if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
-				'You see Albina out on the floor in search of clients. She flashes you a smile and wiggles her ass in your direction, which gets the attention of a man who approaches and asks for a dance.'
+				'You see Albina sitting on the bar teasing potential clients. She flashes you a smile and jiggles her breasts in your direction, which gets the attention of a man who asks for a dance.'
 				'She winks at you before seductively leading him to one of the private rooms.'
 				act 'Get back to work': gt 'stwork3', 'shift_end'
 			else
-				'You see Albina out on the floor in search of clients. She frowns when she sees you before a man approaches her and asks for a dance. She quickly leads him to one of the private rooms to avoid you.'
+				'You see Albina sitting on the bar teasing potential clients. She frowns when she sees you before a man approaches her and asks for a dance. She quickly leads him to one of the private rooms to avoid you.'
 				act 'Get back to work': gt 'stwork3', 'shift_end'
 			end
 		else
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
 			'Your break over, you get back to work serving the crowd of thirsty patrons.'
-			'You see a stripper prowling the floor in search of a client wanting a lap dance. She quickly sets her sights on a man in the queue at the bar and starts flirting with him.'
+			'You see a stripper sitting on the bar teasing potential clients. She quickly sets her sights on a man in the queue at the bar and starts flirting with him.'
 			act 'Get back to work': gt 'stwork3', 'shift_end'
 		end
 	elseif strip_club['rand'] = 6:
@@ -449,22 +460,27 @@ if $ARGS[0] = 'events1':
 			'Leaving the drink on the table, you grab the 300 <b>₽</b> and quickly leave the room.'
 			act 'Leave': gt 'stwork3', 'shift_end'
 		end
-	elseif strip_club['rand'] = 8 and pcs_hotcat >= 6:
+	elseif strip_club['rand'] = 8:
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
-		if strip_club['manager_bonus'] = 0:
-			'A security guard approaches and says Sasha wants to speak with you in his office. Now.'
-			act 'Go to his office': gt 'stwork3' , 'manager_bonus'
+		if pcs_hotcat >= 6:
+			if strip_club['manager_bonus'] = 0:
+				'A security guard approaches and says Sasha wants to speak with you in his office. Now.'
+				act 'Go to his office': gt 'stwork3' , 'manager_bonus'
+			else
+				'A security guard approaches and tells you that Sasha wants to see you in his office again.'
+				'You know what he wants, but do you want to do it?'
+				act 'Go to his office': gt 'stwork2', 'manager_bonus'
+				act 'Turn him down': gt 'stwork3', 'shift_end'
+			end
 		else
-			'A security guard approaches and tells you that Sasha wants to see you in his office again.'
-			'You know what he wants, but do you want to do it?'
-			act 'Go to his office': gt 'stwork2', 'manager_bonus'
-			act 'Turn him down': gt 'stwork3', 'shift_end'
+			'You see a security guard approach one of the strippers and overhear him mention a ''bonus'', which the girl accepts before heading off in the direction of Sasha''s office.'
+			act 'Get back to work': gt 'stwork3', 'shift_end'
 		end
 	else
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/serve.jpg"></center>'
 		'Your break over, you get back to work serving the crowd of thirsty patrons.'
 		act 'Leave': gt 'stwork3', 'shift_end'
 	end
@@ -476,10 +492,10 @@ if $ARGS[0] = 'manager_bonus':
 	!! Should eventually be changed to the correct npc code
 	gs 'npcStat', 'D3'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/manager_office.jpg"></center>'
 	'The security guard ushers you into Sasha''s office before closing the door behind you. Sasha smiles at you as he sits behind his desk.'
 	if strip_club['manager_bonus'] = 0:
-		'"Evening <<$pcs_nickname>>. Having a good night? How about a little bonus to top it off?"'
+		'"Evening, <<$pcs_nickname>>. Having a good night? How about a little bonus to top it off?"'
 		'"What kind of bonus?" you ask while raising an eyebrow.'
 		'He grins. "Here''s the deal. Every week, I choose a girl who ''earns'' a bonus. I''d normally pick one of the strippers, but you''ve caught my eye."'
 		'"You want me to have sex with you?!" you retort and he snorts.'
@@ -505,7 +521,7 @@ if $ARGS[0] = 'manager_bonus':
 				money += 500
 				strip_club['manager_bonus'] = 1
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum17.jpg">"></center>'
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum13.jpg">"></center>'
 				'He finally finishes and releases his grip on your head, allowing you pull yourself off of his cock. You gasp for air and wipe the saliva from your mouth before looking up to see him grinning down at you as you slowly jerk his cock in your hand.'
 				'"Good job <<$pcs_nickname>>, you more than earned this." He counts out a wad of cash and hands it to you. "Keep up the good work and there will be more bonuses in the future."'
 				'You just smile at him before getting up and taking the money. After counting it, the manager sends you on your way with a slap on the ass. Heading out into the hallway, the security guard flashes you a knowing smile as you hurry back to work.'
@@ -534,7 +550,7 @@ if $ARGS[0] = 'manager_bonus':
 				*clr & cla
 				money += 500
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum17.jpg">"></center>'
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum13.jpg">"></center>'
 				'He finally finishes and releases his grip on your head, allowing you pull yourself off of his cock. You gasp for air and wipe the saliva from your mouth before looking up to see him grinning down at you as he counts your money.'
 				'"Nice work, <<$pcs_nickname>>. Good to see you aren''t afraid of performing in front of an audience. Maybe a career in porn is in your future?"'
 				'You just smile at him before getting up and taking the money. Heading out into the hallway, the security guard flashes you a knowing smile as you hurry back to work.'
@@ -551,7 +567,7 @@ if $ARGS[0] = 'manager_bonus':
 				*clr & cla
 				money += 500
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum17.jpg">"></center>'
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum13.jpg">"></center>'
 				'He finally finishes and releases his grip on your head, allowing you pull yourself off of his cock. You gasp for air and wipe the saliva from your mouth before looking up to see him grinning down at you as he counts your money.'
 				'"Nice work, <<$pcs_nickname>>. It''s nice to see young girls with a good work ethic," he laughs.'
 				'You just smile at him before getting up and taking the money. Heading out into the hallway, the security guard flashes you a knowing smile as you hurry back to work.'
@@ -586,11 +602,10 @@ if $ARGS[0] = 'tips':
 	strip_club['bar_shifts'] += 1
 	!! Skill and attribute gains
 	if pcs_servng < 100: gs 'exp_gain', 'servng', 1
-	if pcs_vital < 30: gs 'exp_gain', 'vital', 1 + rand(0,steroid_dose) & steroidcheck = 1
-	if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose: clit_size += rand(0,1) & killvar 'steroidcheck'
+	if pcs_vital < 30: gs 'exp_gain', 'vital', 1 + rand(0,drugVars['steroids_dose']) & steroidcheck = 1
+	if steroidcheck = 1 and drugVars['steroids_dose'] > 0 and rand(1,5) <= drugVars['steroids_dose']: clit_size += rand(0,1) & killvar 'steroidcheck'
 	*clr & cla
 	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/locations/city/.jpg"></center>'
 	'With your shift finally over, you sit at the bar and count out your tips.'
 	*nl
@@ -599,7 +614,7 @@ if $ARGS[0] = 'tips':
 	if (strip_club['stripbarwork'] = 1 and week = 4) or (strip_club['stripbarwork1'] = 1 and week = 6):
 		*nl
 		temp_shifts_pay = 125 * 9 * strip_club['bar_shifts']
-		'After counting your tips, Ivanna pays you <<temp_shifts_pay>> <b>₽</b> for the <<strip_club[''bar_shifts'']>> shifts you''ve worked.'
+		'After counting your tips, Ivanna pays you <<temp_shifts_pay>> <b>₽</b> for the <<strip_club[''bar_shifts'']>> shifts you''ve worked this week.'
 		money += temp_shifts_pay
 		killvar 'temp_shifts_pay'
 		strip_club['bar_shifts'] = 0
@@ -638,7 +653,7 @@ if $ARGS[0] = 'manager_speak':
 		*nl
 		'She hikes up her dress and you stare in bewilderment as a cock suddenly appears between her legs in place of her pussy.'
 		'"How did-" you start to ask before she cuts you off.'
-		'"How did I grow a dick? With a spell that only high ranking succubae such as myself are allowed to use. Beings like you are limited to such ridiculously childish things as ''"Penis Envy," she scoffs while idly jerking her cock. "<i>This</i> is a penis you can envy!"'
+		'"How did I grow a dick? With a spell that only high ranking succubae such as myself are allowed to use. Beings like you are limited to such ridiculously childish things as ''Penis Envy,''" she scoffs while idly jerking her cock. "<i>This</i> is a penis you can envy!"'
 
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if pcs_willpwr < will_cost:
@@ -661,6 +676,7 @@ if $ARGS[0] = 'manager_speak':
 
 		act 'Yes...':
 			*clr & cla
+			pcs_horny += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/ivanna1.jpg"></center>'
 			'Her magic charms pierce your mind and you''re unable to resist as she plants erotic thoughts in your head. You stare at the cock hanging between her legs, feeling yourself growing wet and thinking how tasty her cum would be...'

+ 24 - 13
locations/telefon.qsrc

@@ -117,11 +117,15 @@ $telefon['contact'] = {
 	if dyneval('result = iif(<<$telefon["ContactCallSchedule"]>>,1,0)') = 0:
 		$telefon['ContactCallCode'] = "gs 'telefon', 'phone_call_reject'"
 	end
-	$result = '<tr>
-		<td><img width="75" src="<<$telefon[''ContactIcon'']>>"></td>
-		<td><<$telefon[''ContactNickName'']>></td>
-		<td align="right"><a href="exec:$callerid = ''<<$telefon[''ContactIcon'']>>'' & <<$telefon[''ContactCallCode'']>>"><b>Call</b></a></td>
-	</tr>'
+	$result =	'<tr>'
+	$result +=		'<td><img width="75" src="<<$telefon[''ContactIcon'']>>"></td>'
+	$result +=		'<td><<$telefon[''ContactNickName'']>></td>'
+	if subscription['monthly_calls'] = 0 and subscription['metered_calls'] < 4:
+		$result +=	'<td align="right"><b>Call</b></td>'
+	else
+		$result +=	'<td align="right"><b><a href="exec:$callerid = ''<<$telefon[''ContactIcon'']>>'' & <<$telefon[''ContactCallCode'']>>">Call</a></b></td>'
+	end
+	$result +=	'</tr>'
 }
 
 
@@ -758,9 +762,13 @@ if $ARGS[0] = 'send_sms':
 	$telefon['body'] = '
 	<font size=6>Send SMS</font><br>
 	<img height="80" width="80" src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>"><br>'
-	if subscription['metered_calls'] = 1 and subscription['sms_limit'] > 0:
+	if subscription['monthly_calls'] = 0:
 		$telefon['body'] += '<br/>'
-		$telefon['body'] += '<b>You still can send <<subscription[''sms_limit'']>> text messages on your contract</b>'
+		if subscription['metered_calls-sms_limit'] > 0:
+			$telefon['body'] += '<b>You still can send <<subscription[''metered_calls-sms_limit'']>> text messages on your contract</b>'
+		else
+			$telefon['body'] += '<b>You have run out of text messages on your contract</b>'
+		end
 	end
 !! Colour correction for editor ''''
 
@@ -796,12 +804,15 @@ $telefon['contactsms'] = {
 		$telefon['ContactIcon'] = 'images/system/phone/icons/' + $telefon['ContactIcon']
 	end
 
-	$result = '
-	<tr>
-		<td><img width="75" src="<<$telefon[''ContactIcon'']>>"></td>
-		<td><<$npc_nickname[$telefon[''ContactNPCcode'']]>></td>
-		<td><a href="exec:gs ''telefon'', ''npcSendListSms'', ''<<$telefon[''ContactNPCcode'']>>''">New Message</a></td>
-	</tr>'
+	$result =	'<tr>'
+	$result +=		'<td><img width="75" src="<<$telefon[''ContactIcon'']>>"></td>'
+	$result +=		'<td><<$npc_nickname[$telefon[''ContactNPCcode'']]>></td>'
+	if subscription['monthly_calls'] = 0 and subscription['metered_calls-sms_limit'] <= 0:
+		$result +=	'<td>New Message</td>'
+	else
+		$result +=	'<td><a href="exec:gs ''telefon'', ''npcSendListSms'', ''<<$telefon[''ContactNPCcode'']>>''">New Message</a></td>'
+	end
+	$result +=	'</tr>'
 }
 
 !! List of SMS messages available to be sent to an NPC

+ 1 - 1
locations/therapist_reminder.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = '':
 	
 			act 'Continue':
 				gs 'therapist_reminder', 'clear_vars'
-				gt 'therapist'
+				gt 'therapist', 'start'
 			end
 		end
 	else

+ 3 - 0
locations/version.qsrc

@@ -2,6 +2,9 @@
 
 act 'Return': gt 'start'
 
+'0.9.4.1'
+'- Bug fixes from anjuna, Awesome, bgkjdgbizgblzdgbr, Myles Croft, Felix, Vengeance11 and Kevin Smarts'
+
 '0.9.4'
 '- Experimental trials pharmacy (with some links to therapist storyline) added by anjuna'
 '- More ballet content and background code for it to function from Myles Croft'

+ 69 - 81
locations/viktor_sex.qsrc

@@ -6,8 +6,7 @@ if $ARGS[0] = 'start':
 	!! Should eventually be changed to the correct npc call.
 	gs 'npcStat', 'D4'
 	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/bmw.jpg"></center>'
 	'You climb into Viktor''s car and he speeds off, clearly intent on getting you into bed as fast as possible.'
 	if strip_club['guard_sex'] = 1:
 		'He pulls up to a red light and you glance over at him. He just smirks at you, though the bulge in his pants is quite obvious.'
@@ -55,7 +54,6 @@ if $ARGS[0] = 'first_time':
 	gs 'arousal', 'bj', 5, 'rough'
 	minut += 3
 	gs 'stat'
-
 	'<center><video autoplay loop src="images/shared/sex/blowjob/car.mp4"></video></center>'
 	'After only a moment''s hesitation, you part your lips and take the head of his cock into your mouth. He moans loudly as you start sucking while bobbing your head up and down as far as you can take it.'
 	'After a few seconds, Viktor suddenly wraps your hair around his fingers and forces you down on his cock, causing you to choke and gag as he thrusts his cock in and out of your throat. When he eventually pulls you up for air, tears run down your cheeks and drool dribbles from your mouth, but you smile at him.'
@@ -96,8 +94,7 @@ if $ARGS[0] = 'first_creampy':
 			gs 'drugs', 'smoke', 1
 			gs 'cum_cleanup', 3
 			gs 'stat'
-
-			!!IMAGE
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_smoke.jpg"></center>'
 			'You''re craving a smoke after that performance and eagerly accept it. You lean back in your seat as you take a long drag and exhale.'
 			'"That was some damn fine fucking pussy, baby girl," he says. "Can''t say I''ve had many girls be so eager to have me cum inside them."'
 			'You take another drag as his cum continues trickling from your pussy. "I''m not like most girls."'
@@ -111,9 +108,8 @@ if $ARGS[0] = 'first_creampy':
 		*clr & cla
 		gs 'cum_cleanup', 3
 		gs 'stat'
-
-		!!IMAGE
-		'You shake your head and he just shrugs before taking a long drag and exhaling.'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_smile.jpg"></center>'
+		'You shake your head and he just shrugs before taking a long drag and exhaling as you check your phone.'
 		'"That was some damn fine fucking pussy, baby girl," he says. "Can''t say I''ve had many girls be so eager to have me cum inside them."'
 		'You smile as his cum continues trickling from your pussy. "I''m not like most girls."'
 		'"Clearly," he laughs before handing you some tissues. You clean up and get dressed before he turns to you. "Where am I dropping you off?" he asks as he starts the engine.'
@@ -126,7 +122,6 @@ if $ARGS[0] = 'first_swallow':
 	minut += 1
 	gs 'cum_call', 'mouth_swallow', 'Viktor the Bouncer', 0, 0, 10000, 40
 	gs 'stat'
-
 	'<center><video autoplay loop src="images/shared/prostitution/car/normal/sex/cum/mouth_2.mp4"></video></center>'
 	'Hearing this, you quickly climb off of him and lean over to take his cock into your mouth before jerking it, his warm cum soon shooting into your throat as he groans loudly in pleasure.'
 	'Once he''s finished, you look up at him and obidiently swallow his cum before wiping your mouth. He grins as he lights a cigarette and takes a drag before offering you one.'
@@ -137,8 +132,7 @@ if $ARGS[0] = 'first_swallow':
 			gs 'drugs', 'smoke', 1
 			gs 'cum_cleanup', 2
 			gs 'stat'
-
-			!!IMAGE
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_smoke.jpg"></center>'
 			'You''re craving a smoke after that performance and eagerly accept it. You lean back in your seat as you take a long drag and exhale.'
 			'"That was some damn fine fucking pussy, baby girl," he says. "And you fucking swallow!"'
 			'You take another drag and smile as you exhale. "I''m not like most girls."'
@@ -151,9 +145,8 @@ if $ARGS[0] = 'first_swallow':
 		*clr & cla
 		gs 'cum_cleanup', 2
 		gs 'stat'
-
-		!!IMAGE
-		'You shake your head and he just shrugs before taking a long drag and exhaling.'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_smile.jpg"></center>'
+		'You shake your head and he just shrugs before taking a long drag and exhaling as you check your phone.'
 		'"That was some damn fine fucking pussy, baby girl," he says. "And you fucking swallow!"'
 		'You smile. "I''m not like most girls..."'
 		'"Clearly," he laughs before handing you some tissues. You clean up and get dressed before he turns to you. "Where am I dropping you off?" he asks as he starts the engine.'
@@ -166,7 +159,6 @@ if $ARGS[0] = 'first_pullout':
 	minut += 1
 	gs 'cum_call', 'labia', 'Viktor the Bouncer', 0, 0, 10000, 40
 	gs 'stat'
-
 	'<center><video autoplay loop src="images/shared/prostitution/car/normal/sex/cum/pbelly_4.mp4"></video></center>'
 	'You quickly pull yourself off of him and slump down in your seat as he jerks himself off. He soon groans loudly in pleasure as his warm cum splatters over your pussy.'
 	'Once he''s finished, you sit up in your seat as he lights a cigarette and takes a drag before offering you one.'
@@ -176,8 +168,7 @@ if $ARGS[0] = 'first_pullout':
 			gs 'drugs', 'smoke', 1
 			gs 'cum_cleanup', 1
 			gs 'stat'
-
-			!!IMAGE
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_smoke.jpg"></center>'
 			'You''re craving a smoke after that performance and eagerly accept it. You lean back in your seat as you take a long drag and exhale.'
 			'"That was some damn fine fucking pussy, baby girl," he says. "Shame I couldn''t cum inside it."'
 			'You take another drag of your cigarette. "Getting pregnant is the last thing I need right now."'
@@ -191,9 +182,8 @@ if $ARGS[0] = 'first_pullout':
 		*clr & cla
 		gs 'cum_cleanup', 1
 		gs 'stat'
-
-		!!IMAGE
-		'You shake your head and he just shrugs before taking a long drag and exhaling.'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_smile.jpg"></center>'
+		'You shake your head and he just shrugs before taking a long drag and exhaling as you check your phone.'
 		'"That was some damn fine fucking pussy, baby girl," he says. "Shame I couldn''t cum inside it."'
 		'You shake your head at him. "Getting pregnant is the last thing I need right now."'
 		'He doesn''t say anything as he offers you some tissues and you clean up and get dressed before he turns to you. "Where am I dropping you off?" he asks as he starts the engine.'
@@ -208,7 +198,7 @@ if $ARGS[0] = 'set_home_acts':
 			*clr & cla
 			minut += 5
 			gs 'stat'
-			!!IMAGE
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_ride.jpg"></center>'
 			'You need to get back to the university, but the bridges are raised, so you ask him to drop you off at the metro station. He nods before putting the car into gear.'
 			'After a short drive, you arrive at the station, where Viktor gives you a smack on the ass as you climb out of the car. "Until next time. baby girl."'
 			act 'Walk into the station':
@@ -222,7 +212,7 @@ if $ARGS[0] = 'set_home_acts':
 		*clr & cla
 		minut += 10
 		gs 'stat'
-		!!IMAGE
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_ride.jpg"></center>'
 		'You ask him to drop you off at the residential area and he nods before putting the car into gear.'
 		'After a short drive, you arrive at the apartment complex, where Viktor gives you a smack on the ass as you climb out of the car. "Until next time, baby girl."'
 		act 'Go home': gt 'city_residential'
@@ -232,7 +222,7 @@ if $ARGS[0] = 'set_home_acts':
 		*clr & cla
 		minut += 5
 		gs 'stat'
-		!!IMAGE
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_ride.jpg"></center>'
 		'You ask him to drop you off in the city center. He frowns, seemingly in confusion, but quickly puts the car into gear and sets off.'
 		'After a short drive, you arrive in the city center, where Viktor gives you a smack on the ass as you climb out of the car. "Until next time, baby girl."'
 		act 'Head on your way': gt 'city_center'
@@ -285,10 +275,9 @@ if $ARGS[0] = 'viktor_creampie':
 	gs 'cum_call', '', 'Viktor the Bouncer', 0, 0, 10000, 40
 	gs 'arousal', 'end'
 	gs 'stat'
-
 	'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/doggy5.mp4"></video></center>'
-	'"Do... Do it! Fill... Fill my slutty pussy... With your hot cum..." you manage to say softly between waves of pleasure. In response, Viktor firmly grabs you by the hips and thrusts his entire dick into your pussy and pushes you down on your stomach before groaning loudly as you feel spurts of warm cum shooting deep inside you.'
-	'He pulls out and flops down on the bed next to you, his cum slowly trickling out of you as he lights a cigarette. "Want one?" he asks.'
+	'"Do... Do it! Fill... Fill my slutty pussy... With your hot cum..." you manage to say softly between waves of pleasure. In response, Viktor firmly grabs you by the hips, thrusts his entire dick into your pussy and pushes you down on your stomach before groaning loudly as you feel spurts of warm cum shooting deep inside you.'
+	'He then pulls out and flops down on the bed next to you, his cum slowly trickling out of you as he lights a cigarette. "Want one?" he asks.'
 	if drugVars['cigarettes_used'] > 0:
 		if mc_inventory['cigarettes'] > 0:
 			act 'I have my own':
@@ -322,10 +311,9 @@ if $ARGS[0] = 'viktor_creampie':
 		*clr & cla
 		gs 'cum_cleanup', 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/.jpg"></center>'
-		'You shake your head and sit back on the bed. He takes a long drag as you check your phone in satisfied silence.'
-		'Finishing his cigarette, he extinguishes the butt in his ash tray before leaving the room.'
-		'You grab some tissues from his bedside table and clean yourself up before snuggling down on the bed. Exhausted, you struggle to keep your eyes open...'
+		'<center><img <<$set_imgh>> src="images/shared/sex/after/phone.jpg"></center>'
+		'You shake your head and grab some tissues from his bedside table to clean yourself up as he takes a long drag and exhales, filling the room with smoke.'
+		'Finishing his cigarette, he extinguishes the butt in his ash tray before leaving the room. You don''t bother getting dressed and just roll over and check your phone in satisfied silence for a few minutes before snuggling down on the bed. Exhausted, you struggle to keep your eyes open....'
 		act '...': gt 'viktor_sex', 'viktor_postsex'
 	end
 end
@@ -335,7 +323,6 @@ if $ARGS[0] = 'viktor_pullout':
 	gs 'cum_call', 'labia', 'Viktor the Bouncer', 0, 0, 10000, 40
 	gs 'arousal', 'end'
 	gs 'stat'
-
 	'<center><video autoplay loop src="images/sahred/sex/cum/cum5.mp4"></video></center>'
 	'"Don''t... Don''t cum... Inside me. Pull... Pull out..." you manage to say softly between waves of pleasure. Viktor slides his dick out of you and you soon feel his warm cum splattering over your ass cheek and lower back as he lets out a satisfied grunt.'
 	'Overwhelmed with pleasure, you collapse on the bed and he flops down next to you. He lights a cigarette and takes a drag before looking at you. "Want one?"'
@@ -371,17 +358,13 @@ if $ARGS[0] = 'viktor_pullout':
 	act 'No thanks':
 		gs 'cum_cleanup', 3
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/.jpg"></center>'
-		'You shake your head and sit back on the bed. He takes a long drag as you check your phone in satisfied silence.'
-		'Finishing his cigarette, he extinguishes the butt in his ash tray before leaving the room.'
-		'You grab some tissues from his bedside table and clean yourself up before snuggling down on the bed. Exhausted, you struggle to keep your eyes open...'
+		'<center><img <<$set_imgh>> src="images/shared/sex/after/phone.jpg"></center>'
+		'You shake your head and grab some tissues from his bedside table to clean yourself up as he takes a long drag and exhales, filling the room with smoke.'
+		'Finishing his cigarette, he extinguishes the butt in his ash tray before leaving the room. You don''t bother getting dressed and just roll over and check your phone in satisfied silence for a few minutes before snuggling down on the bed. Exhausted, you struggle to keep your eyes open....'
 		act '...': gt 'viktor_sex', 'viktor_postsex'
 	end
 end
 
-
-
-
 if $ARGS[0] = 'viktor_postsex':
 	if hour < 10 or hour > 20:
 		gs 'sleep_simple', 'sleep_until', 10, 0
@@ -392,7 +375,6 @@ if $ARGS[0] = 'viktor_postsex':
 	else
 		'You awaken feeling groggy as you slowly open your eyes. Looking at your surrondings, you realize that you fell asleep in Viktor''s bed, and have snuggled into him during the night. You look up to see him still snoozing away before checking your phone and seeing that it''s after 10am.'
 		'You''re in no rush to be anywhere, so you roll over lazily on the bed and spend a few minutes just relaxing in the comfort of Viktor''s bed.'
-
 		if drugVars['cigarettes_used'] > 0 and mc_inventory['cigarettes'] > 0:
 			act 'Have a smoke':
 				*clr & cla
@@ -400,15 +382,13 @@ if $ARGS[0] = 'viktor_postsex':
 				pcs_horny += 5
 				gs 'drugs', 'smoke'
 				gs 'stat'
-
-				!! IMAGE
+				'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_bed_smoke.jpg"></center>'
 				'Craving a smoke, you reach into your bag and pull out a cigarette before lighting it. You take a long drag as the events of last night come back to you. You look over at Viktor still snoozing, the memory of him ravaging your pussy becoming vivid in your mind.'
 
 				act 'Get up':
 					*clr & cla
 					minut += 2
 					gs 'stat'
-
 					'<center><video autoplay loop src="images/shared/romance/nude_walk1.mp4"></video></center>'
 					'A few minutes later, you finish your cigarette and extinguish the butt in his ash tray before getting up. Leaving Viktor in bed, you walk out of the bedroom and find the bathroom, where you turn on the water in the shower and step inside.'
 
@@ -428,7 +408,7 @@ if $ARGS[0] = 'viktor_postsex':
 		end
 
 		act 'Wake Viktor up': xgt 'viktor_sex', 'wakeup_viktor'
-		act 'Wake Victor up with a blowjob': gt 'viktor_sex', 'wakeup_viktor_bj'
+		act 'Wake Viktor up with a blowjob': gt 'viktor_sex', 'wakeup_viktor_bj'
 	end
 end
 
@@ -480,9 +460,8 @@ if $ARGS[0] = 'wakeup_uni':
 						minut += 10
 						gs 'drugs', 'smoke'
 						gs 'stat'
-
-						!!IMAGE
-						'Feeling stressed, you rummage through your purse and pull out a cigarette. You light it up and sit back to take a drag, feeling yourself relax as the familiar tingling sensation fills your lungs. Viktor continues driving through the city center on the way to the island. You can only hope that nobody sees him dropping you off...'
+						'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_smoke.jpg"></center>'
+						'Feeling stressed, you rummage through your purse and pull out a cigarette. You light it up and sit back to take a drag, feeling yourself relax as the familiar tingling sensation fills your lungs as Viktor continues driving through the city center on the way to the island. You can only hope that nobody sees him dropping you off...'
 						'You soon reach the university, where you give Viktor a quick kiss and thank him before climbing out of the car.'
 						act 'Continue': gt 'uni_grounds', 'main'
 					else
@@ -490,18 +469,18 @@ if $ARGS[0] = 'wakeup_uni':
 						minut += 10
 						gs 'drugs', 'smoke', 1
 						gs 'stat'
-
-						!!IMAGE
+						'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_smoke.jpg"></center>'
 						'Feeling stressed, you frantically rummage through your purse looking for a cigarette, only to come up empty. "<i>FUCK</i>!" you scream as you throw your head back in frustration.'
-						'Seeing your dilemma, Viktor offers you one. You snatch it from his hand and quickly light it up, feeling yourself relax as the familiar tingling sensation fills your lungs. "Thanks," you say before sitting back to take another long drag. Viktor just nods as he continues driving; you can only hope that nobody sees him dropping you off...'
+						'Seeing your dilemma, Viktor offers you one. You snatch it from his hand and quickly light it up, feeling yourself relax as the familiar tingling sensation fills your lungs.'
+						'"Thanks," you say before sitting back to take another long drag. Viktor just nods as he continues driving; you can only hope that nobody sees him dropping you off...'
 						'You soon reach the university, where you give Viktor a quick kiss and thank him before climbing out of the car.'
 						act 'Continue': gt 'uni_grounds', 'main'
 					end
 				else
-					cla
+					*clr & cla
 					minut += 10
 					gs 'stat'
-
+					'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_ride.jpg"></center>'
 					'Viktor drives through the city center on the way to the island. All you can do is sit back and hope that nobody sees him dropping you off...'
 					'You soon reach the university, where you give Viktor a quick kiss and thank him before climbing out of the car.'
 					act 'Continue': gt 'uni_grounds', 'main'
@@ -511,25 +490,37 @@ if $ARGS[0] = 'wakeup_uni':
 	end
 end
 
-
 if $ARGS[0] = 'wakeup_smoke':
 	minut += 5
 	pcs_horny += 5
 	gs 'drugs', 'smoke'
 	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_bed_smoke.jpg"></center>'
+	if mc_inventory['cigarettes'] > 0:
+		'Craving a smoke, you reach into your bag and pull out a cigarette before lighting it. You take a long drag as the events of last night come back to you. You look over at Viktor still snoozing, the memory of him ravaging your pussy becoming vivid in your mind.'
+		
+		act 'Get up':
+			*clr & cla
+			minut += 2
+			gs 'stat'
+			'<center><video autoplay loop src="images/shared/romance/nude_walk1.mp4"></video></center>'
+			'A few minutes later, you finish your cigarette and extinguish the butt in his ash tray before getting up. Leaving Viktor in bed, you walk out of the bedroom and find the bathroom, where you turn on the water in the shower and step inside.'
 
-	!! IMAGE
-	'Craving a smoke, you reach into your bag and pull out a cigarette before lighting it. You take a long drag as the events of last night come back to you. You look over at Viktor still snoozing, the memory of him ravaging your pussy becoming vivid in your mind.'
-
-	act 'Get up':
-		*clr & cla
-		minut += 2
-		gs 'stat'
-
-		'<center><video autoplay loop src="images/shared/romance/nude_walk1.mp4"></video></center>'
-		'A few minutes later, you finish your cigarette and extinguish the butt in his ash tray before getting up. Leaving Viktor in bed, you walk out of the bedroom and find the bathroom, where you turn on the water in the shower and step inside.'
+			act 'Clean up': gt 'viktor_sex', 'wakeup_cleanup'
+		end
+	else
+		'You''re craving a smoke, but come up empty when you search your bag for a cigarette. You flop back down in frustration before you notice the pack of cigarettes sitting on the nightstand on Viktor''s side of the bed.'
+		'Without thinking, you reach over and slip one out of the pack before lighting it up and taking a drag. The events of last night come back to you as you look over at Viktor still snoozing, the memory of him ravaging your pussy becoming vivid in your mind.'
+		
+		act 'Get up':
+			*clr & cla
+			minut += 2
+			gs 'stat'
+			'<center><video autoplay loop src="images/shared/romance/nude_walk1.mp4"></video></center>'
+			'A few minutes later, you finish your cigarette and extinguish the butt in his ash tray before getting up. Leaving Viktor in bed, you walk out of the bedroom and find the bathroom, where you turn on the water in the shower and step inside.'
 
-		act 'Clean up': gt 'viktor_sex', 'wakeup_cleanup'
+			act 'Clean up': gt 'viktor_sex', 'wakeup_cleanup'
+		end
 	end
 end
 
@@ -538,7 +529,6 @@ if $ARGS[0] = 'wakeup_cleanup':
 	dynamic $showerdin
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & 'Your deodorant gets washed away in the shower.'
 	gs 'stat'
-
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	'You spend a few seconds just letting the warm water rain down on your head before you give yourself a thorough wash, spending a few more minutes in the shower''s warm embrace before turning the water off and stepping out. Grabbing a towel, you dry yourself off before wrapping it around your body and stepping out into the hallway.'
 
@@ -547,7 +537,6 @@ if $ARGS[0] = 'wakeup_cleanup':
 		minut += 5
 		pcs_hairbsh = 1
 		gs 'stat'
-
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 		'You make your way back into the bedroom, where you toss the towel aside and get dressed before giving your hair a quick brush. Feeling clean and refreshed, you turn to see Viktor waking up.'
 		'"Leaving already?" he asks with a smirk.'
@@ -556,7 +545,6 @@ if $ARGS[0] = 'wakeup_cleanup':
 
 		act 'No thanks':
 			*clr & cla
-
 			'<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/1/bedroom.jpg"></center>'
 			'You shake your head. "Thanks, but I can manage."'
 			'"Okay," he shrugs. "See you at work then."'
@@ -566,8 +554,7 @@ if $ARGS[0] = 'wakeup_cleanup':
 
 		act 'Yes':
 			*clr & cla
-
-			!!IMAGE
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/bmw.jpg"></center>'
 			'"That''d be great!" you reply.'
 			'You collect your things while he pulls on a shirt and jeans before grabbing his keys, then both of you head outside and climb into his car.'
 			'"Where to?" he asks.'
@@ -580,10 +567,10 @@ end
 if $ARGS[0] = 'wakeup_set_dropoff_acts':
 	if university['student'] = 1:
 		act 'The university':
-			cla
+			*clr & cla
 			minut += 10
 			gs 'stat'
-
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_ride.jpg"></center>'
 			'"Can you drop me off at the university?"'
 			'"Sure thing, baby girl."'
 			'After a short drive, you arrive at the university, where you lean over and give Viktor a quick kiss before climbing out of the car. He drives off as soon as you close the door.'
@@ -592,10 +579,10 @@ if $ARGS[0] = 'wakeup_set_dropoff_acts':
 	end
 
 	act 'The residential area':
-		cla
+		*clr & cla
 		minut += 10
 		gs 'stat'
-
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/viktor_car_ride.jpg"></center>'
 		'"Can you drop me off at the residential area?"'
 		'"Sure thing, baby girl."'
 		'After a short drive, you arrive at the apartment complex, where you lean over and give Viktor a quick kiss before climbing out of the car. He drives off as soon as you close the door.'
@@ -604,8 +591,9 @@ if $ARGS[0] = 'wakeup_set_dropoff_acts':
 
 end
 
-
 if $ARGS[0] = 'wakeup_viktor':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/1/bedroom.jpg"></center>'
 	'You kiss Viktor softly on the lips, which causes him to stir slightly and open his eyes. "Mmmhm, five more minutes, baby girl. Go take a shower if you want."'
 
 	act 'Get up':
@@ -621,7 +609,7 @@ if $ARGS[0] = 'wakeup_viktor':
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			'You spend a few seconds just letting the warm water rain down on your head before you give yourself a thorough wash, spending a few more minutes in the shower''s warm embrace before turning the water off and stepping out. Grabbing a towel, you dry yourself off before wrapping it around your body and stepping out into the hallway.'
 
-			if rand(0, 1) = 0:
+			if rand(0,1) = 0:
 				act 'Get dressed':
 					*clr & cla
 					gs 'arousal', 'hj', 5
@@ -649,7 +637,7 @@ if $ARGS[0] = 'wakeup_viktor':
 							*clr & cla
 							pcs_hairbsh = 1
 							gs 'stat'
-							!!IMAGE
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/bmw.jpg"></center>'
 							'"That''d be great!" you reply.'
 							'Once you''re dressed, he grabs his keys and you head outside and climb into his car.'
 							'"Where to?" he asks.'
@@ -687,7 +675,7 @@ if $ARGS[0] = 'wakeup_viktor':
 							gs 'cum_cleanup', 11
 							minut += 2
 							gs 'stat'
-							!!IMAGE
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/bmw.jpg"></center>'
 							'"That''d... Thad''t be great!" you reply through coughs.'
 							'Once you''re dressed, he grabs his keys and you head outside and climb into his car.'
 							'"Where to?" he asks.'
@@ -715,7 +703,7 @@ if $ARGS[0] = 'wakeup_viktor':
 
 					act 'Yes':
 						*clr & cla
-						!!IMAGE
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/bmw.jpg"></center>'
 						'"That''d be great!" you reply and you you collect your things as he quickly gets dressed.'
 						'After making sure everything is in order, you both head outside and climb into his car. "Where to?" he asks.'
 
@@ -792,7 +780,7 @@ if $ARGS[0] = 'wakeup_viktor_bj':
 
 							act 'Yes':
 								*clr & cla
-								!!IMAGE
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/bmw.jpg"></center>'
 								'"That''d be great!" you reply.'
 								'You collect your things while he grabs his keys, then both of you head outside and climb into his car.'
 								'"Where to?" he asks.'
@@ -848,7 +836,7 @@ if $ARGS[0] = 'wakeup_viktor_bj':
 
 							act 'Yes':
 								*clr & cla
-								!!IMAGE
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/bmw.jpg"></center>'
 								'"That''d be great!" you reply.'
 								'You collect your things while he grabs his keys, then both of you head outside and climb into his car.'
 								'"Where to?" he asks.'
@@ -918,7 +906,7 @@ if $ARGS[0] = 'wakeup_viktor_bj':
 
 							act 'Yes':
 								*clr & cla
-								!!IMAGE
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/bmw.jpg"></center>'
 								'"That''d be great!" you reply.'
 								'You collect your things while he grabs his keys, then both of you head outside and climb into his car.'
 								'"Where to?" he asks.'
@@ -975,7 +963,7 @@ if $ARGS[0] = 'wakeup_viktor_bj':
 
 							act 'Yes':
 								*clr & cla
-								!!IMAGE
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/bmw.jpg"></center>'
 								'"That''d be great!" you reply.'
 								'You collect your things while he grabs his keys, then both of you head outside and climb into his car.'
 								'"Where to?" he asks.'

+ 3 - 2
locations/vladimirQW_meet.qsrc

@@ -535,13 +535,14 @@ if $ARGS[0] = 'qwmeetdin':
 					npc_gentle[$boy] = 1
 					npc_finance[$boy] = 2
 					if vladimirQW['money_given'] = 0:
-						temp_money += 5000
+						temp_money = 5000
 					else
-						temp_money += 2000
+						temp_money = 2000
 					end
 					money += temp_money
 					vladimirQW['money_given'] += temp_money
 					'You walked with Vladimir into the bedroom. Vladimir sceptically cast his gaze about your humble abode and took out his wallet. "I hope you will not mind if I give you some money?" He handed you' + iif(temp_money = 5000, 'five', 'two') + ' thousand. You took the money you were offered.'
+					killvar 'temp_money'
 
 					act 'Continue': gt 'BDsex', 'start'
 				end