浏览代码

[fixed] missing `$shave_act` in one of `tg` specific shaving branches

LinaHirata 1 月之前
父节点
当前提交
5c351dd315
共有 1 个文件被更改,包括 76 次插入81 次删除
  1. 76 81
      locations/din_van.qsrc

+ 76 - 81
locations/din_van.qsrc

@@ -339,93 +339,88 @@ $brit = "gs 'din_van', 'brit'"
 if $ARGS[0] = 'brit':
 	if lashair ! 1 and pcs_shave['free_razor'] + mc_inventory['razor'] > 0:
 		!! if shave_menu = 1: legs and pussy
+		$shave_act = ''
 		if shave_menu = 1 and mc_inventory['razor'] >= razors_to_use['all']:
 			if pcs_leghair >= 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
-				if pcs_leghair >= 3 and (pubestyle > 0 and pcs_pubes >= shave_trigger):
-					if daystart - daystart_start < 9 and $start_type[1] = 'tg':
-						$shave_act = 'Shave your legs and pussy'
-						$shave_txt1 = 'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
-						$shave_txt2 = 'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
-					elseif daystart - daystart_start < 29 and $start_type[1] = 'tg':
-						pcs_mood += 10
-						$shave_txt1 = 'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
-					elseif pubestyle = 1:
-						$shave_act = 'Shave your legs and pussy'
-						if pcs_pubes > 10:
-							$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the bush growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got everything.'
-							$shave_txt2 = 'Satisfied there isn''t even a single hair left, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
-						else
-							$shave_txt1 = 'You lather up your legs and crotch, grabbing your razor and carefully scraping away stubble that is growing from them.'
-							$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble left. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
-						end
-					elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
-						if pcs_pubes >= shave_trigger + 5:
-							$shave_act = 'Shave your legs and pussy'
-							$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion before deciding what to do next.'
-						else
-							$shave_act = 'Shave your legs and trim your bush'
-							$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you spend some time cleaning up the area around your styled pubic hair, trimming back stubble and hair until it''s neat and tidy again.'
-						end
-					elseif pubestyle = 9:
-						$shave_act = 'Shave your legs and maintain your bush'
-						if pcs_pubes >= 26:
-							$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush and your bikini lines, until it is a neat and tidy lawn of hair.'
-						else
-							$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it short and neat.'
-						end
-					elseif pubestyle = 10:
+				$shave_act = 'Shave your legs and pussy'
+				if daystart - daystart_start < 9 and $start_type[1] = 'tg':
+					$shave_txt1 = 'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
+					$shave_txt2 = 'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
+				elseif daystart - daystart_start < 29 and $start_type[1] = 'tg':
+					pcs_mood += 10
+					$shave_txt1 = 'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
+				elseif pubestyle = 1:
+					if pcs_pubes > 10:
+						$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the bush growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got everything.'
+						$shave_txt2 = 'Satisfied there isn''t even a single hair left, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
+					else
+						$shave_txt1 = 'You lather up your legs and crotch, grabbing your razor and carefully scraping away stubble that is growing from them.'
+						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble left. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
+					end
+				elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
+					if pcs_pubes >= shave_trigger + 5:
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion before deciding what to do next.'
+					else
 						$shave_act = 'Shave your legs and trim your bush'
-						if pcs_pubes >= 40:
-							$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time hacking back the wild jungle covering your crotch. Soon enough, you''re left with a sophisticated and tidy bush of hair that neatly carpets your pussy.'
-						else
-							$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it neat and tidy.'
-						end
-					elseif pubestyle = 11:
-						$shave_act = 'Shave your legs and pussy'
-						if pcs_pubes <= 10:
-							$shave_txt1 = 'You do your legs first before realizing that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.'
-							$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is smooth once again.'
-						else
-							$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
-						end
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you spend some time cleaning up the area around your styled pubic hair, trimming back stubble and hair until it''s neat and tidy again.'
+					end
+				elseif pubestyle = 9:
+					$shave_act = 'Shave your legs and maintain your bush'
+					if pcs_pubes >= 26:
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush and your bikini lines, until it is a neat and tidy lawn of hair.'
 					else
-						$shave_act = ''
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it short and neat.'
 					end
