KevinSmarts 9 éve
szülő
commit
8c235c47dc

+ 1 - 1
locations/buklinik_event

@@ -148,7 +148,7 @@ if $ARGS[0] = 'pos9':
 	'Tramp:- No way! I''m good here. Come visit speaking panties, make the old man company, hehe.'
 	'Girl:- That''s the same old pervert the <<$name>> you have any ideas as to lure him from there?'
 
-	if horny>50 and tanga = 1 and PCloSkirt > 0 or horny > 50 and tanga = 1 and glamur = 1:
+	if horny>50 and tanga = 1 and PCloSkirt > 1:
 		act 'There is one idea':gt 'buklinik_event', 'pos10'
 	end
 	act 'I have no idea':gt 'buklinik', 'olga2'

+ 27 - 17
locations/clothing

@@ -1,23 +1,30 @@
 # clothing
 
 $clothing_list_line = {
-	!! a single line in a clothing list (wardrobe, etc)
-	!! ARGS 0 - action type (wardrobe, sell)
-	!! ARGS 1 - clothing type
-	!! ARGS 2 - clothing index
-
-	$RESULT = FUNC('$short_description', $ARGS[1])
-	$RESULT += '<<ARGS[2]>>'
-	if $ARGS[1] ! 'school' and $ARGS[1] ! 'ero' and $ARGS[1] ! 'sforma':
-		$RESULT += ' (strength ' + dyneval '$RESULT += <<$ARGS[1]>>H[<<ARGS[2]>>]'
-
-		if $ARGS[1] ! 'exercise' and $ARGS[1] ! 'coat' and CloStyle ! 5:
-			$RESULT += ', hip size ' + dyneval '$RESULT += <<$ARGS[1]>>B[<<ARGS[2]>>]'
-		end
-
-		$RESULT += ')'
-	end
-	$RESULT += ' <a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a>'
+   !! a single line in a clothing list (wardrobe, etc)
+   !! ARGS 0 - action type (wardrobe, sell)
+   !! ARGS 1 - clothing type
+   !! ARGS 2 - clothing index
+
+   !$RESULT = FUNC('$short_description', $ARGS[1])
+   !$RESULT += '<<ARGS[2]>>'
+   $RESULT = '<TR><TD><<FUNC(''$short_description'', $ARGS[1])>> <<ARGS[2]>></TD>'
+   if $ARGS[1] ! 'school' and $ARGS[1] ! 'ero' and $ARGS[1] ! 'sforma':
+      !$RESULT += ' (strength ' + dyneval '$RESULT += <<$ARGS[1]>>H[<<ARGS[2]>>]'
+      $RESULT += '<TD>' + dyneval '$RESULT += <<$ARGS[1]>>H[<<ARGS[2]>>]' + '</TD>'
+
+      if $ARGS[1] ! 'exercise' and $ARGS[1] ! 'coat' and CloStyle ! 5:
+         !$RESULT += ', hip size ' + dyneval '$RESULT += <<$ARGS[1]>>B[<<ARGS[2]>>]'
+         $RESULT += '<TD>' + dyneval '$RESULT += <<$ARGS[1]>>B[<<ARGS[2]>>]' + '</TD>'
+      else
+         $RESULT += '<TD></TD>'
+      end
+
+      !$RESULT += ')'
+   else
+      $RESULT += '<TD td colspan="2"></TD>'
+   end
+   $RESULT += '<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a></TD>'
 }
 
 if $ARGS[0] = 'view_clothing_list':
@@ -27,6 +34,8 @@ if $ARGS[0] = 'view_clothing_list':
 
 	act 'Leave':gt $loc, $metka
 
+	'<table border=1><TH>name</TH><TH>strength</TH><TH>hip size</TH><TH>action</TH>'
+
 	if $ARGS[1] = 'wardrobe':
 		if $clothingworntype ! 'nude':act 'Strip':gs 'clothing', 'strip' & gt $loc, $metka
 		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and ($clothingworntype ! 'school' or clothingwornnumber ! 6):dyneval($clothing_list_line, $ARGS[1], 'school', 6)
