Browse Source

Merge remote-tracking branch 'Philo/master'

KevinSmarts 4 năm trước cách đây
mục cha
commit
57ae6dcedc
1 tập tin đã thay đổi với 5 bổ sung3 xóa
  1. 5 3
      locations/journal.qsrc

+ 5 - 3
locations/journal.qsrc

@@ -112,11 +112,13 @@ if $ARGS[0] = 'records':
 		elseif grupTipe = 2:
 			$tab_text += dyneval($NoteBookLine,'Your school social group consists of jocks and natural athletes.'+$journal_school_standing)
 		elseif grupTipe = 3:
-			$tab_text += dyneval($NoteBookLine,'You school social group consists of nerds, geeks, and good students.'+$journal_school_standing)
+			$tab_text += dyneval($NoteBookLine,'Your school social group consists of nerds, geeks, and good students.'+$journal_school_standing)
+			if nerd_game['game_day'] > daystart: $tab_text += dyneval($NoteBookLine,'You have been invited to a games night on <<$week[(week + (nerd_game[''game_day'']  - daystart))]>>.')
+			if nerd_game['game_day'] = daystart: $tab_text += dyneval($NoteBookLine,'You have been invited to a games night tonight.')
 		elseif grupTipe = 4:
-			$tab_text += dyneval($NoteBookLine,'You school social group consists of gopniks, rebels, punks, or troublemakers.'+$journal_school_standing)
+			$tab_text += dyneval($NoteBookLine,'Your school social group consists of gopniks, rebels, punks, or troublemakers.'+$journal_school_standing)
 		elseif grupTipe = 5:
-			$tab_text += dyneval($NoteBookLine,'You school social group consists of losers, teacher''s pets, sluts, and the ugly.')
+			$tab_text += dyneval($NoteBookLine,'Your school social group consists of losers, teacher''s pets, sluts, and the ugly.')
 		end
 	end