1
0
Просмотр исходного кода

[changed] Renamed pav library and fixed teh club file wrong name

KevinSmarts 4 лет назад
Родитель
Сommit
aee8d1593a

+ 1 - 1
glife.qproj

@@ -646,7 +646,7 @@
 	<Folder name="Community center">
 		<Location name="pav_commcenter"/>
 		<Location name="pav_commclubs"/>
-		<Location name="gdkbibl"/>
+		<Location name="pav_library"/>
 		<Location name="gdkin"/>
 		<Location name="gdksport"/>
 		<Location name="gdktoilet"/>

+ 6 - 6
locations/AleksandraHome.qsrc

@@ -34,14 +34,14 @@ if $args[0] = 'pre_library':
 	end	
 end
 if $args[0] = 'library':
-	$loc = 'gdkbibl'
+	$loc = 'pav_library'
 	$location_type = 'public_indoors'
-	$menu_loc = 'gdkbibl'
+	$menu_loc = 'pav_library'
 	$menu_arg = ''
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Community center library</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/pav_library.jpg"></center>'
 	'You arrive at the library and you can see <<$npc_firstname[''A231'']>>''s face light up. It becomes very obvious that this is her favorite place to be. You walk through the stacks of books with her occasionally pulling out a book that she thinks would be good for you to read.'
 	'Being rather indecisive you just can''t make up your mind and keep answering her suggestions with a maybe. Eventually, <<$npc_nickname[''A231'']>> starts to get a little annoyed at you, but continues on, none the less, with her suggestions.'
 	act 'Continue looking':
@@ -137,14 +137,14 @@ if $args[0] = 'pre_library':
 	end	
 end
 if $args[0] = 'library':
-	$loc = 'gdkbibl'
+	$loc = 'pav_library'
 	$location_type = 'public_indoors'
-	$menu_loc = 'gdkbibl'
+	$menu_loc = 'pav_library'
 	$menu_arg = ''
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Community center library</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/pav_library.jpg"></center>'
 	'You arrive at the library and you can see <<$npc_firstname[''A231'']>>''s face light up. It becomes very obvious that this is her favorite place to be. You walk through the stacks with her occasionally pulling out a book that she thinks would be good for you to read.'
 	'Being rather indecisive you just can''t make up your mind and keep answering her suggestions with a maybe. Eventually <<$npc_nickname[''A231'']>> starts to get a little annoyed, but continues on none the less with her suggestions.'
 	act 'Continue looking':

+ 0 - 84
locations/gdkkru.qsrc

@@ -1,84 +0,0 @@
-# pav_commclubs
-
-$metka = ''
-$loc = 'pav_commclubs'
-$menu_loc = 'pav_commclubs'
-$menu_arg = ''
-menu_off = 0
-$location_type = 'public_indoors'
-
-frost = 0
-gs 'stat'
-
-gs 'themes', 'indoors'
-
-'<center><b><font color = maroon>The community center</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gdkkru.jpg"></center>'
-
-
-act 'Leave': gt 'pav_commcenter'
-
-act 'Go to the toilets': gt 'gdktoilet', 'start'
-
-if nerd_game['game_day'] = daystart and hour = 20: act '<b>Join nerds</b>': gt 'nerd_game_night','game'
-
-if hour >= 12 and hour < 20:
-	'At this time of day the community center operates various clubs.'
-
-	if krumonth = month and kruyear = year:
-		act 'Go to the sewing club': gt 'krupo'
-	else
-		act 'Go to the sewing club':
-			cls
-			menu_off = 1
-			gs 'stat'
-			'<center><b><font color = maroon>Sewing circle</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/krupo.jpg"></center>'
-			'You went to the sewing club room, as you walked in, a teacher looked at you said. "It costs 500 <b>₽</b> for one month to join, you can come as many days as you like. Once the month is up any days you did not attend are not transferred."'
-			if money >= 500:
-				act 'Sign up':
-					cls
-					money -= 500
-					krumonth = month
-					kruyear = year
-					gs 'stat'
-					'You pay the tuition.'
-					act 'Leave': gt 'pav_commclubs'
-				end
-			end
-
-			act 'Leave': gt 'pav_commclubs'
-		end
-	end
-     
-	if chessmonth = month and chessyear = year:
-		act 'Go to the chess club': gt 'kruchess'
-	else
-		act 'Go to the chess club':
-			cls
-			menu_off = 1
-			gs 'stat'
-			'<center><b><font color = maroon>Chess Circle</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/kruchess.jpg"></center>'
-			'You went to the chess club room, as you walked in, a teacher looked at you said. "It costs 500 <b>₽</b> for one month to join, you can come as many days as you like. Once the month is up any days you did not attend are not transferred."'
-			if money >= 500:
-				act 'Sign up':
-					cls
-					money -= 500
-					chessmonth = month
-					chessyear = year
-					gs'stat'
-					'You pay the tuition.'
-					act 'Leave': gt 'pav_commclubs'
-				end
-			end
-
-			act 'Leave': gt 'pav_commclubs'
-		end
-	end
-else
-	'Club''s closed.'
-end
-
---- pav_commclubs ---------------------------------
-

