Merge remote-tracking branch 'Anjuna/master'

locations/anushkachat_city.qsrc

@@ -494,7 +494,7 @@ if $ARGS[0] = 'chat':
 		act 'Follow her':gt 'anushapt','snack'
 	end
 !!Artem is commented out until Artem is introduce at the Uni and I do his room and start his story arc there.
-	!!if artemQW['nush3some_ask'] = 2:
+	!!{if artemQW['nush3some_ask'] = 2:
 		act 'Talk about Artem threesome':
 			*clr & cla
 			minut += 5
@@ -513,7 +513,7 @@ if $ARGS[0] = 'chat':
 			act 'Stop talking': gt 'anush_bedroom_city','anushroom'
 			act 'Keep talking': gt 'anushkachat_city', 'chat'
 		end
-	end
+	end}
 end
 
 if $ARGS[0] = 'photo_chat':

locations/bus.qsrc

@@ -784,7 +784,7 @@ if $ARGS[0] = 'community_pavstation':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Pavlovsk train station bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -810,7 +810,7 @@ elseif $ARGS[0] = 'community_pushkin':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Pushkin bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -836,7 +836,7 @@ elseif $ARGS[0] = 'community_construction':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the construction site bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -862,7 +862,7 @@ elseif $ARGS[0] = 'community_gadukino':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Gadukino bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -896,7 +896,7 @@ if $ARGS[0] = 'pavstation_community':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Pavlovsk community center bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -922,7 +922,7 @@ elseif $ARGS[0] = 'pavstation_pushkin':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Pushkin bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -948,7 +948,7 @@ elseif $ARGS[0] = 'pavstation_construction':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the construction site bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -974,7 +974,7 @@ elseif $ARGS[0] = 'pavstation_gadukino':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Gadukino bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1008,7 +1008,7 @@ if $ARGS[0] = 'pushkin_community':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Pavlovsk community center bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1034,7 +1034,7 @@ elseif $ARGS[0] = 'pushkin_pavstation':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Pavlovsk train station bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1060,7 +1060,7 @@ elseif $ARGS[0] = 'pushkin_construction':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the construction site bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1086,7 +1086,7 @@ elseif $ARGS[0] = 'pushkin_gadukino':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Gadukino bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1120,7 +1120,7 @@ if $ARGS[0] = 'construction_community':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Pavlovsk community center bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1146,7 +1146,7 @@ elseif $ARGS[0] = 'construction_pavstation':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Pavlovsk train station bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1172,7 +1172,7 @@ elseif $ARGS[0] = 'construction_pushkin':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Pushkin bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1198,7 +1198,7 @@ elseif $ARGS[0] = 'construction_gadukino':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Gadukino bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1232,7 +1232,7 @@ if $ARGS[0] = 'gadukino_community':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Pavlovsk community center bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1258,7 +1258,7 @@ elseif $ARGS[0] = 'gadukino_pavstation':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Pavlovsk train station bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1284,7 +1284,7 @@ elseif $ARGS[0] = 'gadukino_pushkin':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Pushkin bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1310,7 +1310,7 @@ elseif $ARGS[0] = 'gadukino_construction':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the construction site bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1336,7 +1336,7 @@ elseif $ARGS[0] = 'gadukino_communal':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the communal village bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1362,7 +1362,7 @@ elseif $ARGS[0] = 'gadukino_graveyard':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the graveyard bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1388,7 +1388,7 @@ elseif $ARGS[0] = 'gadukino_suburbs':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the suburbs bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1422,7 +1422,7 @@ if $ARGS[0] = 'communal_gadukino':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Gadukino bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1448,7 +1448,7 @@ elseif $ARGS[0] = 'communal_graveyard':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the graveyard bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1474,7 +1474,7 @@ elseif $ARGS[0] = 'communal_suburbs':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the suburbs bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1508,7 +1508,7 @@ if $ARGS[0] = 'graveyard_gadukino':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Gadukino bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1534,7 +1534,7 @@ elseif $ARGS[0] = 'graveyard_communal':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the communal village bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1560,7 +1560,7 @@ elseif $ARGS[0] = 'graveyard_suburbs':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the suburbs bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1594,7 +1594,7 @@ if $ARGS[0] = 'suburbs_gadukino':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the Gadukino bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1620,7 +1620,7 @@ elseif $ARGS[0] = 'suburbs_communal':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the communal village bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'
@@ -1646,7 +1646,7 @@ elseif $ARGS[0] = 'suburbs_graveyard':
 		end
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/system/image_needed.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
 	'After <<transportVars[''timecost'']>> minutes, the bus stops at the graveyard bus station.'
 	act 'Get off the bus':
 		if rand(1, 100) <= 5: gt 'bus_incidental', 'end'

locations/homes_properties.qsrc

@@ -564,7 +564,7 @@ if $ARGS[0] = 'get_properties_for_sale':
 			i += 1
 		if i < count: jump 'get_properties_for_sale_loop'
 	end
-	killvar 'count' & killvar 'i' & killvar 'j' & killvar 'propcode' & killvar 'checked_homes' & killvar 'ishome' & killvar 'hasprice'
+	killvar 'count' & killvar 'i' & killvar 'j' & killvar 'propcode' & killvar 'checked_homes' & killvar 'ishome' & killvar 'hasprice' & killvar '$getforsalespropcode'
 end
 
 !! Use it as `gs`, creates a set of arrays that contains the relevant info for 
@@ -634,7 +634,7 @@ if $ARGS[0] = 'get_internet_enabled_properties':
 				checked_homes[$getnetenabledprocode] = 1
 				gs 'homes_properties_attr', 'get_property_attr', $getnetenabledprocode
 				accesscheck = ($ARGS[2] = 'hasaccess' and accessible_property[$getnetenabledprocode] ! 0 and accessible_property[$getnetenabledprocode] ! 4) or $ARGS[2] = ''
-				typecheck = (($ARGS[1] ! 'home' and INSTR($property['type'], 'residence') = 0) or ($ARGS[1] ! 'business' and INSTR($property['type'], 'residence') > 0))				
+				typecheck = (($ARGS[1] ! 'home' and INSTR($property['type'], 'residence') = 0) or ($ARGS[1] ! 'business' and INSTR($property['type'], 'residence') > 0))
 				if accesscheck and typecheck and property['internet_enabled']:
 					$property_name[j] = $property['name']
 					$property_code[j] = $getnetenabledprocode
@@ -653,11 +653,11 @@ if $ARGS[0] = 'get_internet_enabled_properties':
 					killvar 'accesscheck' & killvar 'typecheck'
 				end
 				killvar 'property'
-			end			
+			end
 			i += 1
 		if i < count: jump 'get_internet_enabled_properties_loop'
 	end
-	killvar 'count' & killvar 'i' & killvar 'j' & killvar 'propcode'
+	killvar 'count' & killvar 'i' & killvar 'j' & killvar 'propcode' & killvar 'checked_homes'
 end
 
 

locations/sex_ev_dress_talking.qsrc

@@ -1114,7 +1114,7 @@ if $ARGS[0] = 'unsatisfied_breakup':
 			'"You''re not what I want out of a fuckbuddy," you say flatly as you <<$sex_ev[''dress_describe'']>>. "I just don''t think we''re sexually compatible."'
 			*nl
 			'You shrug once, grab your things, and leave without another word.'
-			gs'sex_ev_dress_talking', 'break_up'
+			gs'sex_ev_leave', 'break_up'
 		end
 		if npc_sexdrive[$boy] = 1 or npc_two_pump[$boy] = 1:
 			act'You''re a two pump chump':