[added][fixed] added $property['bedroom'] and $property['bedroom_arg'] to fix an issue with an event firing which should only fire when at home. Fixed some location names

locations/city_hotel.qsrc

@@ -42,9 +42,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	if hotelRoom['city_hotel'] ! 0:
 		act 'Go to your room':
 			$hotel = 'city_hotel'
-			if hotelRoom['city_hotel'] = 1:gt'hotelroom','normal'
-			if hotelRoom['city_hotel'] = 2:gt'hotelroom','better'
-			if hotelRoom['city_hotel'] = 3:gt'hotelroom','best'
+			if hotelRoom['city_hotel'] = 1: gt 'HotelRoom', 'normal'
+			if hotelRoom['city_hotel'] = 2: gt 'HotelRoom', 'better'
+			if hotelRoom['city_hotel'] = 3: gt 'HotelRoom', 'best'
 		end
 
 	end

locations/homes_properties.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'set_home':
 		gs 'homes_properties_attr', 'get_property_attr', $homepropcode
 		if INSTR($property['type'], 'residence') > 0:
 			COPYARR 'home','property'
-			$home['current'] = $property['code']			
+			$home['current'] = $property['code']
 			if accessible_property[$home['current']] = 0: gs 'homes_properties', 'set_access', $home['current'], 1
 			killvar 'property'
 		end

locations/homes_properties_attr.qsrc

@@ -159,9 +159,13 @@ end
 	display: 	The string to use in the middle of a sentence
 	town:		The town/city/village the property can be found
 	location:	The region within the town
-	location-arg: The entry argument for the 'location' location 
+	location-arg: The entry argument for the 'location' location
 	entrance:	The location where the charactes enter
-	entrance-arg: The entry argument for the 'entrance' location 
+	entrance-arg: The entry argument for the 'entrance' location
+	bathroom:	The location of the bathroom
+	bedroom-arg: The entry argument for the 'bathroom' location
+	bedroom:	The location where the charactes sleep
+	bedroom-arg: The entry argument for the 'bedroom' location
 
 	gs '<<location>>', '<<location-arg>>' will take Sveta to the location that leads 
 				to the property. For example Pavlovsk Complex, City Residential, etc.)
@@ -219,6 +223,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = ''
 		$property['bathroom'] = 'vanr'
 		$property['bathroom_arg'] = ''
+		$property['bedroom'] = 'bedr'
+		$property['bedroom_arg'] = ''
 		$property['type'] = 'permanent_residence'
 
 		property['price'] = 800000
@@ -226,6 +232,7 @@ if $ARGS[0] = 'get_property_attr':
 		property['rental'] = 1
 		property['internet_enabled'] = 1
 		property['can_be_renovated'] = 1
+
 	elseif $ARGS[1] = 'parents_home':
 		property['id'] = 2
 		$property['code'] = $ARGS[1]
@@ -239,9 +246,12 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'start'
 		$property['bathroom'] = 'vanrPar'
 		$property['bathroom_arg'] = ''
+		$property['bedroom'] = 'bedrPar'
+		$property['bedroom_arg'] = 'start'
 		$property['type'] = 'permanent_residence'
-		
-		property['free_internet'] = 1	
+
+		property['free_internet'] = 1
+
 	elseif $ARGS[1] = 'village_cottage':
 		property['id'] = 3
 		$property['code'] = $ARGS[1]
@@ -255,11 +265,14 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = ''
 		$property['bathroom'] = 'dachabath'
 		$property['bathroom_arg'] = ''
+		$property['bedroom'] = 'dachain'
+		$property['bedroom_arg'] = 'start'
 		$property['type'] = 'permanent_residence'
 
 		property['price'] = 150000
 		!! Currently no cable or internet can be installed at this property, maybe later.
 		property['internet_enabled'] = 0
+
 	elseif $ARGS[1] = 'old_town_apartment':
 		property['id'] = 4
 		$property['code'] = $ARGS[1]
@@ -273,11 +286,14 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = ''
 		$property['bathroom'] = 'vanr2x'
 		$property['bathroom_arg'] = ''
+		$property['bedroom'] = 'bedr2x'
+		$property['bedroom_arg'] = ''
 		$property['type'] = 'permanent_residence'
 		
 		property['rental'] = 1
