Jengamon/magisterium - Change YZORD7JDBN2KZ6UCVP5FUJ2PJG4OQJPO7NQWBR3PHZ4H7W7UKZMQC

add some stuff

Created by Jengamon on April 3, 2024

YZORD7JDBN2KZ6UCVP5FUJ2PJG4OQJPO7NQWBR3PHZ4H7W7UKZMQC

Dependencies

In channels

main

Change contents

File addition: turn.rs (----------)

[3.36]

//! Manages turns and phases
#![allow(dead_code, unused_imports)]
#[derive(Debug, Default)]
pub struct TurnState {
    current_phase: Phase,
    /// The game starts when this is 1.
    current_turn: usize,
}
impl TurnState {
    pub fn phase(&self) -> Phase {
        self.current_phase
    }
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
pub enum Phase {
    #[default]
    Ready,
    Standby,
    Draw,
    PrecombatMain,
    Battle(BattleStep),
    PostcombatMain,
    End,
}
impl Phase {
    /// Does this phase default to a closed GES?
    pub fn is_closed(self) -> bool {
        matches!(
            self,
            Phase::Ready | Phase::Battle(BattleStep::ResolveDamage)
        )
    }
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub enum BattleStep {
    BeginBattle,
    DeclareAttackers,
    MakeAttacks,
    ResolveDamage,
    EndBattle,
}

Insertion in testbed/src/main.rs at line 3 [3.70]
[2.23]
[3.71]
```
mod card;
mod turn;
```

Replacement in testbed/src/main.rs at line 7 [3.70]

B:BD[3.83] → [2.24:45]

    App::new().run()

[3.83]

[3.114]

