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

Merge remote-tracking branch 'Anjuna/master'

# Conflicts:
#	locations/stat_explanations.qsrc
Kevin_Smarts 5 месяцев назад
Родитель
Сommit
329757edc9
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      locations/stat_explanations.qsrc

+ 4 - 4
locations/stat_explanations.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'<a href="exec:gt ''stat_explanations'', ''status''">The fourth page</a> includes information about the different status effects like mood, hunger, and willpower the player character have.'
 end
-	
+
 if $ARGS[0] = 'icons':
 	gs 'obj_din', 'settingtabs'
 	menu_off = 1
@@ -26,7 +26,7 @@ if $ARGS[0] = 'icons':
 	cla
 	'<center><b><font color="maroon">Introduction and Icons</font></b></center>'
 	'We will go through the stat display, which is the window, that your QSP-player probably calls additional description. '
-	'It stats with an image of the weather '+$weatherImage+' followed by the the current temperature in Celsius. If you click on the picture you will get a pop-up with a more detailed description.'
+	'It starts with an image of the weather '+$weatherImage+' followed by the the current temperature in Celsius. If you click on the picture you will get a pop-up with a more detailed description.'
 	'Below the weather image is a line that gives the current time and date, maybe followed by a line saying if you have vacation and how long time until the vacation ends.'
 	*nl
 	'Next is a line of important Icons. The first is character descriptions '+'<img title="Character description" height = <<set_miconht>> src="images/system/icons/menu/icon_character.png">'+' Clicking on the will take you to the Character description. You might not be able to do that right now '
@@ -49,7 +49,7 @@ if $ARGS[0] = 'icons':
 		'The "Quest" tab contains hints on how to start and proceed with several of the quests in the game. Not all quests are there yet, but this a good place to look if you want to know some of the things that are possible, and the first place you should look if you feel stuck in a quest.'
 		'The relations tab has information about how other NPC''s see the player characters. The value goes from 0 to 100. If it is below 20 it means they dislike or even hate you. Between 20 and 60 is generally neutral. From above 60 the NPC considers your player character a friend and above 80 is when they might fall in love with a character.'
 		'But each character is different, and some might never fall in love with the character and for some NPC''s it might not be enough to just get them to like you.'
-		'The game information tab includes a lot of information about the world. '+iif($start_type['loc'] = 'sg', 'The school subtab includes information about grades and the school cliques.', '')+iif( $start_type['loc'] = 'uni', 'The University subtab includes information about subjects and grades.', '') 
+		'The game information tab includes a lot of information about the world. '+iif($start_type['loc'] = 'sg', 'The school subtab includes information about grades and the school cliques.', '')+iif( $start_type['loc'] = 'uni', 'The University subtab includes information about subjects and grades.', '')
 		*nl
 		'The final icon '+'<img title="Menu & Cheatmenu" height = <<set_miconht>> src="images/system/icons/menu/icon_menu.png">'+' is the game settings menu, which can be used to change the game settings.'
 	else
@@ -62,7 +62,7 @@ if $ARGS[0] = 'icons':
 		'This includes a tab for a description of where you live and the possibility to change this is you have several options. A tab with information about your work.'
 		'The "Quest" tab contains hints on how to start and proceed with several of the quests in the game. Not all quests are there yet, but this a good place to look if you want to know some of the things that are possible, and the first place you should look if you feel stuck in a quest.'
 		'The relations tab has information about how other npc''s see the player characters. The value goes from 0 to 100. If it is below 20 it means they dislike or even hate you. Between 20 and 60 is general neutral. From above 60 the NPC considers your player character a friend and above 80 is when they might fall in love with a character. But each character is different, and some might never fall in love with the character and others it might not be enough to just get them to like you.'
-		'The game information tab includes a lot of information about the world. '+iif($start_type['loc'] = 'sg', 'The school subtab includes information about grades and the school cliques.', '')+iif( $start_type['loc'] = 'uni', 'The University subtab includes information about subjects and grades.', '') 
+		'The game information tab includes a lot of information about the world. '+iif($start_type['loc'] = 'sg', 'The school subtab includes information about grades and the school cliques.', '')+iif( $start_type['loc'] = 'uni', 'The University subtab includes information about subjects and grades.', '')
 		*nl
 		'The final icon '+'<img title="Menu & Cheatmenu" height = <<set_miconht>> src="images/system/icons/menu/icon_menu.png">'+' is the game settings menu, which can be used to change the game settings.'
 		*nl