1
0
Selaa lähdekoodia

Fixed: Going to the road automatically equipped prostitute outfit

Big bug that automatically equipped prostitute outfit if it was set.
netuttki 7 kuukautta sitten
vanhempi
säilyke
9da3e7812b
1 muutettua tiedostoa jossa 43 lisäystä ja 19 poistoa
  1. 43 19
      locations/road.qsrc

+ 43 - 19
locations/road.qsrc

@@ -152,27 +152,43 @@ if $ARGS[0] = '':
 		'A <a href="exec:minut += 5 & gt ''furi''">lorry</a> is parked next to the road. The driver is currently taking a break and is having a cigarette. He could probably bring you to Pavlovsk or St. Petersburg, for a price...'
 		if npc_QW['A60'] > 15: 'Mira <a href="exec:gt ''gadprostitutes'', ''start''">prostitutes</a> herself around here.'
 		if hour >= 16 and hour <= 23 and prostitute['gadukino'] = 1:
-				if car > 0 and cardrive = 22 and ncarroad = nroad:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> in a quieter spot on the side road to Gadukin.'
-				if PCloStyle = 4: 
-					act 'You can work as a prostitute here': gt 'gadprostitutes', 'start'
-					if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']: 
-						act 'You can change into your regular clothes in your car': gt 'prostitution_functions', 'change_back', 'car'
-					end
-				elseif car > 0 and cardrive = 22 and ncarroad = nroad AND prostitute['outfit_is_set']:
-					$loc_desc = 'You change into some more appropriate clothing in your car, then walk down the road a little to catch the attention of passing cars.'
-					gs 'prostitution_functions', 'change_to_work', 'car'
-					killvar '$loc_desc' 
+			if car > 0 and cardrive = 22 and ncarroad = nroad:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> in a quieter spot on the side road to Gadukin.'
+			
+			gs 'prostitution_functions', 'work_clothes'
+			if prostitute['work_clothes']: 
+				act 'You can work as a prostitute here': gt 'gadprostitutes', 'start'
+				if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']: 
+					act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'car'
+				elseif prostitute['changed_for_work']:
+					act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'road_side'
+				end
+			end
+			if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']: 
+				if car > 0 and cardrive = 22 and ncarroad = nroad: 
+					act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'car'
+				else
+					act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'road_side'
 				end
+			end
 		elseif prostitute['road'] = 1 and ((prostitute['wl_block'] = 0 and prostitute['full_block'] = 0) or (prostitute['wl_block'] = 1 and prostitute['payment_method'] = 1)):
 			if car > 0 and cardrive = 22 and ncarroad = nroad:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> in a quieter spot on the side road to Gadukin.'
+			
 			gs 'prostitution_functions', 'work_clothes'
 			if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']: 
+				if car > 0 and cardrive = 22 and ncarroad = nroad: 
 					$loc_desc = 'You change into some more appropriate clothing in your car, then walk down the road a little to catch the attention of passing cars.'
-					gs 'prostitution_functions', 'change_to_work', 'car'
-					killvar '$loc_desc' 
+					act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'car'
+				else
+					$loc_desc = 'You change into some more appropriate clothing behind the bushes, then walk down the road a little to catch the attention of passing cars.'
+					act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'road_side'
+				end
 			elseif prostitute['work_clothes']:
-				act 'Start to work': gt 'road_prostitution', 'work'
-				if prostitute['changed_for_work']: act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'car'
+				act 'Work as a prostitute': gt 'road_prostitution', 'work'
+				if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']: 
+					act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'car'
+				elseif prostitute['changed_for_work']:
+					act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'road_side'
+				end
 			end
 		else
 			if car > 0 and cardrive = 22 and ncarroad = nroad and nroad ! 10:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> next to the road.'
@@ -220,12 +236,20 @@ if $ARGS[0] = '':
 	if prostitute['road'] = 1 and nroad ! 10 and nroad ! 20 and ((prostitute['wl_block'] = 0 and prostitute['full_block'] = 0) or (prostitute['wl_block'] = 1 and prostitute['payment_method'] = 1)):
 		gs 'prostitution_functions', 'work_clothes'
 		if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']: 
-			$loc_desc = 'You change into some more appropriate clothing in your car, then walk down the road a little to catch the attention of passing cars.'
-			gs 'prostitution_functions', 'change_into_prostitute_outfit', 'work'
-			killvar '$loc_desc' 
+			if car > 0 and cardrive = 22 and ncarroad = nroad: 
+				$loc_desc = 'You change into some more appropriate clothing in your car, then walk down the road a little to catch the attention of passing cars.'
+				act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'car'
+			else
+				$loc_desc = 'You change into some more appropriate clothing behind the bushes, then walk down the road a little to catch the attention of passing cars.'
+				act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'road_side'
+			end
 		elseif prostitute['work_clothes']:
-			act 'Start to work': gt 'road_prostitution', 'work'
-			if prostitute['changed_for_work']: act 'Change into your regular clothes': gt 'road', 'change_back'
+			act 'Work as a prostitute': gt 'road_prostitution', 'work'
+			if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']: 
+				act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'car'
+			elseif prostitute['changed_for_work']:
+				act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'road_side'
+			end
 		end
 	end
 end