Răsfoiți Sursa

:wrench: Shared bathroom exits should be set correctly now. Removed duplicate code and added message to show if you are already wearing the clothing you want to wear.

KevinSmarts 9 ani în urmă
părinte
comite
3c9b8c6953
2 a modificat fișierele cu 18 adăugiri și 14 ștergeri
  1. 7 12
      locations/clothing_QV
  2. 11 2
      locations/vann

+ 7 - 12
locations/clothing_QV

@@ -135,20 +135,15 @@ if $ARGS[0] = 'change':
 		end
 	end
 
-	if $ARGS[1] = 'naughty' and CloQuality < 4:'This outfit can be used for prostitution.'
-	if $ARGS[1] = 'uniform':
-		if CloStyle2 = 1:
-			'This outfit is considered to be a maid uniform.'
-		else
-			'This outfit is a server uniform, suitable for jobs that require one.'
+	if $clothingworntype = $ARGS[1] and clothingwornnumber = ARGS[2]:
+		'You are wearing this outfit.'
+	else
+		act 'Wear this outfit':
+			gs 'clothing', 'wear', $ARGS[1], ARGS[2]
+			dynamic $ARGS[1] + 'W[<<ARGS[2]>>] = 1'
+			gt $loc, $metka
 		end
 	end
-
-	act 'Wear this outfit':
-		gs 'clothing', 'wear', $ARGS[1], ARGS[2]
-		dynamic $ARGS[1] + 'W[<<ARGS[2]>>] = 1'
-		gt $loc, $metka
-	end
 	act 'Choose another outfit': gt 'clothing_QV', 'list'
 	act 'Leave':gt $loc, $metka
 end

+ 11 - 2
locations/vann

@@ -16,6 +16,10 @@ $stirkao = {
 if $ARGS[0] = 'start':
 	cla
 	clr
+	if obdysh = 1:
+		$metkaM = $ARGS[0]
+		$locM = $CURLOC
+	end
 	gs 'stat'
 
 	if obdysh = 1 and vannin = 0:
@@ -200,8 +204,13 @@ end
 
 if $ARGS[0] = 'fin':
 	cla
-	vannin = 0
-	gt $locM, $metkaM
+	if obdysh = 1:
+		obdysh = 0
+		gt 'dorm', 'korr'
+	else
+		vannin = 0
+		gt $locM, $metkaM
+	end
 end
 
 if $ARGS[0] = 'brit1':