Browse Source

Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

julzor 5 years ago
parent
commit
b235414b92
2 changed files with 19 additions and 5 deletions
  1. 17 5
      locations/Gadbana.qsrc
  2. 2 0
      locations/bed2.qsrc

+ 17 - 5
locations/Gadbana.qsrc

@@ -10,6 +10,13 @@ $menu_loc = 'Gadbana'
 $menu_arg = ''
 menu_off = 0
 frost = 0
+if banya_underwear = 0:
+	if $pantyworntype ! 'none' and $braworntype ! 'none':
+		banya_underwear = 1
+	else
+		banya_underwear = 2
+	end
+end
 clothesAtLocation = FUNC('lost_clothes_here','Gadbana')
 
 '<center><h4>bath</h4></center>'
@@ -25,8 +32,9 @@ if mira = 0:
 			minut += 1
 			menu_off = 1
 			gs 'clothing', 'recover_lost_clothes', 'Gadbana', 1
-			gs 'underwear', 'wear'
+			if banya_underwear = 1: gs 'underwear', 'wear'
 			gs 'stat'
+			killvar 'banya_underwear'
 			gt 'Gaddvor'
 		end
 	end
@@ -42,6 +50,7 @@ if mira = 0:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
 			gs 'clothing', 'recover_lost_clothes', 'Gadbana'
 			gs 'arousal', 'voyeur', 10, 'exhibitionism'
+			killvar 'banya_underwear'
 			gs 'stat'
 			act 'Continue': gt 'Gaddvor'
 		end
@@ -55,6 +64,7 @@ if mira = 0:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in almost getting caught'
 			gs 'clothing', 'recover_lost_clothes', 'Gadbana'
 			gs 'arousal', 'voyeur', 10, 'exhibitionism'
+			killvar 'banya_underwear'
 			gs 'stat'
 			act 'Continue': gt 'Gaddvor'
 		end
@@ -75,7 +85,7 @@ if mira = 0:
 					dynamic $showerdin
 					pcs_hairbsh = 0
 					pcs_makeup = 1
-					gs 'underwear', 'remove'
+					if $pantyworntype ! 'none' and $braworntype ! 'none': gs 'underwear', 'remove'
 					gs 'clothing', 'strip'
 
 					banaday = daystart
@@ -106,7 +116,7 @@ if mira = 0:
 		dynamic $showerdin
 		if frost > 0:frost = 0
 		gs 'clothing', 'strip', 'Gadbana'
-		gs 'underwear', 'remove'
+		if $pantyworntype ! 'none' and $braworntype ! 'none': gs 'underwear', 'remove'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mit.jpg"></center>'
 		'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather the hair with the shampoo. After rising off the shampoo you are completely clean.'
@@ -221,7 +231,7 @@ else
 		cls
 		menu_off = 1
 		gs 'clothing', 'strip', 'Gadbana'
-		gs 'underwear', 'remove'
+		if $pantyworntype ! 'none' and $braworntype ! 'none': gs 'underwear', 'remove'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/miraban.jpg"></center>'
 			'While you undress, through the corner of your eye you notice Mira removing her panties.'
@@ -260,7 +270,8 @@ else
 						mira = 0
 						minut += 1
 						gs 'clothing', 'recover_lost_clothes', 'Gaddvor', 1
-						gs 'underwear', 'wear'
+						if banya_underwear = 1: gs 'underwear', 'wear'
+						killvar 'banya_underwear'
 						gs 'stat'
 						act 'Continue': gt 'Gaddvor'
 					end
@@ -276,6 +287,7 @@ else
 					gs 'clothing', 'recover_lost_clothes', 'Gaddvor'
 					gs 'arousal', 'voyeur', 10, 'exhibitionism'
 					gs 'arousal', 'end'
+					killvar 'banya_underwear'
 					gs 'stat'
 					act 'Continue': gt 'Gaddvor'
 				end

+ 2 - 0
locations/bed2.qsrc

@@ -361,6 +361,8 @@ if $ARGS[0] = 'end':
 	InSleep = 0
 	slept_in = 0
 	strip_here = 0
+	if $braworntype ! 'none': gs 'bras', 'remove'
+	if $pantyworntype ! 'none':gs 'panties', 'remove'
 	if bedpanty = 1:
 		gs 'underwear', 'remove'
 	else