Bläddra i källkod

Clothing fixes

KevinSmarts 9 år sedan
förälder
incheckning
e3e05a88a6

+ 1 - 1
locations/Gadsarai

@@ -296,7 +296,7 @@ else
 				act 'End trip':gt $loc
 				exit
 			end
-			if (glamur > 0 or ski > 0):
+			if PCloSkirt > 0:
 				if findvelrand > 70:
 					if tanga=1:
 						horny += 5

+ 2 - 1
locations/Gnpc

@@ -119,7 +119,8 @@ act 'Walking through the square':
 	if mop = 3:otnBoyFrend[numnpc] += 2
 	if mop = 4:otnBoyFrend[numnpc] -= 5
 	if sweat > 0:otnBoyFrend[numnpc] -= 5
-	if ski > 0 or glamur > 0:otnBoyFrend[numnpc] += 2
+	if PCloSkirt > 2:otnBoyFrend[numnpc] += 3
+	if PCloPants > 3:otnBoyFrend[numnpc] += 2
 
 	minut += 15
 	boytimes[numnpc] += 1

+ 1 - 1
locations/Snpc

@@ -243,7 +243,7 @@ if numnpc = 14 and meynoldQW = 1:
 	end
 end
 
-if numnpc = 14 and rand(1,5) = 1 and npcSex[14] = 1 and tanga = 0 and (ski > 0 or glamur > 0) and tangaday ! daystart :  gt 'Katja_tanga' 
+if numnpc = 14 and rand(1,5) = 1 and npcSex[14] = 1 and tanga = 0 and PCloSkirt > 1 and tangaday ! daystart :  gt 'Katja_tanga' 
 if numnpc = 14 and rand(1,5) = 1 and Katja_tanga_end=1  and horny > 60 :
 	*clr
 	if $loc = 'gdkin':

+ 31 - 31
locations/clothing

