fix(import): Allow previous name to import spells for monster

closes #439
symposion · Mar 28, 2017 · 6cb8821 · 6cb8821
1 parent 94fffcb
commit 6cb8821
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/data/5eSRDData.js b/data/5eSRDData.js
diff --git a/lib/entity-lookup.js b/lib/entity-lookup.js
@@ -8,6 +8,7 @@ module.exports = class EntityLookup {
     this.entityOrder = [];
     this.entities = {};
     this.noWhiteSpaceEntities = {};
+    this.aliases = {};
     this.entityProcessors = {};
     this.versionCheckers = {};
     this.processedEntityGroupNames = [];
@@ -21,6 +22,7 @@ module.exports = class EntityLookup {
   configureEntity(entityName, processors, versionChecker) {
     this.entityOrder.push(entityName);
     this.entities[entityName] = {};
+    this.aliases[entityName] = {};
     this.noWhiteSpaceEntities[entityName] = {};
     this.entityProcessors[entityName] = processors || [];
     this.versionCheckers[entityName] = versionChecker || _.constant(true);
@@ -93,7 +95,7 @@ module.exports = class EntityLookup {
               const processed = _.reduce(this.entityProcessors[type], Utils.executor, {
                 entity,
                 lookup: (otherType, name) =>
-                  (name ? this.entities[otherType][name.toLowerCase()] : _.values(this.entities[otherType])),
+                  (name ? this.findEntity(otherType, name) : _.values(this.entities[otherType])),
                 type,
                 previousName,
                 source: entitiesObject.name,
@@ -111,6 +113,7 @@ module.exports = class EntityLookup {
                   delete this.entities[type][key];
                   delete this.noWhiteSpaceEntities[type][key.replace(/\s+/g, '')];
                   key = processed.entity.name.toLowerCase();
+                  this.aliases[type][previousName.toLowerCase()] = key;
                 }
                 this.entities[type][key] = processed.entity;
                 this.noWhiteSpaceEntities[type][key.replace(/\s+/g, '')] = processed.entity;
@@ -180,6 +183,9 @@ module.exports = class EntityLookup {
     if (!found && tryWithoutWhitespace) {
       found = this.noWhiteSpaceEntities[type][key.replace(/\s+/g, '')];
     }
+    if (!found && this.aliases[type][key]) {
+      return this.findEntity(type, this.aliases[type][key], tryWithoutWhitespace);
+    }
     return found && Utils.deepClone(found);
   }
 

diff --git a/lib/modules/spell-manager.js b/lib/modules/spell-manager.js
@@ -403,6 +403,14 @@ module.exports = class SpellManager extends ShapedModule {
           });
         spell.lists = _.union(spell.lists, newLists);
       });
+      if (spellEntityInfo.previousName !== spell.name) {
+        const re = new RegExp(spellEntityInfo.previousName, 'ig');
+        _.chain(spellEntityInfo.lookup('monsters'))
+          .pluck('traits')
+          .flatten()
+          .filter(trait => trait && trait.name.toLowerCase().includes('spellcasting'))
+          .forEach(trait => (trait.text = trait.text.replace(re, spell.name.toLowerCase())));
+      }
       return spellEntityInfo;
     };
   }