+ 1 - 1
locations/gdktoilet.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 		CLOSE ALL
 	end
 
-	if hour >= 8 and hour <= 18: act 'Go to the library': gt 'gdkbibl'
+	if hour >= 8 and hour <= 18: act 'Go to the library': gt 'pav_library'
 	if hour >= 12 and hour <= 20: act 'Go upstairs to the hobby clubs': gt 'pav_commclubs'
 	if hour >= 14 and hour <= 20: act 'Go to the gym': gt 'gdksport', 'start'
 end

+ 2 - 2
locations/pav_commcenter.qsrc

@@ -49,11 +49,11 @@ end
 
 if (week < 6 and hour >= 14 and hour < 20) or (week >= 6 and hour >= 9 and hour < 20): act 'Go to the sports section': gt 'gdksport', 'start'
 
-if hour >= 8 and hour < 18: act 'Go to the library': gt 'gdkbibl'
+if hour >= 8 and hour < 18: act 'Go to the library': gt 'pav_library'
 
 if hour >= 12 and hour < 20: act 'Go upstairs to the hobby clubs': gt'pav_commclubs'
 
-if nerd_game['game_day'] = daystart and hour = 19: act 'Wait for game night to start': minut += 60-minut & gt 'gdkbibl'
+if nerd_game['game_day'] = daystart and hour = 19: act 'Wait for game night to start': minut += 60-minut & gt 'pav_library'
 if nerd_game['game_day'] = daystart and hour = 20: act 'Go up stairs to the hobby clubs and <b>Join nerds</b>': gt 'nerd_game_night', 'game'
 
 if hour >= 8:act 'Go to the toilets': gt 'gdktoilet', 'start'

+ 65 - 108
locations/pav_commclubs.qsrc

@@ -1,127 +1,84 @@
-# gdkbibl
+# pav_commclubs
 
 $metka = ''
-$loc = 'gdkbibl'
-$location_type = 'public_indoors'
-$menu_loc = 'gdkbibl'
+$loc = 'pav_commclubs'
+$menu_loc = 'pav_commclubs'
 $menu_arg = ''
 menu_off = 0
+$location_type = 'public_indoors'
+
 frost = 0
 gs 'stat'
+
 gs 'themes', 'indoors'
-'<center><b><font color="maroon">Community center library</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
-'For such a small town, this library is surprisingly large - containing many interesting books on a wide variety of subjects.'
+
+'<center><b><font color = maroon>The community center</font></b></center>'
+'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gdkkru.jpg"></center>'
+
 
 act 'Leave': gt 'pav_commcenter'
 
 act 'Go to the toilets': gt 'gdktoilet', 'start'
 
-if nerd_game['game_day'] = daystart and hour = 19: act 'Wait for game night to start': minut += 60-minut & gt 'gdkbibl'
-if nerd_game['game_day'] = daystart and hour = 20: act 'Join the <b>nerds</b>': gt 'nerd_game_night', 'game'
+if nerd_game['game_day'] = daystart and hour = 20: act '<b>Join nerds</b>': gt 'nerd_game_night','game'
 
