Kaynağa Gözat

File changed AlbFatherQW to albina_election_events
Refactored all files.

Arcadia 3 yıl önce
ebeveyn
işleme
ee03984edc

+ 2 - 1
Name Updates.txt

@@ -1,3 +1,4 @@
 File Name / Name Changes Made:
 artemEv to artem_events
-psoklin to city_suburbs
+psoklin to city_suburbs
+albina_election_events to albina_election_events

+ 1 - 1
glife-notepad++

@@ -4,7 +4,7 @@
 			<File name="locations\abduction" />
 			<File name="locations\abductionCustomer" />
 			<File name="locations\agentned" />
-			<File name="locations\AlbFatherQW" />
+			<File name="locations\albina_election_events" />
 			<File name="locations\albinaEv" />
 			<File name="locations\albinahome" />
 			<File name="locations\albinaporog" />

+ 1 - 1
glife.qproj

@@ -712,7 +712,7 @@
 		<Location name="albinaRide"/>
 		<Location name="albinahome"/>
 		<Location name="albinaporog"/>
-		<Location name="AlbFatherQW"/>
+		<Location name="albina_election_events"/>
 		<Location name="AlbStars"/>
 	</Folder>
 	<Folder name="Lariska">

+ 2 - 2
locations/AlbStars.qsrc