    App::new().add_plugins(MagisterGame).run()
}
struct MagisterGame;
impl Plugin for MagisterGame {
    fn build(&self, app: &mut App) {
        app.add_systems(Startup, camera::setup_camera);
    }
}
mod camera {
    use bevy::prelude::*;
    #[derive(Component)]
    pub struct PrimaryCamera;
    pub fn setup_camera(mut commands: Commands) {
        commands.spawn((
            PrimaryCamera,
            Camera2dBundle {
                camera: Camera {
                    clear_color: ClearColorConfig::Default,
                    ..default()
                },
                ..default()
            },
        ));
    }

File addition: card.rs (----------)

[3.36]

#![allow(dead_code, unused_imports)]
pub use self::subtype::Subtype;
pub mod subtype;
#[derive(Debug, Clone)]
pub enum Card {
    Magister {},
    Fragment {},
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub enum FragmentProperties {
    /// Is not sent to the graveyard on resolution
    Lingering,
    /// Must be Set before it can be activated
    Prepared,
    /// Can be activated during any time GES is half-closed
    /// (as compared to the default of when GES is open during *your* Main Phase(s))
    Impulse,
    /// Can be activated the turn it is Set.
    Rush,
}
#[derive(Debug, Clone, Copy)]
pub struct CardInstance {}

File addition: card (d--x------)
[3.36]

File addition: subtype.rs (----------)

[0.2276]

//! Card subtypes
//!
//! Impl note: Make sure both the canonical representation [`Display`](Subtype#impl-Display-for-Subtype) and
//! the exact representation [`Debug`](Subtype#impl-Debug-for-Subtype) are accessible, as membership relations
//! (both quasi and not)
//! use the exact to determine the relation, but canonical gets the general point across.
//!
//! # Examples
//!
//! ```
//! # use magister::card::Subtype;
//! let subtype = Subtype::new("Mad:Dot");
//! assert!(subtype.is_quasimember("mad"));
//! assert!(!subtype.is_quasimember("mad-dot"));
//! assert!(subtype.is_quasimember("mad:dot"));
//! assert_eq!(&subtype.to_string(), "Mad-Dot");
//! assert_eq!(&format!("{subtype:?}"), "mad:dot");
//! ```
use heck::ToTrainCase;
use regex::Regex;
use serde::de::Visitor;
use std::{
    collections::{HashMap, HashSet},
    fmt,
    sync::{Arc, Mutex, OnceLock},
};
#[derive(Clone)]
pub struct Subtype(HashSet<Arc<str>>, Arc<str>);
impl PartialEq for Subtype {
    fn eq(&self, other: &Self) -> bool {
        self.0 == other.0
    }
}
impl Eq for Subtype {}
impl serde::Serialize for Subtype {
    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
    where
        S: serde::Serializer,
    {
        serializer.serialize_str(&format!("{self:?}"))
    }
}
pub(crate) struct SubtypeVisitor;
impl<'de> Visitor<'de> for SubtypeVisitor {
    type Value = Box<str>;
    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
        formatter.write_str("a string of space separated subtypes")
    }
    fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
    where
        E: serde::de::Error,
    {
        Ok(Box::from(v))
    }
}
impl<'de> serde::Deserialize<'de> for Subtype {
    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
    where
        D: serde::Deserializer<'de>,
    {
        deserializer
            .deserialize_str(SubtypeVisitor)
            .map(Subtype::new)
    }
}
impl fmt::Display for Subtype {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        write!(
            f,
            "{}",
            self.1
                .split_whitespace()
                .map(|s| s.to_train_case())
                .collect::<Vec<_>>()
                .join(" ")
        )
    }
}
impl fmt::Debug for Subtype {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        if f.alternate() {
            f.debug_tuple("Subtype")
                .field(&self.0)
                .field(&self.1)
                .finish()
        } else {
            write!(f, "{}", self.1)
        }
    }
}
impl Subtype {
    pub fn new<S: AsRef<str>>(subtype: S) -> Self {
        static REMOVE_SEPARATORS: OnceLock<Regex> = OnceLock::new();
        let remove_seps =
            REMOVE_SEPARATORS.get_or_init(|| Regex::new(r"(\A|\s)[-+/\\:](\z|\s)").unwrap());
        let subtype = subtype.as_ref().trim().to_lowercase();
        let subtype = remove_seps.replace_all(&subtype, " ");
        Self(
            subtype
                .split_whitespace()
                .filter(|s| !["-", "+", "/", r"\", ":"].contains(s))
                .map(Arc::from)
                .collect(),
            Arc::from(subtype),
        )
    }
    /// Provide an [`ExactSizeIterator`] of all subtypes
    pub fn subtypes(&self) -> impl ExactSizeIterator<Item = &str> {
        self.0.iter().map(|s| s.as_ref())
    }
    /// Check if this subtype is a member of a given subtype group
    pub fn is_member<S: AsRef<str>>(&self, member: S) -> bool {
        let member = member.as_ref().to_lowercase();
        self.0.iter().any(|sm| sm.as_ref() == member)
    }
    /// Check if this subtype is a quasimember of a given subtype group
    ///
    /// Quasimembership is defined for strings separated by `[-+/\:]`
    pub fn is_quasimember<S: AsRef<str>>(&self, quasimember: S) -> bool {
        pub(crate) static SUBTYPE_REGEXES: OnceLock<Mutex<HashMap<Box<str>, Regex>>> =
            OnceLock::new();
        let mut subtype_regex_map = SUBTYPE_REGEXES
            .get_or_init(|| Mutex::new(HashMap::new()))
            .lock()
            .unwrap();
        let subtype_regex = subtype_regex_map
            .entry(Box::from(quasimember.as_ref().to_lowercase()))
            .or_insert_with(|| {
                Regex::new(&format!(
                    r"(\A|[-+/\\:]){}(\z|[-+/\\:])",
                    regex::escape(&quasimember.as_ref().to_lowercase())
                ))
                .unwrap()
            });
        self.0.iter().any(|sm| subtype_regex.is_match(sm))
    }
}
#[cfg(test)]
mod tests {
    use super::Subtype;
    #[test]
    fn membership_will_only_match_whole_subtypes() {
        let subtype = Subtype::new("Mad Relic");
        let subtype2 = Subtype::new("Mad-Devouring Dragon");
        assert!(subtype.is_member("Mad"));
        assert!(!subtype2.is_member("Mad"));
    }
    #[test]
    fn quasimembership_matches_words_in_subtypes() {
        let subtype = Subtype::new("Mad Relic");
        let subtype2 = Subtype::new("Mad-Devouring Dragon");
        assert!(subtype.is_quasimember("Mad"));
        assert!(subtype2.is_quasimember("Mad"));
        assert!(!subtype2.is_quasimember("evo"));
    }
    #[test]
    fn membership_and_quasimembership_are_caseinsensitive() {
        let subtype = Subtype::new("Magic-Spellcaster Ruler");
        assert!(subtype.is_member("MAGIC-SPELLCASTER"));
        assert!(subtype.is_quasimember("SPELLcAsTeR"));
        let subtype2 = Subtype::new("MAGIC-SPELLcaster RULer");
        assert_eq!(subtype, subtype2);
    }
    #[test]
    fn whitespace_doesnt_affect_subtype() {
        let subtype = Subtype::new("Magic Ruler");
        let subtype2 = Subtype::new("Magic \n\t\t Ruler");
        assert_eq!(subtype, subtype2);
    }
    #[test]
    fn valid_unicode_subtypes() {
        let subtype = Subtype::new("Hailstone (-_-/ 😻-Ruler");
        assert!(subtype.is_member("(-_-/"));
        assert!(subtype.is_member("😻-ruler"));
        assert!(subtype.is_quasimember("(-_-/"));
        assert!(subtype.is_quasimember("("));
        assert!(subtype.is_quasimember("_"));
        assert!(subtype.is_quasimember("/"));
        assert!(subtype.is_quasimember("😻"));
        assert!(subtype.is_quasimember("Ruler"));
    }
    #[test]
    fn test_serde() {
        let subtype_a = Subtype::new("Mad:Dot / Dasher");
        let subtype_b = Subtype::new("Mad-dot - Dasher");
        let subtype_c = Subtype::new("Mad:Dot - Dasher");
        assert_eq!(subtype_a, subtype_c);
        assert_ne!(subtype_a, subtype_b);
        assert_ne!(subtype_c, subtype_b);
        insta::assert_ron_snapshot!([subtype_a, subtype_b, subtype_c]);
    }
}

File addition: snapshots (d--x------)
[0.2276]

File addition: magistercardsubtypetestsserde.snap (----------)

[0.9054]

---
source: src/card/subtype.rs
expression: "[subtype_a, subtype_b, subtype_c]"
---
("mad:dot dasher", "mad-dot dasher", "mad:dot dasher")

Replacement in testbed/Cargo.toml at line 10 [3.152]
B:BD[3.345] → [3.345:371]
```
bevy-async-task = "1.4.0"
```
[3.345]
[3.371]
```
bevy_async_task = "0.1"
```

Insertion in testbed/Cargo.toml at line 16 [3.152]

[3.585]

serde = { version = "1.0.197", features = ["derive"] }
regex = "1.10.4"
heck = "0.5.0"
[dev-dependencies]
insta = { version = "1.38.0", features = ["ron", "redactions"] }

Insertion in Cargo.lock at line 446 [3.3841]

[3.14850]


[[package]]
name = "base64"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"

Deletion in Cargo.lock at line 469 [3.3841]

B:BD[3.15280] → [3.15280:15559]

name = "bevy-async-task"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d8812dbcaedbad9fb68230e2379dc00f165786d94123787a0b816bc8d93a198"
dependencies = [
 "async-compat",
 "async-std",
 "bevy",
 "cfg-if",
 "tokio",
]
[[package]]

Replacement in Cargo.lock at line 539 [3.3841]
B:BD[3.17038] → [3.17038:17046]
```
 "ron",
```
[3.17038]
[3.17046]
```
 "ron 0.8.1",
```

Insertion in Cargo.lock at line 583 [3.3841]

[3.18012]

]
[[package]]
name = "bevy_async_task"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1b6369f66a75408f203928de9bfb8bd0ee6647c59e14cb932c87803ff233f11"
dependencies = [
 "async-compat",
 "async-std",
 "bevy",
 "cfg-if",
 "tokio",

Replacement in Cargo.lock at line 624 [3.3841]
B:BD[3.18615] → [3.18615:18623]
```
 "ron",
```
[3.18615]
[3.18623]
```
 "ron 0.8.1",
```
Replacement in Cargo.lock at line 806 [3.3841]
B:BD[3.22488] → [3.22488:22499]
```
 "base64",
```
[3.22488]
[3.22499]
```
 "base64 0.21.7",
```

Insertion in Cargo.lock at line 1350 [3.3841]

[3.33623]

name = "block-buffer"
version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
dependencies = [
 "generic-array",
]
[[package]]

Insertion in Cargo.lock at line 1588 [3.3841]

[3.39502]

name = "console"
version = "0.15.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
dependencies = [
 "encode_unicode",
 "lazy_static",
 "libc",
 "windows-sys 0.52.0",
]
[[package]]

Insertion in Cargo.lock at line 1726 [3.3841]

[3.42747]

name = "cpufeatures"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
dependencies = [
 "libc",
]
[[package]]

Insertion in Cargo.lock at line 1759 [3.3841]

[3.43411]

name = "crypto-common"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
dependencies = [
 "generic-array",
 "typenum",
]
[[package]]

Insertion in Cargo.lock at line 1809 [3.3841]

[3.44517]

name = "digest"
version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
 "block-buffer",
 "crypto-common",
]
[[package]]

Insertion in Cargo.lock at line 1905 [3.3841]

[3.46769]


[[package]]
name = "encode_unicode"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"

Insertion in Cargo.lock at line 2144 [3.3841]

[3.52919]

]
[[package]]
name = "generic-array"
version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
 "typenum",
 "version_check",

