Browse Source

Property code included and better order of the attributes

Netuttki 1 year ago
parent
commit
fbdea94eb8
1 changed files with 52 additions and 33 deletions
  1. 52 33
      locations/homes_properties.qsrc

+ 52 - 33
locations/homes_properties.qsrc

@@ -44,8 +44,12 @@ if ARRSIZE('price')  < 4:
 end
 
 !! Always call this function with gs and use killvar'property' after finished with the data.
+!! ARGS[1] - the string identifier of the property. If it is empty (`' '`) then use `id` in ARGS[2]
+!! ARG[2] - the id of the property, only for backward compatibility and for some mods maybe
 if $ARGS[0] = 'get_property_attr':
-	if $ARGS[1] = 'city_apartment':
+	if $ARGS[1] = 'city_apartment' or ($ARGS[1] = '' and ARGS[2] = 1):
+		property['id'] = 1
+		$property['code'] = 'city_apartment'
 		$property['name'] = 'City residential apartment'
 		$property['display'] = 'apartment in St. Petersburg''s residential area'
 		$property['agency_display'] = 'An apartment in St. Petersburg''s residential area'
@@ -57,18 +61,20 @@ if $ARGS[0] = 'get_property_attr':
 		$property['rent'] = $prop_rent['city_apartment']		
 		property['price'] = prop_price['city_apartment']
 		property['rent'] = prop_rent['city_apartment']
-		property['id'] = 1
 		property['rental'] = 1
 		property['internet_enabled'] = 1
-	elseif $ARGS[1] = 'parents_home':
+	elseif $ARGS[1] = 'parents_home' or ($ARGS[1] = '' and ARGS[2] = 2):
+		property['id'] = 2
+		$property['code'] = 'parents_home'
 		$property['name'] = 'Parent''s home in Pavlovsk'
 		$property['display'] = 'your parent''s home in Pavlovsk'
 		$property['town'] = 'pavlovsk'
 		$property['location'] = 'pav_complex'
 		$property['entrance'] = 'korrPar'
 		$property['type'] = 'permanent_residence'
-		property['id'] = 2
-	elseif $ARGS[1] = 'village_cottage':
+	elseif $ARGS[1] = 'village_cottage' or ($ARGS[1] = '' and ARGS[2] = 3) :
+		property['id'] = 3
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'My cottage in the cooperative village'
 		$property['display'] = 'cottage in the cooperative village'
 		$property['agency_display'] = 'A cottage located in the cooperative village'
@@ -77,10 +83,12 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance'] = 'dachamy'
 		$property['type'] = 'permanent_residence'
 		$property['price'] = $prop_price['village_cottage']
-		property['id'] = 3
 		property['price'] = prop_price['village_cottage']
-		property['internet_enabled'] = 1
-	elseif $ARGS[1] = 'old_town_apartment':
+		!! Currently no cable or internet can be installed at this property, maybe later.
+		property['internet_enabled'] = 0
+	elseif $ARGS[1] = 'old_town_apartment' or ($ARGS[1] = '' and ARGS[2] = 4):
+		property['id'] = 4
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'Old town apartment'
 		$property['display'] = 'old town apartment'
 		$property['angecy-display'] = 'An apartment in the old town of Puskin.'
@@ -90,10 +98,11 @@ if $ARGS[0] = 'get_property_attr':
 		$property['type'] = 'permanent_residence'
 		$property['rent'] = $prop_rent['old_town_apartment']		
 		property['price'] = prop_rent['old_town_apartment']
-		property['id'] = 4
 		property['rental'] = 1
 		property['internet_enabled'] = 1
-	elseif $ARGS[1] = 'matryona_mansion':
+	elseif $ARGS[1] = 'matryona_mansion' or ($ARGS[1] = '' and ARGS[2] = 5):
+		property['id'] = 5
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'Matryona mansion'
 		$property['display'] = 'the Matryona mansion'
 		$property['agency_display'] = 'A plot of land in the St. Petersburg''s suburbs'
@@ -103,82 +112,92 @@ if $ARGS[0] = 'get_property_attr':
 		$property['type'] = 'permanent_residence'
 		$property['price'] = $prop_rent['matryona_mansion']
 		property['price'] = prop_rent['matryona_mansion']
-		property['id'] = 5
 		property['internet_enabled'] = 1
 		property['contstruction_needed'] = 1
-	elseif $ARGS[1] = 'pavlovsk_hotel':
+	elseif $ARGS[1] = 'pavlovsk_hotel' or ($ARGS[1] = '' and ARGS[2] = 6):
+		property['id'] = 6
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'My hotel room in Pavlovsk'
 		$property['display'] = 'your hotel room in Pavlovsk'
 		$property['town'] = 'pavlovsk'
 		$property['location'] = 'pav_market'
 		$property['entrance'] = 'pav_hotel'
 		$property['type'] = 'temporary_residence'
-		property['id'] = 6
-	elseif $ARGS[1] = 'maid_bedroom':
+	elseif $ARGS[1] = 'maid_bedroom' or ($ARGS[1] = '' and ARGS[2] = 7):
+		property['id'] = 7
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'Nicholas'' Apartment'
 		$property['display'] = 'your maid bedroom in Nicholas'' apartment'
 		$property['town'] = 'city'
 		$property['location'] = 'city_center'
 		$property['entrance'] = 'nichBedroomServant'
 		$property['type'] = 'permanent_residence'
