Compare commits

...

3 commits

Author SHA1 Message Date
Tao Tien
1afb7f4e3d cargo fix 2026-02-15 09:41:01 -08:00
Tao Tien
4a833da757 discard out of hand, many new bugs 2026-02-15 09:08:58 -08:00
Tao Tien
f71e32b0b9 危危危 clear_all 危危危 2026-02-15 07:31:57 -08:00
14 changed files with 260 additions and 174 deletions

6
docs/queries.rs Normal file
View file

@ -0,0 +1,6 @@
commands: Commands
tiles: Query<(&Tile, &TileId, Entity)>,
player: Option<Single<&mut player::Player>>,
hand_ent: Option<Single<Entity, With<Hand>>>,

View file

@ -1,28 +1,17 @@
#![allow(unused)]
use bevy::prelude::*; use bevy::prelude::*;
use bevy_spacetimedb::{ use bevy_spacetimedb::{
ReadInsertUpdateMessage, ReadStdbConnectedMessage, ReadStdbDisconnectedMessage, StdbPlugin, ReadInsertUpdateMessage, ReadStdbConnectedMessage, ReadStdbDisconnectedMessage, StdbPlugin,
TableMessages,
}; };
use spacetimedb::Identity; use spacetimedb_sdk::{DbContext, Table};
use spacetimedb_sdk::{DbContext, Table, credentials};
use crate::stdb::{self, DbConnection, LobbyTableAccess, PlayerTableAccess, RemoteTables}; use crate::stdb::{self, DbConnection, LobbyTableAccess, PlayerTableAccess, RemoteTables};
use crate::stdb::{ use crate::stdb::{
add_bot, draw_tile, join_or_create_lobby, login_or_add_player, set_ready, shuffle_deal, add_bot, draw_tile, set_ready, shuffle_deal,
skip_call, start_game, skip_call, start_game,
}; };
use crate::{ use crate::{
SpacetimeDB, creds_store, SpacetimeDB, creds_store,
game::{ game::hand::{Drawn, Hand, Pond},
self,
hand::{Drawn, Hand, Pond},
player::{CurrentPlayer, MainPlayer, Player},
round::Wind,
wall::Wall,
},
tile::{self},
}; };
use jong_types::*; use jong_types::*;
@ -31,17 +20,10 @@ pub mod player;
pub mod round; pub mod round;
pub mod wall; pub mod wall;
#[derive(Message)]
pub enum GameMessage {
Discarded(Entity),
CallPending,
Called { player: Entity, calltype: Entity },
}
pub struct Riichi; pub struct Riichi;
impl Plugin for Riichi { impl Plugin for Riichi {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
let mut plugins = StdbPlugin::default() let plugins = StdbPlugin::default()
.with_uri("http://localhost:3000") .with_uri("http://localhost:3000")
.with_module_name("jongline") .with_module_name("jongline")
.with_run_fn(DbConnection::run_threaded) .with_run_fn(DbConnection::run_threaded)
@ -66,7 +48,6 @@ impl Plugin for Riichi {
.add_sub_state::<TurnState>() .add_sub_state::<TurnState>()
// .init_resource::<round::MatchSettings>() // .init_resource::<round::MatchSettings>()
// .init_resource::<round::Compass>() // .init_resource::<round::Compass>()
.add_message::<GameMessage>()
// .add_systems(Startup, tile::init_tiles) // .add_systems(Startup, tile::init_tiles)
// .add_systems(Update, hand::sort_hands.run_if(in_state(GameState::Play))) // .add_systems(Update, hand::sort_hands.run_if(in_state(GameState::Play)))
// .add_systems(OnEnter(TurnState::Tsumo), round::tsumo) // .add_systems(OnEnter(TurnState::Tsumo), round::tsumo)
@ -88,9 +69,12 @@ impl Plugin for Riichi {
; ;
} }
} }
fn on_connect(stdb: SpacetimeDB, mut messages: ReadStdbConnectedMessage, mut commands: Commands) { fn on_connect(stdb: SpacetimeDB, mut messages: ReadStdbConnectedMessage, _commands: Commands) {
for msg in messages.read() { for msg in messages.read() {
info!("you're now jongline"); info!("you're now jongline");
while stdb.try_identity().is_none() {}
debug!("with identity: {}", stdb.identity()); debug!("with identity: {}", stdb.identity());
creds_store() creds_store()
.save(&msg.access_token) .save(&msg.access_token)
@ -99,7 +83,7 @@ fn on_connect(stdb: SpacetimeDB, mut messages: ReadStdbConnectedMessage, mut com
} }
// TODO how reconnect? // TODO how reconnect?
fn on_disconnect(stdb: SpacetimeDB, mut messages: ReadStdbDisconnectedMessage) { fn on_disconnect(_stdb: SpacetimeDB, mut messages: ReadStdbDisconnectedMessage) {
for msg in messages.read() { for msg in messages.read() {
warn!("lost connection: {:#?}", msg.err); warn!("lost connection: {:#?}", msg.err);
} }
@ -123,26 +107,26 @@ fn subscriptions(stdb: SpacetimeDB) {
pub struct TileId(pub u32); pub struct TileId(pub u32);
fn on_player_insert_update( fn on_player_insert_update(
stdb: SpacetimeDB, _stdb: SpacetimeDB,
mut messages: ReadInsertUpdateMessage<stdb::Player>, mut messages: ReadInsertUpdateMessage<stdb::Player>,
mut commands: Commands, mut commands: Commands,
tiles: Query<(&Tile, &TileId, Entity)>, tiles: Query<(&Tile, &TileId, Entity)>,
mut player: Option<Single<&mut player::Player>>, player: Option<Single<&mut player::Player>>,
mut hand_ent: Option<Single<Entity, With<Hand>>>, hand_ent: Option<Single<Entity, With<Hand>>>,
) { ) {
use player::*; use player::*;
for msg in messages.read() { for msg in messages.read() {
// debug!("player_insert_update msg:\n{:#?}", msg.new); // debug!("player_insert_update msg:\n{:#?}", msg.new);
if let (Some(player), Some(hand_ent)) = (player.as_ref(), hand_ent.as_ref()) { if let (Some(_player), Some(hand_ent)) = (player.as_ref(), hand_ent.as_ref()) {
// if msg.old.as_ref().is_some_and(|m| !m.ready) && msg.new.ready { // if msg.old.as_ref().is_some_and(|m| !m.ready) && msg.new.ready {
// trace!("entered ready"); // trace!("entered ready");
// // TODO add a start game button in the future // // TODO add a start game button in the future
// stdb.reducers().start_game().unwrap(); // stdb.reducers().start_game().unwrap();
// } // }
let mut tiles: Vec<_> = msg let tiles: Vec<_> = msg
.new .new
.hand .hand
.iter() .iter()
@ -182,7 +166,7 @@ fn on_lobby_insert_update(
stdb: SpacetimeDB, stdb: SpacetimeDB,
mut messages: ReadInsertUpdateMessage<stdb::Lobby>, mut messages: ReadInsertUpdateMessage<stdb::Lobby>,
mut commands: Commands, _commands: Commands,
mut next_gamestate: ResMut<NextState<GameState>>, mut next_gamestate: ResMut<NextState<GameState>>,
mut next_turnstate: ResMut<NextState<TurnState>>, mut next_turnstate: ResMut<NextState<TurnState>>,
) { ) {

View file

@ -1,8 +1,6 @@
use std::mem::discriminant;
use bevy::prelude::*; use bevy::prelude::*;
use crate::game::{GameState, player::Player, wall::Wall};
use jong_types::*; use jong_types::*;
#[derive(Component)] #[derive(Component)]
@ -26,7 +24,7 @@ pub struct Discarded;
// } // }
/// assumes hand is sorted /// assumes hand is sorted
pub(crate) fn check_wincon(hand: &[Tile; 14], melds: &[&[Tile]]) -> bool { pub(crate) fn check_wincon(_hand: &[Tile; 14], _melds: &[&[Tile]]) -> bool {
// 4x3 + pair // 4x3 + pair
// assume sorted // assume sorted
// //

View file

@ -1,17 +1,8 @@
use std::rc::Weak;
use bevy::{platform::collections::HashMap, prelude::*}; use bevy::{platform::collections::HashMap, prelude::*};
use strum::{EnumCount, FromRepr}; use strum::{EnumCount, FromRepr};
use crate::{ use crate::EnumNextCycle;
EnumNextCycle,
game::{
GameMessage, GameState,
hand::{Discarded, Drawn, Hand, Pond},
player::{CurrentPlayer, Player},
wall::Wall,
},
};
use jong_types::TurnState; use jong_types::TurnState;
// #[derive(Resource)] // #[derive(Resource)]
@ -111,85 +102,85 @@ impl EnumNextCycle for TurnState {
} }
} }
pub(crate) fn tsumo( // pub(crate) fn tsumo(
mut commands: Commands, // mut commands: Commands,
// curr_player: Res<CurrentPlayer>, // // curr_player: Res<CurrentPlayer>,
curr_player: Single<Entity, With<CurrentPlayer>>, // curr_player: Single<Entity, With<CurrentPlayer>>,
wall: Single<Entity, With<Wall>>, // wall: Single<Entity, With<Wall>>,
walltiles: Single<&Children, With<Wall>>, // walltiles: Single<&Children, With<Wall>>,
curr_turnstate: Res<State<TurnState>>, // curr_turnstate: Res<State<TurnState>>,
mut next_turnstate: ResMut<NextState<TurnState>>, // mut next_turnstate: ResMut<NextState<TurnState>>,
) { // ) {
let drawn = walltiles.last().unwrap(); // let drawn = walltiles.last().unwrap();
commands.entity(*wall).remove_child(*drawn); // commands.entity(*wall).remove_child(*drawn);
let drawn = commands.entity(*drawn).insert(Drawn).id(); // let drawn = commands.entity(*drawn).insert(Drawn).id();
commands.entity(*curr_player).add_child(drawn); // commands.entity(*curr_player).add_child(drawn);
debug!("tsumo for: {:?}, tile: {:?}", *curr_player, drawn); // debug!("tsumo for: {:?}, tile: {:?}", *curr_player, drawn);
next_turnstate.set(curr_turnstate.next()); // next_turnstate.set(curr_turnstate.next());
} // }
pub(crate) fn menzen( // pub(crate) fn menzen(
curr_turnstate: Res<State<TurnState>>, // curr_turnstate: Res<State<TurnState>>,
mut next_turnstate: ResMut<NextState<TurnState>>, // mut next_turnstate: ResMut<NextState<TurnState>>,
) { // ) {
trace!("menzen check"); // trace!("menzen check");
next_turnstate.set(curr_turnstate.next()); // next_turnstate.set(curr_turnstate.next());
} // }
pub(crate) fn riichi_kan( // pub(crate) fn riichi_kan(
curr_turnstate: Res<State<TurnState>>, // curr_turnstate: Res<State<TurnState>>,
mut next_turnstate: ResMut<NextState<TurnState>>, // mut next_turnstate: ResMut<NextState<TurnState>>,
) { // ) {
trace!("riichi_kan"); // trace!("riichi_kan");
next_turnstate.set(curr_turnstate.next()); // next_turnstate.set(curr_turnstate.next());
} // }
#[allow(clippy::too_many_arguments, irrefutable_let_patterns)] // #[allow(clippy::too_many_arguments, irrefutable_let_patterns)]
pub(crate) fn discard( // pub(crate) fn discard(
mut commands: Commands, // mut commands: Commands,
mut reader: MessageReader<GameMessage>, // mut reader: MessageReader<GameMessage>,
curr_player: Single<Entity, With<CurrentPlayer>>, // curr_player: Single<Entity, With<CurrentPlayer>>,
players: Query<&Children, With<Player>>, // players: Query<&Children, With<Player>>,
mut hands: Query<(&Children, Entity), (With<Hand>, Without<Player>)>, // mut hands: Query<(&Children, Entity), (With<Hand>, Without<Player>)>,
drawn: Single<Entity, With<Drawn>>, // drawn: Single<Entity, With<Drawn>>,
curr_turnstate: Res<State<TurnState>>, // curr_turnstate: Res<State<TurnState>>,
mut next_turnstate: ResMut<NextState<TurnState>>, // mut next_turnstate: ResMut<NextState<TurnState>>,
) -> Result { // ) -> Result {
// trace!("discard"); // // trace!("discard");
let (handtiles, hand) = hands.get_mut(players.get(*curr_player)?.iter().next().unwrap())?; // let (handtiles, hand) = hands.get_mut(players.get(*curr_player)?.iter().next().unwrap())?;
let mut done = false; // let mut done = false;
while let Some(message) = reader.read().next() { // while let Some(message) = reader.read().next() {
if let GameMessage::Discarded(discarded) = message { // if let GameMessage::Discarded(discarded) = message {
debug!("discarded: {discarded:?}"); // debug!("discarded: {discarded:?}");
if *discarded == *drawn { // if *discarded == *drawn {
} else if handtiles.contains(discarded) { // } else if handtiles.contains(discarded) {
commands // commands
.entity(hand) // .entity(hand)
.remove_child(*discarded) // .remove_child(*discarded)
.add_child(*drawn); // .add_child(*drawn);
} else { // } else {
panic!("current hand nor drawn tile contains discarded tile") // panic!("current hand nor drawn tile contains discarded tile")
} // }
commands.entity(*drawn).remove::<Drawn>(); // commands.entity(*drawn).remove::<Drawn>();
commands.entity(*discarded).insert(Discarded); // commands.entity(*discarded).insert(Discarded);
done = true; // done = true;
break; // break;
} // }
} // }
if done { // if done {
next_turnstate.set(curr_turnstate.next()); // next_turnstate.set(curr_turnstate.next());
} // }
Ok(()) // Ok(())
} // }
#[derive(Resource)] #[derive(Resource)]
pub struct PendingCalls { pub struct PendingCalls {
@ -197,45 +188,45 @@ pub struct PendingCalls {
calls: HashMap<Entity, CallType>, calls: HashMap<Entity, CallType>,
} }
pub(crate) fn notify_callable() {} // pub(crate) fn notify_callable() {}
pub(crate) fn ron_chi_pon_kan( // pub(crate) fn ron_chi_pon_kan(
mut commands: Commands, // mut commands: Commands,
mut reader: MessageReader<GameMessage>, // mut reader: MessageReader<GameMessage>,
discarded: Single<Entity, With<Discarded>>, // discarded: Single<Entity, With<Discarded>>,
mut ponds: Query<(&Children, Entity), (With<Pond>, Without<Player>)>, // mut ponds: Query<(&Children, Entity), (With<Pond>, Without<Player>)>,
calls: Query<&CallType>, // calls: Query<&CallType>,
curr_turnstate: Res<State<TurnState>>, // curr_turnstate: Res<State<TurnState>>,
mut next_turnstate: ResMut<NextState<TurnState>>, // mut next_turnstate: ResMut<NextState<TurnState>>,
) { // ) {
// check if can call? // // check if can call?
// message players? // // message players?
// collect then prioritize // // collect then prioritize
// let mut received = vec![]; // // let mut received = vec![];
let mut received: Vec<_> = reader // let mut received: Vec<_> = reader
.read() // .read()
.filter_map(|m| { // .filter_map(|m| {
if let GameMessage::Called { player, calltype } = m // if let GameMessage::Called { player, calltype } = m
&& let Ok(calltype) = calls.get(*calltype) // && let Ok(calltype) = calls.get(*calltype)
{ // {
Some((calltype, player)) // Some((calltype, player))
} else { // } else {
None // None
} // }
}) // })
.collect(); // .collect();
// received.sort_unstable_by_key(|(c, t)| c); // // received.sort_unstable_by_key(|(c, t)| c);
// received.sort_unstable_by_key(|m| m.); // // received.sort_unstable_by_key(|m| m.);
next_turnstate.set(curr_turnstate.next()); // next_turnstate.set(curr_turnstate.next());
} // }
pub(crate) fn end( // pub(crate) fn end(
curr_turnstate: Res<State<TurnState>>, // curr_turnstate: Res<State<TurnState>>,
mut next_turnstate: ResMut<NextState<TurnState>>, // mut next_turnstate: ResMut<NextState<TurnState>>,
) { // ) {
next_turnstate.set(curr_turnstate.next()); // next_turnstate.set(curr_turnstate.next());
} // }

View file

@ -1,5 +1,4 @@
use bevy::{log::LogPlugin, prelude::*}; use bevy::{log::LogPlugin, prelude::*};
use bevy_spacetimedb::{StdbConnection, StdbPlugin};
use clap::{Parser, Subcommand}; use clap::{Parser, Subcommand};
use tracing::Level; use tracing::Level;
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
@ -42,7 +41,6 @@ fn main() {
tui_logger::init_logger(tui_logger::LevelFilter::Trace).unwrap(); tui_logger::init_logger(tui_logger::LevelFilter::Trace).unwrap();
tui_logger::set_env_filter_from_string(FILTERSTRING); tui_logger::set_env_filter_from_string(FILTERSTRING);
// app.add_plugins(tui::RiichiTui)
app.add_plugins(tui::TuiPlugin) app.add_plugins(tui::TuiPlugin)
} }
}; };

View file

@ -0,0 +1,100 @@
// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
#![allow(unused, clippy::all)]
use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws};
#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)]
#[sats(crate = __lib)]
pub(super) struct ClearAllArgs {}
impl From<ClearAllArgs> for super::Reducer {
fn from(args: ClearAllArgs) -> Self {
Self::ClearAll
}
}
impl __sdk::InModule for ClearAllArgs {
type Module = super::RemoteModule;
}
pub struct ClearAllCallbackId(__sdk::CallbackId);
#[allow(non_camel_case_types)]
/// Extension trait for access to the reducer `clear_all`.
///
/// Implemented for [`super::RemoteReducers`].
pub trait clear_all {
/// Request that the remote module invoke the reducer `clear_all` to run as soon as possible.
///
/// This method returns immediately, and errors only if we are unable to send the request.
/// The reducer will run asynchronously in the future,
/// and its status can be observed by listening for [`Self::on_clear_all`] callbacks.
fn clear_all(&self) -> __sdk::Result<()>;
/// Register a callback to run whenever we are notified of an invocation of the reducer `clear_all`.
///
/// Callbacks should inspect the [`__sdk::ReducerEvent`] contained in the [`super::ReducerEventContext`]
/// to determine the reducer's status.
///
/// The returned [`ClearAllCallbackId`] can be passed to [`Self::remove_on_clear_all`]
/// to cancel the callback.
fn on_clear_all(
&self,
callback: impl FnMut(&super::ReducerEventContext) + Send + 'static,
) -> ClearAllCallbackId;
/// Cancel a callback previously registered by [`Self::on_clear_all`],
/// causing it not to run in the future.
fn remove_on_clear_all(&self, callback: ClearAllCallbackId);
}
impl clear_all for super::RemoteReducers {
fn clear_all(&self) -> __sdk::Result<()> {
self.imp.call_reducer("clear_all", ClearAllArgs {})
}
fn on_clear_all(
&self,
mut callback: impl FnMut(&super::ReducerEventContext) + Send + 'static,
) -> ClearAllCallbackId {
ClearAllCallbackId(self.imp.on_reducer(
"clear_all",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event:
__sdk::ReducerEvent {
reducer: super::Reducer::ClearAll {},
..
},
..
} = ctx
else {
unreachable!()
};
callback(ctx)
}),
))
}
fn remove_on_clear_all(&self, callback: ClearAllCallbackId) {
self.imp.remove_on_reducer("clear_all", callback.0)
}
}
#[allow(non_camel_case_types)]
#[doc(hidden)]
/// Extension trait for setting the call-flags for the reducer `clear_all`.
///
/// Implemented for [`super::SetReducerFlags`].
///
/// This type is currently unstable and may be removed without a major version bump.
pub trait set_flags_for_clear_all {
/// Set the call-reducer flags for the reducer `clear_all` to `flags`.
///
/// This type is currently unstable and may be removed without a major version bump.
fn clear_all(&self, flags: __ws::CallReducerFlags);
}
impl set_flags_for_clear_all for super::SetReducerFlags {
fn clear_all(&self, flags: __ws::CallReducerFlags) {
self.imp.set_call_reducer_flags("clear_all", flags);
}
}

View file

@ -9,6 +9,7 @@ use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws};
pub mod add_bot_reducer; pub mod add_bot_reducer;
pub mod bot_table; pub mod bot_table;
pub mod bot_type; pub mod bot_type;
pub mod clear_all_reducer;
pub mod db_tile_type; pub mod db_tile_type;
pub mod db_wall_type; pub mod db_wall_type;
pub mod discard_tile_reducer; pub mod discard_tile_reducer;
@ -37,6 +38,7 @@ pub mod wind_type;
pub use add_bot_reducer::{add_bot, set_flags_for_add_bot, AddBotCallbackId}; pub use add_bot_reducer::{add_bot, set_flags_for_add_bot, AddBotCallbackId};
pub use bot_table::*; pub use bot_table::*;
pub use bot_type::Bot; pub use bot_type::Bot;
pub use clear_all_reducer::{clear_all, set_flags_for_clear_all, ClearAllCallbackId};
pub use db_tile_type::DbTile; pub use db_tile_type::DbTile;
pub use db_wall_type::DbWall; pub use db_wall_type::DbWall;
pub use discard_tile_reducer::{discard_tile, set_flags_for_discard_tile, DiscardTileCallbackId}; pub use discard_tile_reducer::{discard_tile, set_flags_for_discard_tile, DiscardTileCallbackId};
@ -75,6 +77,7 @@ pub use wind_type::Wind;
pub enum Reducer { pub enum Reducer {
AddBot { lobby_id: u32 }, AddBot { lobby_id: u32 },
ClearAll,
DiscardTile { tile_id: u32 }, DiscardTile { tile_id: u32 },
DrawTile, DrawTile,
JoinOrCreateLobby { lobby_id: u32 }, JoinOrCreateLobby { lobby_id: u32 },
@ -93,6 +96,7 @@ impl __sdk::Reducer for Reducer {
fn reducer_name(&self) -> &'static str { fn reducer_name(&self) -> &'static str {
match self { match self {
Reducer::AddBot { .. } => "add_bot", Reducer::AddBot { .. } => "add_bot",
Reducer::ClearAll => "clear_all",
Reducer::DiscardTile { .. } => "discard_tile", Reducer::DiscardTile { .. } => "discard_tile",
Reducer::DrawTile => "draw_tile", Reducer::DrawTile => "draw_tile",
Reducer::JoinOrCreateLobby { .. } => "join_or_create_lobby", Reducer::JoinOrCreateLobby { .. } => "join_or_create_lobby",
@ -114,6 +118,13 @@ impl TryFrom<__ws::ReducerCallInfo<__ws::BsatnFormat>> for Reducer {
&value.args, &value.args,
)? )?
.into()), .into()),
"clear_all" => Ok(
__sdk::parse_reducer_args::<clear_all_reducer::ClearAllArgs>(
"clear_all",
&value.args,
)?
.into(),
),
"discard_tile" => Ok( "discard_tile" => Ok(
__sdk::parse_reducer_args::<discard_tile_reducer::DiscardTileArgs>( __sdk::parse_reducer_args::<discard_tile_reducer::DiscardTileArgs>(
"discard_tile", "discard_tile",

View file

@ -13,7 +13,6 @@ use jong::stdb::{self, discard_tile as _};
use jong::{ use jong::{
SpacetimeDB, SpacetimeDB,
game::{ game::{
GameMessage,
hand::{Drawn, Hand}, hand::{Drawn, Hand},
player::{CurrentPlayer, Player}, player::{CurrentPlayer, Player},
}, },
@ -106,7 +105,6 @@ impl Plugin for TuiPlugin {
fn discard_tile( fn discard_tile(
stdb: SpacetimeDB, stdb: SpacetimeDB,
mut writer: MessageWriter<GameMessage>,
mut selected: MessageReader<ConfirmSelect>, mut selected: MessageReader<ConfirmSelect>,
mut commands: Commands, mut commands: Commands,
@ -115,8 +113,8 @@ fn discard_tile(
// player_hands: Populated<(&Player, &Children), With<Hand>>, // player_hands: Populated<(&Player, &Children), With<Hand>>,
// hands: Populated<&Children, (With<Hand>, Without<Player>)>, // hands: Populated<&Children, (With<Hand>, Without<Player>)>,
main_player: Single<(&Player, Entity), With<MainPlayer>>, main_player: Single<(&Player, Entity), With<MainPlayer>>,
hands: Query<(&mut Children, Entity), With<Hand> >, hands: Query<(&Children, Entity), With<Hand>>,
tiles: Populated<&TileId>, tiles: Query<&TileId>,
) { ) {
// trace!("discard_tile"); // trace!("discard_tile");
@ -125,17 +123,9 @@ fn discard_tile(
while let Some(message) = selected.read().next() while let Some(message) = selected.read().next()
// && (message.0 == drawn.0 || hand.contains(&message.0)) // && (message.0 == drawn.0 || hand.contains(&message.0))
{ {
if message.0 == drawn.0 { if let Ok(tile_id) = tiles.get(message.0) {
stdb.reducers().discard_tile(drawn.1.0).unwrap(); stdb.reducers().discard_tile(tile_id.0).unwrap();
// commands.get_entity(drawn.0).unwrap().remove_parent_in_place();
commands.get_entity(drawn.0).unwrap().despawn(); commands.get_entity(drawn.0).unwrap().despawn();
} else if let Some(tile_ent) = hand.iter().find(|t| *t == message.0) { }
stdb.reducers()
.discard_tile(tiles.get(tile_ent).unwrap().0)
.unwrap();
}
// FIXME check if discard actually in hand?
writer.write(GameMessage::Discarded(message.0));
} }
} }

View file

@ -13,6 +13,7 @@ default:
just --list just --list
run-tui: run-tui:
spacetime call jongline "clear_all"
cargo run -- run-tui cargo run -- run-tui
update: update:

View file

@ -1,5 +1,5 @@
use log::info; use log::debug;
use spacetimedb::{ReducerContext, Table, ViewContext, reducer, view}; use spacetimedb::{ReducerContext, Table, reducer};
use crate::tables::{player::player, *}; use crate::tables::{player::player, *};
@ -8,6 +8,13 @@ mod reducers {
} }
mod tables; mod tables;
#[reducer]
pub fn clear_all(ctx: &ReducerContext) {
for row in ctx.db.player().iter() {
ctx.db.player().delete(row);
}
}
#[reducer(client_connected)] #[reducer(client_connected)]
pub fn login_or_add_player(ctx: &ReducerContext) { pub fn login_or_add_player(ctx: &ReducerContext) {
let identity = ctx.sender; let identity = ctx.sender;
@ -24,10 +31,10 @@ pub fn login_or_add_player(ctx: &ReducerContext) {
pond: vec![], pond: vec![],
drawn_tile: None, drawn_tile: None,
}) { }) {
info!("added player: {:?}", player); debug!("added player: {:?}", player);
} else { } else {
let player = ctx.db.player().identity().find(identity).unwrap(); let player = ctx.db.player().identity().find(identity).unwrap();
info!("player {:?} has reconnected", player) debug!("player {:?} has reconnected", player)
} }
} }

View file

@ -1,4 +1,4 @@
use log::{info, trace}; use log::info;
use spacetimedb::{ReducerContext, Table, rand::seq::SliceRandom, reducer}; use spacetimedb::{ReducerContext, Table, rand::seq::SliceRandom, reducer};
use crate::tables::{player::player, *}; use crate::tables::{player::player, *};

View file

@ -1,8 +1,8 @@
use log::{debug, trace}; use log::debug;
use spacetimedb::{ReducerContext, Table, rand::seq::SliceRandom, reducer}; use spacetimedb::{ReducerContext, Table, rand::seq::SliceRandom, reducer};
use super::hand::deal_hands; use super::hand::deal_hands;
use crate::tables::{player::player, *}; use crate::tables::*;
use jong_types::*; use jong_types::*;
#[reducer] #[reducer]

View file

@ -1,5 +1,5 @@
use log::{debug, info, trace}; use log::{debug, trace};
use spacetimedb::{ReducerContext, Table, ViewContext, reducer, view}; use spacetimedb::{ReducerContext, Table, reducer};
use crate::tables::{player::player, *}; use crate::tables::{player::player, *};
use jong_types::*; use jong_types::*;
@ -80,7 +80,7 @@ pub fn discard_tile(ctx: &ReducerContext, tile_id: u32) -> Result<(), String> {
pub fn skip_call(ctx: &ReducerContext) { pub fn skip_call(ctx: &ReducerContext) {
trace!("skip_call"); trace!("skip_call");
let mut player = ctx.db.player().identity().find(ctx.sender).unwrap(); let player = ctx.db.player().identity().find(ctx.sender).unwrap();
let mut lobby = ctx.db.lobby().id().find(player.lobby_id).unwrap(); let mut lobby = ctx.db.lobby().id().find(player.lobby_id).unwrap();
lobby.turn_state = TurnState::Tsumo; lobby.turn_state = TurnState::Tsumo;

View file

@ -1,4 +1,4 @@
use spacetimedb::{Filter, SpacetimeType, client_visibility_filter, table}; use spacetimedb::table;
use jong_types::*; use jong_types::*;