diff --git a/lib/infomon/infomon.rb b/lib/infomon/infomon.rb index 6cbcadf7..738b6a48 100644 --- a/lib/infomon/infomon.rb +++ b/lib/infomon/infomon.rb @@ -145,8 +145,8 @@ def self.get(key) end end rescue StandardError - respond "--- Lich: error: self.get(key): #{$!}" - Lich.log "error: self.get(key): #{$!}\n\t#{$!.backtrace.join("\n\t")}" + respond "--- Lich: error: self.get(#{key}): #{$!}" + Lich.log "error: self.get(#{key}): #{$!}\n\t#{$!.backtrace.join("\n\t")}" end } return self._value(val) diff --git a/lib/infomon/parser.rb b/lib/infomon/parser.rb index 325df2e0..37f56f2e 100644 --- a/lib/infomon/parser.rb +++ b/lib/infomon/parser.rb @@ -8,13 +8,13 @@ module Pattern CharRaceProf = /^Name:\s+(?[A-z\s'-]+)\s+Race:\s+(?[A-z]+|[A-z]+(?: |-)[A-z]+)\s+Profession:\s+(?[-A-z]+)/.freeze CharGenderAgeExpLevel = /^Gender:\s+(?[A-z]+)\s+Age:\s+(?[,0-9]+)\s+Expr:\s+(?[0-9,]+)\s+Level:\s+(?[0-9]+)/.freeze Stat = /^\s*(?[A-z]+)\s\((?:STR|CON|DEX|AGI|DIS|AUR|LOG|INT|WIS|INF)\):\s+(?[0-9]+)\s\((?-?[0-9]+)\)\s+[.]{3}\s+(?\d+)\s+\((?-?\d+)\)/.freeze - StatEnd = /^Mana:\s+-?\d+\s+Silver:\s(?[-\d,]+)$/.freeze - Fame = /^\s+Level: \d+\s+Fame: (?[-\d,]+)$/.freeze # serves as ExprStart + StatEnd = /^Mana:\s+-?\d+\s+Silver:\s(?-?[\d,]+)$/.freeze + Fame = /^\s+Level: \d+\s+Fame: (?-?[\d,]+)$/.freeze # serves as ExprStart RealExp = %r{^\s+Experience: [\d,]+\s+Field Exp: (?[\d,]+)/(?[\d,]+)$}.freeze AscExp = /^\s+Ascension Exp: (?[\d,]+)\s+Recent Deaths: [\d,]+$/.freeze TotalExp = /^\s+Total Exp: (?[\d,]+)\s+Death's Sting: (?None|Light|Moderate|Sharp|Harsh|Piercing|Crushing)$/.freeze LTE = /^\s+Long-Term Exp: (?[\d,]+)\s+Deeds: (?\d+)$/.freeze - ExprEnd = /^\s+Exp (?:until lvl|to next TP): [\d,]+/.freeze + ExprEnd = /^\s+Exp (?:until lvl|to next TP): -?[\d,]+/.freeze SkillStart = /^\s\w+\s\(at level \d+\), your current skill bonuses and ranks/.freeze Skill = /^\s+(?[[a-zA-Z]\s\-']+)\.+\|\s+(?\d+)\s+(?\d+)/.freeze SpellRanks = /^\s+(?[\w\s\-']+)\.+\|\s+(?\d+).*$/.freeze