Jelajahi Sumber

[fixed] clothing _attribute_cheap item number.
[added] specific description for hessian sack to _body_image
[added] swamp_clothes to clothing file and changed various instances of swamp_clothes to gosub for new hessian sack clothing item in swamp locations.
[added] removal of hessian sack to wardrobe.
[changed] stat_display to show when not wearing underwear, and added description for rubbing on pclopants when not wearing panties.

3xpurt 5 tahun lalu
induk
melakukan
c005c8da36

+ 1 - 1
locations/_attributes_cheap.qsrc

@@ -2475,7 +2475,7 @@ elseif ARGS[1] = 413:
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloExhibit = 5
-elseif ARGS[1] = 413:
+elseif ARGS[1] = 414:
 	CloQuality = 1
 	CloThinness = 1
 	CloTopCut = 1

+ 5 - 2
locations/_body_image.qsrc

@@ -58,6 +58,9 @@ if $ARGS[0] = 'clothes':
 	elseif $clothingworntype = 'nude' and $pantyworntype = 'none':
 		$RESULT = 'images/pc/clothing/nude1.jpg'
 		$body_image_msg += 'You are completely naked.'
+	elseif $clothingworntype = 'cheap' and clothingwornnumber = 414:
+		$RESULT = FUNC('$clothing_image', $clothingworntype, clothingwornnumber)
+		$body_image_msg += 'You are wearing a hessian sack the hunters gave you.'
 	else
 		$RESULT = FUNC('$clothing_image', $clothingworntype, clothingwornnumber)
 		$body_image_msg += 'You are wearing ' + FUNC('$short_description', $clothingworntype, PCloStyle2) + '<<clothingwornnumber>>.'
@@ -97,7 +100,7 @@ if $ARGS[0] = 'panties':
 		$body_image_msg += 'You are not wearing any panties.'
 	else
 		$RESULT = FUNC('$panty_image', $pantyworntype, pantywornnumber)
-		!Kevin, please edit this line. I can not find panties description		
+		!Kevin, please edit this line. I can not find panties description
 		!$body_image_msg += 'You are wearing ' + FUNC('$shoe_description', $shoeworntype) + '<<shoewornnumber>>.'
 		$body_image_msg += 'You are wearing <<$pantyworntype>> panty <<pantywornnumber>>'
 	end
@@ -109,7 +112,7 @@ if $ARGS[0] = 'bra':
 		$body_image_msg += 'You are not wearing a bra. Your breasts would be considered an EU <<$titsize>>'
 	else
 		$RESULT = FUNC('$bra_image', $braworntype, brawornnumber)
-		!Kevin, please edit this line. I can not find bra description		
+		!Kevin, please edit this line. I can not find bra description
 		!$body_image_msg += 'You are wearing ' + FUNC('$shoe_description', $shoeworntype) + '<<shoewornnumber>>.'
 		$body_image_msg += 'You are wearing <<$braworntype>> bra <<brawornnumber>>. Your breasts would be considered an EU <<$titsize>>'
 	end

+ 8 - 8
locations/backwater.qsrc

@@ -1,8 +1,8 @@
 # backwater
 
 $location_type = 'secluded'
-$metka = $ARGS[0]
-$loc = $CURLOC
+$metka = ''
+$loc = 'backwater'
 gs 'gadukino_event', 'sound'
 cls
 gs'stat'
@@ -23,7 +23,7 @@ if $clothingworntype = 'nude' and hantersKnowSlut = 0 and hanters = 1 and hour >
 			cls
 			minut += 5
 			gs 'underwear', 'wear'
-			gs 'clothing', 'recover_lost_clothes', $CURLOC, 1
+			gs 'clothing', 'recover_lost_clothes', 'backwater', 1
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude1.jpg"></center>'
 			'Noticing the hunter, you rush over to your clothes and begin dressing yourself in panic. As you get fully dressed, you look over your shoulder, expecting the hunter standing there, but there is no one there.'
@@ -86,7 +86,7 @@ if clothesAtLocation = 0:
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterundress.jpg"></center>'
 				end
-				gs 'clothing', 'strip', $CURLOC
+				gs 'clothing', 'strip', 'backwater'
 				'You do not hesitate getting undressed, not caring if anyone is watching.'
 				act'Back':gt'backwater'
 			else
@@ -103,7 +103,7 @@ else
 		act 'Pick up your clothes':
 			cla
 			*clr
-			gs 'clothing', 'recover_lost_clothes', $CURLOC
+			gs 'clothing', 'recover_lost_clothes', 'backwater'
 			'You pick up your clothes laying on the ground.'
 			gt $loc, $metka
 		end
@@ -111,7 +111,7 @@ else
 		act 'Get dressed':
 			cla
 			*clr
-			gs 'clothing', 'recover_lost_clothes', $CURLOC, 1
+			gs 'clothing', 'recover_lost_clothes', 'backwater', 1
 			gs 'underwear', 'wear'
 			'You pick up your clothes laying on the ground and get dressed.'
 			gt $loc, $metka
