Fix item names in rust (related to #50) (#47)

Cargo.toml

@@ -15,6 +15,9 @@ pancurses = "0.16"
 enum-iterator = "1.1"
 backtrace = "0.3.66"
 
+[dev-dependencies]
+serial_test = "0.4.0"
+
 [lib]
 name = "omoria"
 crate-type = ["staticlib"]

src/conversion/item_subtype.rs

@@ -1,3 +1,5 @@
+use std::convert::TryInto;
+
 use crate::model::{item_subtype::ItemSubType, ItemType};
 
 pub mod amulet;
@@ -161,3 +163,12 @@ pub fn from_usize(item_type: ItemType, item_subtype: usize) -> Option<ItemSubTyp
         _ => panic!("Unhandled item type {:?}", item_type),
     }
 }
+
+pub fn from_i64(item_type: ItemType, item_subtype: i64) -> Option<ItemSubType> {
+    from_usize(
+        item_type,
+        item_subtype
+            .try_into()
+            .unwrap_or_else(|err| panic!("Failed to convert i64 to usize: {}", err)),
+    )
+}

src/data/item_name.rs

@@ -4,3 +4,6 @@ mod main;
 
 pub(crate) mod helpers;
 pub(crate) mod subtypes;
+
+#[cfg(test)]
+mod test;

src/data/item_name/helpers.rs

@@ -1,7 +1,10 @@
 use std::borrow::Cow;
 
-use crate::model::Item;
+use crate::{misc, model::Item};
 
+/**
+ * Returns the number of the given item. 1 returns an empty string
+ */
 pub(crate) fn number_of<'a>(item: &Item) -> Cow<'a, str> {
     match item.number {
         0 => Cow::from("no more "),
@@ -10,6 +13,70 @@ pub(crate) fn number_of<'a>(item: &Item) -> Cow<'a, str> {
     }
 }
 
+/**
+ * Returns the number of the given item, including 1 if number is 1
+ */
+pub(crate) fn full_number_of<'a>(item: &Item) -> Cow<'a, str> {
+    match item.number {
+        0 => Cow::from("no more "),
+        _ => Cow::from(item.number.to_string() + " "),
+    }
+}
+
+/**
+ * Returns if there are no items left, or empty string
+ */
+pub(crate) fn no_more<'a>(item: &Item) -> Cow<'a, str> {
+    match item.number {
+        0 => Cow::from("no more "),
+        _ => Cow::from(""),
+    }
+}
+
+pub(crate) fn p1_plural_s<'a>(item: &Item) -> Cow<'a, str> {
+    if item.p1 == 1 {
+        Cow::Borrowed("")
+    } else {
+        Cow::Borrowed("s")
+    }
+}
+
+pub(crate) fn plural_s<'a>(item: &Item) -> Cow<'a, str> {
+    if item.number == 1 {
+        Cow::Borrowed("")
+    } else {
+        Cow::Borrowed("s")
+    }
+}
+
+pub(crate) fn plural_es<'a>(item: &Item) -> Cow<'a, str> {
+    if item.number == 1 {
+        Cow::Borrowed("")
+    } else {
+        Cow::Borrowed("es")
+    }
+}
+
+pub(crate) fn damage<'a>(item: &Item) -> Cow<'a, str> {
+    let raw_string = item.damage.iter().map(|&i| i as u8).collect::<Vec<u8>>();
+    let damage_string = misc::c_array_to_rust_string(raw_string);
+    Cow::from(format!(" ({})", damage_string))
+}
+
+pub(crate) fn attack_bonus<'a>(item: &Item) -> Cow<'a, str> {
+    let tohit_sign = if item.tohit > 0 { "+" } else { "" };
+    let todam_sign = if item.todam > 0 { "+" } else { "" };
+    Cow::from(format!(
+        " ({}{},{}{})",
+        tohit_sign, item.tohit, todam_sign, item.todam
+    ))
+}
+
+pub(crate) fn p1_bonus<'a>(item: &Item) -> Cow<'a, str> {
+    let p1_sign = if item.p1 > 0 { "+" } else { "" };
+    Cow::from(format!(" ({}{})", p1_sign, item.p1))
+}
+
 #[cfg(test)]
 mod test {