Browse Source

[Fixed] Several events using old clothing variables spotted by Batman

KevinSmarts 3 years ago
parent
commit
9af95eade5

+ 2 - 2
locations/lover_love.qsrc

@@ -62,13 +62,13 @@ elseif loverlove[lover_number] = 2:
 	exit
 	exit
 end
 end
 
 
-if pcs_makeup > 1 and ($clothingworntype = 'expensive' or $clothingworntype = 'formal') and curly > 0 and loverlove[lover_number] = 1 and haraklover[lover_number] = 0:
+if pcs_makeup > 1 and ($clothingworntype = 'fashionista' or $clothingworntype = 'moncheri') and curly > 0 and loverlove[lover_number] = 1 and haraklover[lover_number] = 0:
 	'<<$loverdesc[lover_number]>> looks very excited. He decides that you are now ready to meet his mother.'
 	'<<$loverdesc[lover_number]>> looks very excited. He decides that you are now ready to meet his mother.'
 
 
 	act 'Meet the parents':gt 'love', 'mother'
 	act 'Meet the parents':gt 'love', 'mother'
 
 
 	exit
 	exit
-elseif pcs_makeup > 1 and ($clothingworntype = 'expensive' or $clothingworntype = 'formal') and curly > 0 and loverlove[lover_number] = 1 and haraklover[lover_number] = 1 and $pantyworntype ! 'none':
+elseif pcs_makeup > 1 and ($clothingworntype = 'fashionista' or $clothingworntype = 'moncheri') and curly > 0 and loverlove[lover_number] = 1 and haraklover[lover_number] = 1 and $pantyworntype ! 'none':
 	'<<$loverdesc[lover_number]>> examins you and decides that you are ready to meet his friends.'
 	'<<$loverdesc[lover_number]>> examins you and decides that you are ready to meet his friends.'
 
 
 	act 'Meet his friends':gt 'love', 'frends'
 	act 'Meet his friends':gt 'love', 'frends'

+ 8 - 8
locations/mey_tamara_events.qsrc

@@ -221,7 +221,7 @@ if $args[0] = 'learning1':
 
 
 		newdress_count = 0
 		newdress_count = 0
 		newdress_loop = 0
 		newdress_loop = 0
-		!by random cloth, modify from :markbuyclomother. original kitty pussy *2 (average clothes), set to 1 formal 1 average
+		!by random cloth, modify from :markbuyclomother. original kitty pussy *2 (average clothes), set to 1 moncheri 1 average
 		'<center><table><tr><td>'
 		'<center><table><tr><td>'
 		:markbuyclotamaraaverage
 		:markbuyclotamaraaverage
 		newdress_id = rand(1, 522)
 		newdress_id = rand(1, 522)
@@ -243,11 +243,11 @@ if $args[0] = 'learning1':
 		:markbuyclotamaraformal
 		:markbuyclotamaraformal
 		newdress_id = rand(1, 168)
 		newdress_id = rand(1, 168)
 
 
-		if formal[newdress_id] = 0:
-			formal[newdress_id] = 1
-			formalH[newdress_id] = 35
-			formalB[newdress_id] = pcs_hips
-			*P '<center><img height = 400 src="images/pc/clothing/4formal/<<newdress_id>>.jpg"></center>'
+		if moncheri[newdress_id] = 0:
+			moncheri[newdress_id] = 1
+			moncheriH[newdress_id] = 35
+			moncheriB[newdress_id] = pcs_hips
+			*P '<center><img height = 400 src="images/pc/clothing/moncheri/<<newdress_id>>.jpg"></center>'
 		else
 		else
 			newdress_loop += 1
 			newdress_loop += 1
 			if newdress_loop > 1000:
 			if newdress_loop > 1000:
@@ -477,8 +477,8 @@ end
 if $args[0] = 'check_look':
 if $args[0] = 'check_look':
 	*clr & cla
 	*clr & cla
 	! dress, medium black, clean, looks stunning
 	! dress, medium black, clean, looks stunning
-	!there need a good glamour dress, change to formal or expensive in ECV (she already give you 1 formal)
-	if ($clothingworntype = 'formal' or $clothingworntype = 'expensive') and (pcs_makeup = 3 or pcs_makeup = 2) and pcs_sweat <= 20 and pcs_apprnc >= 60:
+	!there need a good glamour dress, change to moncheri or expensive in ECV (she already give you 1 moncheri)
+	if ($clothingworntype = 'moncheri' or $clothingworntype = 'fashionista') and (pcs_makeup = 3 or pcs_makeup = 2) and pcs_sweat <= 20 and pcs_apprnc >= 60:
 		! if long hair is desired styling
 		! if long hair is desired styling
 		if shorthair = 0 and pcs_hairbsh = 0:
 		if shorthair = 0 and pcs_hairbsh = 0:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/party0.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/party0.jpg"></center>'

+ 1 - 1
locations/mother.qsrc

@@ -630,7 +630,7 @@ if $ARGS[0] = '':
 		end
 		end
 	end
 	end
 
 
