Sfoglia il codice sorgente

Moved the rest of the home/internet update code to be with their friends

netuttki 1 anno fa
parent
commit
1f5b7fc9c8
1 ha cambiato i file con 69 aggiunte e 70 eliminazioni
  1. 69 70
      locations/saveupdater.qsrc

+ 69 - 70
locations/saveupdater.qsrc

@@ -1300,76 +1300,6 @@ end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00080802:
 
-	!!--------------------------------------------------------------------
-	!! Homes, Properties and Internet Update
-	!!--------------------------------------------------------------------
-	
-
-	killvar 'home_owned' & killvar 'curr_home' & killvar 'ArendHouseSL' & killvar 'ArendHouseSL4'
-	killvar 'home_rent_txt' & killvar 'home_value' & killvar 'home_value_txt'
-	killvar 'sdaday' & killvar 'sdamonth' & killvar 'owned_property'
-
-	if $home['current'] = '':
-		if mid($start_type, 1, 2) = 'sg':
-			gs 'homes_properties', 'give_access', 'parents_home'
-			gs 'homes_properties', 'set_home', 'parents_home'
-		elseif mid($start_type, 1, 4) = 'city':
-			gs 'homes_properties', 'give_access', 'city_apartment'
-			gs 'homes_properties', 'set_home', 'city_apartment'
-		elseif mid($start_type, 1, 3) = 'uni':
-			gs 'homes_properties', 'give_access', 'university_dorm'
-			gs 'homes_properties', 'set_home', 'university_dorm'
-		end
-	end
-
-	!! Setting the internet
-	if internet > 0:
-		old_internet_value = 10*internet
-		if $home['internet_enabled'] = 1: 
-			gs 'internet_mobile', 'buy_subscription', $home['current'], 900			
-			if (old_internet_value - 900) >= 0: money += (old_internet_value - 900)
-		else
-			if old_internet_value >= 1200: 
-				gs 'internet_mobile', 'buy_subscription', 'mobile', 1200
-				if (old_internet_value - 1200) > 0: money += (old_internet_value - 1200)
-			else
-				gs 'internet_mobile', 'top_up_metered', 'metered_mobile', internet*60
-			end
-		end
-		killvar 'internet'
-	end
-
-	!! Setting the mobile phone calls and texts
-	if balans > 0:
-		if (balans - 800) >= 0: 
-			gs 'internet_mobile', 'buy_subscription', 'monthly_calls', 800
-			money += (balans - 800)
-		else
-			if balans >= 225: 
-				temp_phone_mult = balans/225
-				temp_phone_rem = balans MOD 225
-				new_balans = temp_phone_mult * 240
-				gs 'internet_mobile', 'top_up_metered', 'metered_calls', new_balans
-				if temp_phone_rem > 0: money += temp_phone_rem
-			elseif balans >= 170:
-				 temp_phone_rem = balans MOD 170
-				 gs 'internet_mobile', 'top_up_metered', 'metered_calls', 180
-				 if temp_phone_rem > 0: money += temp_phone_rem
-			elseif balans = 115:
-				 temp_phone_rem = balans MOD 115
-				 gs 'internet_mobile', 'top_up_metered', 'metered_calls', 120
-				 if temp_phone_rem > 0: money += temp_phone_rem
-			elseif balans >= 60: 
-				 temp_phone_rem = balans MOD 60
-				 gs 'internet_mobile', 'top_up_metered', 'metered_calls', 60
-				 if temp_phone_rem > 0: money += temp_phone_rem
-			else
-				gs 'internet_mobile', 'top_up_metered', 'metered_calls', balans
-			end
-		end	
-		killvar 'balans' & killvar 'temp_phone_rem' & killvar 'temp_phone_mult' & killvar 'new_balans'
-	end
-
 	!!--------------------------------------------------------------------
 	!! Prostitution related changes
 	!!--------------------------------------------------------------------
