Explorar o código

[fixed] CloSkirtShortness replaced with PCloSkirt in various checks

Sicaa %!s(int64=4) %!d(string=hai) anos
pai
achega
2d0ca7d588

+ 1 - 1
locations/backwater.qsrc

@@ -165,7 +165,7 @@ end
 					gs 'underwear', 'remove'
 					if huntersRape = 1: huntersRape = 2
 
-					if CloSkirtShortness > 0:
+					if PCloSkirt > 0:
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterundress_ski.jpg"></center>'
 					else
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterundress.jpg"></center>'

+ 4 - 4
locations/bicycle.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'sarai':
 					act 'Finish the trip':gt $loc, $metka
 					exit
 				end
-				if CloSkirtShortness > 0 and findvelrand > 70:
+				if PCloSkirt > 0 and findvelrand > 70:
 					if $pantyworntype ! 'none':
 						pcs_mood+=5
 						gs'stat'
@@ -69,7 +69,7 @@ if $ARGS[0] = 'sarai':
 
 					exit
 				end
-				if CloSkirtShortness > 0 and findvelrand <= 70:
+				if PCloSkirt > 0 and findvelrand <= 70:
 					pcs_mood += 5
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
@@ -77,7 +77,7 @@ if $ARGS[0] = 'sarai':
 					act 'Finish the ride':gt $loc, $metka
 					exit
 				end
-				if CloSkirtShortness = 0:
+				if PCloSkirt = 0:
 					pcs_mood += 5
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike.jpg"></center>'
@@ -239,7 +239,7 @@ end
 if $ARGS[0] = 'clothes_findvel':
 	if $clothingworntype = 'nude':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_nude.jpg"></center>'
-	elseif CloSkirtShortness > 0:
+	elseif PCloSkirt > 0:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike.jpg"></center>'

+ 13 - 13
locations/gadforest.qsrc

@@ -127,8 +127,8 @@ if $ARGS[0] = '1':
 				menu_off = 1
 				if pcs_inhib < 50:inhib_exp += rand(1,3)
 				minut += 5
-				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>'
+				if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+				if PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
 				gs 'underwear', 'remove'
 				gs 'clothing', 'strip', 'gadforest'
 				gs 'exhibitionism', 3
@@ -158,8 +158,8 @@ if $ARGS[0] = '1':
 			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>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+			if PCloSkirt > 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
@@ -211,9 +211,9 @@ if $ARGS[0] = '1':
 
 			if month >= 4 and month <= 10:
 				if MiraLoc ! 3:
-					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
-					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest1.'+rand(1,3)+'.jpg"></center>'
-					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga0.'+rand(1,2)+'.jpg"></center>'
+					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
+					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest1.'+rand(1,3)+'.jpg"></center>'
+					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga0.'+rand(1,2)+'.jpg"></center>'
 					if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_nude0.'+rand(1,4)+'.jpg"></center>'
 					'You are walking through the woods, enjoying the sounds of the forest and the fresh air.'
 				else
@@ -632,9 +632,9 @@ end
 !dynamics to ARGS by illume
 if $ARGS[0] = 'clothes1':
 	if MiraLoc ! 3:
-		if $clothingworntype ! 'nude' and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
-		if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
-		if $clothingworntype ! 'nude' and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
+		if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
+		if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
+		if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
 		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom4.'+rand(1,3)+'.jpg"></center>'
 
 	else
@@ -645,9 +645,9 @@ end
 
 if $ARGS[0] = 'clothes2':
 	if MiraLoc ! 3:
-		if $clothingworntype ! 'nude' and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest2.jpg"></center>'
-		if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest3.jpg"></center>'
-		if $clothingworntype ! 'nude' and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga1.'+rand(1,2)+'.jpg"></center>'
+		if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest2.jpg"></center>'
+		if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest3.jpg"></center>'
+		if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga1.'+rand(1,2)+'.jpg"></center>'
 		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_nude1.'+rand(1,4)+'.jpg"></center>'
 	else
 		if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom3.jpg"></center>'

