excluded roles, witch and necromancer are mafia power

ItsSammyM · ItsSammyM · commit bf1e8da57930 · 2023-12-01T20:48:19.000-05:00
diff --git a/client/src/components/WikiSearch.tsx b/client/src/components/WikiSearch.tsx
@@ -2,24 +2,26 @@ import React from "react";
 import ROLES from "./../resources/roles.json";
 import translate, { langText } from "../game/lang";
 import "./wikiSearch.css";
-import { Role } from "../game/roleState.d";
-import { FactionAlignment, getRoleOutlineFromFactionAlignment, translateRoleOutline } from "../game/roleListState.d";
+import { Role, getFactionAlignmentFromRole, getFactionFromRole } from "../game/roleState.d";
+import { FactionAlignment, RoleOutline, getRoleOutlineFromFactionAlignment, translateRoleOutline } from "../game/roleListState.d";
 import StyledText from "../components/StyledText";
 import { HistoryQueue } from "../history";
 import { regEscape } from "..";
 
 type WikiSearchProps = {
     page?: WikiPage,
+    excludedRoles?: RoleOutline[]
     pageChangeCallback?: (page: WikiPage) => void
 }
 
 type WikiSearchState = ({
-    type: "search"
+    type: "search",
 } | {
     type: "page",
     page: WikiPage,
 }) & {
     searchQuery: string,
+    excludedRoles: RoleOutline[]
 }
 
 export type WikiPage = 