@@ -288,8 +288,8 @@ if $ARGS[0] = 'starlets':
 			!! third rally in the park if sveta is dancing
 			if ((month > 9 and day > 20) or (month = 11 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 2 and AlbinaQW['ParkRallyDay'] < daystart :  gt 'AlbStars', 'parkrally'
 
-			if AlbinaQW['AlbFatherQW']  = 0 and AlbinaQW['StarletsWhore'] >= 8:
-				AlbinaQW['AlbFatherQW']  = 1
+			if AlbinaQW['albina_election_events']  = 0 and AlbinaQW['StarletsWhore'] >= 8:
+				AlbinaQW['albina_election_events']  = 1
 				'At the end of the session, Albina beckons you to her. "I''ve been told to tell you that you''re doing good <<$pcs_nickname>> and that the clients are saying that you''re their new favourite girl. You''re handling it all quite well, but it will all be over soon. He won''t get away with it much longer. I promise."'
 				'You raise an eyebrow at her, but she just pats you on the shoulder and walks away before you can ask her who or what she is talking about.'
 			end

+ 1 - 1
locations/Snpc.qsrc

@@ -227,7 +227,7 @@ if numnpc = 23:
 	! 	AlbinaQW['Friends'] = 2
 	! 	npc_rel['A23'] = 100
 	! 	'Albina smiles gratefully at you as she says: "Thank you <<$pcs_nickname>>! Like they say... a friend in need is a friend indeed. Your timely warning saved me, I had just enough time to get rid of all the evidence! Unfortunately we do have to stop with Albina''s Starlets, to keep ourselves out of trouble."'
-	! elseif AlbinaQW['AlbFatherQW']  = 2 and AlbEnemy = 0:
+	! elseif AlbinaQW['albina_election_events']  = 2 and AlbEnemy = 0:
 	! 	npc_rel['A23'] = 0
 	! 	AlbEnemy = 1
 	! 	'Albina angrily glares at you as she talks: "Cut the crap, bitch... I know what you did. You''ll regret this!"'

+ 4 - 4
locations/AlbFatherQW.qsrc → locations/albina_election_events.qsrc

@@ -1,4 +1,4 @@
-# AlbFatherQW
+# albina_election_events
 !!This is intended to happen during the election run, so should fire around the time that the "Vote Boris!" posters start appearing.
 !!Add trigger depending on whether or not Sveta gave a statement so Albina can talk about her choice later.
 
@@ -63,7 +63,7 @@ $din_zajava_albfather = {
 		*clr & cla
 		menu_off = 1
 		minut += 1
-		AlbinaQW['AlbFatherQW']  = 2
+		AlbinaQW['albina_election_events']  = 2
 		AlbinaQW['Chernov'] = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
@@ -125,7 +125,7 @@ $din_zajava_albfather_no2 = {
 		*clr & cla
 		menu_off = 1
 		minut += 1
-		AlbinaQW['AlbFatherQW']  = -1
+		AlbinaQW['albina_election_events']  = -1
 		AlbinaQW['Chernov'] = 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
@@ -145,4 +145,4 @@ $din_zajava_albfather_no2 = {
 	end
 }
 
---- AlbFatherQW ---------------------------------
+--- albina_election_events ---------------------------------

+ 1 - 1
locations/gschool_grounds.qsrc

@@ -302,7 +302,7 @@ if $ARGS[0] = 'main':
 				'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 			end
 		end
-		if AlbinaQW['albride'] = 0 and AlbinaQW['RideDaystart'] <= daystart and AlbinaQW['AlbFatherQW']  >= 1 and AlbinaQW['ParkRally'] > 0 and AlbinaQW['Chernov'] > 0: 
+		if AlbinaQW['albride'] = 0 and AlbinaQW['RideDaystart'] <= daystart and AlbinaQW['albina_election_events']  >= 1 and AlbinaQW['ParkRally'] > 0 and AlbinaQW['Chernov'] > 0: 
 			'<a href="exec:minut += 15 & gt ''albinaRide''">Albina Barlovskaya</a> is waiting behind the wheel of a large black SUV, parked near the school.'
 		end
 

+ 2 - 2
locations/pav_commercial.qsrc

@@ -55,13 +55,13 @@ end
 
 gs'street_event','pav_commercial', 'extras'
 
-if AlbinaQW['AlbFatherQW']  >= 1 and AlbinaQW['ParkRally'] > 0:
+if AlbinaQW['albina_election_events']  >= 1 and AlbinaQW['ParkRally'] > 0:
 	if AlbinaQW['ElectionCampaignTime'] = 0:AlbinaQW['ElectionCampaignTime'] = totminut + 2880
 
 	'You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?'
 end
 
-if AlbinaQW['ElectionCampaignTime'] > 0 and AlbinaQW['ElectionCampaignTime'] <= totminut and hour >= 14 and AlbinaQW['AlbFatherQW']  = 1:gt 'AlbFatherQW'
+if AlbinaQW['ElectionCampaignTime'] > 0 and AlbinaQW['ElectionCampaignTime'] <= totminut and hour >= 14 and AlbinaQW['albina_election_events']  = 1:gt 'albina_election_events'
 
 if StoryLine > 0 and hour < 4 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and home_owned[2] = 1:
 	motherWorry = 1

+ 2 - 2
locations/pav_industrial.qsrc

@@ -47,13 +47,13 @@ end
 
 gs'street_event','pav_industrial', 'extras'
 
-if AlbinaQW['AlbFatherQW']  >= 1 and AlbinaQW['ParkRally'] > 0:
+if AlbinaQW['albina_election_events']  >= 1 and AlbinaQW['ParkRally'] > 0:
 	if AlbinaQW['ElectionCampaignTime'] = 0:AlbinaQW['ElectionCampaignTime'] = totminut + 2880
 
 	'You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?'
 end
 
-if AlbinaQW['ElectionCampaignTime'] > 0 and AlbinaQW['ElectionCampaignTime'] <= totminut and hour >= 14 and AlbinaQW['AlbFatherQW']  = 1:gt 'AlbFatherQW'
+if AlbinaQW['ElectionCampaignTime'] > 0 and AlbinaQW['ElectionCampaignTime'] <= totminut and hour >= 14 and AlbinaQW['albina_election_events']  = 1:gt 'albina_election_events'
 
 if rand(1,5) >= 4 and pav_slut >= 100:
 	if pav_slut < 150:

+ 2 - 2
locations/pav_residential.qsrc

@@ -86,12 +86,12 @@ if pav_slut >= 250 and rand(1, 10) = 10 and pav_residential_prost_day ! daystart
 	exit
 end
 
-if AlbinaQW['AlbFatherQW']  >= 1 and AlbinaQW['ParkRally'] > 0:
+if AlbinaQW['albina_election_events']  >= 1 and AlbinaQW['ParkRally'] > 0:
 	if AlbinaQW['ElectionCampaignTime'] = 0:AlbinaQW['ElectionCampaignTime'] = totminut + 2880
 	'<br>You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?</br>'
 end
 
-if AlbinaQW['ElectionCampaignTime'] > 0 and AlbinaQW['ElectionCampaignTime'] <= totminut and hour >= 14 and AlbinaQW['AlbFatherQW']  = 1:gt 'AlbFatherQW'
+if AlbinaQW['ElectionCampaignTime'] > 0 and AlbinaQW['ElectionCampaignTime'] <= totminut and hour >= 14 and AlbinaQW['albina_election_events']  = 1:gt 'albina_election_events'
 
 if rand(1, 5) >= 4 and pav_slut >= 150:
 	if pav_slut < 200:

+ 1 - 1
locations/saveupdater.qsrc

@@ -494,7 +494,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	! ----- Diner Bystroeshka (burger) story variables migrated to array
 
 	! ----- Albina story variables migrated to array
-	if AlbFather > 0:          AlbinaQW['AlbFatherQW'] = AlbFather & killvar 'AlbFather'
+	if AlbFather > 0:          AlbinaQW['albina_election_events'] = AlbFather & killvar 'AlbFather'
 	if AlbFrend > 0:           AlbinaQW['Friends'] = AlbFrend & killvar 'AlbFrend'
 	if ZvezdEnd > 0:           AlbinaQW['StarletsShutDown'] = ZvezdEnd & killvar 'ZvezdEnd'
 	if DanceWhore > 0:         AlbinaQW['StarletsWhore'] = DanceWhore & killvar 'DanceWhore'