Browse Source

[removed[ Roma file was pointless so merged it to the main party file

KevinSmarts 5 years ago
parent
commit
b2548eafbf
3 changed files with 12 additions and 14 deletions
  1. 0 1
      glife.qproj
  2. 0 11
      locations/roma.qsrc
  3. 12 2
      locations/sbReksHome.qsrc

+ 0 - 1
glife.qproj

@@ -451,7 +451,6 @@
 		<Location name="party_boys"/>
 		<Location name="party_girls"/>
 		<Location name="sister_party"/>
-		<Location name="roma"/>
 		<Location name="ira"/>
 		<Location name="lena"/>
 	</Folder>

+ 0 - 11
locations/roma.qsrc

@@ -1,11 +0,0 @@
-# roma
-cls
-minut += 5
-gs'stat'
-'<center><b><font color = maroon>Roma</font></b></center>'
-'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/roma/roma.jpg"></center>'
-'Red-haired skinny guy named Roma'
-act 'Move away':gt $loc,$metka
-
---- roma ---------------------------------
-

+ 12 - 2
locations/sbReksHome.qsrc

@@ -74,7 +74,7 @@ if $ARGS[0] = 'party_home':
 	'<center><b><font color = maroon>Rex''s Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_1_' + rand(1,5) + '.jpg"></center>'
 	'Sitting at a table and drinking with your friends, sitting to one side of you sharing a bottle as always is <a href="exec:gt ''lena'',''lena''">Lena</a> who is always fun, her slightly more reserved friend <a href="exec:gt ''ira'',''ira''">Ira</a>, and always up beat <a href="exec:gt ''reks'',''party''">Rex</a>.'
-	'To your other side sits your sister <a href="exec:gt ''sister_party'',''sister_party''">Anya</a> drinking already and <a href="exec:gt ''roma''">Roma</a>, whom himself sits just a bit away looking more serious than normal, plus lots of <a href="exec:gt ''party_girls'',''party_girls''">girls</a> and <a href="exec:gt ''party_boys'',''party_boys''">guys</a> you barely know.'
+	'To your other side sits your sister <a href="exec:gt ''sister_party'',''sister_party''">Anya</a> drinking already and <a href="exec:gt ''sbReksHome'', ''roma''">Roma</a>, whom himself sits just a bit away looking more serious than normal, plus lots of <a href="exec:gt ''party_girls'',''party_girls''">girls</a> and <a href="exec:gt ''party_boys'',''party_boys''">guys</a> you barely know.'
 	if alko < 3:'One of the guys offers you a bottle to <a href="exec:gt ''sbReksHome'',''party_drink''">drink</a> from as they say "A little more to set the mood."'
 	!You''re drunk
 	if alko >= 3:
@@ -91,6 +91,16 @@ if $ARGS[0] = 'party_home':
 	act 'Go to the living room':gt'sbReksHome','party_gost'
 end
 
+if $ARGS[0] = 'roma':
+	cls
+	minut += 5
+	gs'stat'
+	'<center><b><font color = maroon>Roma</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/roma/roma.jpg"></center>'
+	'Red-haired skinny guy named Roma'
+	act 'Move away':gt $loc,$metka
+end
+
 !Drink
 if $ARGS[0] = 'party_drink':
 	cls
@@ -119,7 +129,7 @@ if $ARGS[0] = 'party_gost':
 	elseif alko >= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_4_' + rand(1,8) + '.jpg"></center>'
 		'The party is in full swing. In one corner a <a href="exec:gt ''party_boy'',''party_boy''">guy</a> the party DJ is spinning the beats at the turntable. You want to give it a try and <a href="exec:gt ''dinParty'', ''dance''">spin some beats</a>.'
-		'<a href="exec:gt ''roma''">Roma</a> and <a href="exec:gt ''sister_party'',''sister_party''">Anya</a> are locked together having fun dancing.'
+		'<a href="exec:gt ''sbReksHome'', ''roma''">Roma</a> and <a href="exec:gt ''sister_party'',''sister_party''">Anya</a> are locked together having fun dancing.'
 		if Rex_Love =0:'<a href="exec:gt ''reks'',''party''">Rex</a> is having fun dancing with some <a href="exec:gt ''party_girls'',''party_girls''">girls</a>.'
 		if Rex_Love =1:'You are dancing with some <a href="exec:gt ''party_girls'',''party_girls''">girls</a> and <a href="exec:gt ''reks'',''party''">Rex</a>, who looks at you with loving eyes.'
 		'<a href="exec:gt ''lena'',''lena''">Lena</a> and <a href="exec:gt ''ira'',''ira''">Ira</a> are having fun in the company of drunken <a href="exec:gt ''party_boys'',''party_boys''">guys</a>.'