blastmud_game/src/db.rs

@@ -234,8 +234,7 @@ pub struct ItemSearchParams<'l> {
     pub include_contents: bool,
     pub include_loc_contents: bool,
     pub include_active_players: bool,
-    pub include_all_players: bool,
-    pub dead_first: bool,
+    pub include_all_players: bool
 }
 
 impl ItemSearchParams<'_> {
@@ -245,8 +244,7 @@ impl ItemSearchParams<'_> {
             include_contents: false,
             include_loc_contents: false,
             include_active_players: false,
-            include_all_players: false,
-            dead_first: false,
+            include_all_players: false
         }
     }
 }

blastmud_game/src/language.rs

@@ -54,60 +54,6 @@ pub fn pluralise(input: &str) -> String {
     input.to_owned() + "s"
 }
 
-pub fn indefinite_article(countable_word: &str) -> &'static str {
-    if countable_word.is_empty() {
-        return "";
-    }
-    let vowels = ["a", "e", "i", "o", "u"];
-    if !vowels.contains(&&countable_word[0..1]) {
-        if countable_word.starts_with("honor") || countable_word.starts_with("honour") ||
-            countable_word.starts_with("honest") || countable_word.starts_with("hour") ||
-            countable_word.starts_with("heir") {
-                return "an";
-            }
-        return "a";
-    }
-    if countable_word.starts_with("eu") || countable_word.starts_with("one") ||
-        countable_word.starts_with("once") {
-           return "a";
-       }
-    if countable_word.starts_with("e") {
-        if countable_word.starts_with("ewe") {
-            return "a";
-        }
-        return "an";
-    }
-    if countable_word.starts_with("u") {
-        if countable_word.len() < 3 {
-            return "an";
-        }
-        if countable_word.starts_with("uni") {
-            if countable_word.starts_with("unid") ||
-                countable_word.starts_with("unim") ||
-                countable_word.starts_with("unin") {
-                    // unidentified, unimaginable, uninhabited etc...
-                    return "an";
-                }
-            // Words like unilateral
-            return "a";
-        }
-        if countable_word.starts_with("unani") || countable_word.starts_with("ubiq") {
-            return "a";
-        }
-        if ["r", "s", "t"].contains(&&countable_word[1..2]) {
-            if vowels.contains(&&countable_word[2..3]) {
-                // All u[rst][aeiou] words, e.g. usury, need "a"
-                return "a";
-            }
-            return "an";
-        }
-        if countable_word.starts_with("ubiq") || countable_word.starts_with("uku") || countable_word.starts_with("ukr") {
-            return "a"
-        }
-    }
-    return "an";
-}
-
 pub fn caps_first(inp: &str) -> String {
     if inp.is_empty() {
         "".to_string()
@@ -156,36 +102,6 @@ mod test {
         }
     }
 
-    #[test]
-    fn indefinite_article_should_follow_english_rules() {
-        for (article, word) in vec!(
-            ("a", "cat"),
-            ("a", "human"),
-            ("an", "apple"),
-            ("an", "easter egg"),
-            ("an", "indigo orb"),
-            ("an", "orange"),
-            ("an", "urchin"),
-            ("an", "hour"),
-            ("a", "once-in-a-lifetime opportunity"),
-            ("a", "uranium-covered field"),
-            ("a", "usurper to the throne"),
-            ("a", "Ukrainian hero"),
-            ("a", "universal truth"),
-            ("an", "uninvited guest"),
-            ("a", "unanimous decision"),
-            ("a", "European getaway"),
-            ("an", "utter disaster"),
-            ("a", "uterus"),
-            ("a", "user"),
-            ("a", "ubiquitous hazard"),
-            ("a", "unitary plan"),
-        ) {
-            let result = super::indefinite_article(&word.to_lowercase());
-            assert_eq!(format!("{} {}", result, word), format!("{} {}", article, word));
-        }
-    }
-
     #[test]
     fn caps_first_works() {
         for (inp, outp) in vec!(

blastmud_game/src/message_handler/new_session.rs

@@ -16,7 +16,6 @@ pub async fn handle(session: &ListenerSession, source: String, pool: &DBPool) ->
       \t<bold>help<reset> to learn more.\r\n\
       [Please contact staff@blastmud.org with any feedback or suggestions on how to \r\n\
       improve Blastmud, to report any inappropriate user generated content or behaviour, or if you \r\n\
-      need any other help from the game's operators].\r\n\
-      Blastmud's privacy policy: https://blastmud.org/privacy/\r\n"))).await?;
+      need any other help from the game's operators].\r\n"))).await?;
     Ok(())
 }

blastmud_game/src/message_handler/user_commands.rs

@@ -254,7 +254,6 @@ pub async fn search_item_for_user<'l>(ctx: &'l VerbContext<'l>, search: &'l Item
                                 trans: &trans,
                                 session_dat: &mut session_dat,
                                 user_dat: &mut user_dat };
-        assert_eq!(resolve_handler(&ctx, "less_explicit_mode").is_some(),
-                   true);
+       resolve_handler(&ctx, "less_explicit_mode");
     }
 }