+				elseif pubestyle = 10:
+					$shave_act = 'Shave your legs and trim your bush'
+					if pcs_pubes >= 40:
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time hacking back the wild jungle covering your crotch. Soon enough, you''re left with a sophisticated and tidy bush of hair that neatly carpets your pussy.'
+					else
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it neat and tidy.'
+					end
+				elseif pubestyle = 11:
+					if pcs_pubes <= 10:
+						$shave_txt1 = 'You do your legs first before realizing that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.'
+						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is smooth once again.'
+					else
+						$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
+					end
+				else
+					$shave_act = ''
+				end
 
-
-					if $shave_act ! '':
-						act '<<$shave_act>> (0:15)':
-							menu_off = 1
-							*clr & cla
-							!! if $locM = 'uni_dorm' and $loc ='vann' and rand(0, 5) = 0:gt 'vann', 'brit1'
-							if shave_length < 2:
-								if pcs_pubes <= 10:
-									'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
-								else
-									'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
-								end
-							else
-								'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
-							end
-							*nl
-							'<<$shave_txt1>>'
-							*nl
-							'<<$shave_txt2>>'
-							minut += 15
-							pcs_leghair = 0
-							stat['leg_hair_growth_timer'] = totminut
-							pcs_pubes = shave_length
-							stat['pube_growth_timer'] = totminut
-							pcs_horny += 5
-							if pcs_shave['free_razor'] = 1:
-								pcs_shave['free_razor'] = 0
+				if $shave_act ! '':
+					act '<<$shave_act>> (0:15)':
+						menu_off = 1
+						*clr & cla
+						!! if $locM = 'uni_dorm' and $loc ='vann' and rand(0, 5) = 0:gt 'vann', 'brit1'
+						if shave_length < 2:
+							if pcs_pubes <= 10:
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
 							else
-								mc_inventory['razor'] -= razors_to_use['all']
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
 							end
-							gs 'din_van', 'dryOff'
-							gs 'selfplay', 'bathtub_dildo_check'
-							gs 'selfplay', 'shower_dildo_check'
+						else
+							'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
 						end
+						*nl
+						'<<$shave_txt1>>'
+						*nl
+						'<<$shave_txt2>>'
+						minut += 15
+						pcs_leghair = 0
+						stat['leg_hair_growth_timer'] = totminut
+						pcs_pubes = shave_length
+						stat['pube_growth_timer'] = totminut
+						pcs_horny += 5
+						if pcs_shave['free_razor'] = 1:
+							pcs_shave['free_razor'] = 0
+						else
+							mc_inventory['razor'] -= razors_to_use['all']
+						end
+						gs 'din_van', 'dryOff'
+						gs 'selfplay', 'bathtub_dildo_check'
+						gs 'selfplay', 'shower_dildo_check'
 					end
 				end
 			else
@@ -433,11 +428,12 @@ if $ARGS[0] = 'brit':
 			end
 		end
 
+		$shave_act = ''
 		!! if shave_menu = 2: pussy only
 		if (shave_menu = 2 or shave_menu = 1) and mc_inventory['razor'] >= razors_to_use['pussy']:
 			if pubestyle > 0 and pcs_pubes >= shave_trigger:
+				$shave_act = 'Shave your pussy'
 				if pubestyle = 1:
-					$shave_act = 'Shave your pussy'
 					if pcs_pubes <= 10:
 						$shave_txt1 = 'You lather up yourself up, and grab your razor, carefully scraping away stubble that is growing from your crotch.'
 						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
@@ -446,7 +442,6 @@ if $ARGS[0] = 'brit':
 					end
 				elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
 					if pcs_pubes >= shave_trigger + 5:
-						$shave_act = 'Shave your pussy'
 						$shave_txt1 = 'You lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion.'
 					else
 						$shave_act = 'Trim your bush'
@@ -468,7 +463,6 @@ if $ARGS[0] = 'brit':
 						$shave_txt1 = 'You spend some time maintaining your bush, trimming back the edges, keeping it neat and tidy.'
 					end
 				elseif pubestyle = 11:
-					$shave_act = 'Shave your pussy'
 					if pcs_pubes <= 10:
 						$shave_txt1 = 'As the water of the shower continues to roll down your body, you suddenly realize that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.'
 						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is smooth once again.'
@@ -478,6 +472,7 @@ if $ARGS[0] = 'brit':
 				else
 					$shave_act = ''
 				end
+
 				if $shave_act ! '':
 					act '<<$shave_act>> (0:10)':
 						menu_off = 1