-if hour >= 8 and hour < 18:
-	act 'Read a book on science (1:00)':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		intel_exp += rand(3,6) + (mentats_dose - rand(0,mentats_dose))
-		blizoruk += 1
-		grupvalue[3] +=1
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/science1.jpg"></center>'
-		'You spend an hour reading, trying to make sense of all the clever propositions writen inside and to finally understand the subject it describes.'
-		act 'Put the book back': gt 'gdkbibl'
-	end
-	act 'Read an adventure novel (1:00)':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		pcs_mood = 100
-		blizoruk += 1
-		grupvalue[3] +=1
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/fiction' + rand(1,2) + '.jpg"></center>'
-		'You spend an hour reading an adventure novel, immersing yourself in daring deeds and awesome twists.'
-		act 'Put the book back': gt 'gdkbibl'
-	end
-	act 'Read a fantasy novel (1:00)':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		pcs_mood = 100
-		blizoruk += 1
-		grupvalue[3] +=1
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/fantasy' + rand(1,9) + '.jpg"></center>'
-		'You spend an hour reading a fantasy novel, rescuing damsels from dragons, digging for jewels with dwarves and performing word changing magic alongside elves and druids.'
-		act 'Put the book back': gt 'gdkbibl'
-	end
-	act 'Read a science fiction novel (1:00)':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		pcs_mood = 100
-		blizoruk += 1
-		grupvalue[3] +=1
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/scifi' + rand(1,6) + '.jpg"></center>'
-		'You spend an hour reading a science fiction novel - flying off into space, travelling though time, running from rogue AI''s and creating monsters with your hunchbacked assistant.'
-		act 'Put the book back': gt 'gdkbibl'
-	end
-	act 'Read a romance novel (1:00)':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		pcs_mood = 100
-		blizoruk += 1
-		pcs_horny += 20
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/romance' + rand(1,20) + '.jpg"></center>'
-		'You spend a very short hour reading a romance novel - choosing between a vampire or a werewolf, falling in love with an obscenely wealthy Grey...several of the scenes are very steamy and you find yourself getting quite aroused.'
-		act 'Put the book back': gt 'gdkbibl'
-	end
-	act 'Study for an hour':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		lern += rand(1,3)
-		blizoruk += 1
-		grupvalue[3] += 2
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/learning' + rand(1,3) + '.jpg"></center>'
-		'You read several books that should help you with your school work, you feel that you learned something today.'
-		act 'Put the book back': gt 'gdkbibl'
+if hour >= 12 and hour < 20:
+	'At this time of day the community center operates various clubs.'
+
+	if krumonth = month and kruyear = year:
+		act 'Go to the sewing club': gt 'krupo'
+	else
+		act 'Go to the sewing club':
+			cls
+			menu_off = 1
+			gs 'stat'
+			'<center><b><font color = maroon>Sewing circle</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/krupo.jpg"></center>'
+			'You went to the sewing club room, as you walked in, a teacher looked at you said. "It costs 500 <b>₽</b> for one month to join, you can come as many days as you like. Once the month is up any days you did not attend are not transferred."'
+			if money >= 500:
+				act 'Sign up':
+					cls
+					money -= 500
+					krumonth = month
+					kruyear = year
+					gs 'stat'
+					'You pay the tuition.'
+					act 'Leave': gt 'pav_commclubs'
+				end
+			end
+
+			act 'Leave': gt 'pav_commclubs'
+		end
 	end
-	act 'Read from the collected works of Leo Tolstoy (1:00)':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		sprt_exp += rand(3,6)
-		blizoruk += 1
-		grupvalue[3] +=2
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/tolstoy.jpg"></center>'
-		'You read the book for an hour. Tolstoy is certainly a classic writer, no one denies this, but he used a shit-load of words.'
-		act 'Put the book back': gt 'gdkbibl'
+     
+	if chessmonth = month and chessyear = year:
+		act 'Go to the chess club': gt 'kruchess'
+	else
+		act 'Go to the chess club':
+			cls
+			menu_off = 1
+			gs 'stat'
+			'<center><b><font color = maroon>Chess Circle</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/kruchess.jpg"></center>'
+			'You went to the chess club room, as you walked in, a teacher looked at you said. "It costs 500 <b>₽</b> for one month to join, you can come as many days as you like. Once the month is up any days you did not attend are not transferred."'
+			if money >= 500:
+				act 'Sign up':
+					cls
+					money -= 500
+					chessmonth = month
+					chessyear = year
+					gs'stat'
+					'You pay the tuition.'
+					act 'Leave': gt 'pav_commclubs'
+				end
+			end
+
+			act 'Leave': gt 'pav_commclubs'
+		end
 	end
 else
