changeset 218:e5e8083769fa misc

log2template: Accept ' in NPC short names.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 08 Aug 2011 08:16:36 +0300
parents 138a3143a1fd
children d352ae078cbb
files log2template.pl
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/log2template.pl	Fri Aug 05 22:53:07 2011 +0300
+++ b/log2template.pl	Mon Aug 08 08:16:36 2011 +0300
@@ -471,7 +471,7 @@
   $s =~ s/\e\[?.*?[\@-~]//g if ($opt_ansi);
 
   if
-  ($s =~ /^([A-Za-z][A-Za-z\ -]+?)\ ($spellregexps)\ \(([A-Za-z][A-Za-z\ ]+)\)/o)
+  ($s =~ /^([A-Za-z][A-Za-z\'\ -]+?)\ ($spellregexps)\ \(([A-Za-z][A-Za-z\ ]+)\)/o)
   {
     # Grab cast spells
     $spells{$1}{$line} = lc($3);
@@ -526,7 +526,7 @@
     # Grab detect alignment
     $aligns{$1}{$line} = $2;
   }
-  elsif ($s =~ /^([A-Za-z][A-Za-z\ .-]+?)\ is an? ([a-z-]+)\.$/o) {
+  elsif ($s =~ /^([A-Za-z][A-Za-z\'\ .-]+?)\ is an? ([a-z-]+)\.$/o) {
     # Grab detect race
     $races{$1}{$line} = $2;
   }
@@ -534,7 +534,7 @@
     # Error, reset parsing state
     set_state(0, $s);
   }
-  elsif ($s =~ /^([A-Za-z][A-Za-z\ -]+?) starts grappling [A-Z][a-z]+\.$/) {
+  elsif ($s =~ /^([A-Za-z][A-Za-z\'\ -]+?) starts grappling [A-Z][a-z]+\.$/) {
     $skills{$1}{$line} = "grapple";
   }
 }