+ 10 - 10
locations/gadforest_event.qsrc

@@ -2103,8 +2103,8 @@ if $ARGS[0] = 'nude_event':
 			gs 'exhibitionism', 3
 			gs 'stat'
 
-			if CloSkirtShortness = 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
-			if CloSkirtShortness > 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+			if PCloSkirt = 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+			if PCloSkirt > 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
 			if MiraLoc = 3:'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest5.jpg"></center>'
 
 			if MiraLoc ! 3:'You do not hesitate and quickly get undressed, leaving your clothes in a pile on the forest floor.'
@@ -2125,9 +2125,9 @@ if $ARGS[0] = 'nude_event':
 
 		if MiraLoc = 3:'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest2.jpg"></center>'
 		if MiraLoc ! 3:
-			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
-			if $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest1.'+rand(1,3)+'.jpg"></center>'
-			if $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga0.'+rand(1,2)+'.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
+			if $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest1.'+rand(1,3)+'.jpg"></center>'
+			if $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga0.'+rand(1,2)+'.jpg"></center>'
 		end
 
 		if MiraLoc ! 3:'Although the temptation to strip naked is very strong, you are too afraid of getting caught so you decide to keep your clothes on.'
@@ -2246,9 +2246,9 @@ if $ARGS[0] = 'mushroom':
 		boletus += rand(5,10)
 		gs 'stat'
 
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
+		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
+		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
+		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
 		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom4.'+rand(1,2)+'.jpg"></center>'
 
 		'You begin collecting mushrooms trying to make everything fit in the basket.'
@@ -2328,8 +2328,8 @@ if $ARGS[0] = 'picnic':
 			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>'
-			if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+			if PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
 			'You changed into your clothes.'
 			act 'Continue': gt 'gadforest','1'
 		end

+ 2 - 2
locations/gadforestlost.qsrc

@@ -252,8 +252,8 @@ if $ARGS[0] = 'gadforestlost':
 end
 
 if $ARGS[0] = 'lostclothes':
-	if $clothingworntype ! 'nude' and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch0.'+rand(1,4)+'.jpg"></center>'
-	if $clothingworntype ! 'nude' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_ski0.'+rand(1,4)+'.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch0.'+rand(1,4)+'.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_ski0.'+rand(1,4)+'.jpg"></center>'
 	if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_nude0.'+rand(1,4)+'.jpg"></center>'
 	'After wandering through the woods for an hour you decide to....'
 end

+ 11 - 11
locations/gadforestrelax.qsrc

@@ -12,11 +12,11 @@ wolfrand = rand(1,10)
 gs'stat'
 
 '<center><H4>Forest</H4></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax1.jpg"></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0 and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax2.jpg"></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness > 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski1.jpg"></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness > 0 and $pantyworntype ! 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski2.jpg"></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness > 0 and $pantyworntype = 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski3.jpg"></center>'
+if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax1.jpg"></center>'
+if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0 and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax2.jpg"></center>'
+if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski1.jpg"></center>'
+if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0 and $pantyworntype ! 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski2.jpg"></center>'
+if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0 and $pantyworntype = 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski3.jpg"></center>'
 if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_nude'+ rand(1,3) +'.jpg"></center>'
 if $clothingworntype = 'nude':inhib_exp += rand(1,3)
 'You are tired and decided to rest a little.'
@@ -137,9 +137,9 @@ if $clothingworntype ! 'nude' and bonfire = 0:
         pcs_sleep += 6
         pcs_mood += 10
         
-	    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax3.jpg"></center>'    
-	    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski4.jpg"></center>'   
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski5.jpg"></center>' 
+	    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax3.jpg"></center>'    
+	    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski4.jpg"></center>'   
+		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski5.jpg"></center>' 
         if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_nude'+rand(1,2)+'.jpg"></center>'    	    
    	    
    	    'You sit in silence for hours looking at the fire. You feel warm and rested, perhaps it''s time to move on.'
@@ -157,9 +157,9 @@ if $clothingworntype ! 'nude' and bonfire = 0:
 		    pcs_mood += 20
 		    gs'stat'
 		    
