Browse Source

[added] Exit option to bathroom in all Sveta's owned homes and directions to send Sveta there when she vomits in the morning

Kevin_Smarts 9 months ago
parent
commit
6fe62e1850
3 changed files with 41 additions and 39 deletions
  1. 1 37
      locations/home_activity.qsrc
  2. 7 1
      locations/homes_properties.qsrc
  3. 33 1
      locations/homes_properties_attr.qsrc

+ 1 - 37
locations/home_activity.qsrc

@@ -310,43 +310,7 @@ if $ARGS[0] = 'vomiting_exit':
 	vomit['hangover'] = 0
 	vomit['unlucky'] = 0
 
-	if at_home = 1:
-		!! location = 'City residential apartment'
-		gt 'vanr'
-	elseif $loc = 'bedrPar':
-		!! location = 'Parent''s home in Pavlovsk'
-		gt 'vanrPar'
-	elseif at_home = 3:
-		!! location = 'My cottage in the cooperative farm'
-		gt 'dachain', 'dachabath'
-	elseif at_home = 4:
-		!! location = 'Old town apartment'
-		gt 'vanr2x'
-	elseif $home['current'] = 5:
-		!! location = 'Matryona mansion'
-		gt'city_mansion_residence_1','ybathroom'
-	elseif at_home = 6:
-		!! location = 'My hotel room in Pavlovsk'
-		gt 'HotelRoom', 'shower1'
-!!{	elseif at_home = 9:
-		!! location = 'Uncle Sergey''s apartment'
-		$home_activity['vomit_bedroom'] = ''
-		$home_activity['vomit_bathroom'] = ''
-
-		gt 'vasilyhome', 'bathroom'}
-	elseif at_home = 13:
-		gt 'pav_shared_apt', 'bathroom'
-!!{	elseif at_home = 14:
-		!! location = 'Grandparent''s house in Gadukino'
-		$home_activity['vomit_bedroom'] = ''
-		$home_activity['vomit_bathroom'] = ''}
-	elseif at_home = 15:
-		!! location = 'City residential house'
-		gt 'city_house_res_bathr', 'bathr'
-	elseif $loc = 'mey_home':
-		!! location = 'Meynold Household'
-		gt 'mey_home', 'bathroom'
-	end
+	gt $home['bathroom'], $home['bathroom_arg']
 end
 
 !! --------------- end vomiting ----------------------------

+ 7 - 1
locations/homes_properties.qsrc

@@ -1031,11 +1031,17 @@ if $ARGS[0] = 'go_home':
 end
 
 !! Call: `gs 'homes_properties', 'go_straight_home'
-!! Takes Sveta to the entracne of her home
+!! Takes Sveta to the entrance of her home
 if $ARGS[0] = 'go_straight_home':
 	gt $home['entrance'], $home['entrance_arg']
 end
 
+!! Call: `gs 'homes_properties', 'go_bathroom_home'
+!! Takes Sveta to the bathroom of her home
+if $ARGS[0] = 'go_bathroom_home':
+	gt $home['bathroom'], $home['bathroom_arg']
+end
+
 
 !! Returns 0 if the property doesn''t give free internet access, and 1 or -1 if it does
 !!

+ 33 - 1
locations/homes_properties_attr.qsrc

@@ -185,6 +185,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'korr'
 		$property['entrance_arg'] = ''
+		$property['bathroom'] = 'vanr'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'permanent_residence'
 
 		property['price'] = 800000
@@ -202,6 +204,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = 'start'
  		$property['entrance'] = 'korrPar'
 		$property['entrance_arg'] = 'start'
+		$property['bathroom'] = 'vanrPar'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'permanent_residence'
 		
 		property['free_internet'] = 1	
@@ -215,6 +219,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'dachamy'
 		$property['entrance_arg'] = ''
+		$property['bathroom'] = 'dachabath'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'permanent_residence'
 
 		property['price'] = 150000