@@ -1411,6 +1341,10 @@ end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00080804:
 
+	!!--------------------------------------------------------------------
+	!! Homes, Properties and Internet Update
+	!!--------------------------------------------------------------------
+
 	!! Transferring the owned, rented, accessible properties
 	! city apartment
 	if home_owned[1] = 1 or owned_property['city_apartment'] = 1: 
@@ -1467,6 +1401,71 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 	if curr_home > 0 and $home['current'] = '': gs 'homes_properties', 'set_home', '', STR(curr_home)
 	if $home['current'] = 'parents_home' and accessible_property['parents_home'] = 0: gs 'homes_properties', 'give_access', 'parents_home'
  
+	killvar 'home_owned' & killvar 'curr_home' & killvar 'ArendHouseSL' & killvar 'ArendHouseSL4'
+	killvar 'home_rent_txt' & killvar 'home_value' & killvar 'home_value_txt'
+	killvar 'sdaday' & killvar 'sdamonth' & killvar 'owned_property'
+
+	if $home['current'] = '':
+		if mid($start_type, 1, 2) = 'sg':
+			gs 'homes_properties', 'give_access', 'parents_home'
+			gs 'homes_properties', 'set_home', 'parents_home'
+		elseif mid($start_type, 1, 4) = 'city':
+			gs 'homes_properties', 'give_access', 'city_apartment'
+			gs 'homes_properties', 'set_home', 'city_apartment'
+		elseif mid($start_type, 1, 3) = 'uni':
+			gs 'homes_properties', 'give_access', 'university_dorm'
+			gs 'homes_properties', 'set_home', 'university_dorm'
+		end
+	end
+
+	!! Setting the internet
+	if internet > 0:
+		old_internet_value = 10*internet
+		if $home['internet_enabled'] = 1: 
+			gs 'internet_mobile', 'buy_subscription', $home['current'], 900			
+			if (old_internet_value - 900) >= 0: money += (old_internet_value - 900)
+		else
+			if old_internet_value >= 1200: 
+				gs 'internet_mobile', 'buy_subscription', 'mobile', 1200
+				if (old_internet_value - 1200) > 0: money += (old_internet_value - 1200)
+			else
+				gs 'internet_mobile', 'top_up_metered', 'metered_mobile', internet*60
+			end
+		end
+		killvar 'internet'
+	end
+
+	!! Setting the mobile phone calls and texts
+	if balans > 0:
+		if (balans - 800) >= 0: 
+			gs 'internet_mobile', 'buy_subscription', 'monthly_calls', 800
+			money += (balans - 800)
+		else
+			if balans >= 225: 
+				temp_phone_mult = balans/225
+				temp_phone_rem = balans MOD 225
+				new_balans = temp_phone_mult * 240
+				gs 'internet_mobile', 'top_up_metered', 'metered_calls', new_balans
+				if temp_phone_rem > 0: money += temp_phone_rem
+			elseif balans >= 170:
+				 temp_phone_rem = balans MOD 170
+				 gs 'internet_mobile', 'top_up_metered', 'metered_calls', 180
+				 if temp_phone_rem > 0: money += temp_phone_rem
+			elseif balans = 115:
+				 temp_phone_rem = balans MOD 115
+				 gs 'internet_mobile', 'top_up_metered', 'metered_calls', 120
+				 if temp_phone_rem > 0: money += temp_phone_rem
+			elseif balans >= 60: 
+				 temp_phone_rem = balans MOD 60
+				 gs 'internet_mobile', 'top_up_metered', 'metered_calls', 60
+				 if temp_phone_rem > 0: money += temp_phone_rem
+			else
+				gs 'internet_mobile', 'top_up_metered', 'metered_calls', balans
+			end
+		end	
+		killvar 'balans' & killvar 'temp_phone_rem' & killvar 'temp_phone_mult' & killvar 'new_balans'
+	end
+
 
 	!! ------------ NPC Stat Updater ------------------------