Insertion in Cargo.lock at line 2419 [3.3841]

[3.59058]


[[package]]
name = "heck"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"

Insertion in Cargo.lock at line 2529 [3.3841]

[3.61629]

name = "insta"
version = "1.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc"
dependencies = [
 "console",
 "lazy_static",
 "linked-hash-map",
 "pest",
 "pest_derive",
 "ron 0.7.1",
 "serde",
 "similar",
]
[[package]]

Insertion in Cargo.lock at line 2777 [3.3841]

[3.67492]

name = "linked-hash-map"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]

Insertion in Cargo.lock at line 3277 [3.3841]

[3.79998]


[[package]]
name = "pest"
version = "2.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95"
dependencies = [
 "memchr",
 "thiserror",
 "ucd-trie",
]
[[package]]
name = "pest_derive"
version = "2.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c"
dependencies = [
 "pest",
 "pest_generator",
]
[[package]]
name = "pest_generator"
version = "2.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd"
dependencies = [
 "pest",
 "pest_meta",
 "proc-macro2",
 "quote",
 "syn 2.0.52",
]
[[package]]
name = "pest_meta"
version = "2.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca"
dependencies = [
 "once_cell",
 "pest",
 "sha2",
]

Replacement in Cargo.lock at line 3503 [3.3841]
B:BD[3.84802] → [3.84802:84821]
```
version = "1.10.3"
```
[3.84802]
[3.84821]
```
version = "1.10.4"
```