@@ -230,6 +236,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'korr2x'
 		$property['entrance_arg'] = ''
+		$property['bathroom'] = 'vanr2x'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'permanent_residence'
 		
 		property['rental'] = 1
@@ -247,6 +255,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'city_mansion_residence_1'
 		$property['entrance_arg'] = 'yfoyer'
+		$property['bathroom'] = 'city_mansion_residence_1'
+		$property['bathroom_arg'] = 'ybathroom'
 		$property['type'] = 'permanent_residence'
 
 		property['price'] = 1500000
@@ -262,6 +272,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'pav_hotel'
 		$property['entrance_arg'] = ''
+		$property['bathroom'] = 'HotelRoom'
+		$property['bathroom_arg'] = 'shower1'
 		$property['type'] = 'temporary_residence'
 
 		property['free_internet'] = 1	
@@ -275,6 +287,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'nichBedroomServant'
 		$property['entrance_arg'] = 'start'
+		$property['bathroom'] = 'nichBathServant'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'permanent_residence'
 
 		property['free_internet'] = 1	
@@ -288,6 +302,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'pav_residential'
 		$property['entrance_arg'] = ''
+		$property['bathroom'] = 'pav_residential'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'temporary_residence'
 	elseif $ARGS[1] = 'shulga_apartment':
 		property['id'] = 9
@@ -299,6 +315,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = 'start'
 		$property['entrance'] = 'vasilyhome'
 		$property['entrance_arg'] = 'hallway'
+		$property['bathroom'] = 'vasilyhome'
+		$property['bathroom_arg'] = 'bathroom'
 		$property['type'] = 'temporary_residence'
 
 		property['free_internet'] = 1	
@@ -312,6 +330,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'etoexhib'
 		$property['entrance_arg'] = 'pos40'
+		$property['bathroom'] = 'etoexhib'
+		$property['bathroom_arg'] = 'pos41'
 		$property['type'] = 'permanent_residence'
 
 		property['free_internet'] = 1	
@@ -325,6 +345,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'uni_dorm'
 		$property['entrance_arg'] = 'dorm_room'
+		$property['bathroom'] = 'uni_dorm'
+		$property['bathroom_arg'] = 'womens_restroom'
 		$property['type'] = 'permanent_residence'
 
 		property['free_internet'] = 1		
@@ -338,6 +360,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = 'start'
 		$property['entrance'] = 'swamphouse'
 		$property['entrance_arg'] = 'start'
+		$property['bathroom'] = 'swamphouse'
+		$property['bathroom_arg'] = 'washstand'
 		$property['type'] = 'temporary_residence'
 	elseif $ARGS[1] = 'shared_apartment':
 		property['id'] = 13
@@ -349,6 +373,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = 'start'
 		$property['entrance'] = 'pav_shared_apt'
 		$property['entrance_arg'] = 'start'
+		$property['bathroom'] = 'pav_shared_apt'
+		$property['bathroom_arg'] = 'bathroom'
 		$property['type'] = 'temporary_residence'
 
 		property['free_internet'] = 1	
@@ -362,6 +388,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'gaddvor'
 		$property['entrance_arg'] = ''
+		$property['bathroom'] = 'vanr'
+		$property['bathroom_arg'] = ''
 		$property['type'] = 'temporary_residence'
 	elseif $ARGS[1] = 'city_house':
 		property['id'] = 15
@@ -372,7 +400,9 @@ 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['type'] = 'permanent_residence'
 		
 		property['price'] = 800000
@@ -387,6 +417,8 @@ if $ARGS[0] = 'get_property_attr':
 		$property['location_arg'] = ''
 		$property['entrance'] = 'mey_home'
 		$property['entrance_arg'] = 'door'
+		$property['bathroom'] = 'mey_home'
+		$property['bathroom_arg'] = 'bathroom'
 		$property['type'] = 'temporary_residence'
 
 		property['free_internet'] = 1