Переглянути джерело

[fixed] Check for if wear swimwear error

KevinSmarts 3 роки тому
батько
коміт
8db3397693
2 змінених файлів з 6 додано та 6 видалено
  1. 5 5
      locations/city_lake.qsrc
  2. 1 1
      locations/clothing.qsrc

+ 5 - 5
locations/city_lake.qsrc

@@ -53,10 +53,10 @@ if $ARGS[0] = 'start':
 		*nl
 	end
 
-	if npc_QW['A192'] = 3 and temper >= 15 and ($clothingworntype = 'danilovich_swimsuit' and $clothingworntype = 'scandalicious_swimsuit' and $clothingworntype = 'scandalicious_bikinis' and $clothingworntype = 'allure_swimsuit' and $clothingworntype = 'allure_bikinis') and hour >= 6 and hour <= 20:'Waving her hand at you is <a href="exec:gt ''nastja'', ''pos14''">Anastasia</a>.'
+	if npc_QW['A192'] = 3 and temper >= 15 and (PCloswimwear = 1) and hour >= 6 and hour <= 20:'Waving her hand at you is <a href="exec:gt ''nastja'', ''pos14''">Anastasia</a>.'
 
 	act 'Leave':
-		if $clothingworntype = 'danilovich_swimsuit' and $clothingworntype = 'scandalicious_swimsuit' and $clothingworntype = 'scandalicious_bikinis' and $clothingworntype = 'allure_swimsuit' and $clothingworntype = 'allure_bikinis':
+		if PCloswimwear = 1:
 			cla
 			'You need to get dressed in regular clothing first.'
 			act'Return':gt 'city_lake','start'
@@ -67,10 +67,10 @@ if $ARGS[0] = 'start':
 	end
 
 	if hour >= 6 and hour <= 20:
-		'Nearby are various '+iif($clothingworntype = 'danilovich_swimsuit' and $clothingworntype = 'scandalicious_swimsuit' and $clothingworntype = 'scandalicious_bikinis' and $clothingworntype = 'allure_swimsuit' and $clothingworntype = 'allure_bikinis','<a href="exec:gt ''city_lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
+		'Nearby are various '+iif(PCloswimwear = 1,'<a href="exec:gt ''city_lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
 		'You can go for a ride on a <a href="exec:gt ''city_lake'', ''horse''">horse</a> along the beach.'
 		'And a short walk from here there is even a '+iif(pcs_inhib >= 30 or (exhibitionist_lvl > 1 and pcs_horny > 60),'<a href="exec:gt ''Nudelake''">nudist beach</a>','nudist beach, but you are''t confident enough to go in that direction.')+''
-		if temper >= 15 and ($clothingworntype = 'danilovich_swimsuit' and $clothingworntype = 'scandalicious_swimsuit' and $clothingworntype = 'scandalicious_bikinis' and $clothingworntype = 'allure_swimsuit' and $clothingworntype = 'allure_bikinis'):
+		if temper >= 15 and (PCloswimwear = 1):
 			'Also you can sunbathe or swim.'
 
 			act 'Walk on the beach':
@@ -987,7 +987,7 @@ if $ARGS[0] = 'stasValera4':
 						StasValeraKnow = 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/stasValera.jpg"></center>'
-						if $clothingworntype = 'danilovich_swimsuit' and $clothingworntype = 'scandalicious_swimsuit' and $clothingworntype = 'scandalicious_bikinis' and $clothingworntype = 'allure_swimsuit' and $clothingworntype = 'allure_bikinis':
+						if PCloswimwear = 1:
 							gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 							'You go to the changing room and quickly get out of your swimwear and dress in your regular clothes.'
 						end

+ 1 - 1
locations/clothing.qsrc

@@ -1130,7 +1130,7 @@ if $ARGS[0] = 'wear':
 
 	if PCloPanties = 1: PXCloBottomShortness = 400
 
-	if $clothingworntype = 'danilovich_swimsuit' and $clothingworntype = 'scandalicious_swimsuit' and $clothingworntype = 'scandalicious_bikinis' and $clothingworntype = 'allure_swimsuit' and $clothingworntype = 'allure_bikinis': PCloswimwear = 1
+	if $clothingworntype = 'danilovich_swimsuit' or $clothingworntype = 'scandalicious_swimsuit' or $clothingworntype = 'scandalicious_bikinis' or $clothingworntype = 'allure_swimsuit' or $clothingworntype = 'allure_bikinis': PCloswimwear = 1
 end
 
 if $ARGS[0] = 'wear_last_worn':