소스 검색

Added uniforms to store and fixed maid uniform check for BDSM club.

KevinSmarts 9 년 전
부모
커밋
f914ce4774
3개의 변경된 파일52개의 추가작업 그리고 8개의 파일을 삭제
  1. 4 2
      locations/BDSM_Club
  2. 1 1
      locations/BDSM_training
  3. 47 5
      locations/budgetclothes

+ 4 - 2
locations/BDSM_Club

@@ -36,6 +36,8 @@ if $ARGS[0] = 'start':
 	elseif BDSMmeet = 1 and BDSMday ! daystart:
 		if money < 10000:
 			'You go to the Club entrance but don''t have enough money, you try to negotiate a deal to pay later, but the staff, realising you are not going to pay, call security. You are walked back to the gate.'
+		elseif $clothingworntype ! 'uniform' or PCloStyle2 ! 1:
+			'You are not wearing a maid uniform and security refuse you entry.'
 		else
 			if $BDSMrole = 's':
 				gt 'BDSM_training', 'start'
@@ -107,9 +109,9 @@ if $ARGS[0] = 'in':
 				'"Listen carefully..."'
 				'She explains to you, that the club costs 20,000 rubles per 30 days access, with a 10,000 ruble registration fee. For slaves there is a means for discount, if the slave is well behaved and earns enough merits, the membership will be automatically extended.'
 				'Untrained slaves are not allowed in the Mansion, you will require training. You''ll have to report to me for that, I''m going to enjoy it.'
-				'"Come back when you are ready for training. Be clean, have an enema. Please bring a maid outfit. Everything clear?'
+				'"Come back when you are ready for training. Be clean, have an enema. You must own a maid outfit, so you will be wearing it. Everything clear?'
 				'"But...  what if I don''t have a maid outfit?..." You whisper.'
-				'"Find a branch of G & M and buy one, bring it and the first installment of 10 thousand rubles. We are not a charitable organization, nothing is free. However, if you prove yourself as a sub, you will be able to earn some tips in private sessions. But the main thing – do not talk. We have important clients, and don''t need advertising. Everything clear?"'
+				'"Find a branch of G & M and buy one, and don't forget to bring the first instalment of 10 thousand rubles. We are not a charitable organization, nothing is free. However, if you prove yourself as a sub, you will be able to earn some tips in private sessions. But the main thing – do not talk. We have important clients, and don''t need advertising. Everything clear?"'
 				'"Clear... Mistress..."'
 				'As you are leaving, you think, where will you get the money for the down payment.'
 				act 'Logout':gt 'BDSM_Club', 'start'

+ 1 - 1
locations/BDSM_training

@@ -430,7 +430,7 @@ if $ARGS[0] = '3':
 										gs 'stat'
 										'<center><img src="images/BDSM_Club/r<<BDSMmeet>>_10.jpg"></center>'
 										'"Now jerk!" Orders Mistress.'
-										'You begin to pull at your Clit, while grinding on the dick. Soon you feel, that you are at the brink, and ask permission.'
+										'You begin to pull at your clit, while grinding on the dick. Soon you feel, that you are at the brink, and ask permission.'
 										'"Finish!" Allows Mistress.'
 										'You shout "Cumming!". You are having an orgasm of unprecedented power. At the peak point, Mistress abruptly pulls the strings, tearing the clothespins from you. You think that she ripped off the skin, it is very painful and pleasant at the same time.'
 										act 'Breathe':

+ 47 - 5
locations/budgetclothes

@@ -23,6 +23,12 @@ if $ARGS[0] = 'start':
 		gt 'budgetclothes', 'office'
 	end
 
+	act 'View uniforms':
+		cla
+		minut += 5
+		gt 'budgetclothes', 'uniform'
+	end
+
 	act 'View school uniforms':
 		cla
 		minut += 5
@@ -39,7 +45,6 @@ if $ARGS[0] = 'start':
 		cla
 		if torg = 1:
 			minut += 3
-			torg = 0
 			gt 'torgcentr'
 		else
 			gt 'Gshveyfab', 'start'
@@ -81,7 +86,7 @@ if $ARGS[0] = 'cheapclo':
 	
 	if cheap[i] ! 0:
 		msg 'You already own these clothes.'
-		gt $loc, $metka
+		gt 'budgetclothes', 'clothes'
 	end
 
 	gt 'clothing', 'view_clothing_item', 'shop', 'cheap',i, 2000
@@ -118,12 +123,49 @@ if $ARGS[0] = 'officeclo':
 	
 	if office[i] ! 0:
 		msg 'You already own these clothes.'
-		gt $loc, $metka
+		gt 'budgetclothes', 'office'
 	end
 
 	gt 'clothing', 'view_clothing_item', 'shop', 'office',i, 4000
 end
 
+if $ARGS[0] = 'uniform':
+	$metka = $ARGS[0]
+	$loc = $CURLOC
+	cls
+	gs'stat'
+
+	act 'Return':
+		cla
+		minut += 5
+		gt 'budgetclothes', 'start'
+	end
+
+	if Clothingstock > 7:
+		i = 1
+	elseif Clothingstock > 15:
+		i = 2
+	else
+		i = 3
+	end
+
+	:loopuniform
+		if uniform[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''uniformclo''"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/10uniform/Uniform<<i>>.jpg" 	height="250" /></div></a>'
+		i += 3
+	if i <= 24:jump 'loopuniform'
+end
+
+if $ARGS[0] = 'uniformclo':
+	cla
+	
+	if uniform[i] ! 0:
+		msg 'You already own these clothes.'
+		gt 'budgetclothes', 'uniform'
+	end
+
+	gt 'clothing', 'view_clothing_item', 'shop', 'uniform',i, 3000
+end
+
 if $ARGS[0] = 'school':
 	$metka = $ARGS[0]
 	$loc = $CURLOC
@@ -153,7 +195,7 @@ if $ARGS[0] = 'schoolclo':
 	
 	if school[i] ! 0:
 		msg 'You already own these clothes.'
-		gt $loc, $metka
+		gt 'budgetclothes', 'school'
 	end
 
 	gt 'clothing', 'view_clothing_item', 'shop', 'school',i, 3000
@@ -186,7 +228,7 @@ if $ARGS[0] = 'coatsclo':
 	
 	if coat[i] ! 0:
 		msg 'You already own these clothes.'
-		gt $loc, $metka
+		gt 'budgetclothes', 'coats'
 	end
 
 	gt 'clothing', 'view_clothing_item', 'shop', 'coat',i, 8000