Merge remote-tracking branch 'Netuttki/master'

locations/pav_commercial.qsrc

@@ -178,7 +178,7 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 end
 
 !-- Random prostitution solicitation check ------------------------ 
-if prostitute['blocked'] = 0: gs 'prostitution_functions', 'check_solicitation_event'
+gs 'prostitution_functions', 'check_solicitation_event'
 
 
 --- pav_commercial ---------------------------------

locations/pav_complex.qsrc

@@ -147,7 +147,7 @@ if $ARGS[0] = 'start':
 	gs 'camera', 'check_location'
 
 	!-- Random prostitution solicitation check ------------------------ 
-	if prostitute['blocked'] = 0: gs 'prostitution_functions', 'check_solicitation_event'
+	gs 'prostitution_functions', 'check_solicitation_event'
 
 end
 

locations/pav_industrial.qsrc

@@ -117,7 +117,7 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 end
 
 !-- Random prostitution solicitation check ------------------------ 
-if prostitute['blocked'] = 0: gs 'prostitution_functions', 'check_solicitation_event'
+gs 'prostitution_functions', 'check_solicitation_event'
 
 
 --- pav_industrial ---------------------------------

locations/pav_market.qsrc

@@ -46,7 +46,7 @@ if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart a
 exit
 end
 
-if prostitute['blocked'] = 0 and prostitute['gas_station'] = 1:
+if prostitute['wl_block'] = 0 and prostitute['full_block'] = 0 and prostitute['gas_station'] = 1:
 	*nl 
 	if money >= 75:
 		'Next to the train station you can find the bus terminal. Here you can catch the bus that will take you to <a href="exec:minut += 87 & money -= 75 & gt ''gas_station_gp_117'', ''outside''">the gas station on the M11</a>.'
@@ -317,7 +317,7 @@ act 'Walk to Pushkin (0:20)':minut += 20 & nroad = 19 & gt 'pushkin'
 gs 'camera', 'check_location'
 
 !-- Random prostitution solicitation check ------------------------ 
-if prostitute['blocked'] = 0: gs 'prostitution_functions', 'check_solicitation_event'
+gs 'prostitution_functions', 'check_solicitation_event'
 
 --- pav_market ---------------------------------
 

locations/pav_park.qsrc

@@ -309,7 +309,7 @@ if $ARGS[0] = 'start':
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
 
 	!-- Random prostitution solicitation check ------------------------ 
-	if prostitute['blocked'] = 0 : gs 'prostitution_functions', 'check_solicitation_event'
+	gs 'prostitution_functions', 'check_solicitation_event'
 
 	gs 'camera', 'check_location'
 end

locations/pushkin.qsrc

@@ -75,7 +75,7 @@ end
 act 'Wait':gs 'obj_din', 'wait'
 
 !-- Random prostitution solicitation check ------------------------ 
-if prostitute['blocked'] = 0: gs 'prostitution_functions', 'check_solicitation_event'
+gs 'prostitution_functions', 'check_solicitation_event'
 
 
 --- pushkin ---------------------------------