Merge pull request #210 from retro-pc/release-20240326

Release 20240326
dschu012 · Mar 30, 2024 · 238b096 · 238b096
2 parents 5a72a54 + 78c052d
commit 238b096
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 9 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -1,4 +1,4 @@
 <!doctype html><html><head><script async src="https://www.googletagmanager.com/gtag/js?id=G-Z9KBPJ8PYG"></script><script>window.dataLayer = window.dataLayer || [];
     function gtag(){dataLayer.push(arguments);}
     gtag('js', new Date());
-    gtag('config', 'G-Z9KBPJ8PYG');</script><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/darkly/bootstrap.min.css" crossorigin="anonymous"><link href="css/app.css" rel="stylesheet"/><title>d2s - Example</title><script defer="defer" src="/js/chunk-vendors.e44ec39b.js"></script><script defer="defer" src="/js/app.603a734f.js"></script><link href="/css/app.50565aee.css" rel="stylesheet"><!--[if IE]><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><![endif]--><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="ds2-editor"><meta name="msapplication-TileColor" content="#000000"></head><body><script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script><script src="./d2/constants_96.bundle.min.js"></script><script src="./d2/constants_99.bundle.min.js"></script><script src="./d2/d2s.bundle.min.js"></script><div id="app"></div></body></html>
+    gtag('config', 'G-Z9KBPJ8PYG');</script><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/darkly/bootstrap.min.css" crossorigin="anonymous"><link href="css/app.css" rel="stylesheet"/><title>d2s - Example</title><script defer="defer" src="/js/chunk-vendors.e44ec39b.js"></script><script defer="defer" src="/js/app.d5947eba.js"></script><link href="/css/app.50565aee.css" rel="stylesheet"><!--[if IE]><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><![endif]--><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="ds2-editor"><meta name="msapplication-TileColor" content="#000000"></head><body><script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script><script src="./d2/constants_96.bundle.min.js"></script><script src="./d2/constants_99.bundle.min.js"></script><script src="./d2/d2s.bundle.min.js"></script><div id="app"></div></body></html>
diff --git a/docs/js/app.603a734f.js b/docs/js/app.603a734f.js
diff --git a/docs/js/app.603a734f.js.map b/docs/js/app.603a734f.js.map
diff --git a/docs/js/app.d5947eba.js b/docs/js/app.d5947eba.js
diff --git a/docs/js/app.d5947eba.js.map b/docs/js/app.d5947eba.js.map
diff --git a/docs/service-worker.js b/docs/service-worker.js
diff --git a/docs/service-worker.js.map b/docs/service-worker.js.map
diff --git a/src/components/App.vue b/src/components/App.vue
@@ -1067,7 +1067,12 @@
           }
         }
         d2s.enhanceItems(newItems, window.constants);
-        for (const item of newItems) {     
+        for (const item of newItems) {   
+          let socketIndex = item.magic_attributes.findIndex(i => i.name == "item_numsockets");
+          if (socketIndex > 0) {
+            item.socketed =  true;
+            item.total_nr_of_sockets = item.magic_attributes[socketIndex].value;
+          }
           this.itempack.push({
             key: `[${category}]/${item.set_name}`,
             value: {item: item}
@@ -1093,7 +1098,12 @@
           }
         }
         d2s.enhanceItems(newItems, window.constants);
-        for (const item of newItems) {     
+        for (const item of newItems) {    
+          let socketIndex = item.magic_attributes.findIndex(i => i.name == "item_numsockets");
+          if (socketIndex > 0) {
+            item.socketed =  true;
+            item.total_nr_of_sockets = item.magic_attributes[socketIndex].value;
+          } 
           this.itempack.push({
             key: `[${category}]/${item.unique_name}`,
             value: {item: item}

diff --git a/src/components/inventory/ItemEditor.vue b/src/components/inventory/ItemEditor.vue
@@ -49,7 +49,7 @@
         </span>
 
         <li>
-          <div v-if="!item.is_ear">
+          <div v-if="!item.simple_item">
             Base:
               <multiselect v-model="item.type" :options="getBasesOptions(item.type)" :searchable="true" :can-deselect="false" :can-clear="false" :required="true" @update:model-value="onEvent('update')" />
           </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,7 @@ @@
             </span>
             <li>
-              <div v-if="!item.is_ear">
+              <div v-if="!item.simple_item">
                 Base:
                   <multiselect v-model="item.type" :options="getBasesOptions(item.type)" :searchable="true" :can-deselect="false" :can-clear="false" :required="true" @update:model-value="onEvent('update')" />
               </div>
@@ Expand Down @@