-	        if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleep.jpg"></center>'   
-	        if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski.jpg"></center>'    
-		    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski1.jpg"></center>' 
+	        if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleep.jpg"></center>'   
+	        if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski.jpg"></center>'    
+		    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski1.jpg"></center>' 
             if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepnude1.'+rand(1,2)+'.jpg"></center>'    
 		  	
 	        'You doze off for about 3 hours, you wake up feeling more cheerful and rested.'

+ 4 - 4
locations/gadforestswamp.qsrc

@@ -40,8 +40,8 @@ if $ARGS[0] = '1':
 		gs 'sweat', 'add', 15
 		gs 'stat'
 
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp.jpg"></center>'
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski.jpg"></center>'
+		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp.jpg"></center>'
+		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski.jpg"></center>'
 		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
 		'You entered the swamp and felt your feet starting to sink into the mud...'
 		temp_gads = RAND(1,100)
@@ -201,8 +201,8 @@ if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry
 	end
 end
 $swampclothes = {
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp1.jpg"></center>'
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski1.jpg"></center>'
+	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp1.jpg"></center>'
+	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski1.jpg"></center>'
 	if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
 }
 

+ 6 - 6
locations/gadgarden.qsrc

@@ -160,9 +160,9 @@ if $ARGS[0] = 'strawberry':
 			hndiwrk_exp += rand(3,9)
 			gs 'stat'
 
-			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries.jpg"></center>'
-			if CloSkirtShortness > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_ski.jpg"></center>'
-			if CloSkirtShortness > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_tanga.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_ski.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_tanga.jpg"></center>'
 			'You wander through the plot for several hours, collecting ripe strawberries and placing them in the basket.'
 
 			act 'Finish':gt'gadgarden','strawberry'
@@ -226,9 +226,9 @@ if $ARGS[0] = 'fruit_garden':
 			hndiwrk_exp += rand(3,9)
 			gs 'stat'
 
-			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect.jpg"></center>'
-			if CloSkirtShortness > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect_ski.jpg"></center>'
-			if CloSkirtShortness > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect_tanga.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect_ski.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect_tanga.jpg"></center>'
 			'You walk around the orchard and pick the ripe fruit hanging from the trees.'
 
 			act 'Finish':gt 'gadgarden','fruit_garden'

+ 2 - 2
locations/gopsex.qsrc

@@ -119,7 +119,7 @@ if $ARGS[0] = 'masturb_gg':
 		if pcs_horny >=50:
 			$dummywhere = 'into your panties'
 			if $pantyworntype = 'none': $dummywhere = 'down to your pussy'
-			if CloSkirtShortness > 0: $dummywhat = 'lift up your skirt'
+			if PCloSkirt > 0: $dummywhat = 'lift up your skirt'
 			if CloPantsShortness > 0: $dummywhat = 'unbutton and unzipp your pants'
 			if CloPantsShortness > 2: $dummywhat = 'unbutton and unzipp your shorts'
 			rnd_masturb_text = rand(1,3)
@@ -1584,7 +1584,7 @@ if $ARGS[0] = 'hide':
 	if $ARGS[1] = 'text_sex_doggy':
 		txt_sex_doggy = RAND(0,6)
 		if txt_sex_doggy = 0:
-			if CloSkirtShortness > 0: 
+			if PCloSkirt > 0: 
 				$dummytxt = 'He hikes up your skirt'
 			elseif CloPantsShortness > 2: 
 				$dummytxt = 'He pulls your shorts down to your knees'

+ 1 - 1
locations/hunter_interactions.qsrc

@@ -230,7 +230,7 @@ if $ARGS[0] = 'chat_with_hunters':
 			gs 'hunter_interactions', 'chat_with_hunters', 'boy_talk'
 		elseif boy_talk = 1 and virginity_talk = 0 and hunters_drink = 1 and rand(1,10) = 1:
 			gs 'hunter_interactions', 'chat_with_hunters', 'virginity_talk'
