Browse Source

[Renamed] Renamed hotel.qsrc to city_hotel.qsrc to avoid confusion with pav hotel

ADCSux 2 years ago
parent
commit
1fc02d70f4
3 changed files with 16 additions and 15 deletions
  1. 1 1
      glife.qproj
  2. 1 1
      locations/city_center.qsrc
  3. 14 13
      locations/city_hotel.qsrc

+ 1 - 1
glife.qproj

@@ -865,7 +865,7 @@
 		<Location name="MartinSex3"/>
 		<Location name="MartinSex3"/>
 		<Location name="casino"/>
 		<Location name="casino"/>
 		<Location name="mqroom"/>
 		<Location name="mqroom"/>
-		<Location name="hotel"/>
+		<Location name="city_hotel"/>
 		<Location name="deckShuffle"/>
 		<Location name="deckShuffle"/>
 	</Folder>
 	</Folder>
 	<Folder name="City Red Light">
 	<Folder name="City Red Light">

+ 1 - 1
locations/city_center.qsrc

@@ -219,7 +219,7 @@ if hour >= 8 and hour <= 18:
 else
 else
 	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 8:00''">National Library of Russia</a>'
 	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 8:00''">National Library of Russia</a>'
 end
 end
-'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>> and <<$desc_txt3>> and the 5-star <a href="exec: minut += 5 & gt ''hotel'', ''foyer''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>> and <<$desc_txt5>> can be found at the end of the road.'
+'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>> and <<$desc_txt3>> and the 5-star <a href="exec: minut += 5 & gt ''city_hotel'', ''start''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>> and <<$desc_txt5>> can be found at the end of the road.'
 *nl
 *nl
 if week < 6 and hour >= 7 and hour <= 17:
 if week < 6 and hour >= 7 and hour <= 17:
 	$desc_txt6 = '<a href="exec: minut += 5 & gt ''sentence'',''start''">The City Courthouse</a>'
 	$desc_txt6 = '<a href="exec: minut += 5 & gt ''sentence'',''start''">The City Courthouse</a>'

+ 14 - 13
locations/hotel.qsrc → locations/city_hotel.qsrc

@@ -1,15 +1,16 @@
-# hotel
+# city_hotel
+$this = 'city_hotel'
 
 
-if $ARGS[0] = 'foyer':
+if $ARGS[0] = 'start':
 	*clr & cla
 	*clr & cla
 	nom_o[1] = 100
 	nom_o[1] = 100
 	nom_o[2] = 1000
 	nom_o[2] = 1000
 	nom_o[3] = 10000
 	nom_o[3] = 10000
 	nom_o[4] = 100000
 	nom_o[4] = 100000
-	$loc = 'hotel'
-	$menu_loc = 'hotel'
-	$loc_arg = 'foyer'
-	$menu_arg = 'foyer'
+	$loc = 'city_hotel'
+	$menu_loc = 'city_hotel'
+	$loc_arg = 'start'
+	$menu_arg = 'start'
 	menu_off = 0
 	menu_off = 0
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/casino/metrd.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/casino/metrd.jpg"></center>'
@@ -39,14 +40,14 @@ if $ARGS[0] = 'foyer':
 
 
 	act 'Leave': minut += 5 & gt 'city_center'
 	act 'Leave': minut += 5 & gt 'city_center'
 
 
-	act 'Go to the reception desk': gt 'hotel', 'reception'
+	act 'Go to the reception desk': gt 'city_hotel', 'reception'
 	
 	
 	act 'Go to the lift': 
 	act 'Go to the lift': 
 		*clr & cla
 		*clr & cla
 		minut += 1
 		minut += 1
 		gs 'stat'
 		gs 'stat'
 		msg 'Excuse me, but the elevator is not working'
 		msg 'Excuse me, but the elevator is not working'
-		gt 'hotel', 'foyer'
+		gt 'city_hotel', 'start'
 	end
 	end
 end
 end
 
 
@@ -59,7 +60,7 @@ if $ARGS[0] = 'reception':
 	'You walk up to the front reception and get greeted by a smiling young woman behind the counter.'
 	'You walk up to the front reception and get greeted by a smiling young woman behind the counter.'
 	'"How can I help you?" she asks.'
 	'"How can I help you?" she asks.'
 
 
-	act 'Go back to the foyer': minut += 1 & gt 'hotel', 'foyer'
+	act 'Go back to the foyer': minut += 1 & gt 'city_hotel', 'start'
 	
 	
 	act 'See the room descriptions':
 	act 'See the room descriptions':
 		cla
 		cla
@@ -71,7 +72,7 @@ if $ARGS[0] = 'reception':
 		'3. Suites, our luxurious room. Beside a private bathroom there''s also an extra livingroom.'
 		'3. Suites, our luxurious room. Beside a private bathroom there''s also an extra livingroom.'
 		'4. Presidential Suite, our most prized room with all the modern necessities. Free room service included.'
 		'4. Presidential Suite, our most prized room with all the modern necessities. Free room service included.'
 
 
-		act 'Continue': gt 'hotel', 'reception'
+		act 'Continue': gt 'city_hotel', 'reception'
 	end
 	end
 
 
 	if tobiQW = 2000:
 	if tobiQW = 2000:
@@ -81,7 +82,7 @@ if $ARGS[0] = 'reception':
 			minut += 1
 			minut += 1
 			'"Why so the hotel so crowded today?" you ask.'
 			'"Why so the hotel so crowded today?" you ask.'
 			'"There''s an conference on indigenous languages, they meet every year and complain about their disappearing languages." she says laughing.'
 			'"There''s an conference on indigenous languages, they meet every year and complain about their disappearing languages." she says laughing.'
-				act 'Move away': gt 'hotel', 'foyer'
+				act 'Move away': gt 'city_hotel', 'start'
 		end
 		end
 	end
 	end
 
 
@@ -92,10 +93,10 @@ if $ARGS[0] = 'reception':
 		*nl
 		*nl
 		'"I would like to rent a room." you tell the girl at the counter.'
 		'"I would like to rent a room." you tell the girl at the counter.'
 		'"Unfortunately, we have no rooms available." she replies.'
 		'"Unfortunately, we have no rooms available." she replies.'
-		act 'Move away': gt 'hotel', 'foyer'
+		act 'Move away': gt 'city_hotel', 'start'
 	end
 	end
 end
 end
 
 
 
 
---- hotel ---------------------------------
+--- city_hotel ---------------------------------