Browse Source

Simplified a bit the statuses - still not convinced about using numbers

Netuttki 1 year ago
parent
commit
1660ab7dce

+ 1 - 1
locations/intro_sg_select.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 	gs 'npcstatic6'
 
 	$pcs_dna = func('dna','generate',$npc_dna['A29'],$npc_dna['A35'])
-	gs 'homes_properties', 'set_ownership', 'parents_home', 4
+	gs 'homes_properties', 'set_ownership', 'parents_home', 1
 	gs 'homes_properties', 'set_home', 'parents_home'
 	killvar 'class_list_institution'
 	killvar 'class_list_name'

+ 1 - 1
locations/intro_sg_tg.qsrc

@@ -179,7 +179,7 @@ if $ARGS[0] = 'settings':
 
 	npc_rel['A25'] -= 5
 
-	gs 'homes_properties', 'set_ownership', 'parents_home', 4
+	gs 'homes_properties', 'set_ownership', 'parents_home', 1
 	gs 'homes_properties', 'set_home', 'parents_home'
 
 	pcs_eyesize = 3

+ 2 - 2
locations/mey_vika_events.qsrc

@@ -1133,7 +1133,7 @@ if $ARGS[0] = 'learning0':
 							act 'Go into the hall':
 								*clr & cla
 								mey_vika['mey_vika_qw'] = 35
-								gs 'homes_properties', 'set_ownership', 'meynold_household', 4
+								gs 'homes_properties', 'set_ownership', 'meynold_household', 1
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/learning4.jpg"></center>'
 								'You sniff and unassumingly, still wiping your wet eyes, you follow aunt Tamara, mentally preparing for the worst.'
 								'As soon as you enter the room, Vicky stands up and hugs you. She makes you sit next to her.'
@@ -1163,7 +1163,7 @@ if $ARGS[0] = 'learning0':
 							act 'Cry from shame and resentment':
 								*clr & cla
 								mey_vika['mey_vika_qw'] = 35
-								gs 'homes_properties', 'set_ownership', 'meynold_household', 4
+								gs 'homes_properties', 'set_ownership', 'meynold_household', 1
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/learning4.jpg"></center>'
 								'As Tamara gets up you break out in tears again.'
 								'"B-But... They''ll be mad at me!..." You start sobbing again. "I can''t face them after this."'

+ 1 - 1
locations/nichUtil.qsrc

@@ -335,7 +335,7 @@ end
 
 !! initializes variables when hired, might mess everything up if called at any other time
 if $ARGS[0] = 'hired':
-	gs 'homes_properties', 'set_ownership', 'maid_bedroom', 4
+	gs 'homes_properties', 'set_ownership', 'maid_bedroom', 1
 
 	nichWork = 2
 	nichWorkState = 0

+ 11 - 11
locations/saveupdater.qsrc

@@ -1303,7 +1303,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 	! city apartment
 	if home_owned[1] > 0: gs 'homes_properties', 'set_ownership', 'city_apartment', home_owned[1]
 	! parents home
-	if home_owned[2] = 1: gs 'homes_properties', 'set_ownership', 'parents_home', 4
+	if home_owned[2] = 1: gs 'homes_properties', 'set_ownership', 'parents_home', 1
 	! cottage in the village
 	if home_owned[3] = 2:  gs 'homes_properties', 'set_ownership', 'village_cottage', 2
 	! Pushking old town apartment
@@ -1313,27 +1313,27 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 	if home_owned[5] > 1: gs 'homes_properties', 'progress_construction_status', 'matryona_mansion'
 	if home_owned[5] > 2: gs 'homes_properties', 'progress_construction_status', 'matryona_mansion'
 	! Pavlovsk hotel room
-	if home_owned[6] = 1:  gs 'homes_properties', 'set_ownership', 'pavlovsk_hotel', 4
+	if home_owned[6] = 1:  gs 'homes_properties', 'set_ownership', 'pavlovsk_hotel', 1
 	! Live in maid bedroom
-	if home_owned[7] = 1:  gs 'homes_properties', 'set_ownership', 'maid_bedroom', 4
+	if home_owned[7] = 1:  gs 'homes_properties', 'set_ownership', 'maid_bedroom', 1
 	! Niko apartment
-	if home_owned[8] = 1:  gs 'homes_properties', 'set_ownership', 'nikos_apartment', 4
+	if home_owned[8] = 1:  gs 'homes_properties', 'set_ownership', 'niko_apartment', 1
 	! Shulga apartment
-	if home_owned[9] = 1:  gs 'homes_properties', 'set_ownership', 'shulga_apartment', 4
+	if home_owned[9] = 1:  gs 'homes_properties', 'set_ownership', 'shulga_apartment', 1
 	! Lyceum dorm room
-	if home_owned[10] = 1:  gs 'homes_properties', 'set_ownership', 'lyceum_dorm', 4
+	if home_owned[10] = 1:  gs 'homes_properties', 'set_ownership', 'lyceum_dorm', 1
 	! University dorm room
-	if home_owned[11] = 1:  gs 'homes_properties', 'set_ownership', 'university_dorm', 4
+	if home_owned[11] = 1:  gs 'homes_properties', 'set_ownership', 'university_dorm', 1
 	! Hunters lodge
-	if home_owned[12] = 1:  gs 'homes_properties', 'set_ownership', 'hunters_lodge', 4
+	if home_owned[12] = 1:  gs 'homes_properties', 'set_ownership', 'hunters_lodge', 1
 	! Shared apartment in Pavlovsk
-	if home_owned[13] = 1:  gs 'homes_properties', 'set_ownership', 'shared_apartment', 4
+	if home_owned[13] = 1:  gs 'homes_properties', 'set_ownership', 'shared_apartment', 1
 	! Grandparents house
-	if home_owned[14] = 1:  gs 'homes_properties', 'set_ownership', 'grandparents_house', 4
+	if home_owned[14] = 1:  gs 'homes_properties', 'set_ownership', 'grandparents_house', 1
 	! City residential house
 	if home_owned[15] = 2:  gs 'homes_properties', 'set_ownership', 'city_house', 2
 	! Meynold household
-	if home_owned[16] = 1:  gs 'homes_properties', 'set_ownership', 'meynold_household', 4
+	if home_owned[16] = 1:  gs 'homes_properties', 'set_ownership', 'meynold_household', 1
 
 	!! Setting the current home and fixing potential missing access issues
 	if curr_home > 0: gs 'homes_properties', 'set_home', '', curr_home

+ 1 - 1
locations/uni_admin.qsrc

@@ -101,7 +101,7 @@ if $ARGS[0] = 'enrollment':
 					$university['enrolled_in']= 'teaching_studies'
 					university['enrolled_in_semester'] = 1
 					
-					gs 'homes_properties', 'set_ownership', 'university_dorm', 4
+					gs 'homes_properties', 'set_ownership', 'university_dorm', 1
 
 					!!This creates the classes for the first semester of the teaching program to be used by the grade system, and gives the player a starting grade value (which is a failing grade, the player have to study if they want to pass)
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'general education 101', 3, 2, 'no', 'no', 1, 12