ditch pretties for stronger eslint. skin exceptions

Author: Koshirei

.eslintrc.cjs

@@ -7,14 +7,45 @@ module.exports = {
     'plugin:vue/vue3-essential',
     'eslint:recommended',
     '@vue/eslint-config-typescript',
-    '@vue/eslint-config-prettier/skip-formatting',
-    'prettier'
+    '@vue/eslint-config-prettier/skip-formatting'
   ],
   parserOptions: {
     ecmaVersion: 'latest'
   },
   rules: {
+    '@typescript-eslint/type-annotation-spacing': 'error',
+    'arrow-parens': ['error', 'always'],
+    'arrow-spacing': ['error', {
+      'before': true, 'after': true
+    }],
+    'comma-spacing': ['error', {
+      'before': false, 'after': true
+    }],
+    'block-spacing': ['error', 'always'],
+    'default-case': 'error',
+    'default-case-last': 'error',
+    'default-param-last': 'error',
+    'eqeqeq': 'error',
+    'func-call-spacing': ['error', 'never'],
+    'indent': [ 'error', 2, {
+      'SwitchCase': 1
+    } ],
+    'keyword-spacing': ['error', {
+      'after': true, 'before': true,
+    }],
+    'no-trailing-spaces': 'error',
+    'no-unreachable': 'error',
+    'no-unreachable-loop': 'error',
+    'no-unused-vars': 'error',
+    'no-var': 'error',
+    'object-curly-spacing': ['error', 'always'],
+    'quotes': [ 'error', 'single' ],
+    'semi': [ 'error', 'never' ],
+    'space-infix-ops': 'error',
+    'switch-colon-spacing': ['error', {
+      'after': true, 'before': false
+    }],
     'vue/multi-word-component-names': 'off',
-    'prettier/prettier': ['error']
+    'yoda': 'error',
   }
 }

.prettierrc.json

@@ -5,5 +5,6 @@
   "trailingComma": "none",
   "bracketSpacing": true,
   "bracketSameLine": false,
-  "arrowParens": "always"
+  "arrowParens": "always",
+  "printWidth": 999
 }

README.md

@@ -14,6 +14,6 @@ Sure ! Fork the repository and fix a bug you've found, a bug someone else found,
 Make sure mobile display is good enough ( not asking for perfection ), grab width and conditions from other components to have the same workflow. To test it out run ```npm run serve``` and open a network url on your mobile device ( connected on the same wifi ! ) to instantly test out your modification on mobile.
 
 ## Pull Requests requirements
