Browse Source

[fixed] Saveupdater fixes for recent entries placed incorrectly and older entries not version locked. Changed game to 0.8.8.4

Kevin_Smarts 1 year ago
parent
commit
4e105188f1
2 changed files with 111 additions and 99 deletions
  1. 1 1
      locations/saveg.qsrc
  2. 110 98
      locations/saveupdater.qsrc

+ 1 - 1
locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 8
 version_revision = 8
-version_patch = 3
+version_patch = 4
 --- saveg ---------------------------------
 

+ 110 - 98
locations/saveupdater.qsrc

@@ -272,6 +272,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	!!--------0.8.0.1---school social group adjustment
 end
 
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080100:
 	!!--------0.8.1--- Music variable names changed
 	if ml_update_1 = 0:
 		ml_guitar['hasguitar'] = ml_guitar
@@ -410,7 +411,10 @@ end
 		end
 		shave_update = 1
 	end
+end
+
 
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080200:
 	!! 0.8.2 clothing package for old saves ---------------------------------------
 
 	if ARRSIZE('cheapH') > 0 or ARRSIZE('averageH') > 0 or ARRSIZE('expensiveH') > 0 or ARRSIZE('formalH') > 0 or ARRSIZE('officeH') > 0 or ARRSIZE('schoolH') > 0 or ARRSIZE('exerciseH') > 0 or ARRSIZE('uniformH') > 0 or ARRSIZE('exhibitH') > 0 or ARRSIZE('alternativeH') > 0 or ARRSIZE('fetishH') > 0 or ARRSIZE('burlesqueH') > 0:
@@ -557,20 +561,21 @@ end
 		gm_outfits_b[50] = pcs_hips
 		gs 'clothing', 'wear', 'gm_outfits', 50
 	end
-!! Shave updater
-if shave_update ! 1:
-	if pubestyle = 1:
-		shave_length = 2
-		shave_trigger = 4
-	elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
-		shave_length = 16
-		shave_trigger = 21
-	elseif pubestyle = 10:
-		shave_length = 26
-		shave_trigger = 31
-	elseif pubestyle = 11:
-		shave_length = 2
-		shave_trigger = 8
+	!! Shave updater
+	if shave_update ! 1:
+		if pubestyle = 1:
+			shave_length = 2
+			shave_trigger = 4
+		elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
+			shave_length = 16
+			shave_trigger = 21
+		elseif pubestyle = 10:
+			shave_length = 26
+			shave_trigger = 31
+		elseif pubestyle = 11:
+			shave_length = 2
+			shave_trigger = 8
+		end
 	end
 end
 
@@ -1299,62 +1304,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 	!! Homes, Properties and Internet Update
 	!!--------------------------------------------------------------------
 	
