Fix some errors found in playtesting

Author: Astavie

discord/partial_id/src/lib.rs

@@ -113,8 +113,8 @@ pub fn derive_partial(input: proc_macro::TokenStream) -> proc_macro::TokenStream
             #where_clause
         {
             #vis async fn update(&mut self, client: &crate::request::Bot) -> crate::request::Result<()> {
-                let full: #ty = crate::request::Request::request(crate::request::HttpRequest::get(crate::resource::Endpoint::uri(&self.id)), client).await?;
-                *self = full.into();
+                let full: #ty #ty_generics = crate::request::Request::request(crate::request::HttpRequest::get(crate::resource::Endpoint::uri(&self.id)), client).await?;
+                *self = ::core::convert::Into::into(full);
                 crate::request::Result::Ok(())
             }
             #vis async fn get_field<T>(&mut self, client: &crate::request::Bot, f: fn(&Self) -> &::core::option::Option<T>) -> crate::request::Result<&T> {

src/cah/mod.rs

@@ -34,7 +34,7 @@ pub enum CardData {
 impl CardData {
     fn blanks(&self) -> usize {
         match *self {
-            CardData::Raw(ref s) => s.chars().filter(|&c| c == '_').count().min(1),
+            CardData::Raw(ref s) => s.chars().filter(|&c| c == '_').count().max(1),
             CardData::Full { pick, .. } => pick,
         }
     }
@@ -287,6 +287,7 @@ impl Packs {
         let (pack, start_index) = start_indices
             .into_iter()
             .enumerate()
+            .rev()
             .find(|&(_, t)| random >= t)
             .unwrap();
         let card = random - start_index;
@@ -318,6 +319,7 @@ impl Packs {
         let (pack, start_index) = start_indices
             .into_iter()
             .enumerate()
+            .rev()
             .find(|&(_, t)| random >= t)
             .unwrap();
         let card = random - start_index;
@@ -525,10 +527,23 @@ impl Game for CAH {
     fn new(user: User) -> Self {
         CAH::Setup(setup::Setup::new(
             user,
-            Packs(vec![Arc::new((
-                "CAH Base".into(),
-                serde_json::from_str(read_to_string("cards/base.json").unwrap().as_str()).unwrap(),
-            ))]),
+            Packs(vec![
+                Arc::new((
+                    "CAH Base".into(),
+                    serde_json::from_str(read_to_string("cards/base.json").unwrap().as_str())
+                        .unwrap(),
+                )),
+                Arc::new((
+                    "EPPgroep.".into(),
+                    serde_json::from_str(read_to_string("cards/eppgroep.json").unwrap().as_str())
+                        .unwrap(),
+                )),
+                Arc::new((
+                    "EPPgroep.".into(),
+                    serde_json::from_str(read_to_string("cards/eppgroep.json").unwrap().as_str())
+                        .unwrap(),
+                )),
+            ]),
         ))
     }
 

src/game/mod.rs

@@ -5,7 +5,7 @@ use std::{
 };
 
 use async_trait::async_trait;
-use futures_util::future::try_join_all;
+use futures_util::future::{join_all, try_join_all};
 
 use discord::{
     channel::ChannelResource,
@@ -190,7 +190,7 @@ impl GameUI {
         Ok(())
     }
     pub async fn delete_replies(&mut self) -> Result<()> {
-        try_join_all(self.replies.drain().map(|(_, (_, id))| id.delete(&Webhook))).await?;
+        join_all(self.replies.drain().map(|(_, (_, id))| id.delete(&Webhook))).await;
         Ok(())
     }
 }