Replacement in Cargo.lock at line 3505 [3.3841]

B:BD[3.84886] → [3.84886:84964]

checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"

[3.84886]

[3.84964]

checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"

Insertion in Cargo.lock at line 3563 [3.3841]

[3.86414]

version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
dependencies = [
 "base64 0.13.1",
 "bitflags 1.3.2",
 "serde",
]
[[package]]
name = "ron"

Replacement in Cargo.lock at line 3578 [3.3841]
B:BD[3.86592] → [3.86592:86603]
```
 "base64",
```
[3.86592]
[3.86603]
```
 "base64 0.21.7",
```

Insertion in Cargo.lock at line 3707 [3.3841]

[3.89742]

name = "sha2"
version = "0.10.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
dependencies = [
 "cfg-if",
 "cpufeatures",
 "digest",
]
[[package]]

Insertion in Cargo.lock at line 3737 [3.3841]

[3.90345]


[[package]]
name = "similar"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"

Deletion in Cargo.lock at line 3873 [3.3841]
B:BD[3.93460] → [3.93460:93480]
```
 "bevy-async-task",
```
Insertion in Cargo.lock at line 3874 [3.3841]
[3.93502]
[3.93502]
```
 "bevy_async_task",
```
Insertion in Cargo.lock at line 3876 [3.3841]
[3.93516]
[3.93516]
```
 "heck",
 "insta",
```
Insertion in Cargo.lock at line 3880 [3.3841]
[3.93561]
[3.93561]
```
 "regex",
```
Insertion in Cargo.lock at line 3882 [3.3841]
[3.93578]
[3.93578]
```
 "serde",
```

Insertion in Cargo.lock at line 4066 [3.3841]

[3.98044]


[[package]]
name = "typenum"
version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"

Insertion in Cargo.lock at line 4074 [3.3841]

[3.98057]

name = "ucd-trie"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
[[package]]

File addition: .zed (d--x------)
[4.1]

File addition: tasks.json (----------)

[0.14659]

// Static tasks configuration.
//
// Example:
[
  {
    "label": "Run dev",
    "command": "just dev",
    //"args": [],
    // Env overrides for the command, will be appended to the terminal's environment from the settings.
    // "env": {},
    // Current working directory to spawn the command into, defaults to current project root.
    //"cwd": "/path/to/working/directory",
    // Whether to use a new terminal tab or reuse the existing one to spawn the process, defaults to `false`.
    "use_new_terminal": false,
    // Whether to allow multiple instances of the same task to be run, or rather wait for the existing ones to finish, defaults to `false`.
    "allow_concurrent_runs": false,
    // What to do with the terminal pane and tab, after the command was started:
    // * `always` — always show the terminal pane, add and focus the corresponding task's tab in it (default)
    // * `never` — avoid changing current terminal pane focus, but still add/reuse the task's tab there
    "reveal": "always"
  }
]

add some stuff

Dependencies

In channels

Change contents

File addition: turn.rs (----------)

Insertion in testbed/src/main.rs at line 3 [3.70]

Replacement in testbed/src/main.rs at line 7 [3.70]

File addition: card.rs (----------)

File addition: card (d--x------)

File addition: subtype.rs (----------)

File addition: snapshots (d--x------)

File addition: magister__card__subtype__tests__serde.snap (----------)

Replacement in testbed/Cargo.toml at line 10 [3.152]

Insertion in testbed/Cargo.toml at line 16 [3.152]

Insertion in Cargo.lock at line 446 [3.3841]

Deletion in Cargo.lock at line 469 [3.3841]

Replacement in Cargo.lock at line 539 [3.3841]

Insertion in Cargo.lock at line 583 [3.3841]

Replacement in Cargo.lock at line 624 [3.3841]

Replacement in Cargo.lock at line 806 [3.3841]