-		elseif CloSkirtShortness > 0 and $pantyworntype = 'none' and rand(1,9) = 1:
+		elseif PCloSkirt > 0 and $pantyworntype = 'none' and rand(1,9) = 1:
 			gs 'hunter_interactions', 'chat_with_hunters', 'pantiless_flash'
 		elseif $clothingworntype = 'nude' and $pantyworntype = 'none' and rand(1,3) = 1:
 			gs 'hunter_interactions', 'chat_with_hunters', 'nude'

+ 1 - 1
locations/hunters.qsrc

@@ -105,7 +105,7 @@ if $ARGS[0] = 'start':
 			if huntersSergeiQw < 10:huntersSergeiQw += 1
 			gs 'stat'
 
-			if CloSkirtShortness > 0 and $pantyworntype = 'none':
+			if PCloSkirt > 0 and $pantyworntype = 'none':
 				*clr & cla
 				if huntersKnowSlut > 0:hunterslut += 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersnotanga1.jpg"></center>'

+ 1 - 1
locations/placer_sex.qsrc

@@ -1890,7 +1890,7 @@ if $ARGS[0] = 'sleeping_park_bench':
 			else
 				'You wake up with a smile, stretching your arms and legs, flashing your bare pussy to the entire Park.'
 			end
-		elseif CloSkirtShortness > 0:
+		elseif PCloSkirt > 0:
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/sleeping_park.jpg"></center>'
 			if $pantyworntype ! 'none':
 				gs 'underwear', 'dispose'

+ 1 - 1
locations/porn_view.qsrc

@@ -77,7 +77,7 @@ if seepornofut < 10:
 				func('porn_view_strings', 'view_7_virgin'+iif(pcs_horny > 70,'_horny_no_tanga','_no_tanga'))
 
 				! we`ve got skirt!
-				if PCloSkirtShortness > 0:
+				if PCloSkirt > 0:
 					func('porn_view_strings','view_7_virgin_horny_no_tanga_skirt')
 				end
 

+ 6 - 6
locations/swamp_yard.qsrc

@@ -570,13 +570,13 @@ if $ARGS[0] = 'start':
 				gs 'stat'
 
 				if huntersIgorLove = 0 and huntersIgorQw >= 20 and huntersIgorQw < 25:
-					if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers2_ski.jpg"></center>'
-					if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers2.jpg"></center>'
+					if PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers2_ski.jpg"></center>'
+					if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers2.jpg"></center>'
 					'Smiling, you take the bouquet out of his hand and walk away yearning for something more.'
 				end
 				if huntersIgorLove = 0 and huntersIgorQw >= 25 and huntersIgorQw < 30 or huntersIgorLove > 0:
-					if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers3_ski.jpg"></center>'
-					if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers3.jpg"></center>'
+					if PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers3_ski.jpg"></center>'
+					if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers3.jpg"></center>'
 					'Smiling, you take the bouquet from his hands and walk away cherfully.'
 				end
 				if huntersIgorLove = 0 and huntersIgorQw >= 30:
@@ -977,7 +977,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 		!! wind lifts skirt
-		if hunters_outside = 1 and huntersknow = 0 and CloSkirtShortness > 1 and $pantyworntype = 'none' and RAND(1,20) = 1:
+		if hunters_outside = 1 and huntersknow = 0 and PCloSkirt > 1 and $pantyworntype = 'none' and RAND(1,20) = 1:
 			*clr & cla
 			hunterslut += 1
 			gs 'stat'
@@ -1022,7 +1022,7 @@ if $ARGS[0] = 'start':
 		end
 		! wind lifts skirt
 		skirtsrand = RAND(1,10)
-		if hunters_outside = 1 and huntersknow = 0 and CloSkirtShortness > 1 and $pantyworntype = 'none' and skirtsrand = 1:
+		if hunters_outside = 1 and huntersknow = 0 and PCloSkirt > 1 and $pantyworntype = 'none' and skirtsrand = 1:
 			*clr & cla
 			hunterslut += 1
 			gs 'stat'