-		property['rent'] = 10000		
+		property['rent'] = 10000
 		property['internet_enabled'] = 1
+
 	elseif $ARGS[1] = 'matryona_mansion':
 		property['id'] = 5
 		$property['code'] = $ARGS[1]
@@ -293,11 +309,14 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'yfoyer'
 		$property['bathroom'] = 'city_mansion_residence_1'
 		$property['bathroom_arg'] = 'ybathroom'
+		$property['bedroom'] = 'city_mansion_residence_1'
+		$property['bedroom_arg'] = 'ybedroom'
 		$property['type'] = 'permanent_residence'
 
 		property['price'] = 1500000
 		property['internet_enabled'] = 1
 		property['construction_needed'] = 1
+
 	elseif $ARGS[1] = 'pavlovsk_hotel':
 		property['id'] = 6
 		$property['code'] = $ARGS[1]
@@ -311,9 +330,13 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = ''
 		$property['bathroom'] = 'HotelRoom'
 		$property['bathroom_arg'] = 'shower1'
+		$property['bedroom'] = 'HotelRoom'
+		$property['bedroom_arg'] = 'normal'
+		!I do not know how to do this for the various price levels.....
 		$property['type'] = 'temporary_residence'
 
-		property['free_internet'] = 1	
+		property['free_internet'] = 1
+
 	elseif $ARGS[1] = 'maid_bedroom':
 		property['id'] = 7
 		$property['code'] = $ARGS[1]
@@ -327,9 +350,12 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'start'
 		$property['bathroom'] = 'nichBathServant'
 		$property['bathroom_arg'] = ''
+		$property['bedroom'] = 'nichBedroomServant'
+		$property['bedroom_arg'] = 'start'
 		$property['type'] = 'permanent_residence'
 
-		property['free_internet'] = 1	
+		property['free_internet'] = 1
+
 	elseif $ARGS[1] = 'niko_apartment':
 		property['id'] = 8
 		$property['code'] = $ARGS[1]
@@ -343,10 +369,13 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = ''
 		$property['bathroom'] = 'pav_residential'
 		$property['bathroom_arg'] = ''
+		$property['bedroom'] = 'pav_residential'
+		$property['bedroom_arg'] = ''
 		$property['type'] = 'temporary_residence'
+
 	elseif $ARGS[1] = 'shulga_apartment':
 		property['id'] = 9
-		$property['code'] = $ARGS[1]	
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'Uncle Sergey''s apartment'
 		$property['display'] = 'Uncle Sergey''s apartment'
 		$property['region'] = 'pav'
@@ -357,12 +386,15 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'hallway'
 		$property['bathroom'] = 'vasilyhome'
 		$property['bathroom_arg'] = 'bathroom'
+		$property['bedroom'] = 'vasilyhome'
+		$property['bedroom_arg'] = 'vasily_room'
 		$property['type'] = 'temporary_residence'
 
-		property['free_internet'] = 1	
+		property['free_internet'] = 1
+
 	elseif $ARGS[1] = 'lyceum_dorm':
 		property['id'] = 10
-		$property['code'] = $ARGS[1]	
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'Lyceum school'
 		$property['display'] = 'room in the Lyceum dorm'
 		$property['region'] = 'pav'
@@ -373,9 +405,12 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'pos40'
 		$property['bathroom'] = 'etoexhib'
 		$property['bathroom_arg'] = 'pos41'
+		$property['bedroom'] = 'dom_gor'
+		$property['bedroom_arg'] = ''
 		$property['type'] = 'permanent_residence'
 
-		property['free_internet'] = 1	
+		property['free_internet'] = 1
+
 	elseif $ARGS[1] = 'university_dorm':
 		property['id'] = 11
 		$property['code'] = $ARGS[1]
@@ -389,9 +424,12 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'dorm_room'
 		$property['bathroom'] = 'uni_dorm'
 		$property['bathroom_arg'] = 'womens_restroom'
+		$property['bedroom'] = 'uni_dorm'
+		$property['bedroom_arg'] = 'dorm_room'
 		$property['type'] = 'permanent_residence'
 
-		property['free_internet'] = 1		
+		property['free_internet'] = 1
+
 	elseif $ARGS[1] = 'hunters_lodge':
 		property['id'] = 12
 		$property['code'] = $ARGS[1]