@@ -174,7 +174,7 @@ if $clothingworntype = 'nude':
 				*clr
 				minut += 5
 				clearclothes = 5
-				gs 'clothing','recover_lost_clothes',$CURLOC, 1
+				gs 'clothing','recover_lost_clothes','backwater', 1
 				gs 'clothing', 'strip', 'swamphouse'
 				if $clothingworntype = 'nude':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basinwash1.jpg"></center>'
@@ -191,7 +191,7 @@ if $clothingworntype = 'nude':
 					*clr
 					minut += 10
 					clearclothes = 3
-					gs 'clothing','recover_lost_clothes',$CURLOC, 1
+					gs 'clothing','recover_lost_clothes','backwater', 1
 					gs 'clothing', 'strip', 'clothesline_swamp'
 					if $clothingworntype = 'nude':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basinwash2.jpg"></center>'

+ 8 - 10
locations/bicycle.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'sarai':
 	else
 		'You notice an old bike. It looks like it''s still in a good condition, you can probably ride it without any trouble.'
 	end
-		
+
 	if hour >= 6 and hour <= 20 and sunWeather = 1 and month >= 4 and month <= 10:
 		if findvelday ! daystart:
 			act 'Ride the bike (1:00)':
@@ -132,18 +132,18 @@ if $ARGS[0] = 'forest':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
 
 	act 'Bike to the village (0:25)':
-		dirtyclothes = 0 & swamp_clothes = 0
+		dirtyclothes = 0
+		gs 'clothing', 'swamp_clothes', 0
 		if $clothingworntype ! 'nude' or pcs_inhib > 50:
 			cls
 			pcs_mood += 10
 			findvel = 1
 			minut += 25
 			inhib_exp += 4
-			gs'stat'
-
 			gs 'bicycle', 'clothes_findvel'
 			'You ride your bike out of the forest and return to the village.'
 			gs 'bicycle', 'ridego', 'Gaddvor'
+			gs'stat'
 		else
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel_nude.jpg"></center>'
@@ -182,7 +182,8 @@ if $ARGS[0] = 'swamp':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
 
 	act 'Bike to the village (1:15)':
-		dirtyclothes = 0 & swamp_clothes = 0
+		dirtyclothes = 0
+		gs 'clothing', 'swamp_clothes', 0
 		if $clothingworntype ! 'nude' or pcs_inhib > 50:
 			cls
 			minut += 75
@@ -194,13 +195,11 @@ if $ARGS[0] = 'swamp':
 			findvel = 1
 			hanters = 0
 			inhib_exp += 4
-			gs'stat'
 			!gs'time'
-
 			gs 'bicycle', 'clothes_findvel'
 			'You ride your bike out of the swamp and return to the village.'
-
 			gs 'bicycle', 'ridego', 'Gaddvor'
+			gs'stat'
 		else
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel_nude.jpg"></center>'
@@ -214,12 +213,11 @@ if $ARGS[0] = 'swamp':
 		pcs_mood += 5
 		hanters = 0
 		findvel = 2
-		gs'stat'
 		!gs'time'
-
 		gs 'bicycle', 'clothes_findvel'
 		'You jump onto your bike and ride to the forest.'
 		gs 'bicycle', 'ridego', 'gadforest','1'
+		gs'stat'
 	end
 	act 'Put the bike aside': gt'swamp_yard'
 end

+ 16 - 2
locations/clothing.qsrc