-	'The library is closed.'
+	'Club''s closed.'
 end
 
---- gdkbibl ---------------------------------
+--- pav_commclubs ---------------------------------
 

+ 127 - 0
locations/pav_library.qsrc

@@ -0,0 +1,127 @@
+# pav_library
+
+$metka = ''
+$loc = 'pav_library'
+$location_type = 'public_indoors'
+$menu_loc = 'pav_library'
+$menu_arg = ''
+menu_off = 0
+frost = 0
+gs 'stat'
+gs 'themes', 'indoors'
+'<center><b><font color="maroon">Community center library</font></b></center>'
+'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/pav_library.jpg"></center>'
+'For such a small town, this library is surprisingly large - containing many interesting books on a wide variety of subjects.'
+
+act 'Leave': gt 'pav_commcenter'
+
+act 'Go to the toilets': gt 'gdktoilet', 'start'
+
+if nerd_game['game_day'] = daystart and hour = 19: act 'Wait for game night to start': minut += 60-minut & gt 'pav_library'
+if nerd_game['game_day'] = daystart and hour = 20: act 'Join the <b>nerds</b>': gt 'nerd_game_night', 'game'
+
+if hour >= 8 and hour < 18:
+	act 'Read a book on science (1:00)':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		intel_exp += rand(3,6) + (mentats_dose - rand(0,mentats_dose))
+		blizoruk += 1
+		grupvalue[3] +=1
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/science1.jpg"></center>'
+		'You spend an hour reading, trying to make sense of all the clever propositions writen inside and to finally understand the subject it describes.'
+		act 'Put the book back': gt 'pav_library'
+	end
+	act 'Read an adventure novel (1:00)':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		pcs_mood = 100
+		blizoruk += 1
+		grupvalue[3] +=1
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/fiction' + rand(1,2) + '.jpg"></center>'
+		'You spend an hour reading an adventure novel, immersing yourself in daring deeds and awesome twists.'
+		act 'Put the book back': gt 'pav_library'
+	end
+	act 'Read a fantasy novel (1:00)':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		pcs_mood = 100
+		blizoruk += 1
+		grupvalue[3] +=1
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/fantasy' + rand(1,9) + '.jpg"></center>'
+		'You spend an hour reading a fantasy novel, rescuing damsels from dragons, digging for jewels with dwarves and performing word changing magic alongside elves and druids.'
+		act 'Put the book back': gt 'pav_library'
+	end
+	act 'Read a science fiction novel (1:00)':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		pcs_mood = 100
+		blizoruk += 1
+		grupvalue[3] +=1
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/scifi' + rand(1,6) + '.jpg"></center>'
+		'You spend an hour reading a science fiction novel - flying off into space, travelling though time, running from rogue AI''s and creating monsters with your hunchbacked assistant.'
+		act 'Put the book back': gt 'pav_library'
+	end
+	act 'Read a romance novel (1:00)':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		pcs_mood = 100
+		blizoruk += 1
+		pcs_horny += 20
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/romance' + rand(1,20) + '.jpg"></center>'
+		'You spend a very short hour reading a romance novel - choosing between a vampire or a werewolf, falling in love with an obscenely wealthy Grey...several of the scenes are very steamy and you find yourself getting quite aroused.'
+		act 'Put the book back': gt 'pav_library'
+	end
+	act 'Study for an hour':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		lern += rand(1,3)
+		blizoruk += 1
+		grupvalue[3] += 2
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/learning' + rand(1,3) + '.jpg"></center>'
+		'You read several books that should help you with your school work, you feel that you learned something today.'
+		act 'Put the book back': gt 'pav_library'
+	end
+	act 'Read from the collected works of Leo Tolstoy (1:00)':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		sprt_exp += rand(3,6)
+		blizoruk += 1
+		grupvalue[3] +=2
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/tolstoy.jpg"></center>'
+		'You read the book for an hour. Tolstoy is certainly a classic writer, no one denies this, but he used a shit-load of words.'
+		act 'Put the book back': gt 'pav_library'
+	end
+else
+	'The library is closed.'
+end
+
+--- pav_library ---------------------------------
+