@@ -405,10 +443,13 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'start'
 		$property['bathroom'] = 'swamphouse'
 		$property['bathroom_arg'] = 'washstand'
+		$property['bedroom'] = 'swamphouse'
+		$property['bedroom_arg'] = 'start'
 		$property['type'] = 'temporary_residence'
+
 	elseif $ARGS[1] = 'shared_apartment':
 		property['id'] = 13
-		$property['code'] = $ARGS[1]	
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'Shared apartment in Pavlovsk'
 		$property['display'] = 'shared apartment in Pavlovsk'
 		$property['region'] = 'pav'
@@ -419,9 +460,12 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'start'
 		$property['bathroom'] = 'pav_shared_apt'
 		$property['bathroom_arg'] = 'bathroom'
+		$property['bedroom'] = 'pav_shared_apt'
+		$property['bedroom_arg'] = 'pcsRoom'
 		$property['type'] = 'temporary_residence'
 
-		property['free_internet'] = 1	
+		property['free_internet'] = 1
+
 	elseif $ARGS[1] = 'grandparents_house':
 		property['id'] = 14
 		$property['code'] = $ARGS[1]
@@ -435,7 +479,10 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = ''
 		$property['bathroom'] = 'vanr'
 		$property['bathroom_arg'] = ''
+		$property['bedroom'] = 'gadhouse'
+		$property['bedroom_arg'] = 'main'
 		$property['type'] = 'temporary_residence'
+
 	elseif $ARGS[1] = 'city_house':
 		property['id'] = 15
 		$property['code'] = $ARGS[1]
@@ -446,13 +493,16 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location'] = 'city_residential'
 		$property['location_arg'] = ''
 		$property['entrance'] = 'city_house_res_misc'
-		$property['entrance_arg'] = 'fronty'	
+		$property['entrance_arg'] = 'fronty'
 		$property['bathroom'] = 'city_house_res_bathr'
-		$property['bathroom_arg'] = 'bathr'	
+		$property['bathroom_arg'] = 'bathr'
+		$property['bedroom'] = 'city_house_res_bedr'
+		$property['bedroom_arg'] = 'bedro'
 		$property['type'] = 'permanent_residence'
-		
+
 		property['price'] = 800000
 		property['internet_enabled'] = 1
+
 	elseif $ARGS[1] = 'meynold_household':
 		property['id'] = 16
 		$property['code'] = $ARGS[1]
@@ -466,6 +516,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'door'
 		$property['bathroom'] = 'mey_home'
 		$property['bathroom_arg'] = 'bathroom'
+		$property['bedroom'] = 'mey_home'
+		$property['bedroom_arg'] = 'guest_bedroom'
 		$property['type'] = 'temporary_residence'
 
 		property['free_internet'] = 1

locations/pav_hotel.qsrc

@@ -208,8 +208,8 @@ end
 if hotelRoom['pav_hotel'] > 0:
 	act 'Go to your room':
 		$hotel = 'pav_hotel'
-		if hotelRoom['pav_hotel'] = 1:gt'hotelroom','normal'
-		if hotelRoom['pav_hotel'] = 2:gt'hotelroom','better'
+		if hotelRoom['pav_hotel'] = 1: gt 'HotelRoom', 'normal'
+		if hotelRoom['pav_hotel'] = 2: gt 'HotelRoom', 'better'
 	end
 end
 

locations/wakeup_events.qsrc

@@ -153,7 +153,7 @@ end
 
 if $ARGS[0] = 'vomiting_check':
 	!! if not one of these locations, event will not fire
-	if at_home = 1 or at_home = 2 or at_home = 3 or at_home = 4 or $loc = 'bedrPar' or at_home = 6 or at_home = 13 or at_home = 15 or $loc = 'mey_home':
+	if $loc = $home['bedroom'] and (at_home = 1 or at_home = 2 or at_home = 3 or at_home = 4 or $loc = 'bedrPar' or at_home = 6 or at_home = 13 or at_home = 15 or $loc = 'mey_home'):
 		gs 'wakeup_events', 'exit'
 		gs 'home_activity', 'vomiting_images'
 		gt 'home_activity', 'morning_vomit'