@@ -36,7 +36,7 @@ $clothing_list_line = {
 	end
 
 	if $ARGS[1] = 'cheap' and ARGS[2] = 414:
-		$RESULT += '<TD>A potato sack the hunters gave you.</TD>'
+		$RESULT += '<TD>A hessian sack the hunters gave you.</TD>'
 	elseif $ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear':
 		gs 'clothing_descriptions'
 		$RESULT += '<TD><<FUNC(''$short_description'', $ARGS[1])>> <<ARGS[2]>><br/><br/><<$description>></TD>'
@@ -370,7 +370,7 @@ if $ARGS[0] = 'view_clothing_item':
 	$RESULT += '<<ARGS[3]>>'
 	'<<$RESULT>>'
 	if $ARGS[1] = 'cheap' and ARGS[2] = 414:
-		'A potato sack the hunters gave you.'
+		'A hessian sack the hunters gave you.'
 	elseif $ARGS[2] ! 'coat' and $ARGS[2] ! 'swimwear':
 		gs 'clothing_descriptions'
 		'<<$description>>'
@@ -833,5 +833,19 @@ if $ARGS[0] = 'wear_last_worn':
 	gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 end
 
+if $ARGS[0] = 'swamp_clothes':
+	if ARGS[1] = 1:
+		cheap[414] = 1
+		cheapS[414] = 0
+		cheapH[414] = 100
+		cheapB[414] = pcs_hips
+		swamp_clothes = 1
+		gs 'clothing', 'wear', 'cheap', 414
+	end
+	if ARGS[1] = 0:
+		cheap[414] = 0
+		swamp_clothes = 0
+	end
+end
 --- clothing ---------------------------------
 

+ 7 - 7
locations/clothing_QV.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'list':
 			gt 'wardrobe', 'start'
 		end
 	end
-	
+
 	'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm''"><img src="images/locations/city/citycenter/mall/GM.png"></a></center>'
 
 	if ARRSIZE('average') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
@@ -34,9 +34,9 @@ if $ARGS[0] = 'list':
 	if ARRSIZE('fetish') > 0 or ARRSIZE('burlesque') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sexshop''"><img src="images/locations/city/citycenter/sexshop/shop_name.png"></a></center>'
 
 	if ARRSIZE('exhibit') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''exhibitshop''"><img src="images/locations/oldtown/exhibitshop/shop_name.png"></a></center>'
-	
+
 	if ARRSIZE('alternative') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''dolls''"><img src="images/locations/city/island/dolls.png"></a></center>'
-	
+
 	if ARRSIZE('exercise') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
 	if $ARGS[1] = 'gm':
@@ -54,7 +54,7 @@ if $ARGS[0] = 'list':
 
 		i = 1
 		:loopcheap
-		if cheap[i] = 1: 
+		if cheap[i] = 1:
 			gs 'clothing_attributes', 'cheap', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
@@ -257,7 +257,7 @@ if $ARGS[0] = 'list':
 		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></center></table>'
 		*nl
 		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl	
+		*nl
 
 		i = 1
 		:loopalternative
@@ -371,7 +371,7 @@ if $ARGS[0] = 'strip':
 			gt 'clothing_QV', 'gym'
 		end
 	end
-	
+
 	act 'Leave': gt $loc, $metka
 end
 
@@ -381,7 +381,7 @@ if $ARGS[0] = 'change':
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
 	'<center><img src="<<FUNC(''$clothing_image'',  $ARGS[1], ARGS[2])>>"></center>'
 	if $ARGS[1] = 'cheap' and ARGS[2] = 414:
-		'A potato sack the hunters gave you.'
+		'A hessian sack the hunters gave you.'
 	else
 		$RESULT = FUNC('$short_description', $ARGS[1], CloStyle2)
 		$RESULT += '<<ARGS[2]>>'

+ 47 - 47
locations/clothing_descriptions.qsrc

@@ -3,33 +3,33 @@
 
 $description = ''
 if CloQuality = 1:
-   $description = 'This crappy quality outfit'
+	$description = 'This crappy quality outfit'
 elseif CloQuality = 2:
-   $description = 'This very low quality outfit'
+	$description = 'This very low quality outfit'
 elseif CloQuality = 3:
-   $description = 'This low quality outfit'
+	$description = 'This low quality outfit'
 elseif CloQuality = 4:
-   $description = 'This average quality outfit'
+	$description = 'This average quality outfit'
 elseif CloQuality = 5:
-   $description = 'This reasonable quality outfit'
+	$description = 'This reasonable quality outfit'
 elseif CloQuality = 6:
-   $description = 'This good quality outfit'
+	$description = 'This good quality outfit'
 elseif CloQuality = 7:
-   $description = 'This is a outstanding quality outfit'
+	$description = 'This is a outstanding quality outfit'
 end
 
 if CloThinness = 1:
-   $description = $description + ', which completely obscures your figure'
+	$description = $description + ', which completely obscures your figure'
 elseif CloThinness = 2:
-   $description = $description + ', which somewhat obscures your figure'
+	$description = $description + ', which somewhat obscures your figure'
 elseif CloThinness = 3:
-   $description = $description + ', which shows your figure somewhat'
+	$description = $description + ', which shows your figure somewhat'
 elseif CloThinness = 4:
-   $description = $description + ', which shows your figure well'
+	$description = $description + ', which shows your figure well'
 elseif CloThinness = 5:
-   $description = $description + ', which shows every detail of your figure'
+	$description = $description + ', which shows every detail of your figure'
 elseif CloThinness = 6:
-   $description = $description + ', which intentionally reveals your intimate areas'
+	$description = $description + ', which intentionally reveals your intimate areas'
 end
 
 if CloBra = 2:
@@ -38,55 +38,55 @@ elseif CloBra = 1:
 	$description = $description + ', the top replaces a bra (if you are wearing one)'
 elseif CloTopCut > 0:
 	if CloTopCut = 1:
-	   $description = $description + ', includes a very modest top'
+		$description = $description + ', includes a very modest top'
 	elseif CloTopCut = 2:
-	   $description = $description + ', includes a modest top'
+		$description = $description + ', includes a modest top'
 	elseif CloTopCut = 3:
-	   $description = $description + ', includes a somewhat revealing top'
+		$description = $description + ', includes a somewhat revealing top'
 	elseif CloTopCut = 4:
-	   $description = $description + ', includes a very revealing top'
+		$description = $description + ', includes a very revealing top'
 	end
 	if tits < 2:
-	   $description = $description + ', that would hang loosely around your humble bosom'
+		$description = $description + ', that would hang loosely around your humble bosom'
 	elseif tits < 5:
-	   $description = $description + ', that would fit your decently-sized bosom'
+		$description = $description + ', that would fit your decently-sized bosom'
 	elseif tits < 8:
-	   $description = $description + ', that would tightly strain to contain your ample bosom'
+		$description = $description + ', that would tightly strain to contain your ample bosom'
 	else
-	   $description = $description + ', that your huge bosom would spill out of'
+		$description = $description + ', that your huge bosom would spill out of'
 	end
 end
 
 if CloPanties = 1:
 	$description += ' the bottom of which is so skimpy it replaces your panties.'
 elseif CloPantsShortness > 0:
-   if CloPantsShortness = 1:
-      $description = $description + ' and long pants.'
-   elseif CloPantsShortness = 2:
-      $description = $description + ' and calf-length pants.'
-   elseif CloPantsShortness = 3:
-      $description = $description + ' and knee-length shorts.'
-   elseif CloPantsShortness = 4:
-      $description = $description + ' and thigh-length shorts.'
-   elseif CloPantsShortness = 5:
-      $description = $description + ' and shorts that don''t go past your crotch.'
-   elseif CloPantsShortness = 6:
-      $description = $description + ' and shorts so short, that they reveal your panties.'
-   end
+	if CloPantsShortness = 1:
+		$description = $description + ' and long pants.'
+	elseif CloPantsShortness = 2:
+		$description = $description + ' and calf-length pants.'
+	elseif CloPantsShortness = 3:
+		$description = $description + ' and knee-length shorts.'
+	elseif CloPantsShortness = 4:
+		$description = $description + ' and thigh-length shorts.'
+	elseif CloPantsShortness = 5:
+		$description = $description + ' and shorts that don''t go past your crotch.'
+	elseif CloPantsShortness = 6:
+		$description = $description + ' and shorts so short, that they reveal your panties.'
+	end
 elseif CloSkirtShortness > 0:
-   if CloSkirtShortness = 1:
-      $description = $description + ' and a floor-length skirt.'
-   elseif CloSkirtShortness = 2:
-      $description = $description + ' and a knee-length skirt.'
-   elseif CloSkirtShortness = 3:
-      $description = $description + ' and a fairly standard skirt.'
-   elseif CloSkirtShortness = 4:
-      $description = $description + ' and a rather short skirt.'
-   elseif CloSkirtShortness = 5:
-      $description = $description + ' and a miniskirt that barely reaches past your groin.'
-   elseif CloSkirtShortness = 6:
-      $description = $description + ' and a microskirt not even long enough to hide your privates.'
-   end
+	if CloSkirtShortness = 1:
+		$description = $description + ' and a floor-length skirt.'
+	elseif CloSkirtShortness = 2:
+		$description = $description + ' and a knee-length skirt.'
+	elseif CloSkirtShortness = 3:
+		$description = $description + ' and a fairly standard skirt.'
+	elseif CloSkirtShortness = 4:
+		$description = $description + ' and a rather short skirt.'
+	elseif CloSkirtShortness = 5:
+		$description = $description + ' and a miniskirt that barely reaches past your groin.'
+	elseif CloSkirtShortness = 6:
+		$description = $description + ' and a microskirt not even long enough to hide your privates.'
+	end
 end
 
 --- clothing_descriptions ---------------------------------

+ 29 - 10
locations/gadforest.qsrc

@@ -95,24 +95,41 @@ if $ARGS[0] = '1':
 		act 'Dress':
 			cla
 			*clr
-			swamp_clothes = 0
 			minut += 5
+			gs 'clothing', 'swamp_clothes', 0
 			gs 'underwear', 'wear'
 			gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
+			gs 'stat'
 			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
-			 if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
-			'You change into your clothes.'
+			if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+			'You change back into your clothes.'
 			act 'Back': gt 'gadforest','1'
 		end
 	end
 	!if he had gone from the forest and put in another place
 	if clothesAtLocation = 1 and $clothingworntype ! 'nude':
-		act 'Pick up the abandoned clothing':
-			cla
-			*clr
-			gs 'clothing', 'recover_lost_clothes', 'gadforest'
-			'You pick up your clothes.'
-			act 'Back': gt 'gadforest','1'
+		if $clothingworntype = 'cheap' and clothingwornnumber = 414:
+			act 'Pick up the abandoned clothing':
+				cla
+				minut += 2
+				gs 'clothing', 'swamp_clothes', 0
+				gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
+				gs 'stat'
+				*nl
+				'You pick up your abandoned clothing and change out of the hessian sack the hunters gave you.'
+				act 'Back': gt 'gadforest','1'
+			end
+		else
+			act 'Pick up the abandoned clothing':
+				cla
+				minut += 5
+				gs 'clothing', 'swamp_clothes', 0
+				gs 'clothing', 'recover_lost_clothes', 'gadforest'
+				gs 'stat'
+				*nl
+				'You pick up your abandoned clothing.'
+				act 'Back': gt 'gadforest','1'
+			end
 		end
 	end
 	if hour >= 6 and hour <= 20 and sunWeather = 1:
@@ -220,7 +237,8 @@ if $ARGS[0] = '1':
 		end
 	end
 	act 'Out of the woods':
-		dirtyclothes = 0 & swamp_clothes = 0
+		dirtyclothes = 0
+		gs 'clothing', 'swamp_clothes', 0
 		if $clothingworntype = 'nude':
 			if $CloLosTyp[$CURLOC] = '' or gadforest_clothestorn = 1:
 				!no cloth here, it must be broken. There may be a good exhibi or rape event entry point.
@@ -238,6 +256,7 @@ if $ARGS[0] = '1':
 		end
 	end
 	if rand(1,10)> 9: gs 'gadforest', 'torncloth'
+	gs 'stat'
 end
 
 if $ARGS[0] = '2':

+ 16 - 16
locations/gadforest_event.qsrc

@@ -242,8 +242,8 @@ if $ARGS[0] = 'gopforest_mitka':
 						gopsawnaked += 1
 						if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 						pcs_horny += 10
-						swamp_clothes = 0
 						minut += 5
+						gs 'clothing', 'swamp_clothes', 0
 						gs 'underwear', 'wear'
 						gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 						gs 'stat'
@@ -320,8 +320,8 @@ if $ARGS[0] = 'gopforest_mitka':
 							*clr
 							if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 							pcs_horny += 10
-							swamp_clothes = 0
 							minut += 5
+							gs 'clothing', 'swamp_clothes', 0
 							gs 'underwear', 'wear'
 							gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 							gs 'stat'
@@ -370,8 +370,8 @@ if $ARGS[0] = 'gopforest_mitka':
 							gopsawnaked += 1
 							if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 							pcs_horny += 10
-							swamp_clothes = 0
 							minut += 5
+							gs 'clothing', 'swamp_clothes', 0
 							gs 'underwear', 'wear'
 							gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 							gs 'stat'
@@ -629,8 +629,8 @@ if $ARGS[0] = 'gopforest_kolyamba':
 						gopsawnaked += 1
 						if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 						pcs_horny += 10
-						swamp_clothes = 0
 						minut += 5
+						gs 'clothing', 'swamp_clothes', 0
 						gs 'underwear', 'wear'
 						gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 						gs 'stat'
@@ -692,8 +692,8 @@ if $ARGS[0] = 'gopforest_kolyamba':
 							gopsawnaked += 1
 							if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 							pcs_horny += 10
-							swamp_clothes = 0
 							minut += 5
+							gs 'clothing', 'swamp_clothes', 0
 							gs 'underwear', 'wear'
 							gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 							gs 'stat'
@@ -740,8 +740,8 @@ if $ARGS[0] = 'gopforest_kolyamba':
 							gopsawnaked += 1
 							if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 							pcs_horny += 10
-							swamp_clothes = 0
 							minut += 5
+							gs 'clothing', 'swamp_clothes', 0
 							gs 'underwear', 'wear'
 							gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 							gs 'stat'
@@ -985,8 +985,8 @@ if $ARGS[0] = 'gopforest_vasyan':
 						gopsawnaked += 1
 						if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 						pcs_horny += 10
-						swamp_clothes = 0
 						minut += 5
+						gs 'clothing', 'swamp_clothes', 0
 						gs 'underwear', 'wear'
 						gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 						gs 'stat'
@@ -1048,8 +1048,8 @@ if $ARGS[0] = 'gopforest_vasyan':
 							gopsawnaked += 1
 							if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 							pcs_horny += 10
-							swamp_clothes = 0
 							minut += 5
+							gs 'clothing', 'swamp_clothes', 0
 							gs 'underwear', 'wear'
 							gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 							gs 'stat'
@@ -1097,8 +1097,8 @@ if $ARGS[0] = 'gopforest_vasyan':
 							gopsawnaked += 1
 							if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 							pcs_horny += 10
-							swamp_clothes = 0
 							minut += 5
+							gs 'clothing', 'swamp_clothes', 0
 							gs 'underwear', 'wear'
 							gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 							gs 'stat'
@@ -1371,8 +1371,8 @@ if $ARGS[0] = 'gopforest_2boys':
 						gopsawnaked += 1
 						if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 						pcs_horny += 10
-						swamp_clothes = 0
 						minut += 5
+						gs 'clothing', 'swamp_clothes', 0
 						gs 'underwear', 'wear'
 						gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 						gs 'stat'
@@ -1440,8 +1440,8 @@ if $ARGS[0] = 'gopforest_2boys':
 							gopsawnaked += 1
 							if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 							pcs_horny += 10
-							swamp_clothes = 0
 							minut += 5
+							gs 'clothing', 'swamp_clothes', 0
 							gs 'underwear', 'wear'
 							gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 							gs 'stat'
@@ -1495,8 +1495,8 @@ if $ARGS[0] = 'gopforest_2boys':
 							gopsawnaked += 1
 							if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 							pcs_horny += 10
-							swamp_clothes = 0
 							minut += 5
+							gs 'clothing', 'swamp_clothes', 0
 							gs 'underwear', 'wear'
 							gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 							gs 'stat'
@@ -1756,8 +1756,8 @@ if $ARGS[0] = 'gopforest_3boys':
 						gopsawnaked += 1
 						if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 						pcs_horny += 10
-						swamp_clothes = 0
 						minut += 5
+						gs 'clothing', 'swamp_clothes', 0
 						gs 'underwear', 'wear'
 						gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 						gs 'stat'
@@ -1821,8 +1821,8 @@ if $ARGS[0] = 'gopforest_3boys':
 							gopsawnaked += 1
 							if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 							pcs_horny += 10
-							swamp_clothes = 0
 							minut += 5
+							gs 'clothing', 'swamp_clothes', 0
 							gs 'underwear', 'wear'
 							gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 							gs 'stat'
@@ -1872,8 +1872,8 @@ if $ARGS[0] = 'gopforest_3boys':
 							gopsawnaked += 1
 							if gopsawnaked >= 10:gopsawnaked = 0 & npc_QW['A63'] += 1
 							pcs_horny += 10
-							swamp_clothes = 0
 							minut += 5
+							gs 'clothing', 'swamp_clothes', 0
 							gs 'underwear', 'wear'
 							gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 							gs 'stat'
@@ -2212,8 +2212,8 @@ if $ARGS[0] = 'picnic':
 		act 'To hide and dress':
 			cla
 			*clr
-			swamp_clothes = 0
 			minut += 5
+			gs 'clothing', 'swamp_clothes', 0
 			gs 'underwear', 'wear'
 			gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'

+ 5 - 2
locations/gadforestlost.qsrc

@@ -6,9 +6,10 @@ if $ARGS[0] = 'forestrescue':
 	cls
 	minut += 150
 	lost_girl = 0
-	dirtyclothes = 0 & swamp_clothes = 0
+	dirtyclothes = 0
 	forest_lostday = 0
 	hanters = 0
+	gs 'clothing', 'swamp_clothes', 0
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/forester.jpg"></center>'
@@ -206,9 +207,11 @@ if $ARGS[0] = 'gadforestlostfinish':
 	'You look over and realize that you finally see lights shining from distnat houses, glad to get out of this alive you rush forward.'
 	!clear lost flags by illume, clear dirtyclothes flag by rachels
 	lost_girl = 0
-	dirtyclothes = 0 & swamp_clothes = 0
+	dirtyclothes = 0
 	forest_lostday = 0
 	hanters = 0
+	gs 'clothing', 'swamp_clothes', 0
+	gs 'stat'
 	if $clothingworntype = 'nude':
 		act 'Out of the woods':
 			minut += 25

+ 11 - 3
locations/stat_display.qsrc

@@ -166,7 +166,7 @@ if StoryLine > 0 and SchoolAtestat = 0 and $holyday ! '': $stat_msg += '<BR><<$h
 if birthday = day and birthmonth = month: $stat_msg += '<BR><b>Today is your birthday.</b>' & $stat_msg += '<BR>'
 
 !New icon based menu.
-!if menu_off = 0: 
+!if menu_off = 0:
 	$stat_msg += '<table><tr><td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''description''"><img src="images/system/menu icons/icon_character.png"></a></td><td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''face''"><img src="images/system/menu icons/icon_lookself.png"></a></td>'+iif(bag > 0,'<td><a href="exec:gs ''din_bad'', ''d_bag''"><img src="images/system/menu icons/icon_purse.png"></a></td>','')+'<td><a href="exec:gs ''telefon'',''Phone_menu''"><img src="images/system/menu icons/icon_phone.png"></a></td><td><a href="exec:gs ''obj_din'', ''records''"><img src="images/system/menu icons/icon_additional.png"></a></td><td><a href="exec:killvar ''menu_page'' & gs''$menu_setting''"><img src="images/system/menu icons/icon_menu.png"></a></td></tr></table>'
 !elseif menu_off = 1: disabled for now.
 	!$stat_msg += '<table><tr><td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/icon_character.png"></a></td><td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/icon_lookself.png"></a></td>'+iif(bag > 0,'<td><a href="exec:gs ''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/icon_purse.png"></a></td>','')+'<td><a href="exec:gs ''telefon'',''Phone_menu''"><img src="images/system/menu icons/icon_phone.png"></a></td><td><a href="exec:gs ''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/icon_additional.png"></a></td><td><a href="exec:killvar ''menu_page'' & gs''obj_din'', ''menu_disabled''"><img src="images/system/menu icons/icon_menu.png"></a></td></tr></table>'
@@ -1089,10 +1089,18 @@ elseif $pantyworntype = 'none' and $clothingworntype ! 'swimwear':
 		else
 			$stat_msg += '<BR><b><font color="red">Your face is flushed with shame, you are not wearing panties and your naked ass flashes from under your short skirt.</font></b>'
 		end
+	elseif PCloPants > 0:
+		if $braworntype = 'none':
+			$stat_msg += '<BR><b><font color="red">You aren''t wearing underwear, and your bare pussy is rubbing against your clothing.</font></b>'
+		else
+			$stat_msg += '<BR><b><font color="red">You aren''t wearing panties, and your bare pussy is rubbing against your clothing.</font></b>'
+		end
 	elseif $clothingworntype ! 'nude':
 		$stat_msg += '<BR><b><font color="red">You are not wearing panties.</font></b>'
 	elseif towel = 1:
 		$stat_msg += '<BR><b><font color = red>Your naked body is covered only by a short towel.</font></b>'
+	elseif $braworntype = 'none':
+		$stat_msg += '<BR><b><font color = red>You are not wearing any underwear.</font></b>'
 	end
 elseif PCloBimbo = 1 and cheatBimbo = 0:
 	$stat_msg += '<BR><b><font color = #FF00FF>You are dressed as a bimbo</font></b>'
@@ -1248,7 +1256,7 @@ if StoryLine = 1:
 	if nerd_night_game = 1 and nerd_night_game_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Join nerds at the community center at eight</b>'
 	if InvitationToDimkaNYparty = 1 and month = 12 and day = 31: $stat_msg += '<BR><b>Go to the residential area between 15:00 and 18:00 to go to Dimka''s New Year party.</b>'
 end
-	
+
 if home_owned[1] = 1 and home_owned[4] > 0:
 	$stat_msg += '<BR>You have rented an apartment in the city residential area, which is paid up for <b><<ArendHouseSL>></b> days, and you also have an apartment in Pushkin, which is paid up for <b><<ArendHouseSL4>></b> days. Utilities are due on the 25th of <<$month>>.'
 elseif home_owned[1] = 1:
@@ -1256,7 +1264,7 @@ elseif home_owned[1] = 1:
 elseif home_owned[4] > 0:
 	$stat_msg += '<BR>You have rented an apartment in Pushkin, and you''re paid up for <<ArendHouseSL4>> days. Utilities are due on the 25th of <<$month>>.'
 end
-	
+
 if model > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:
 	$stat_msg += '<BR><b>You have no more modelling jobs available this week.</b>'
 elseif model > 0 and model_week < (daystart - week) / 7 and model_job_week = 1:

+ 3 - 3
locations/swamp.qsrc

@@ -30,12 +30,12 @@ end
 'There''s a small visible path to a clearing that leads to <a href="exec: gt ''swamp_yard'' ">the old hut</a>, it is probably used as a hunting lodge.'
 
 if hour >= 6 and hour <= 21 and month >= 6 and month <= 9:
-	act 'Walk into the forest':swamp_clothes = 0 & minut += 30 & gt 'gadforest','4'
+	act 'Walk into the forest':gs 'clothing', 'swamp_clothes', 0  & minut += 30 & gt 'gadforest','4'
 end
 if hour >= 6 and hour < 21:
-	act 'Return to the edge of the forest':swamp_clothes = 0 & hanters = 0 & minut += 150 & gt 'gadforest','1'
+	act 'Return to the edge of the forest':gs 'clothing', 'swamp_clothes', 0  & hanters = 0 & minut += 150 & gt 'gadforest','1'
 else
-	act 'Return to the edge of the forest':swamp_clothes = 0 & hanters = 0 & gt 'gadforest_event', 'forest_road'
+	act 'Return to the edge of the forest':gs 'clothing', 'swamp_clothes', 0  & hanters = 0 & gt 'gadforest_event', 'forest_road'
 end
 
 if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and swamp_day ! daystart:

+ 6 - 6
locations/swamp_yard.qsrc

@@ -220,8 +220,7 @@ if hanterhelp = 2 and hantersKnow = 0:
 		act 'Take the hessian and walk away':
 			*clr & cla
 			hanterhelp = 0
-			swamp_clothes = 1
-			gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
+			gs 'clothing', 'swamp_clothes', 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
 			'You thank them and quickly cover yourself with the piece of hessian... It''s not much but it''s at least better than nothing.'
@@ -230,8 +229,7 @@ if hanterhelp = 2 and hantersKnow = 0:
 		act 'Take the hessian and stay':
 			*clr & cla
 			hanterhelp = 0
-			swamp_clothes = 1
-			gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
+			gs 'clothing', 'swamp_clothes', 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
 			'You thank them and quickly cover yourself with the piece of hessian... It''s not much but it''s at least better than nothing.'
@@ -400,7 +398,8 @@ if hour >= 8 and hour < 20:
 				act'Dress':
 					*clr & cla
 					minut+=5
-					swamp_clothes = 1
+					gs 'clothing', 'swamp_clothes', 1
+					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
 					'You quickly rush inside the hut and hide behind a piece of hessian... It''s not much, but at least it''s better than nothing.'
 					act'Further':gt 'swamphouse'
@@ -1019,8 +1018,9 @@ if StoryLine = 1 and lost_girl > 0 and daystart > lost_girl:
 	minut += 150
 	lost_girl = 0
 	forest_lostday = 0
-	dirtyclothes = 0 & swamp_clothes = 0
+	dirtyclothes = 0
 	hanters = 0
+	gs 'clothing', 'swamp_clothes', 0
 	gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
 	gs 'stat'
 

+ 14 - 13
locations/swamphouse.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 	hantslutsexrand = rand(1,3)
 	temp_sh = rand(1,5)
-	clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
+	clothesAtLocation = FUNC('lost_clothes_here','swamphouse')
 	clothesOnLine = FUNC('lost_clothes_here','clothesline_swamp')
 
 	'<center><H4>Hut</H4></center>'
@@ -88,18 +88,18 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		end
 	end
 	!re-arrange it, there should be no logic error now by illume
-	if $clothingworntype ! 'nude' or swamp_clothes = 1:
+	if $clothingworntype ! 'nude' and clothesAtLocation = 0:
 		!have cloth, or rag on
 		act 'Undress':
 			if hantersKnowSlut > 0 or hanters = 0 or hanters = 1 and hour >= 8 and hour < 20 and hantersKnowSlut = 0:
 				cla
 				*clr
+				minut+=5
 				if $clothingworntype ! 'nude':
 					gs 'clothing', 'strip', 'swamphouse'
 				end
-				swamp_clothes = 0
 				gs 'underwear', 'remove'
-				minut+=5
+				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphouseundress.jpg"></center>'
 				'Feeling the heat in the cabin, you start removing your clothes.'
@@ -117,9 +117,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		!clothes are ready
 		if $clothingworntype = 'nude':
 			act 'Get dressed':
-				gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
-				swamp_clothes = 0
 				gs 'underwear', 'wear'
+				gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
+				gs 'stat'
 				gt 'swamphouse', 'start'
 			end
 		else
@@ -135,9 +135,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		!clothes are ready
 		if $clothingworntype = 'nude':
 			act 'Get dressed':
-				gs 'clothing', 'recover_lost_clothes', 'clothesline_swamp', 1
-				swamp_clothes = 0
 				gs 'underwear', 'wear'
+				gs 'clothing', 'recover_lost_clothes', 'clothesline_swamp', 1
+				gs 'stat'
 				gt 'swamphouse', 'start'
 			end
 		else
@@ -155,8 +155,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			gt 'selfplay', 'start'
 		end
 	end
-	if $clothingworntype = 'nude' and swamp_clothes = 0:
-		act 'Look for your clothes':
+	if ($clothingworntype = 'nude' and swamp_clothes = 0) or swamp_enema = 0:
+		act 'Look for some clothes':
 			cla
 			*clr
 			minut += 10
@@ -167,8 +167,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				'You search for your clothes, but only manage to find an enema syringe... "What is this doing here?" you wonder.'
 				act 'Further': gt 'swamphouse', 'start'
 			else
-				swamp_clothes = 1
-				!gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
+				gs 'clothing', 'swamp_clothes', 1
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphouse_tkancloth.jpg"></center>'
 				'You find a piece of hessian... "Well, at least it''s something." you say to yourself.'
 				act 'Back.': gt 'swamphouse', 'start'
@@ -423,7 +423,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 					cla
 					*clr
 					minut+=5
-					swamp_clothes = 1
+					gs 'clothing', 'swamp_clothes', 1
+					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
 					'You look around searching for your clothes but can''t seem to find them, instead you hide behind a piece of hessian... It''s better than nothing.'
 					act 'Further': gt 'swamphouse', 'start'

+ 4 - 0
locations/wardrobe.qsrc

@@ -6,6 +6,10 @@ if $ARGS[0] = 'start':
 	PShoCut = ShoCut
 	PShoStyle = ShoStyle
 	$wloc = 'wardrobe'
+	if $clothingworntype = 'cheap' and clothingwornnumber = '414':
+		gs 'clothing', 'strip'
+		gs 'clothing', 'swamp_clothes', 0
+	end
 	if ward_img_hgt = 0:ward_img_hgt = 150
 	'<h3><center><b><font color="maroon">Wardrobe overview</b></h3><br><center><font color="maroon">These are the clothes you are currently wearing - Click on an item to change it</font></center>'
 	'<br><center><table border=0 cellspacing=<<ward_img_hgt/25>> cellpadding=5>'