-	!! Transferring the owned, rented, accessible properties
-	! city apartment
-	if home_owned[1] = 1 or owned_property['city_apartment'] = 1: 
-		gs 'homes_properties', 'rent_property', 'city_apartment', ArendHouseSL
-	elseif home_owned[1] = 2 or owned_property['city_apartment'] = 2: 
-		gs 'homes_properties', 'buy_property', 'city_apartment'
-	elseif home_owned[1] = 3 or owned_property['city_apartment'] = 3: 
-		gs 'homes_properties', 'tenants_move_in', 'city_apartment',sdaday, sdamonth
-	end
-
-	!! Checking for renovation
-	if home_owned[1] > 0 or owned_property['city_apartment'] = 1:
-		if rembedr = 1: gs 'homes_properties', 'renovate_property', 'city_apartment', 50000, 'bedroom'
-		if remsitr = 1: gs 'homes_properties', 'renovate_property', 'city_apartment', 50000, 'living room'
-		if remkorr = 1: gs 'homes_properties', 'renovate_property', 'city_apartment', 50000, 'hallway'
-		if remvanr = 1: gs 'homes_properties', 'renovate_property', 'city_apartment', 50000, 'bathroom'
-		if remkuhr = 1: gs 'homes_properties', 'renovate_property', 'city_apartment', 50000, 'kitchen'
-	end
-	! parents home
-	if home_owned[2] > 0 or owned_property['parents_home'] > 0: gs 'homes_properties', 'give_access', 'parents_home'
-	! cottage in the village
-	if home_owned[3] > 0 or owned_property['village_cottage'] > 0:  gs 'homes_properties', 'buy_property', 'village_cottage'
-	if home_owned[3] > 1 or owned_property['village_cottage-renovated'] = 1:  gs 'homes_properties', 'renovate_property', 'village_cottage', 200000
-	! Pushking old town apartment
-	if home_owned[4] = 1 or owned_property['old_town_apartment'] = 1: gs 'homes_properties', 'rent_property', 'old_town_apartment', ArendHouseSL4
-	! Matryona mansion
-	if home_owned[5] > 0 or owned_property['matryona_mansion'] > 0: gs 'homes_properties', 'buy_property', 'matryona_mansion'
-	if home_owned[5] > 1 or owned_property['matryona_mansion-construction-status'] = 1: gs 'homes_properties', 'progress_construction_status', 'matryona_mansion'
-	if home_owned[5] > 2 or owned_property['matryona_mansion-construction-status'] = 2: gs 'homes_properties', 'progress_construction_status', 'matryona_mansion'
-	! Pavlovsk hotel room
-	if home_owned[6] > 0 or owned_property['pavlovsk_hotel'] > 0:  gs 'homes_properties', 'give_access', 'pavlovsk_hotel'
-	! Live in maid bedroom
-	if home_owned[7] > 0 or owned_property['maid_bedroom'] > 0:  gs 'homes_properties', 'give_access', 'maid_bedroom'
-	! Niko apartment
-	if home_owned[8] > 0 or owned_property['niko_apartment'] > 0:  gs 'homes_properties', 'give_access', 'niko_apartment'
-	! Shulga apartment
-	if home_owned[9] > 0 or owned_property['shulga_apartment'] > 0:  gs 'homes_properties', 'give_access', 'shulga_apartment'
-	! Lyceum dorm room
-	if home_owned[10] > 0 or owned_property['lyceum_dorm'] > 0:  gs 'homes_properties', 'give_access', 'lyceum_dorm'
-	! University dorm room
-	if home_owned[11] > 0 or owned_property['university_dorm'] > 0:  gs 'homes_properties', 'give_access', 'university_dorm'
-	! Hunters lodge
-	if home_owned[12] > 0 or owned_property['hunters_lodge'] > 0:  gs 'homes_properties', 'give_access', 'hunters_lodge'
-	! Shared apartment in Pavlovsk
-	if home_owned[13] > 0 or owned_property['shared_apartment'] > 0:  gs 'homes_properties', 'give_access', 'shared_apartment'
-	! Grandparents house
-	if home_owned[14] > 0 or owned_property['grandparents_house'] > 0:  gs 'homes_properties', 'give_access', 'grandparents_house'
-	! City residential house
-	if home_owned[15] > 0 or owned_property['city_house'] > 0:  gs 'homes_properties', 'buy_property', 'city_house'
-	! Meynold household
-	if home_owned[16] > 0 or owned_property['meynold_household'] > 0:  gs 'homes_properties', 'give_access', 'meynold_household'
 
-	!! Setting the current home and fixing potential missing access issues
-	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'
@@ -1459,39 +1409,101 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 
 end
 
