1
0
Переглянути джерело

Replaced all instances of psiklin with city_suburbs.

Arcadia 3 роки тому
батько
коміт
a6134a8c95

+ 3 - 0
Name Updates.txt

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

+ 1 - 1
glife-notepad++

@@ -578,7 +578,7 @@
 			<File name="locations\preTG" />
 			<File name="locations\priziv" />
 			<File name="locations\Prostitute" />
-			<File name="locations\psiklin" />
+			<File name="locations\city_suburbs" />
 			<File name="locations\ptu_dush" />
 			<File name="locations\qjob" />
 			<File name="locations\qwBarPolet" />

+ 1 - 1
glife.qproj

@@ -1091,7 +1091,7 @@
 		<Location name="parks"/>
 		<Location name="lug"/>
 		<Location name="dibodi"/>
-		<Location name="psiklin"/>
+		<Location name="city_suburbs"/>
 		<Location name="din_pav"/>
 		<Location name="shop_fancy_pancy"/>
 		<Location name="shop_skuas"/>

+ 1 - 1
locations/BDSM_Club.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = 'start':
 	end
 
 	gs 'taxi'
-	act 'Elite settlement':gt 'psiklin', 'start'
+	act 'Elite settlement':gt 'city_suburbs', 'start'
 end
 
 if $ARGS[0] = 'in':

+ 1 - 1
locations/alexandriaEv.qsrc

@@ -357,7 +357,7 @@ if $ARGS[0] = 'interview4':
 		'"You told her that? And she confirmed it? Because I don''t have much information about..." You blink surprised at her lack of concern, which prompts her to sigh and change the theme. "<<$pcs_nickname>>, when I talked about Reinhold and The Council, I was... well, <i>having fun at your expense</i>. But the truth is that you must be a little wary of their intentions. I wanted to win some time before talking to Reinhold and prevent, that some red-lipped succubus charmed you away to some gilded cage, and for Alexandria... Look, is my fault ok? I wasn''t expecting for you to run after her, but <<$pcs_nickname>>, you must understand that she is the equivalent of a walking magical WMD. She can impose terms at The Council, and ending on her grasp... Well, that can trigger all sort of bad scenarios with you in the middle, something that Reinhold is trying to prevent."'
 		'After this explanation, that you don''t know if belive, Tatiana turn back and return to her hideout, leaving you alone to digest the new situation.'
 
-		act 'Continue':gt'psiklin','start'
+		act 'Continue':gt'city_suburbs','start'
 	end
 end
 

+ 10 - 10
locations/psiklin.qsrc → locations/city_suburbs.qsrc

@@ -1,11 +1,11 @@
-# psiklin
+# city_suburbs
 
 $location_type = 'public_outdoors'
 
 if $ARGS[0]='start':
-	$loc = 'psiklin'
+	$loc = 'city_suburbs'
 	$loc_arg = 'start'
-	$menu_loc = 'psiklin'
+	$menu_loc = 'city_suburbs'
 	$menu_arg = 'start'
 	menu_off = 0
 	gs'stat'
@@ -28,8 +28,8 @@ if $ARGS[0]='start':
 		'One of the most impressive buildings is your newly built mansion.'
 		act 'Visit your mansion': gt 'youplace'
 	end
-	act 'View the insane asylum': minut += 2 & gt 'psiklin', 'ps1'
-	act 'View the creepy old building': minut += 2 & gt 'psiklin', 'ps2'
+	act 'View the insane asylum': minut += 2 & gt 'city_suburbs', 'ps1'
+	act 'View the creepy old building': minut += 2 & gt 'city_suburbs', 'ps2'
 
 	act 'Go to the main road':nroad = 1 & minut += 15 & gt 'road'
 
@@ -49,7 +49,7 @@ end
 if $ARGS[0]='ps1':
 	cla
 	*clr
-	$menu_loc = 'psiklin'
+	$menu_loc = 'city_suburbs'
 	$menu_arg = 'ps1'
 	menu_off = 0
 	gs'stat'
@@ -58,13 +58,13 @@ if $ARGS[0]='ps1':
 	if psiklik = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/asylum0.jpg" ></center>'
 	if psiklik = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/asylum1.jpg" ></center>'
 
-	act 'Go': minut += 2 & gt'psiklin','start'
+	act 'Go': minut += 2 & gt'city_suburbs','start'
 end
 
 if $ARGS[0]='ps2':
 	cla
 	*clr
-	$menu_loc = 'psiklin'
+	$menu_loc = 'city_suburbs'
 	$menu_arg = 'ps2'
 	menu_off = 0
 	gs'stat'
@@ -72,8 +72,8 @@ if $ARGS[0]='ps2':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/abandoned.jpg" ></center>'
 	'An abandoned building that spoils the local communities appearance and intimidates local residents.'
 
-	act 'Go': minut += 2 & gt'psiklin','start'
+	act 'Go': minut += 2 & gt'city_suburbs','start'
 end
 
---- psiklin ---------------------------------
+--- city_suburbs ---------------------------------
 

+ 3 - 3
locations/metro.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 		'<center><b><font color="maroon">City Industrial Region</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platindust.jpg"></center>'
 !!new locations for the metro, you will have to see how the code works and for now the island will be commented out until we add that area of the city
-	elseif $loc = 'psiklin':
+	elseif $loc = 'city_suburbs':
 		'<center><b><font color="maroon">City Suburbs</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platsuburb.jpg"></center>'
 	elseif $loc = 'city_island': 
@@ -71,9 +71,9 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if $loc ! 'psiklin':
+		if $loc ! 'city_suburbs':
 			act 'Go to the <b>City Suburbs</b> (16 <b>₽</b>)':
-				$loc = 'psiklin'
+				$loc = 'city_suburbs'
 				$loc_arg = 'start'
 				money -= 16
 				minut += 10

+ 1 - 1
locations/road.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = '':
 		'You''re on the outskirts of St. Petersburg. You see a number of crudely made huts near the trees, a bunch of homeless people must have sought shelter here.'
 		'A <a href="exec:minut += 5 & gt ''furi''">lorry</a> is parked next to the road. The driver is currently taking a break, and is having a cigarette. He could probably bring you to Gadukino or Pavlovsk, for a price...'
 	elseif nroad = 1:
-		'You''re not very far from St. Petersburg. You see a bunch of <a href="exec:minut += 15 & gt ''psiklin'',''start''">luxury houses</a> not far from the road. That settlement looks like it''s very expensive to live in.'
+		'You''re not very far from St. Petersburg. You see a bunch of <a href="exec:minut += 15 & gt ''city_suburbs'',''start''">luxury houses</a> not far from the road. That settlement looks like it''s very expensive to live in.'
 	elseif nroad = 2:
 		''
 	elseif nroad = 3:

+ 1 - 1
locations/youplace.qsrc

@@ -20,7 +20,7 @@ if car > 0 and cardrive = 18:
 	'<a href="exec:gs ''carF'', ''start''">Your <<$car>></a> is parked here.'
 end
 
-act 'Go to the suburbs':minut += 10 & gt 'psiklin', 'start'
+act 'Go to the suburbs':minut += 10 & gt 'city_suburbs', 'start'
 
 if bassMansion = 1:'<a href="exec:gt ''ybass''">Go to the pool</a>.'
 if banaMansion >= 1:'<a href="exec:gt ''yban''">Go to the sauna</a>.'