@@ -105,6 +114,7 @@ if $ARGS[0] = 'view_clothing_list':
 		i += 1
 	if i <= 30:jump 'loopswimwear'
 
+	'</table>' 
 end
 
 if $ARGS[0] = 'view_clothing_item':

+ 1 - 1
locations/gor_exh

@@ -18,7 +18,7 @@ if $ARGS[0] = 'pos1':
 
 	! WD: Bimbo look
 	if hcol = 3 and (exhibi + lip + skin + mop + tits) >= 15 and PCloBimbo = 1:
-	! if exhibi >= 2 and ski = 1 and hcol = 3 and lip >= 3 and skin >= 2 and mop = 4 or glamur = 1 and hcol = 3 and lip >= 3 and skin >= 2 and mop = 4:
+	! if exhibi >= 2 and hcol = 3 and lip >= 3 and skin >= 2 and mop = 4 and PCloBimbo = 1:
  		act 'Dress like a Bimbo':
 			cla
 			*clr

+ 1 - 1
locations/koncepod

@@ -26,7 +26,7 @@ act 'Climb':gt'koncepod1','krr2x1'
 
 
 
-if tanga = 0 and PCloSkirt > 3 and hour > 6 and hour <= 20 or tanga = 0 and glamur = 1 and hour >= 6 and hour <= 20:
+if tanga = 0 and PCloSkirt > 3 and hour > 6 and hour <= 20:
 	nurand = RAND(0,100)
 	if nurand >= 90:
 		manna = manna - 5

+ 6 - 6
locations/meet

@@ -93,13 +93,13 @@ if $ARGS[0] = 'start':
 		exit
 	end
 
-	if mop > 1 and glamur = 1 and curly > 0 and love = 1 and harakBoyA = 0:
+	if mop > 1 and ($clothingworntype = 'expensive' or $clothingworntype = 'formal') and curly > 0 and love = 1 and harakBoyA = 0:
 		'<<$boyA>> looks very excited, he decided to look around you that you are willing to appear before his mother.'
 
 		act 'Meet the parents':gt 'love', 'mother'
 
 		exit
-	elseif mop > 1 and glamur = 1 and curly > 0 and love = 1 and harakBoyA = 1 and tanga = 1:
+	elseif mop > 1 and ($clothingworntype = 'expensive' or $clothingworntype = 'formal') and curly > 0 and love = 1 and harakBoyA = 1 and tanga = 1:
 		'<<$boyA>> examining you decided that you are ready to appear before his friends.'
 
 		act 'Meet his friends':gt 'love', 'frends'
@@ -413,7 +413,7 @@ if $ARGS[0] = 'a':
 	end
 
 	if financeA = 0:
-		if glamur = 1:
+		if ($clothingworntype = 'expensive' or $clothingworntype = 'formal') and PCloSkirt > 0:
 			bfa -= (harakBoyA + 1)
 			'"And you dress smartly, " remarked skeptical <<$boyA>> looking at your expensive dress.'
 		end
@@ -451,7 +451,7 @@ if $ARGS[0] = 'a':
 			exit
 		end
 	elseif financeA = 1:
-		if glamur = 1 or skirt = 1:
+		if ($clothingworntype = 'expensive' or $clothingworntype = 'formal'):
 			boyA += (harakBoyA + 1)
 			'"Great clothes, " said admiringly <<$boyA>>.'
 		end
@@ -501,10 +501,10 @@ if $ARGS[0] = 'a':
 			exit
 		end
 	elseif financeA = 2:
-		if glamur = 1:
+		if ($clothingworntype = 'expensive' or $clothingworntype = 'formal') and PCloSkirt > 0:
 			bfa += (harakBoyA + 1)
 			'"You''ve got great taste in clothes, " said admiringly <<$boyA>> looking at your expensive dress.'