-!! ------------ NPC Stat Updater ------------------------
-
-if $ARGS[0] = 'npc_stat_update':
-	if npc_start_free_time[$boy] = 0 or npc_day_off[$boy] = 0:
-		if npc_finance[$boy] = 0:
-			if rand(1,3) = 1:
-				npc_start_free_time[$boy] = 9
-				npc_end_free_time[$boy] = 12
-			elseif rand(1,2) = 1:
-				npc_start_free_time[$boy] = 16
-				npc_end_free_time[$boy] = 20
-			else
-				npc_start_free_time[$boy] = 20
-				npc_end_free_time[$boy] = 23
-			end
-		elseif npc_finance[$boy] = 1:
-			if rand(1,2) = 1:
-				npc_start_free_time[$boy] = 9
-				npc_end_free_time[$boy] = 12
-			else
-				npc_start_free_time[$boy] = 20
-				npc_end_free_time[$boy] = 23
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00080804:
+
+	!! Transferring the owned, rented, accessible properties
+	! city apartment
+	if home_owned[1] = 1 or owned_property['city_apartment'] = 1: 
+		gs 'homes_properties', 'rent_property', 'city_apartment', ArendHouseSL
+	elseif home_owned[1] = 2 or owned_property['city_apartment'] = 2: 
+		gs 'homes_properties', 'buy_property', 'city_apartment'
+	elseif home_owned[1] = 3 or owned_property['city_apartment'] = 3: 
+		gs 'homes_properties', 'tenants_move_in', 'city_apartment',sdaday, sdamonth
+	end
+
+	!! Checking for renovation
+	if home_owned[1] > 0 or owned_property['city_apartment'] = 1:
+		if rembedr = 1: gs 'homes_properties', 'renovate_property', 'city_apartment', 50000, 'bedroom'
+		if remsitr = 1: gs 'homes_properties', 'renovate_property', 'city_apartment', 50000, 'living room'
+		if remkorr = 1: gs 'homes_properties', 'renovate_property', 'city_apartment', 50000, 'hallway'
+		if remvanr = 1: gs 'homes_properties', 'renovate_property', 'city_apartment', 50000, 'bathroom'
+		if remkuhr = 1: gs 'homes_properties', 'renovate_property', 'city_apartment', 50000, 'kitchen'
+	end
+	! parents home
+	if home_owned[2] > 0 or owned_property['parents_home'] > 0: gs 'homes_properties', 'give_access', 'parents_home'
+	! cottage in the village
+	if home_owned[3] > 0 or owned_property['village_cottage'] > 0:  gs 'homes_properties', 'buy_property', 'village_cottage'
+	if home_owned[3] > 1 or owned_property['village_cottage-renovated'] = 1:  gs 'homes_properties', 'renovate_property', 'village_cottage', 200000
+	! Pushking old town apartment
+	if home_owned[4] = 1 or owned_property['old_town_apartment'] = 1: gs 'homes_properties', 'rent_property', 'old_town_apartment', ArendHouseSL4
+	! Matryona mansion
+	if home_owned[5] > 0 or owned_property['matryona_mansion'] > 0: gs 'homes_properties', 'buy_property', 'matryona_mansion'
+	if home_owned[5] > 1 or owned_property['matryona_mansion-construction-status'] = 1: gs 'homes_properties', 'progress_construction_status', 'matryona_mansion'
+	if home_owned[5] > 2 or owned_property['matryona_mansion-construction-status'] = 2: gs 'homes_properties', 'progress_construction_status', 'matryona_mansion'
+	! Pavlovsk hotel room
+	if home_owned[6] > 0 or owned_property['pavlovsk_hotel'] > 0:  gs 'homes_properties', 'give_access', 'pavlovsk_hotel'
+	! Live in maid bedroom
+	if home_owned[7] > 0 or owned_property['maid_bedroom'] > 0:  gs 'homes_properties', 'give_access', 'maid_bedroom'
+	! Niko apartment
+	if home_owned[8] > 0 or owned_property['niko_apartment'] > 0:  gs 'homes_properties', 'give_access', 'niko_apartment'
+	! Shulga apartment
+	if home_owned[9] > 0 or owned_property['shulga_apartment'] > 0:  gs 'homes_properties', 'give_access', 'shulga_apartment'
+	! Lyceum dorm room
+	if home_owned[10] > 0 or owned_property['lyceum_dorm'] > 0:  gs 'homes_properties', 'give_access', 'lyceum_dorm'
+	! University dorm room
+	if home_owned[11] > 0 or owned_property['university_dorm'] > 0:  gs 'homes_properties', 'give_access', 'university_dorm'
+	! Hunters lodge
+	if home_owned[12] > 0 or owned_property['hunters_lodge'] > 0:  gs 'homes_properties', 'give_access', 'hunters_lodge'
+	! Shared apartment in Pavlovsk
+	if home_owned[13] > 0 or owned_property['shared_apartment'] > 0:  gs 'homes_properties', 'give_access', 'shared_apartment'
+	! Grandparents house
+	if home_owned[14] > 0 or owned_property['grandparents_house'] > 0:  gs 'homes_properties', 'give_access', 'grandparents_house'
+	! City residential house
+	if home_owned[15] > 0 or owned_property['city_house'] > 0:  gs 'homes_properties', 'buy_property', 'city_house'
+	! Meynold household
+	if home_owned[16] > 0 or owned_property['meynold_household'] > 0:  gs 'homes_properties', 'give_access', 'meynold_household'
+
+	!! Setting the current home and fixing potential missing access issues
+	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'
+ 
+
+	!! ------------ NPC Stat Updater ------------------------
+
+	if $ARGS[0] = 'npc_stat_update':
+		if npc_start_free_time[$boy] = 0 or npc_day_off[$boy] = 0:
+			if npc_finance[$boy] = 0:
+				if rand(1,3) = 1:
+					npc_start_free_time[$boy] = 9
+					npc_end_free_time[$boy] = 12
+				elseif rand(1,2) = 1:
+					npc_start_free_time[$boy] = 16
+					npc_end_free_time[$boy] = 20
+				else
+					npc_start_free_time[$boy] = 20
+					npc_end_free_time[$boy] = 23
+				end
+			elseif npc_finance[$boy] = 1:
+				if rand(1,2) = 1:
+					npc_start_free_time[$boy] = 9
+					npc_end_free_time[$boy] = 12
+				else
+					npc_start_free_time[$boy] = 20
+					npc_end_free_time[$boy] = 23
+				end
+			elseif npc_finance[$npclastgenerated] = 2:
+				npc_apt_type[$npclastgenerated] = 5
+				!!npc_apt_type[$npclastgenerated] = rand(5,6)
+				!! apt_type 6 is disabled until pictures are added
+				npc_occupation[$npclastgenerated] = rand(14,18)
+				npc_car[$npclastgenerated] = rand(0,1)
 			end
-		elseif npc_finance[$npclastgenerated] = 2:
-			npc_apt_type[$npclastgenerated] = 5
-			!!npc_apt_type[$npclastgenerated] = rand(5,6)
-			!! apt_type 6 is disabled until pictures are added
-			npc_occupation[$npclastgenerated] = rand(14,18)
-			npc_car[$npclastgenerated] = rand(0,1)
+			npc_day_off = rand(1,7)
 		end
-		npc_day_off = rand(1,7)
 	end
 end
+
+
 gs 'saveg'
 --- saveupdater ---------------------------------