Merge pull request #12 from DavidArthurCole/1.5.10

1.5.10
DavidArthurCole · Mar 15, 2024 · c00fd26 · c00fd26
2 parents 8e401bf + 8f69c3f
commit c00fd26
Show file tree

Hide file tree

Showing 7 changed files with 161 additions and 108 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.5.9
+1.5.10
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -48,6 +48,7 @@ module.exports = {
         '40': '10rem',
         '6/10': '60%',
         '60vh': '60vh',
+        '80vh': '80vh',
         '90vh': '90vh',
       },
       width: {
@@ -93,19 +94,22 @@ module.exports = {
         '1rem': '1rem',
         '2rem': '2rem',
         '3rem': '3rem',
+        '7rem': '7rem',
       },
       margin: {
         '0': '0rem !important',
         '025rem': '0.25rem !important',
         '075rem': '0.75rem',
         '05rem': '0.5rem',
+        '2rem': '2rem',
       },
       padding: {
         '0': '0rem',
         '05rem': '0.5rem',
         '1rem:' : '1rem',
         '2rem': '2rem',
         'select': '2.5rem',
+        '7rem': '7rem',
       },
       fontSize: {
         'star': '1.4rem',

diff --git a/www/custom.css b/www/custom.css
@@ -171,7 +171,7 @@
   content: '';
   position: absolute;
   top: 0;
-  right: 10%;
+  right: 7%;
   width: 20px;
   height: 100%;
   border-right: 2px solid;
@@ -182,8 +182,8 @@
   content: '';
   position: absolute;
   top: 0;
-  right: 0;
-  width: 10%;
+  right: -3%;
+  width: 12%;
   height: calc(100%);
   border-top: 2px solid;
   border-bottom: 2px solid;

diff --git a/www/images/icon_afx_chest_2.png b/www/images/icon_afx_chest_2.png
diff --git a/www/index.html b/www/index.html
diff --git a/www/templates/DropDisplay.vue b/www/templates/DropDisplay.vue
@@ -136,15 +136,17 @@
               return (!match ? ["?", "?", "?"] : [str.substring(0, match.index), match[1], str.substring(match.index + match[0].length)]);
             },
             getDropCalcs (dropId, dropLevel, dropRarity) {
-              const mennoItem = this.mennoMissionData.configs.find(item => 
-                item.artifactConfiguration.artifactType.id == dropId &&
-                item.artifactConfiguration.artifactLevel == dropLevel &&
-                item.artifactConfiguration.artifactRarity.id == dropRarity
-              );
-              if(mennoItem == null) return null;
-              return [mennoItem.totalDrops, this.mennoMissionData.totalDropsCount]
+                if(this.mennoMissionData?.configs == null) return null;
+                const mennoItem = this.mennoMissionData.configs.find(item => 
+                    item.artifactConfiguration.artifactType.id == dropId &&
+                    item.artifactConfiguration.artifactLevel == dropLevel &&
+                    item.artifactConfiguration.artifactRarity.id == dropRarity
+                );
+                if(mennoItem == null) return null;
+                return [mennoItem.totalDrops, this.mennoMissionData.totalDropsCount]
             },
             getLifetimeDropCalcs(dropId, dropLevel, dropRarity){
+                if(this.mennoMissionData?.configs == null) return null;
                 const mennoItem = this.mennoMissionData.configs.find(item => 
                 item.artifactConfiguration.artifactType.id == dropId &&
                 item.artifactConfiguration.artifactLevel == dropLevel &&

diff --git a/www/templates/ShipDisplay.vue b/www/templates/ShipDisplay.vue
@@ -1,7 +1,7 @@
 <template>
     <div 
         v-if="topLevelBool"
-        :class="(isMulti ? 'max-h-90vh' : 'max-w-50vw overflow-auto' ) + ' text-gray-300 text-center' + ( shipCount > 3 ? ' min-w-30vw' : '') "
+        :class="(isMulti ? ((isFirst ? ' pl-7rem' : ' pl-3rem') + (isLast ? ' pr-7rem' : ' pr-3rem')) : 'overflow-auto pl-7rem pr-7rem' ) + ' text-gray-300 text-center' + ( shipCount > 3 ? ' min-w-30vw' : '') "
     >
         <!-- Header information about the mission -->
         <span :class="durToTextClass(viewMissionData.shipInfo.durationType)">
@@ -24,7 +24,7 @@
                 >
                     <img 
                         alt="Artifact Crate" 
-                        src="https://eggincassets.tcl.sh/64/egginc/icon_afx_chest_2.png" 
+                        src="/images/icon_afx_chest_2.png" 
                         class="w-6 mr-05rem"
                     >
                     <span class="tooltip-custom text-xs font-bold">
@@ -118,6 +118,8 @@
             mennoMissionData: Object,
             showExpectedDrops: Boolean,
             shipCount: Number,
+            isFirst: Boolean,
+            isLast: Boolean,
         },
         methods: {
             durToTextClass(dur){