-		elseif glamur = 0:
+		elseif $clothingworntype ! 'expensive' and $clothingworntype ! 'formal':
 			bfa -= harakBoyA + 1
 			'"Dear naryadets" remarked skeptical <<$boyA>> examining your unpretentious clothes.'
 		end

+ 2 - 2
locations/metro

@@ -79,14 +79,14 @@ if $ARGS[0] = 'vagon':
 
 		if frotrand >= 90 - (frot * 10) and frot < 3:
 			gt 'frot', 'a'
-		elseif frotrand >= 90 - (frot * 10) and frot >= 3 and spdirtyc = 0 and PCloSkirt > 0 or frotrand >= 90 - (frot * 10) and frot >= 3 and spdirtyc = 0 and glamur = 1:
+		elseif frotrand >= 90 - (frot * 10) and frot >= 3 and spdirtyc = 0 and PCloSkirt > 0:
 			tipfrot = rand(0, 1)
 
 			if tipfrot = 0:gt 'frot', 'b'
 			if tipfrot = 1:gt 'frot', 'd1'
 
 			!!gt 'frot', 'b'
-		elseif frotrand >= 90 - (frot * 10) and frot >= 3 and spdirtyc = 0 and PCloSkirt = 0 or frotrand >= 90 - (frot * 10) and frot >= 3 and spdirtyc = 0 and glamur = 0:
+		elseif frotrand >= 90 - (frot * 10) and frot >= 3 and spdirtyc = 0 and PCloSkirt = 0:
 			tipfrot = rand(0, 2)
 
 			if tipfrot =0:gt 'frot', 'c'

+ 1 - 1
locations/park

@@ -51,7 +51,7 @@ if $ARGS[0] = 'start':
 		'Stands near the park <a href="exec:GS ''carF'', ''start''">your <<$car>></a>.'
 	end
 
-	if tanga = 0 and ski = 1 and hour > 6 and hour <= 20 or tanga = 0 and glamur = 1 and hour > 6 and hour <= 20:
+	if tanga = 0 and PCloSkirt > 2 and hour > 6 and hour <= 20:
 		nurand = rand(0, 100)
 
 		if nurand >= 80:

+ 1 - 1
locations/rinok

@@ -183,7 +183,7 @@ if $ARGS[0] = 'start':
 
 	'On one of the tents hangs a sign <a href="exec:gt ''clothing'', ''view_clothing_list'', ''sell''">"Cash paid for secondhand clothes"</a>'
 
-	if analplugIN = 1 and tanga = 0 and ski = 1 or analplugIN = 1 and tanga = 0 and glamur = 1:
+	if analplugIN = 1 and tanga = 0 and PCloSkirt > 2:
 		nurand = rand(0, 100)
 
 		if nurand >= 80:

+ 3 - 2
locations/stat

@@ -1028,8 +1028,9 @@ else
 			end
 
 			! WD: Clothing
-			if Sexual = 1 and horny < 70:set horny += rand(0, 2)
-			if glamur = 1 and horny < 50:set horny += rand(0, 1)
+			if CloStyle = 4 and horny < 70:set horny += rand(0, 2)
+			if (PCloSkirt > 5 or PCloPants > 5) and horny < 50:set horny += rand(0, 1)
+			if PCloTopCut = 4 and horny < 50:set horny += rand(0, 1)
 		end
 			
 !!SECTION: Bimbo (15 minute interval update checks)

+ 1 - 1
locations/street_event

@@ -320,7 +320,7 @@ if shantpopala > 0:
 	streetrand=-1 & exit
 end
 
-if tanga = 0 and ski = 1 and hour > 6 and hour <= 20 or tanga = 0 and glamur = 1 and hour > 6 and hour <= 20:
+if tanga = 0 and PCloSkirt > 2 and hour > 6 and hour <= 20:
 	nurand = rand(0, 100)
 
 	if nurand >= streetev_pantie: