Merge pull request IITC-CE#733 from McBen/artifacts

artifacts: inject portals instead of special code
modos189 · May 15, 2024 · 0fe373b · 0fe373b
2 parents f6e9917 + 8eb9d2e
commit 0fe373b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/core/code/artifact.js b/core/code/artifact.js
@@ -43,6 +43,8 @@ window.artifact.setup = function() {
     title: 'Show artifact portal list',
     action: window.artifact.showArtifactList,
   });
+
+  window.addHook('mapDataEntityInject', window.artifact.entityInject);
 }
 
 /**
@@ -201,12 +203,22 @@ window.artifact.isArtifact = function(type) {
 /**
  * Used to render portals that would otherwise be below the visible level.
  * @function window.artifact.getArtifactEntities
- * @returns {Array} An array of artifact entities.
+ * @returns {Array} array of Portal entities with shards or shard targets
+ *
+ * unused by IITC
  */
-window.artifact.getArtifactEntities = function() {
+window.artifact.getArtifactEntities = function () {
   return artifact.entities;
 }
 
+/**
+ * Inject artifact portals into render process
+ * @param {hookdata} data
+ */
+window.artifact.entityInject = function (data) {
+  data.callback(window.artifact.entities, 'summary');
+};
+
 /**
  * Gets the portals that are relevant to the artifacts.
  * @function window.artifact.getInterestingPortals
@@ -232,8 +244,10 @@ window.artifact.isInterestingPortal = function(guid) {
  * @param {string} guid - The GUID of the portal.
  * @param {string} artifactId - The ID of the artifact type.
  * @returns {Object|false} Artifact data for the specified portal and type, or undefined if not available.
+ *
+ * unused by IITC
  */
-window.artifact.getPortalData = function(guid,artifactId) {
+window.artifact.getPortalData = function (guid, artifactId) {
   return artifact.portalInfo[guid] && artifact.portalInfo[guid][artifactId];
 }
 

diff --git a/core/code/map_data_request.js b/core/code/map_data_request.js
@@ -292,10 +292,7 @@ window.MapDataRequest.prototype.refresh = function() {
 
   this.render.startRenderPass(dataBounds);
 
-  window.runHooks ('mapDataEntityInject', {callback: this.render.processGameEntities.bind(this.render)});
-
-
-  this.render.processGameEntities(artifact.getArtifactEntities(), 'summary');
+  window.runHooks('mapDataEntityInject', { callback: this.render.processGameEntities.bind(this.render) });
 
   var logMessage = 'requesting data tiles at zoom '+dataZoom;
   logMessage += ' (L'+tileParams.level+'+ portals';