diff --git a/style/main.scss b/style/main.scss index d6803c7..c848c32 100644 --- a/style/main.scss +++ b/style/main.scss @@ -784,3 +784,80 @@ form { user-select: none; } } + +.start-game-status { + min-height: 6ch; + display: flex; + justify-content: center; + align-items: center; + + &:has(.error) { + border: 1px solid rgb(128, 0, 0); + background-color: rgba(255, 0, 0, 0.1); + } + + .error { + font-size: 1.5em; + + &::before { + content: '⚠️'; + margin-right: 1ch; + } + } + + .start-game { + font-size: 1.5em; + } +} + +.start-game-dialog-info { + word-wrap: normal; + + margin-bottom: 1ch; +} + + +.host-role-reveal { + display: flex; + flex-direction: column; + gap: 0.25ch; + + .force-all { + font-size: 1.25em; + margin-top: 1ch; + margin-bottom: 1ch; + } +} + +.role-reveal-list { + display: flex; + flex-direction: row; + flex-wrap: wrap; + gap: 0.25ch; + + .player { + @media only screen and (min-width : 1199px) { + width: 20%; + } + + flex-grow: 1; + display: flex; + flex-direction: column; + gap: 0.25ch; + padding: 0.5ch; + + .identity { + align-self: center; + user-select: none; + } + + &.ready { + background-color: $village_color_faint; + border: 1px solid $village_color; + + button { + opacity: 0%; + } + } + } +} diff --git a/werewolves-proto/src/error.rs b/werewolves-proto/src/error.rs index 6a48fab..7f8f5f8 100644 --- a/werewolves-proto/src/error.rs +++ b/werewolves-proto/src/error.rs @@ -51,6 +51,10 @@ pub enum GameError { HostChannelClosed, #[error("too many players: there's {got} players but only {need} roles")] TooManyPlayers { got: u8, need: u8 }, + #[error( + "too few players: there's {got} players and this setup would require {need} roles to not be at instant parity" + )] + TooFewPlayers { got: u32, need: u32 }, #[error("it's already daytime")] AlreadyDaytime, #[error("it's not the end of the night yet")] diff --git a/werewolves-proto/src/game/settings.rs b/werewolves-proto/src/game/settings.rs index a170671..3f57919 100644 --- a/werewolves-proto/src/game/settings.rs +++ b/werewolves-proto/src/game/settings.rs @@ -182,6 +182,12 @@ impl GameSettings { pub fn check_with_player_list(&self, players: &[Identification]) -> Result<()> { self.check()?; + if self.min_players_needed() > players.len() { + return Err(GameError::TooFewPlayers { + got: players.len() as _, + need: self.min_players_needed() as _, + }); + } let (p_len, r_len) = (players.len(), self.roles.len()); if p_len > r_len { return Err(GameError::TooManyPlayers { diff --git a/werewolves-proto/src/message/host.rs b/werewolves-proto/src/message/host.rs index 4d89aad..ad0e661 100644 --- a/werewolves-proto/src/message/host.rs +++ b/werewolves-proto/src/message/host.rs @@ -37,6 +37,8 @@ pub enum HostMessage { Lobby(HostLobbyMessage), InGame(HostGameMessage), ForceRoleAckFor(CharacterId), + #[cfg(debug_assertions)] + ForceAllRoleAcks, PostGame(PostGameMessage), Echo(ServerToHostMessage), CancelGame, diff --git a/werewolves/src/app/components/input/number.rs b/werewolves/src/app/components/input/number.rs index 48a2d1e..84f097d 100644 --- a/werewolves/src/app/components/input/number.rs +++ b/werewolves/src/app/components/input/number.rs @@ -68,7 +68,7 @@ pub fn ChangePlayerNumber( on:input:target=update value=move || { number.get().map(|n| n.get().to_string()).unwrap_or_default() } /> - + } } diff --git a/werewolves/src/app/pages/game/host.rs b/werewolves/src/app/pages/game/host.rs index f9b5971..4da97b1 100644 --- a/werewolves/src/app/pages/game/host.rs +++ b/werewolves/src/app/pages/game/host.rs @@ -19,6 +19,7 @@ enum HostPage { #[default] None, Settings, + RoleRevealAcks, } #[component] @@ -33,6 +34,8 @@ pub fn HostGamePage( let qr_mode = RwSignal::new(false); let players: RwSignal> = RwSignal::new(Box::new([])); let dialog_open = RwSignal::new(HashMap::new()); + let acks: RwSignal> = RwSignal::new(Box::new([])); + let open_categories = RwSignal::new( Category::ALL .into_iter() @@ -74,6 +77,22 @@ pub fn HostGamePage( Srv2Host::Error(err) => { error.set(Some(err.to_string())); } + Srv2Host::WaitingForRoleRevealAcks { ackd, waiting } => { + let mut reveals = ackd + .into_iter() + .map(|a| RoleRevealCharacter { + char: a, + acknowledged: true, + }) + .chain(waiting.into_iter().map(|w| RoleRevealCharacter { + char: w, + acknowledged: false, + })) + .collect::>(); + reveals.sort_by_key(|r| r.char.number); + acks.set(reveals); + page.set(HostPage::RoleRevealAcks); + } _ => log::error!("{message:#?}"), } } @@ -98,6 +117,9 @@ pub fn HostGamePage( /> } .into_any(), + HostPage::RoleRevealAcks => { + view! { }.into_any() + } }; view! { {cancel} diff --git a/werewolves/src/app/pages/game/host/players.rs b/werewolves/src/app/pages/game/host/players.rs index 1dea94b..506e7a0 100644 --- a/werewolves/src/app/pages/game/host/players.rs +++ b/werewolves/src/app/pages/game/host/players.rs @@ -78,7 +78,7 @@ pub fn HostPlayerList( - "no number assigned" + "no seat assigned" } diff --git a/werewolves/src/app/pages/game/host/role_reveal_acks.rs b/werewolves/src/app/pages/game/host/role_reveal_acks.rs new file mode 100644 index 0000000..e92a49d --- /dev/null +++ b/werewolves/src/app/pages/game/host/role_reveal_acks.rs @@ -0,0 +1,57 @@ +use core::ops::Not; + +use leptos::{ev::MouseEvent, prelude::*}; +use werewolves_proto::message::{CharacterIdentity, host::HostMessage}; + +use crate::app::components::IdentityInline; + +#[derive(Debug, Clone)] +pub struct RoleRevealCharacter { + pub char: CharacterIdentity, + pub acknowledged: bool, +} + +#[component] +pub fn RoleRevealAcks( + reply: WriteSignal>, + acks: ReadSignal>, + error: WriteSignal>, +) -> impl IntoView { + let acks = move || { + acks.get() + .into_iter() + .map(|ackd| { + let RoleRevealCharacter { char, acknowledged } = ackd; + let char_id = char.character_id; + let ident = RwSignal::new(char.into_public()).read_only(); + let force_ready = move |ev: MouseEvent| { + ev.prevent_default(); + reply.set(Some(HostMessage::ForceRoleAckFor(char_id))); + }; + view! { +
+ + +
+ } + }) + .collect_view() + }; + + let force_all = move || { + (option_env!("LEPTOS_WATCH") == Some("true")).then_some({ + let force = move |ev: MouseEvent| { + ev.prevent_default(); + #[cfg(debug_assertions)] + reply.set(Some(HostMessage::ForceAllRoleAcks)); + }; + view! { } + }) + }; + + move || { + view! {
{force_all}
{acks}
} + } +} diff --git a/werewolves/src/app/pages/game/host/settings.rs b/werewolves/src/app/pages/game/host/settings.rs index fd2fd12..37049fb 100644 --- a/werewolves/src/app/pages/game/host/settings.rs +++ b/werewolves/src/app/pages/game/host/settings.rs @@ -37,13 +37,32 @@ pub fn Settings( .cloned() .map(move |s| { let signal = RwSignal::new(s); - Effect::new(move || { - let mut s = settings.get(); - s.update_slot(signal.get()); - reply.set(Some(HostMessage::Lobby(HostLobbyMessage::SetGameSettings(s)))); - }); + let remove = RwSignal::new(false); + Effect::new(move || { + let mut s = settings.get(); + s.update_slot(signal.get()); + reply.set(Some(HostMessage::Lobby(HostLobbyMessage::SetGameSettings( + s, + )))); + }); + Effect::new(move || { + if remove.get() { + let mut s = settings.get(); + s.remove_slot(signal.read().slot_id); + reply.set(Some(HostMessage::Lobby(HostLobbyMessage::SetGameSettings( + s, + )))); + } + }); - view! { } + view! { + + } }) .collect_view() }; @@ -124,9 +143,67 @@ pub fn Settings( }) .collect_view(); + let fill_villagers = move |ev: MouseEvent| { + ev.prevent_default(); + let mut s = settings.get(); + s.fill_remaining_slots_with_villagers(players.read().len()); + reply.set(Some(HostMessage::Lobby(HostLobbyMessage::SetGameSettings( + s, + )))); + }; + let clear_setup = move |ev: MouseEvent| { + ev.prevent_default(); + reply.set(Some(HostMessage::Lobby(HostLobbyMessage::SetGameSettings( + GameSettings::empty(), + )))); + }; + let fill_disabled = move || settings.read().slots().len() >= players.read().len(); + let clear_disabled = move || settings.read().slots().is_empty(); + + let start_content = move || { + if let Err(err) = settings.read().check_with_player_list( + &players + .read() + .iter() + .map(|p| p.identification.clone()) + .collect::>(), + ) { + return view! { {err.to_string()} }.into_any(); + } + let start = move |ev: MouseEvent| { + ev.prevent_default(); + reply.set(Some(HostMessage::Lobby(HostLobbyMessage::Start))); + }; + view! { + +

"start game"

+ + "once the game starts, all players will recieve their role on their phones" + + + "instruct them to ensure no other player can see their screen at this time" + + + + } + .into_any() + // }.into_any() + }; + view! {
-
{qr_mode_btn}
+
+ {qr_mode_btn} +
+
{start_content}
{categories}
{slots}
@@ -138,6 +215,7 @@ fn SettingsSetupSlot( setup_slot: RwSignal, players: ReadSignal>, dialog_open: RwSignal>, + remove: WriteSignal, ) -> impl IntoView { let auras = move || { let slot = setup_slot.read(); @@ -215,7 +293,7 @@ fn SettingsSetupSlot( button_content=setup_slot.read().role.title().to_string().to_case(Case::Title) close_backdrop=true > - + {assigned_to} {auras} @@ -228,6 +306,7 @@ fn SettingsSetupSlot( fn SlotSettingsDialogBody( setup_slot: RwSignal, players: ReadSignal>, + remove: WriteSignal, ) -> impl IntoView { #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] enum OpenTab { @@ -257,6 +336,10 @@ fn SlotSettingsDialogBody( .map(|p| p.identification.public) .map(|id| view! { }.into_any()) .unwrap_or_else(|| view! { "none" }.into_any()); + let remove = move |ev: MouseEvent| { + ev.prevent_default(); + remove.set(true); + }; view! {
{tab_view}
+ } } } diff --git a/werewolves/src/app/pages/game/player/lobby.rs b/werewolves/src/app/pages/game/player/lobby.rs index dd29746..fe96bc0 100644 --- a/werewolves/src/app/pages/game/player/lobby.rs +++ b/werewolves/src/app/pages/game/player/lobby.rs @@ -68,7 +68,11 @@ pub fn PlayerLobby( form_hidden.set(true); }; view! { -