-	if ($clothingworntype = 'formal' or $clothingworntype = 'expensive') and hour > 9:'Your <<$npc_nickname[''A29'']>> looks a bit puzzled at your fancy clothes: "Well well, look at you... why are you so dressed up? Big plans today?"'
+	if ($clothingworntype = 'moncheri' or $clothingworntype = 'fashionista') and hour > 9:'Your <<$npc_nickname[''A29'']>> 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 and grandaQW['block'] = 0:
 	if week = 5 and dostupindorf = 1 and grandaQW['block'] = 0:
 		if hour > 9:'While your <<$npc_nickname[''A29'']>> is working on some meals in the kitchen, she remembers something and looks at you: "Oh <<$pcs_nickname>>, while you''re here... we''re going to visit your grandparents in Gadukino tomorrow. We leave at noon (12:00) tomorrow, so if you want to come along you should meet me in the kitchen before then."'
 		if hour > 9:'While your <<$npc_nickname[''A29'']>> is working on some meals in the kitchen, she remembers something and looks at you: "Oh <<$pcs_nickname>>, while you''re here... we''re going to visit your grandparents in Gadukino tomorrow. We leave at noon (12:00) tomorrow, so if you want to come along you should meet me in the kitchen before then."'

+ 1 - 1
locations/pav_train.qsrc

@@ -169,7 +169,7 @@ end
 				
 				
 if kidalob = 0:
 if kidalob = 0:
 	podrand = rand(0, 5)	
 	podrand = rand(0, 5)	
-	if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 5 and ($clothingworntype = 'formal' or $clothingworntype = 'expensive') and monthKidalo ! month:
+	if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 5 and ($clothingworntype = 'moncheri' or $clothingworntype = 'fashionista') and monthKidalo ! month:
 		*clr & cla
 		*clr & cla
 		menu_off = 1
 		menu_off = 1
 		monthKidalo = month
 		monthKidalo = month

+ 2 - 2
locations/pod_whore.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'client_talk':
 	else
 	else
 		if $clothingworntype = 'nude':
 		if $clothingworntype = 'nude':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door_nude'+rand(1,3)+'.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door_nude'+rand(1,3)+'.jpg"></center>'
-		elseif $clothingworntype = 'formal' or $clothingworntype = 'expensive':
+		elseif $clothingworntype = 'moncheri' or $clothingworntype = 'fashionista':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door_glamur.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door_glamur.jpg"></center>'
 		else
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door.jpg"></center>'
@@ -92,7 +92,7 @@ if $ARGS[0] = 'setup':
 	if pcs_hairbsh = 1: money_hapri = 50
 	if pcs_hairbsh = 1: money_hapri = 50
 	!glamorous clothes
 	!glamorous clothes
 	money_glamur = 0
 	money_glamur = 0
-	if $clothingworntype = 'formal' or $clothingworntype = 'expensive': money_glamur = 150
+	if $clothingworntype = 'moncheri' or $clothingworntype = 'fashionista': money_glamur = 150
 	!!hooker clothing
 	!!hooker clothing
 	money_odethooker = 0
 	money_odethooker = 0
 	if PCloStyle = 4: money_odethooker = 50
 	if PCloStyle = 4: money_odethooker = 50

+ 3 - 3
locations/restoran.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'maitred':
 	menu_off = 0
 	menu_off = 0
 	minut += 5
 	minut += 5
 	!!eto there_were glamur > 1 and pcs_apprnc > 50
 	!!eto there_were glamur > 1 and pcs_apprnc > 50
-	if $clothingworntype = 'formal' and pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 20:
+	if $clothingworntype = 'moncheri' and pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 20:
 		'<center><b><font color="maroon">Babel</font></b></center>'
 		'<center><b><font color="maroon">Babel</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/maitredseat.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/maitredseat.jpg"></center>'
 		'The well-dressed maître d'' politely asks you whether you prefer the VIP section or the common room'
 		'The well-dressed maître d'' politely asks you whether you prefer the VIP section or the common room'
@@ -36,7 +36,7 @@ if $ARGS[0] = 'maitred':
 		'The maître d'' politely informs you that customers must look presentable and wear formal clothing if they wish to dine here.'
 		'The maître d'' politely informs you that customers must look presentable and wear formal clothing if they wish to dine here.'
 	end
 	end
 
 
-	if $clothingworntype = 'formal' and pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 20 and money >= 5000:
+	if $clothingworntype = 'moncheri' and pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 20 and money >= 5000:
 		act 'Go to the VIP room (5,000 <b>₽</b>)':
 		act 'Go to the VIP room (5,000 <b>₽</b>)':
 		*clr & cla
 		*clr & cla
 		'<center><b><font color="maroon">Babel</font></b></center>'
 		'<center><b><font color="maroon">Babel</font></b></center>'
@@ -47,7 +47,7 @@ if $ARGS[0] = 'maitred':
 		end
 		end
 	end
 	end
 
 
-	if $clothingworntype = 'formal' and pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 20:
+	if $clothingworntype = 'moncheri' and pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 20:
 		act 'Go to the Common Room': gt 'restoran', 'zal'
 		act 'Go to the Common Room': gt 'restoran', 'zal'
 	end
 	end
 	act 'Back to the foyer': gt 'restoran', 'start'
 	act 'Back to the foyer': gt 'restoran', 'start'