Report orc names

Author: Assumeru

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "StandardsValidator"
-version = "2.21.2"
+version = "2.22.0"
 edition = "2021"
 
 [dependencies]

Cargo.toml

@@ -37,6 +37,7 @@ pub trait Handler<'a> {
         code: &str,
         comment: &str,
         topic: &Dialogue,
+        code_original: &str,
     ) {
     }
 
@@ -144,9 +145,10 @@ impl<'a> Handler<'a> for Handlers<'a> {
         code: &str,
         comment: &str,
         topic: &Dialogue,
+        code_original: &str,
     ) {
         for handler in &mut self.handlers {
-            handler.on_scriptline(context, record, code, comment, topic);
+            handler.on_scriptline(context, record, code, comment, topic, code_original);
         }
     }
 

src/handlers.rs

@@ -163,6 +163,7 @@ impl<'a> Validator<'a> {
                 &code.to_ascii_lowercase(),
                 comment,
                 topic,
+                code,
             );
         }
     }

src/validators.rs

@@ -165,7 +165,15 @@ impl Handler<'_> for OrphanValidator {
         self.used_objects.insert(entry.1.to_ascii_lowercase());
     }
 
-    fn on_scriptline(&mut self, _: &Context, _: &TES3Object, code: &str, _: &str, _: &Dialogue) {
+    fn on_scriptline(
+        &mut self,
+        _: &Context,
+        _: &TES3Object,
+        code: &str,
+        _: &str,
+        _: &Dialogue,
+        _: &str,
+    ) {
         if code.is_empty() {
             return;
         }

src/validators/orphans.rs

@@ -147,6 +147,7 @@ impl Handler<'_> for ScriptValidator {
         code: &str,
         comment: &str,
         topic: &Dialogue,
+        _: &str,
     ) {
         if !code.is_empty() && self.position.is_match(code) {
             if let TES3Object::DialogueInfo(info) = record {

src/validators/scripts.rs

@@ -15,6 +15,7 @@ impl Handler<'_> for ToDoValidator {
         _: &str,
         comment: &str,
         topic: &Dialogue,
+        _: &str,
     ) {
         if self.todo.is_match(comment) {
             if let TES3Object::Script(script) = record {

src/validators/todo.rs

@@ -1,10 +1,12 @@
 use super::Context;
-use crate::handlers::Handler;
+use crate::{handlers::Handler, util::is_marker};
 use regex::Regex;
 use tes3::esp::{Dialogue, DialogueInfo, EditorId, TES3Object, TypeInfo};
 
 pub struct UnicodeValidator {
     invalid: Regex,
+    orc_name: Regex,
+    script_text: Regex,
 }
 
 impl Handler<'_> for UnicodeValidator {
@@ -27,6 +29,9 @@ impl Handler<'_> for UnicodeValidator {
                 self.test(record, "name", &r.name, None);
             }
             TES3Object::Book(r) => {
+                if is_marker(r) {
+                    return;
+                }
                 self.test(record, "name", &r.name, None);
                 self.test(record, "text", &r.text, None);
             }
@@ -111,12 +116,36 @@ impl Handler<'_> for UnicodeValidator {
         self.test(record, "text", &record.text, Some(topic));
         self.test(record, "script_text", &record.script_text, Some(topic));
     }
+
+    fn on_scriptline(
+        &mut self,
+        _: &Context,
+        record: &TES3Object,
+        code: &str,
+        _: &str,
+        topic: &Dialogue,
+        code_original: &str,
+    ) {
+        if let Some(m) = self.script_text.find(code) {
+            let mut t = Some(topic);
+            if topic.id.is_empty() {
+                t = None;
+            }
+            self.check_orc_name(record, "script_text", &code_original[m.end()..], t);
+        }
+    }
 }
 
 impl UnicodeValidator {
     pub fn new() -> Result<Self, regex::Error> {
         let invalid = Regex::new(r"[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\uffff]")?;
-        Ok(Self { invalid })
+        let orc_name = Regex::new(" (Gr[oa]-[A-Za-z]|gr[oa]-[a-z])[a-z'-]+")?;
+        let script_text = Regex::new("(say|messagebox)[, ]")?;
+        Ok(Self {
+            invalid,
+            orc_name,
+            script_text,
+        })
     }
 
     fn test<T>(&self, record: &T, field: &str, value: &str, topic: Option<&Dialogue>)
@@ -143,5 +172,34 @@ impl UnicodeValidator {
                 );
             }
         }
+        if field != "id" && field != "script_text" {
+            self.check_orc_name(record, field, value, topic);
+        }
+    }
+
+    fn check_orc_name<T>(&self, record: &T, field: &str, value: &str, topic: Option<&Dialogue>)
+    where
+        T: EditorId + TypeInfo,
+    {
+        if let Some(m) = self.orc_name.find(value) {
+            if let Some(dial) = topic {
+                println!(
+                    "{} {} in topic {} contains odd orc name{} in field {}",
+                    record.type_name(),
+                    record.editor_id(),
+                    dial.id,
+                    m.as_str(),
+                    field
+                );
+            } else {
+                println!(
+                    "{} {} contains contains odd orc name{} in field {}",
+                    record.type_name(),
+                    record.editor_id(),
+                    m.as_str(),
+                    field
+                );
+            }
+        }
     }
 }

src/validators/unicode.rs

@@ -97,6 +97,7 @@ impl Handler<'_> for UniquesValidator {
         code: &str,
         _: &str,
         topic: &Dialogue,
+        _: &str,
     ) {
         if self.create_func.is_match(code) {
             for uni in &self.uniques {