@@ -46,7 +46,7 @@ $clothing_list_line = {
 
 	$RESULT += '<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a>'
 	if ($ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear') and dyneval('RESULT = <<$ARGS[1]>>H[<<ARGS[2]>>]') > 0:
-		$RESULT += '<a href="exec:gs ''clothing_attributes'', $ARGS[2], ARGS[3] & gs ''clothing'', ''wear'', ''<<$ARGS[1]>>'', <<ARGS[2]>> & gt ''clothing'', ''view_clothing_list'', ''wardrobe''">Wear</a></TD>'
+		$RESULT += ' <a href="exec:gs ''clothing'', ''wear'', ''<<$ARGS[1]>>'', <<ARGS[2]>> & gt ''clothing'', ''view_clothing_list'', ''wardrobe''">Wear</a></TD>'
 	else
 		$RESULT += '</TD>'
 	end
@@ -63,79 +63,79 @@ if $ARGS[0] = 'view_clothing_list':
 
 	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)
+		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and ($clothingworntype ! 'school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ARGS[1], 'school', 6)
 	end
 
 	i = 1
 	:loopcheap
-		if cheap[i] = 1 and ($clothingworntype ! 'cheap' or clothingwornnumber ! i):dyneval($clothing_list_line, $ARGS[1], 'cheap', i)
+		if cheap[i] = 1 and ($clothingworntype ! 'cheap' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'cheap', i)
 		i += 1
 	if i <= 85:jump 'loopcheap'
 
 	i = 1
 	:loopaverage
-		if average[i] = 1 and ($clothingworntype ! 'average' or clothingwornnumber ! i):dyneval($clothing_list_line, $ARGS[1], 'average', i)
+		if average[i] = 1 and ($clothingworntype ! 'average' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'average', i)
 		i += 1
 	if i <= 125:jump 'loopaverage'
 
 	i = 1
 	:loopexpensive
-		if expensive[i] = 1 and ($clothingworntype ! 'expensive' or clothingwornnumber ! i):dyneval($clothing_list_line, $ARGS[1], 'expensive', i)
+		if expensive[i] = 1 and ($clothingworntype ! 'expensive' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'expensive', i)
 		i += 1
 	if i <= 147:jump 'loopexpensive'
 
 	i = 1
 	:loopformal
-		if formal[i] = 1 and ($clothingworntype ! 'formal' or clothingwornnumber ! i):dyneval($clothing_list_line, $ARGS[1], 'formal', i)
+		if formal[i] = 1 and ($clothingworntype ! 'formal' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'formal', i)
 		i += 1
 	if i <= 14:jump 'loopformal'
 
 	i = 1
 	:loopoffice
-		if office[i] = 1 and ($clothingworntype ! 'office' or clothingwornnumber ! i):dyneval($clothing_list_line, $ARGS[1], 'office', i)
+		if office[i] = 1 and ($clothingworntype ! 'office' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'office', i)
 		i += 1
 	if i <= 30:jump 'loopoffice'
 
 	i = 1
 	:loopschool
-		if school[i] = 1 and ($clothingworntype ! 'school' or clothingwornnumber ! i):dyneval($clothing_list_line, $ARGS[1], 'school', i)
+		if school[i] = 1 and ($clothingworntype ! 'school' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'school', i)
 		i += 1
 		if i = 6: i = 7
 	if i <= 14:jump 'loopschool'
 
 	i = 1
 	:loopexercise
-		if exercise[i] = 1 and ($clothingworntype ! 'exercise' or clothingwornnumber ! i):dyneval($clothing_list_line, $ARGS[1], 'exercise', i)
+		if exercise[i] = 1 and ($clothingworntype ! 'exercise' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'exercise', i)
 		i += 1
 	if i <= 26:jump 'loopexercise'
 
 	i = 1
 	:loopnaughty
-		if naughty[i] = 1 and ($clothingworntype ! 'naughty' or clothingwornnumber ! i):dyneval($clothing_list_line, $ARGS[1], 'naughty', i)
+		if naughty[i] = 1 and ($clothingworntype ! 'naughty' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'naughty', i)
 		i += 1
 	if i <= 67:jump 'loopnaughty'
 
 	i = 1
 	:loopexhibit
-		if exhibit[i] = 1 and ($clothingworntype ! 'exhibit' or clothingwornnumber ! i):dyneval($clothing_list_line, $ARGS[1], 'exhibit', i)
+		if exhibit[i] = 1 and ($clothingworntype ! 'exhibit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'exhibit', i)
 		i += 1
 	if i <= 30:jump 'loopexhibit'
 
 	i = 1
 	:loopuniform
-		if uniform[i] = 1 and ($clothingworntype ! 'uniform' or clothingwornnumber ! i):dyneval($clothing_list_line, $ARGS[1], 'uniform', i)
+		if uniform[i] = 1 and ($clothingworntype ! 'uniform' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'uniform', i)
 		i += 1
 	if i <= 24:jump 'loopuniform'
 
 	i = 1
 	:loopcoat
-		if coat[i] = 1:dyneval($coat_list_line, $ARGS[1], 'coat', i)
+		if coat[i] = 1:*P dyneval($coat_list_line, $ARGS[1], 'coat', i)
 		i += 1
 	if i <= 12:jump 'loopcoat'
 
 	i = 1
 	:loopswimwear
-		if swimwear[i] = 1:dyneval($clothing_list_line, $ARGS[1], 'swimwear', i)
+		if swimwear[i] = 1:*P dyneval($clothing_list_line, $ARGS[1], 'swimwear', i)
 		i += 1
 	if i <= 30:jump 'loopswimwear'
 
@@ -190,7 +190,7 @@ if $ARGS[0] = 'view_clothing_item':
 					if CloStyle = 2:h = 10
 					if CloStyle = 5:h = 20
 					h += (3 * CloQuality)
-					money -= ARGS[4]
+					money -= price
 					dynamic $ARGS[2] + '[<<ARGS[3]>>] = 1'
 					if $ARGS[2] = 'cheap' or $ARGS[2] = 'office':
 						dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 70 + <<h>>'
@@ -491,38 +491,38 @@ if $ARGS[0] = 'wear':
 		end
 	end
 
-	if PCloSkirtShortness > 0:
-		if PCloSkirtShortness = 1:
+	if PCloSkirt > 0:
+		if PCloSkirt = 1:
 			PXCloSkirtShortness = 25
-		elseif PCloSkirtShortness = 2:
+		elseif PCloSkirt = 2:
 			PXCloSkirtShortness = 50
-		elseif PCloSkirtShortness = 3:
+		elseif PCloSkirt = 3:
 			PXCloSkirtShortness = 100
-		elseif PCloSkirtShortness = 4:
+		elseif PCloSkirt = 4:
 			PXCloSkirtShortness = 150
-		elseif PCloSkirtShortness = 5:
+		elseif PCloSkirt = 5:
 			PXCloSkirtShortness = 200
-		elseif PCloSkirtShortness = 6:
+		elseif PCloSkirt = 6:
 			PXCloSkirtShortness = 300
-		elseif PCloSkirtShortness >= 7:
+		elseif PCloSkirt >= 7:
 			PXCloSkirtShortness = 400
 		end
 	end
 
-	if PCloPantsShortness > 0:
-		if PCloPantsShortness = 1:
+	if PCloPants > 0:
+		if PCloPants = 1:
 			PXCloPantsShortness = 25
-		elseif PCloPantsShortness = 2:
+		elseif PCloPants = 2:
 			PXCloPantsShortness = 50
-		elseif PCloPantsShortness = 3:
+		elseif PCloPants = 3:
 			PXCloPantsShortness = 100
-		elseif PCloPantsShortness = 4:
+		elseif PCloPants = 4:
 			PXCloPantsShortness = 150
-		elseif PCloPantsShortness = 5:
+		elseif PCloPants = 5:
 			PXCloPantsShortness = 200
-		elseif PCloPantsShortness = 6:
+		elseif PCloPants = 6:
 			PXCloPantsShortness = 300
-		elseif PCloPantsShortness >= 7:
+		elseif PCloPants >= 7:
 			PXCloPantsShortness = 400
 		end
 	end

+ 12 - 12
locations/clothing_attributes

@@ -59,29 +59,29 @@ CloStyle = 0
 CloBimbo = 0
 
 if $ARGS[0] = 'cheap':
-	FUNC('$attributes_cheap', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_cheap', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'average':
-	FUNC('$attributes_average', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_average', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'expensive':
-	FUNC('$attributes_expensive', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_expensive', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'formal':
-	FUNC('$attributes_formal', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_formal', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'office':
-	FUNC('$attributes_office', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_office', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'school':
-	FUNC('$attributes_school', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_school', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'exercise':
-	FUNC('$attributes_exercise', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_exercise', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'naughty':
-	FUNC('$attributes_naughty', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_naughty', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'exhibit':
-	FUNC('$attributes_exhibit', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_exhibit', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'uniform':
-	FUNC('$attributes_uniform', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_uniform', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'coat':
-	FUNC('$attributes_coat', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_coat', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'swimwear':
-	FUNC('$attributes_swimwear', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_swimwear', $ARGS[0], ARGS[1])
 end
 
 --- clothing_attributes ---------------------------------

+ 1 - 1
locations/krutishi

@@ -7,7 +7,7 @@ if grupTipe[numnpc] = 3:
 		grupNPC[numnpc] -= 5
 		'<<$npcName[numnpc]>> with a smile looking at your messy hair.'
 	elseif npcPol[numnpc] = 0 and hapri > 0 and $loc = 'gdkin' and grupNPC[numnpc] >= 40:
-		if glamur > 0 or ski > 0:
+		if PCloSkirt > 0:
 			cla
 			'<<$npcName[numnpc]>> - Care for a dance?'
 

+ 1 - 1
locations/mother

@@ -634,7 +634,7 @@ if (spdirtyv > 0 or spdirtyc > 0) and whoremday ! daystart:
 	end
 end
 
-if glamur > 0 and hour > 9:'Your mother looks a bit puzzled at your fancy clothes: "Well well, look at you... why are you so dressed up? Big plans today?"'
+if ($clothingworntype = 'formal' or $clothingworntype = 'expensive') and hour > 9:'Your mother looks a bit puzzled at your fancy clothes: "Well well, look at you... why are you so dressed up? Big plans today?"'
 
 if week = 5 and dostupindorf = 1:
 	if hour > 9:'While your mother is working on some meals in the kitchen, she remembers something and looks at you: "Oh <<$nickname>>, while you''re here... we''re going to visit your grandparents in Gadyukino tomorrow. We leave at noon (12:00) tomorrow, so if you want to come along you should meet me in the kitchen before then."'

+ 9 - 6
locations/pod_whore

@@ -32,10 +32,10 @@ money_hapri = 0
 if hapri = 1: money_hapri = 50
 !glamorous clothes
 money_glamur = 0
-if glamur >= 1: money_glamur = 150
-!clothes whore
+if $clothingworntype = 'formal' or $clothingworntype = 'expensive': money_glamur = 150
+!naughty clothing
 money_odethooker = 0
-if odethooker >= 1: money_odethooker = 50
+if $clothingworntype = 'naughty': money_odethooker = 50
 !smooth and clean skin
 money_skin = 0
 if skin >= 3: money_skin = 50
@@ -580,11 +580,14 @@ $pod_client_talk = {
 	cls
 	gs'stat'
 	if whore_money_bjsex < 50: '<center><img src="images/zsoft/pod_ezd/whore/fear.jpg"></center>'
-	if nude => 1 and whore_money_bjsex >= 50: 
+	if nude >= 1 and whore_money_bjsex >= 50: 
 		'<center><img src="images/zsoft/pod_ezd/whore/door_nude'+rand(1,3)+'.jpg"></center>'
 	elseif nude <=0 and whore_money_bjsex >= 50: 
-		if glamur >= 1:'<center><img src="images/zsoft/pod_ezd/whore/door_glamur.jpg"></center>'
-		if glamur < 1:'<center><img src="images/zsoft/pod_ezd/whore/door.jpg"></center>'
+		if $clothingworntype = 'formal' or $clothingworntype = 'expensive':
+			'<center><img src="images/zsoft/pod_ezd/whore/door_glamur.jpg"></center>'
+		else
+			'<center><img src="images/zsoft/pod_ezd/whore/door.jpg"></center>'
+		end
 	end
 	if whore_money_bjsex < 50:
 		'You open the door and look at a strange man who looks quite surprised. He accidentally mutters: "Holy shit, she looks terrible!", just loud enough for you to hear. 

+ 1 - 1
locations/torgpred

@@ -37,7 +37,7 @@ if svQW = 2:
 
 			if StasikSex = 0:
 				if TPworkTimes >= 3 and TPmainQW = 0 and mesec = 0:
-					if ski > 0 or glamur > 0:
+					if PCloSkirt > 0:
 						'Stas interest asks "Well, how do you work?"'
 
 						act 'Excellent!':

+ 4 - 4
locations/trashplace

@@ -81,7 +81,7 @@ $bomzstartqwestdi = {
 									minut += 15
 									gs 'stat'
 
-									if ski > 0 or glamur > 0:
+									if PCloSkirt > 0:
 										'You raise your skirt and show your pussy.'
 									else
 										'You lower your pants and show your pussy.'
@@ -92,7 +92,7 @@ $bomzstartqwestdi = {
 									end
 
 									if lobok <= 0:
-										if ski > 0 or glamur > 0:
+										if PCloSkirt > 0:
 											'<center><img src="images/sauna/sauna_pussy1.jpg"></center>'
 										else
 											'<center><img src="images/sauna/sauna_pussy1.jpg"></center>'
@@ -100,7 +100,7 @@ $bomzstartqwestdi = {
 
 										'"How schoolgirl, the manager spends way too long checking, do not forget to come on Thursday.'
 									elseif lobok <= 2:
-										if ski > 0 or glamur > 0:
+										if PCloSkirt > 0:
 											'<center><img src="images/sauna/sauna_pussy2.jpg"></center>'
 										else
 											'<center><img src="images/sauna/sauna_pussy3.jpg"></center>'
@@ -108,7 +108,7 @@ $bomzstartqwestdi = {
 
 										'"A lovely well kept garden, the manager checks you out, do not forget to come on Thursday."'
 									else
-										if ski > 0 or glamur > 0:
+										if PCloSkirt > 0:
 											'<center><img src="images/sauna/sauna_pussy4.jpg"></center>'
 										else
 											'<center><img src="images/sauna/sauna_pussy5.jpg"></center>'

+ 1 - 1
locations/vokzalG

@@ -82,7 +82,7 @@ end
 		
 if kidalob = 0:
 	podrand = rand(0, 5)	
-	if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 5 and glamur > 0 and monthKidalo ! month:
+	if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 5 and ($clothingworntype = 'formal' or $clothingworntype = 'expensive') and monthKidalo ! month:
 		cls
 		monthKidalo = month
 		gs 'stat'