@@ -35,7 +35,7 @@ const NightOrder = ({ players, allCharacters }: NightOrderProps) => {
3535
3636 const gameCharacters = players . map ( ( p ) => p . characterId ) ;
3737 const deadCharacters = players
38- . filter ( ( p ) => p . isAlive )
38+ . filter ( ( p ) => ! p . isAlive )
3939 . map ( ( p ) => p . characterId ) ;
4040 let nightOrder = showFirstNight
4141 ? allNightOrders . firstNight
@@ -48,9 +48,30 @@ const NightOrder = ({ players, allCharacters }: NightOrderProps) => {
4848 }
4949
5050 return (
51- < div >
51+ < div className = 'flex flex-col' >
52+ < div className = 'flex flex-col gap-4 p-2 pt-3 lg:flex-row' >
53+ < Switch
54+ label = 'Show dead characters'
55+ value = { showDeadCharacters }
56+ onChange = { ( ) => {
57+ setShowDeadCharacters ( ! showDeadCharacters ) ;
58+ } }
59+ />
60+ < Switch
61+ label = 'Show characters not in play'
62+ value = { showCharactersNotInPlay }
63+ onChange = { ( ) => {
64+ if ( ! showCharactersNotInPlay ) {
65+ setShowCharactersNotInPlay ( true ) ;
66+ setShowDeadCharacters ( true ) ;
67+ } else {
68+ setShowCharactersNotInPlay ( false ) ;
69+ }
70+ } }
71+ />
72+ </ div >
5273 < Select
53- label = 'Show'
74+ label = 'Show nights '
5475 options = { [
5576 { value : 'first' , label : 'First night' } ,
5677 { value : 'other' , label : 'Following nights' } ,
@@ -74,28 +95,12 @@ const NightOrder = ({ players, allCharacters }: NightOrderProps) => {
7495 ) }
7596 { nightOrder . map ( ( [ id , text ] ) => (
7697 < NightOrderEntry
77- muted = { ! gameCharacters . includes ( id ) }
98+ muted = { deadCharacters . includes ( id ) || ! gameCharacters . includes ( id ) }
7899 key = { `${ id } night${ showFirstNight ? 'FirstNight' : 'OtherNights' } ` }
79100 characterId = { id }
80101 text = { text }
81102 />
82103 ) ) }
83- < div className = 'flex flex-col gap-4 p-2 pt-3 lg:flex-row' >
84- < Switch
85- label = 'Show dead characters'
86- value = { showDeadCharacters }
87- onChange = { ( ) => {
88- setShowDeadCharacters ( ! showDeadCharacters ) ;
89- } }
90- />
91- < Switch
92- label = 'Show characters not in play'
93- value = { showCharactersNotInPlay }
94- onChange = { ( ) => {
95- setShowCharactersNotInPlay ( ! showCharactersNotInPlay ) ;
96- } }
97- />
98- </ div >
99104 </ div >
100105 ) ;
101106} ;
0 commit comments