-		property['id'] = 7
-	elseif $ARGS[1] = 'nikos_apartment':
+	elseif $ARGS[1] = 'nikos_apartment' or ($ARGS[1] = '' and ARGS[2] = 8):
+		property['id'] = 8
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'Niko''s apartment'
 		$property['display'] = 'Niko''s apartment'
 		$property['town'] = 'pavlovsk'
 		$property['location'] = 'pav_residential'
 		$property['entrance'] = 'pav_residential'
 		$property['type'] = 'temporary_residence'
-		property['id'] = 8
-	elseif $ARGS[1] = 'sergeys_apartment':
+	elseif $ARGS[1] = 'shulga_apartment' or ($ARGS[1] = '' and ARGS[2] = 9):
+		property['id'] = 9
+		$property['code'] = $ARGS[1]	
 		$property['name'] = 'Uncle Sergey''s apartment'
 		$property['display'] = 'Uncle Sergey''s apartment'
 		$property['town'] = 'pavlovsk'
 		$property['location'] = 'pav_complex'
 		$property['entrance'] = 'shulgahall'
 		$property['type'] = 'temporary_residence'
-		property['id'] = 9
-	elseif $ARGS[1] = 'lyceum_dorm':
+	elseif $ARGS[1] = 'lyceum_dorm' or ($ARGS[1] = '' and ARGS[2] = 10):
+		property['id'] = 10
+		$property['code'] = $ARGS[1]	
 		$property['name'] = 'Lyceum school'
 		$property['display'] = 'your room in the Lyceum dorm'
 		$property['town'] = 'pavlovsk'
 		$property['location'] = 'pav_commercial'
 		$property['entrance'] = 'etoexhib'
 		$property['type'] = 'permanent_residence'
-		property['id'] = 10
-	elseif $ARGS[1] = 'university_dorm':
+	elseif $ARGS[1] = 'university_dorm' or ($ARGS[1] = '' and ARGS[2] = 11):
+		property['id'] = 11
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'University halls'
 		$property['display'] = 'your room in the university dorm'
 		$property['town'] = 'city'
 		$property['location'] = 'city_island'
 		$property['entrance'] = 'uni_dorm'
 		$property['type'] = 'permanent_residence'
-		property['id'] = 11
-	elseif $ARGS[1] = 'hunters_lodge':
+	elseif $ARGS[1] = 'hunters_lodge' or ($ARGS[1] = '' and ARGS[2] = 12):
+		property['id'] = 12
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'Hunter''s lodge in Gadukino'
 		$property['display'] = 'the hunter''s lodge in Gadukino'
 		$property['town'] = 'gadukino'
 		$property['location'] = 'swamp_yard'
 		$property['entrance'] = 'swamphouse'
 		$property['type'] = 'temporary_residence'
-		property['id'] = 12
-	elseif $ARGS[1] = 'shared_apartment':
+	elseif $ARGS[1] = 'shared_apartment' or ($ARGS[1] = '' and ARGS[2] = 13):
+		property['id'] = 13
+		$property['code'] = $ARGS[1]	
 		$property['name'] = 'Shared apartment in Pavlovsk'
 		$property['display'] = 'the shared apartment in Pavlovsk'
 		$property['town'] = 'pavlovsk'
 		$property['location'] = 'pav_complex'
 		$property['entrance'] = 'pav_shared_apt'
 		$property['type'] = 'temporary_residence'
-		property['id'] = 13
-	elseif $ARGS[1] = 'grandparents_house':
+	elseif $ARGS[1] = 'grandparents_house' or ($ARGS[1] = '' and ARGS[2] = 14):
+		property['id'] = 14
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'Grandparent''s house in Gadukino'
 		$property['display'] = 'your grandparent''s house in Gadukino'
 		$property['town'] = 'gadukino'
 		$property['location'] = 'gaddvor'
 		$property['entrance'] = 'gaddvor'
 		$property['type'] = 'temporary_residence'
-		property['id'] = 14
-	elseif $ARGS[1] = 'city_house':
+	elseif $ARGS[1] = 'city_house' or ($ARGS[1] = '' and ARGS[2] = 15):
+		property['id'] = 15
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'City residential house'
 		$property['display'] = 'house in the St. Petersburg''s residential area'
 		$property['agency_display'] = 'A house in the St. Petersburg''s residential area'
@@ -188,16 +207,16 @@ if $ARGS[0] = 'get_property_attr':
 		$property['type'] = 'permanent_residence'
 		$property['price'] = $prop_price['city_house']
 		property['price'] = prop_price['city_house']
-		property['id'] = 15
 		property['internet_enabled'] = 1
-	elseif $ARGS[1] = 'meynold_household':
+	elseif $ARGS[1] = 'meynold_household' or ($ARGS[1] = '' and ARGS[2] = 16):
+		property['id'] = 16
+		$property['code'] = $ARGS[1]
 		$property['name'] = 'Meynold Household'
 		$property['display'] = 'the Meynold Household'
 		$property['town'] = 'pavlovsk'
 		$property['location'] = 'pav_residential'
 		$property['entrance'] = 'mey_home'
 		$property['type'] = 'temporary_residence'
-		property['id'] = 16
 	else
 		!! Nonexisting property. CAn be useful if someone wants to check if something is a property or not. For example the
 		!! internet transfer code does this right now.