-Before asking any pull request, run ```npm run format``` and ```npm run lint```, fix all the warning and errors from eslint.
+Before asking any pull request, run ```npm run lint```, fix all the warning and errors from eslint.
 If your feature require to use files, especially spine assets, "si_" icons, "mi_" banners, or anything else, host them on [https://github.com/Nikke-db/Nikke-db.github.io](https://github.com/Nikke-db/Nikke-db.github.io) and make a Pull Request there as well.
 

src/components/common/Spine/Loader.vue

@@ -45,14 +45,14 @@ const spineLoader = () => {
       usedSpine = spine41
       break
     default:
-      console.log('TBA ALERT MESSAGE')
+      break
   }
 
   spineCanvas = new usedSpine.SpinePlayer('player-container', {
     skelUrl: getPathing('skel'),
     atlasUrl: getPathing('atlas'),
     animation: getDefaultAnimation(),
-    // skin: skin,
+    skin: market.live2d.getSkin(),
     backgroundColor: '#00000000',
     alpha: true,
     mipmaps: market.live2d.current_pose === 'fb' ? true : false,
@@ -333,6 +333,8 @@ document.addEventListener('wheel', (e) => {
           ? (transformScale = 0.02)
           : ''
         break
+      default:
+        break
     }
 
     canvas.style.transform = 'scale(' + transformScale + ')'
@@ -343,7 +345,7 @@ document.addEventListener('wheel', (e) => {
 <style scoped lang="less">
 #player-container {
   // height: calc(100vh - 100px);
-  // overflow:hidden
+  overflow:hidden
 }
 .mobile {
   height: -webkit-fill-available;

src/components/common/Spine/ToolList.vue

@@ -24,6 +24,9 @@
           <Screenshot />
           <ChangeScreenshotSize />
         </div>
+        <div>
+          <CustomLoader />
+        </div>
       </n-card>
     </n-scrollbar>
   </div>
@@ -37,6 +40,7 @@ import BackgroundColor from './Tools/BackgroundColor.vue'
 import BackgroundImage from './Tools/BackgroundImage.vue'
 import Screenshot from './Tools/Screenshot.vue'
 import ChangeScreenshotSize from './Tools/ChangeScreenshotSize.vue'
+import CustomLoader from './Tools/CustomLoader.vue'
 </script>
 
 <style scoped lang="less">

src/components/common/Spine/Tools/ChangeScreenshotSize.vue

@@ -1,7 +1,8 @@
 <template>
   <span>
     <n-button ghost type="info" round @click="openScSzModal()">
-      Screenshot <br />options
+      Screenshot <br />
+      Options
     </n-button>
 
     <n-modal

src/components/common/Spine/Tools/CustomLoader.vue

@@ -0,0 +1,25 @@
+<template>
+  <n-button ghost type="error" round @click="customLoader()">
+    Custom Spine<br />
+    Loader
+  </n-button>
+</template>
+
+<script setup lang="ts">
+import {
+  useMarket
+} from '@/stores/market'
+
+const market = useMarket()
+
+const customLoader = () => {
+  market.message.getMessage().error('(FEATURE TO BE ADDED)')
+}
+</script>
+
+<style scoped lang="less">
+.n-button {
+  width: 100%;
+  height: 40px;
+}
+</style>

src/components/common/Spine/Tools/PoseSelector.vue

@@ -23,7 +23,8 @@ const market = useMarket()
 const poses = [
   {
     value: 'aim',
-    label: h('div', {}, [
+    label: h('div', {
+    }, [
       h(NIcon, {
         component: AimOutlined,
         size: 18,
@@ -34,7 +35,8 @@ const poses = [
   },
   {
     value: 'cover',
-    label: h('div', {}, [
+    label: h('div', {
+    }, [
       h(NIcon, {
         component: ManageProtection,
         size: 18,
@@ -45,7 +47,8 @@ const poses = [
   },
   {
     value: 'fb',
-    label: h('div', {}, [
+    label: h('div', {
+    }, [
       h(NIcon, {
         component: AccessibilityTwotone,
         size: 18,

src/components/common/Spine/WrapperMobile.vue

@@ -95,6 +95,8 @@ watch(showHeaderBool, () => {
     case false:
       market.globalParams.hideMobileHeader()
       break
+    default:
+      break
   }
 })
 </script>

src/stores/live2dStore.ts

@@ -48,6 +48,60 @@ export const useLive2dStore = defineStore('live2d', () => {
     screenshot.value = new Date().getTime()
   }
 
+  const getSkin = () => {
+    let skin = ''
+    switch (current_pose.value) {
+      case 'aim':
+        skin = getSkinAim()
+        break
+      case 'cover':
+        skin = getSkinCover()
+        break
+      default:
+        skin = getSkinFb()
+        break
+    }
+
+    if (current_id.value === 'c010_01' || current_id.value === 'c907_01' ) {
+      skin = '00'
+    }
+
+    return skin
+  }
+
+  const getSkinAim = () => {
+    return 'default'
+  }
+
+  const getSkinCover = () => {
+    switch (current_id.value) {
+      case 'c220':
+        return 'weapon_1'
+      default:
+        return 'default'
+    }
+  }
+
+  const getSkinFb = () => {
+    switch (current_id.value) {
+      case 'c220':
+      case 'c102':
+      case 'c940':
+      case 'c101_01':
+      case 'c350':
+      case 'c810':
+      case 'c810_01':
+      case 'c321':
+        return 'acc'
+      case 'c351':
+      case 'c070_02':
+      case 'c810_02':
+        return 'bg'
+      default:
+        return 'default'
+    }
+  }
+
   return {
     filtered_l2d_Array,
     current_id,
@@ -58,6 +112,7 @@ export const useLive2dStore = defineStore('live2d', () => {
     resetPlacement,
     triggerResetPlacement,
     screenshot,
-    triggerScreenshot
+    triggerScreenshot,
+    getSkin
   }
 })

src/utils/enum/globalParams.ts

@@ -1,3 +1,4 @@
+/* eslint-disable */
 enum globalParams {
   GITHUB = 'https://github.com/Nikke-db/nikke-db-vue',
   NIKKE_DB = 'https://nikke-db.pages.dev/',
@@ -14,7 +15,7 @@ enum messagesEnum {
   MESSAGE_LOCALSTORAGE_SAVED = 'Data saved to the local storage',
   MESSAGE_CANCELLED = 'Action Cancelled',
   MESSAGE_CANNOT_SAVE_EMPTY = 'Cannot save an empty value',
-  MESSAGE_WRONG_FORM_DATA = "Something is wrong with the form data you've entered",
+  MESSAGE_WRONG_FORM_DATA = 'Something is wrong with the form data you\'ve entered',
   MESSAGE_PROCESSING = 'Processing'
 }