Forgot to add most of the changes in previous commit

MaxWilson · May 25, 2019 · e142c29 · e142c29
1 parent f98af68
commit e142c29
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3,474 deletions.
diff --git a/app/services/monsters.service.js b/app/services/monsters.service.js
@@ -56,7 +56,9 @@
 			var monster = new monsterFactory.Monster(monsterData);
 
 			if ( byId[monster.id] ) {
-				console.warn("Duplicate ID", monster.id, monster.fid);
+				// We already have this monster from some other source, so just merge it
+				// with the existing entry
+				byId[monster.id].merge(monster)
 				return;
 			}
 

diff --git a/build/index.html b/build/index.html
@@ -26,6 +26,6 @@
 	<script src="thirdparty/dirPagination/dirPagination.js"></script>
 	<script src="thirdparty/angular-local-storage/angular-local-storage.js"></script>
 
-	<script src="js/app-658bd5c77d.js"></script>
+	<script src="js/app-a04a87739c.js"></script>
 </body>
 </html>