blastmud_game/src/message_handler/user_commands/list.rs

@@ -3,7 +3,6 @@ use super::{VerbContext, UserVerb, UserVerbRef, UResult, user_error,
 use crate::{
     static_content::room,
     static_content::possession_type::possession_data,
-    language
 };
 use async_trait::async_trait;
 use ansi::ansi;
@@ -39,8 +38,7 @@ impl UserVerb for Verb {
                 let display = if ctx.session_dat.less_explicit_mode {
                     possession_type.display_less_explicit.as_ref().unwrap_or(&possession_type.display)
                 } else { &possession_type.display };
-                msg.push_str(&format!("| {:20} | {:15.2} |\n",
-                                      &language::caps_first(&display), &stock.list_price))
+                msg.push_str(&format!("| {:20} | {:15.2} |\n", display, &stock.list_price))
             }
         }
         msg.push_str(ansi!("\nUse <bold>buy<reset> item to purchase something.\n"));

blastmud_game/src/models/item.rs

@@ -314,15 +314,14 @@ impl Item {
                 buf.push_str("the body of ");
             }
         }
-        let singular = if explicit_ok { &self.display } else {
-            self.display_less_explicit.as_ref().unwrap_or(&self.display) };
         if !self.pronouns.is_proper && pluralise == 1 {
-            buf.push_str(language::indefinite_article(&singular));
-            buf.push(' ');
+            buf.push_str("a ");
         }
         if pluralise > 1 {
             buf.push_str(&format!("{} ", pluralise));
         }
+        let singular = if explicit_ok { &self.display } else {
+            self.display_less_explicit.as_ref().unwrap_or(&self.display) };
         if pluralise > 1 {
             buf.push_str(&language::pluralise(singular));
         } else {

blastmud_game/src/static_content/possession_type.rs

@@ -1,6 +1,6 @@
 use serde::{Serialize, Deserialize};
 use crate::{
-    models::item::{SkillType, Item, Pronouns}
+    models::item::{SkillType, Item}
 };
 use once_cell::sync::OnceCell;
 use std::collections::BTreeMap;
@@ -123,10 +123,6 @@ impl Into<Item> for PossessionType {
             aliases: possession_dat.aliases.iter().map(|al| (*al).to_owned()).collect(),
             health: possession_dat.max_health,
             weight: possession_dat.weight,
-            pronouns: Pronouns {
-                is_proper: false,
-                ..Pronouns::default_inanimate()
-            },
             ..Default::default()
         }
     }
@@ -195,7 +191,7 @@ pub fn possession_data() -> &'static BTreeMap<PossessionType, PossessionData> {
                 ..Default::default()
             }),
             (AntennaWhip, PossessionData {
-                display: "antenna whip",
+                display: "Antenna whip",
                 details: "A crudely fashioned whip made from a broken metal antenna. It looks a bit flimsy, but it \
                           might do you until you get a better weapon!",
                 aliases: vec!("whip"),