@@ -33,25 +35,30 @@ const PAGES: WikiPage[] = Object.keys(ROLES).map(role => `role/${role}`)
     .concat(ARTICLES.map(article => `article/${article}`)) as WikiPage[];
 
 export default class WikiSearch extends React.Component<WikiSearchProps, WikiSearchState> {
+    
     private static activeWikis: WikiSearch[] = [];
     history: HistoryQueue<WikiSearchState> = new HistoryQueue(10);
+
     constructor(props: WikiSearchProps) {
         super(props);
 
         if (props.page !== undefined) {
             this.history.push({
                 type: "search",
                 searchQuery: "",
+                excludedRoles: props.excludedRoles ? props.excludedRoles : [],
             });
             this.state = {
                 type: "page",
                 searchQuery: "",
-                page: props.page
+                page: props.page,
+                excludedRoles: props.excludedRoles ? props.excludedRoles : [],
             }
         } else {
             this.state = {
                 type: "search",
                 searchQuery: "",
+                excludedRoles: props.excludedRoles ? props.excludedRoles : [],
             };
         }
     }
@@ -75,6 +82,7 @@ export default class WikiSearch extends React.Component<WikiSearchProps, WikiSea
         this.setState({
             type: "page",
             searchQuery: this.state.searchQuery,
+            excludedRoles: this.state.excludedRoles,
             page
         }, () => {
             if (this.props.pageChangeCallback !== undefined) {
@@ -84,9 +92,41 @@ export default class WikiSearch extends React.Component<WikiSearchProps, WikiSea
     }
 
     renderOpenPageButton(page: WikiPage) {
-        return <button key={page} onClick={()=>{this.setPage(page)}}>
-            <StyledText noLinks={true}>{getPageTitle(page)}</StyledText>
-        </button>
+
+
+        let excludedRolesExact: Role[] = [];
+        for(let role in ROLES){
+            let faction = getFactionFromRole(role as Role);
+            let factionAlignment = getFactionAlignmentFromRole(role as Role);
+
+
+            for(let excludedRoleOutline of this.state.excludedRoles){
+                switch(excludedRoleOutline.type){
+                    case "exact":
+                        if(excludedRoleOutline.role === role)
+                            excludedRolesExact.push(role as Role);
+                    break;
+                    case "factionAlignment":
+                        if(excludedRoleOutline.factionAlignment === factionAlignment)
+                            excludedRolesExact.push(role as Role);
+                    break;
+                    case "faction":
+                        if(excludedRoleOutline.faction === faction)
+                            excludedRolesExact.push(role as Role);
+                    break;
+                }
+            }
+        }
+
+        if(!excludedRolesExact.map((role)=>{return `role/${role}`}).includes(page)){
+            return <button key={page} onClick={()=>{this.setPage(page)}}>
+                <StyledText noLinks={true}>{getPageTitle(page)}</StyledText>
+            </button>
+        }else{
+            return <button key={page} onClick={()=>{this.setPage(page)}}>
+                <span className="keyword-dead">{getPageTitle(page)}</span>
+            </button>
+        }
     }
 
     getSearchResults(search: string): WikiPage[] {
diff --git a/client/src/components/styledText.css b/client/src/components/styledText.css
@@ -37,7 +37,7 @@
 .keyword-info {
     color: lightblue;
 }
-.keyword-hidden {
+.keyword-hiddenRole {
     color: whitesmoke;
     font-style: italic;
     font-weight: bold;
diff --git a/client/src/menu/game/gameScreenContent/WikiMenu.tsx b/client/src/menu/game/gameScreenContent/WikiMenu.tsx
@@ -38,7 +38,7 @@ export default class WikiMenu extends React.Component<WikiMenuProps, WikiMenuSta
         <ContentTab close={ContentMenus.WikiMenu}>{translate("menu.wiki.title")}</ContentTab>
         
         <div className="wiki-menu-search">
-            <WikiSearch/>
+            <WikiSearch excludedRoles={this.state.gameState.excludedRoles}/>
         </div>
     </div>)}
 }
diff --git a/client/src/resources/keywords.json b/client/src/resources/keywords.json
@@ -16,11 +16,11 @@
         "link": "article/phases_and_timeline"
     },
     "grave.role.cleaned": { 
-        "style": "keyword-hidden",
+        "style": "keyword-hiddenRole",
         "link": "role/janitor"
     },
     "grave.role.petrified": { 
-        "style": "keyword-hidden"
+        "style": "keyword-hiddenRole"
     },
     "suspicious": { 
         "style": "keyword-evil",
diff --git a/client/src/resources/lang/en_us.json b/client/src/resources/lang/en_us.json
@@ -309,7 +309,7 @@
     "chatMessage.playerDied.noWill":"\\0 (\\1) died and was killed by \\2.",
     "chatMessage.deathNote": "A note left with the body reads:",
     "chatMessage.phaseChange":"\\0 \\1",
-    "chatMessage.gameOver": "Game Over, win conditions not implemented yet",
+    "chatMessage.gameOver": "Game Over",
 
     "chatMessage.trialInformation":"\\0 votes needed for the \\1 trials left today.",
     "chatMessage.voted":"\\0 voted for \\1.",
diff --git a/client/src/resources/roles.json b/client/src/resources/roles.json
@@ -220,7 +220,7 @@
         "largeRoleSpecificMenu": false
     },
     "witch": {
-        "factionAlignment": "mafiaSupport",
+        "factionAlignment": "mafiaPower",
         "suspicious": true,
         "roleblockable": false,
         "defense": 0,
@@ -230,7 +230,7 @@
         "largeRoleSpecificMenu": false
     },
     "necromancer": {
-        "factionAlignment": "mafiaSupport",
+        "factionAlignment": "mafiaPower",
         "suspicious": true,
         "roleblockable": false,
         "defense": 0,
diff --git a/server/src/game/role/necromancer.rs b/server/src/game/role/necromancer.rs
@@ -10,7 +10,7 @@ use crate::game::Game;
 use crate::game::team::Team;
 use super::{Priority, RoleState, RoleStateImpl};
 
-pub(super) const FACTION_ALIGNMENT: FactionAlignment = FactionAlignment::MafiaSupport;
+pub(super) const FACTION_ALIGNMENT: FactionAlignment = FactionAlignment::MafiaPower;
 pub(super) const MAXIMUM_COUNT: Option<u8> = Some(1);
 
 #[derive(Clone, Debug, Default, Serialize)]
diff --git a/server/src/game/role/witch.rs b/server/src/game/role/witch.rs
@@ -10,7 +10,7 @@ use crate::game::team::Team;
 use crate::game::Game;
 use super::{Priority, RoleStateImpl, RoleState};
 
-pub(super) const FACTION_ALIGNMENT: FactionAlignment = FactionAlignment::MafiaSupport;
+pub(super) const FACTION_ALIGNMENT: FactionAlignment = FactionAlignment::MafiaPower;
 pub(super) const MAXIMUM_COUNT: Option<u8> = Some(1);
 
 #[derive(Clone, Debug, Default, Serialize)]
diff --git a/server/src/game/role_list.rs b/server/src/game/role_list.rs
@@ -127,14 +127,18 @@ impl RoleOutline{
                             Some(m) => taken_roles.iter().filter(|r2|*r2==r).count() < m.into(),
                             None => true,
                         }
-
                     )
                     .collect()
             },
             RoleOutline::Faction { faction } => {
                 Role::values().into_iter()
                     .filter(|r|r.faction_alignment().faction() == *faction)
-                    .filter(|r|!excluded_roles.contains(&RoleOutline::Exact { role: *r }))
+                    .filter(|r|
+                        !(
+                            excluded_roles.contains(&RoleOutline::Exact { role: *r }) || 
+                            excluded_roles.contains(&RoleOutline::FactionAlignment { faction_alignment: r.faction_alignment() })
+                        )
+                    ) 
                     .filter(|r|
                         match r.maximum_count() {
                             Some(m) => taken_roles.iter().filter(|r2|*r2==r).count() < m.into(),
@@ -146,7 +150,13 @@ impl RoleOutline{
             },
             RoleOutline::Any => {
                 Role::values().into_iter()
-                    .filter(|r|!excluded_roles.contains(&RoleOutline::Exact { role: *r }))
+                    .filter(|r|
+                        !(
+                            excluded_roles.contains(&RoleOutline::Exact { role: *r }) ||
+                            excluded_roles.contains(&RoleOutline::FactionAlignment { faction_alignment: r.faction_alignment() }) ||
+                            excluded_roles.contains(&RoleOutline::Faction { faction: r.faction_alignment().faction() })
+                        )
+                    )
                     .filter(|r|
                         match r.maximum_count() {
                             Some(m) => taken_roles.iter().filter(|r2|*r2==r).count() < m.into(),
diff --git a/server/src/lobby.rs b/server/src/lobby.rs
@@ -215,7 +215,7 @@ impl Lobby {
 
 
                 let roles: HashSet<_> = roles.drain(..).collect();
-                let roles: Vec<_> = roles.into_iter().collect();
+                let roles: Vec<_> = roles.into_iter().filter(|e|*e!=RoleOutline::Any).map(|e|e.clone()).collect();
                 settings.excluded_roles = roles.clone();
                 self.send_to_all(ToClientPacket::ExcludedRoles { roles });
             }
@@ -301,7 +301,7 @@ impl Lobby {
 
         match &mut self.lobby_state {
             LobbyState::Lobby {players, settings} => {
-                players.remove(&id);
+                let player = players.remove(&id);
             
                 if players.is_empty() {
                     self.lobby_state = LobbyState::Closed;
@@ -313,24 +313,29 @@ impl Lobby {
                     }
                 }
 
-                settings.role_list.pop();
+                if let Some(_player) = player {
+                    settings.role_list.pop();
+                };
 
                 Self::send_players_lobby(players);
                 for player in players.iter(){
-                    Self::send_settings(player.1, settings)
+                    Self::send_settings(player.1, settings);
                 }
             },
             LobbyState::Game {game, players} => {
                 //TODO proper disconnect from game
                 let player_index = players.get(&id);
+
                 if let Some(game_player) = player_index {
                     if let Ok(player_ref) = PlayerReference::new(game, game_player.player_index) {
                         if !player_ref.has_left(game) {
                             player_ref.lose_connection(game);
                         }
                     }
                 }
+
                 players.remove(&id);
+                
                 if !players.iter().any(|p|p.1.host) {
                     if let Some(new_host) = players.values_mut().next(){
                         new_host.host = true;

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`.keyword-info {`
`38`	`38`	`color: lightblue;`
`39`	`39`	`}`
`40`		`-.keyword-hidden {`
	`40`	`+.keyword-hiddenRole {`
`41`	`41`	`color: whitesmoke;`
`42`	`42`	`font-style: italic;`
`43`	`43`	`font-weight: bold;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ export default class WikiMenu extends React.Component<WikiMenuProps, WikiMenuSta`
`38`	`38`	`<ContentTab close={ContentMenus.WikiMenu}>{translate("menu.wiki.title")}</ContentTab>`
`39`	`39`
`40`	`40`	`<div className="wiki-menu-search">`
`41`		`- <WikiSearch/>`
	`41`	`+ <WikiSearch excludedRoles={this.state.gameState.excludedRoles}/>`
`42`	`42`	`</div>`
`43`	`43`	`</div>)}`
`44`	`44`	`}`