Ver Fonte

:womans_clothes:

KevinSmarts há 9 anos atrás
pai
commit
ff3a3dbce6
5 ficheiros alterados com 31 adições e 34 exclusões
  1. 1 1
      locations/Prostitute
  2. 19 6
      locations/bass
  3. 2 18
      locations/gLakeNude
  4. 2 2
      locations/obj_din
  5. 7 7
      locations/svi

+ 1 - 1
locations/Prostitute

@@ -77,7 +77,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if whoreQW > 1 and $clothingworntype = 'hooker' and son > 0:
+		if whoreQW > 1 and ($clothingworntype = 'naughty' and CloQuality = 2) and son > 0:
 			act 'Stand on the panel (0:15)':
 				cla
 				minut += 10

+ 19 - 6
locations/bass

@@ -1,8 +1,11 @@
 # bass
 if $ARGS[0] = 'start':
-	cla
-	clr
-	*clr
+	CLOSE ALL
+	$metka = $ARGS[0]
+	$loc = $CURLOC
+	$metkaM = $ARGS[0]
+	$locM = $CURLOC
+	cls
 	minut += 5
 	gs 'stat'
 	fcolor = rgb(0, 0, 0)
@@ -12,11 +15,11 @@ if $ARGS[0] = 'start':
 	'<center><img src="images/etogame/bass.jpg"></center>'
 	'Entrance to the pool costs 100 rubles, you must have a swimsuit.'
 
-	act 'Leave':minut += 5 & gt 'down'
+	act 'Use changing room':gt 'changingroom', 'view_swim_list'
 
-	if db >= 1 and bikini > 0 and Goraday ! daystart:act 'Search ZHoru':Goraday = daystart & gt 'klofdomhouse', 'ev42'
+	if db >= 1 and $clothingworntype = 'swimwear' and Goraday ! daystart:act 'Search ZHoru':Goraday = daystart & gt 'klofdomhouse', 'ev42'
 
-	if money >= 100 and bikini > 0:
+	if money >= 100 and $clothingworntype = 'swimwear':
 		act 'Pay to swim in the pool for an hour (100 rubles)':
 			cla
 			minut += 5
@@ -24,6 +27,16 @@ if $ARGS[0] = 'start':
 			gt 'bass', 'a'
 		end
 	end
+	act'Leave':
+		if $clothingworntype = 'swimwear':
+			cla
+			'You need to get dressed in regular clothing first.'
+			act'Return':gt'bass', 'start'
+		else
+			minut += 5
+			gt 'down'
+		end
+	end
 end
 
 if $ARGS[0] = 'a':

+ 2 - 18
locations/gLakeNude

@@ -43,22 +43,6 @@ end
 
 'This beach is hidden from the public and as is usual, it is currently empty. You could go skinny dipping if you want, no one would see you.'
 
-if bikini_cloth=1: 
-	act'Take off your swimwear':
-		cla
-		bikini_cloth=0
-		if tangamemb = 1: 
-			tanga = 0
-		else 
-			tanga = 1
-		end
-		minut+=5
-		odevnesh+=5
-		'You take off your swimsuit.'
-		act'Continue':gt'gLakeNude'
-	end
-end
-
 if $clothingworntype = 'nude':
 	act'Get dressed':
 		cla
@@ -88,7 +72,7 @@ if temper >= 20 and month>=5 and month<=9:
 		
 	if hour>=6 and hour<=20:
 		act 'Go swimming (1:00)':
-			if bikini = 1 or $clothingworntype = 'nude':
+			if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 				cla
 				*clr
 				cumspclnt = 4
@@ -116,7 +100,7 @@ if temper >= 20 and month>=5 and month<=9:
 	end
 	if sunWeather = 1 and hour>=6 and hour<=20:
 		act 'Go sunbathing (1:00)':
-			if bikini = 1 or $clothingworntype = 'nude':
+			if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 				cla
 				*clr
 				minut = minut + 60

+ 2 - 2
locations/obj_din

@@ -528,9 +528,9 @@ $objclothes = {
 		pl 'You are dressed like a bimbo.'
 	else
 		view FUNC('$clothing_image', $clothingworntype, clothingwornnumber)
-		pl 'You are wearing ' + FUNC('$clothing_name', $clothingworntype, clothingwornnumber) + '.'
+		pl 'You are wearing ' + FUNC('$short_description', $clothingworntype) + '<<clothingwornnumber>>''.'
 
-		if $clothingworntype ! 'vatnik' and $clothingworntype ! 'sforma' and $clothingworntype ! 'ero':
+		if $ARGS[2] ! 'exercise' and $ARGS[2] ! 'coat' and CloStyle ! 5:
 			$RESULT = '(strength '
 			dynamic '$RESULT += <<$clothingworntype>>H[<<clothingwornnumber>>]'
 			if $clothingworntype ! 'yoga' and $clothingworntype ! 'sarafan':

+ 7 - 7
locations/svi

@@ -27,7 +27,7 @@ if $ARGS[0] = 'poor':
 		exit
 	end
 
-	if $clothingworntype = 'vatnik':
+	if temper < 0 and defaultcoat = 5:
 		!!quilted_jacket
 		bfA -= 1
 
@@ -43,7 +43,7 @@ if $ARGS[0] = 'poor':
 		exit
 	end
 
-	if harakBoyA > 0 and izvrat = 0 and (cumface > 0 or cumlip > 0):
+	if harakBoyA > 0 and izvrat = 0 and spdirtyv > 0:
 		bfA = 0
 		'<<$boyA>> you saw traces of semen. He called you slut had severed relations with you.'
 
@@ -222,7 +222,7 @@ if $ARGS[0] = 'norm':
 		exit
 	end
 
-	if $clothingworntype = 'vatnik':
+	if temper < 0 and defaultcoat = 5:
 		!!quilted_jacket
 		bfA -= 1
 
@@ -235,7 +235,7 @@ if $ARGS[0] = 'norm':
 		exit
 	end
 
-	if harakBoyA > 0 and izvrat = 0 and (cumface > 0 or cumlip > 0):
+	if harakBoyA > 0 and izvrat = 0 and spdirtyv > 0:
 		bfA = 0
 		'<<$boyA>> you saw traces of semen. He called you slut had severed relations with you.'
 
@@ -422,8 +422,8 @@ if $ARGS[0] = 'reach':
 		exit
 	end
 
-	if $clothingworntype = 'vatnik':
-		!!quilted_jacket
+	if temper < 0 and defaultcoat = 5:
+	!!quilted_jacket
 		bfA -= 1
 
 		if harakBoyA = 0:'<<$boyA>> tells you that he appeared urgent business.'
@@ -435,7 +435,7 @@ if $ARGS[0] = 'reach':
 		exit
 	end
 
-	if harakBoyA > 0 and izvrat = 0 and (cumface > 0 or cumlip > 0):
+	if harakBoyA > 0 and izvrat = 0 and spdirtyv > 0:
 		bfA = 0
 		'<<$boyA>> you saw traces of semen. He called you slut had severed relations with you.'