From e282fdc80ff086a0543396a179c29f117a1f6ba3 Mon Sep 17 00:00:00 2001 From: bartvdbraak Date: Tue, 4 Feb 2020 07:51:32 +0100 Subject: [PATCH] yarn package changes, minor tweaks --- package.json | 10 ++++++---- src/Combat_icon.png | Bin 369 -> 0 bytes src/assets/{Combat_icon.png => combat_icon.png} | Bin src/assets/{Defence_icon.png => defence_icon.png} | Bin src/assets/{Slayer_icon.png => slayer_icon.png} | Bin src/components/MainContent.vue | 12 ++++++------ src/main.js | 2 +- yarn.lock | 11 +++-------- 8 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 src/Combat_icon.png rename src/assets/{Combat_icon.png => combat_icon.png} (100%) rename src/assets/{Defence_icon.png => defence_icon.png} (100%) rename src/assets/{Slayer_icon.png => slayer_icon.png} (100%) diff --git a/package.json b/package.json index 324a886..13c5d78 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,7 @@ "bootstrap-vue": "^2.3.0", "core-js": "^3.4.4", "vue": "^2.6.10", - "vue-router": "^3.1.5", - "vuex": "^3.1.2" + "vue-router": "^3.1.5" }, "devDependencies": { "@babel/polyfill": "^7.7.0", @@ -28,7 +27,7 @@ "popper.js": "^1.16.0", "portal-vue": "^2.1.6", "sass": "^1.19.0", - "sass-loader": "^8.0.0", + "sass-loader": "^8.0.2", "vue-cli-plugin-bootstrap-vue": "^0.6.0", "vue-template-compiler": "^2.6.10" }, @@ -49,5 +48,8 @@ "browserslist": [ "> 1%", "last 2 versions" - ] + ], + "peerDependencies": { + "jquery": "^3.4.1" + } } diff --git a/src/Combat_icon.png b/src/Combat_icon.png deleted file mode 100644 index edc5f19bea1c7f8caef5960dc17913f6ac21cf01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmV-%0gnEOP)Px$D@jB_R7l6g*E#k=4=1B7;ViTj3~XzRrB>f#{M*<4@QH+-tsIt67pvuh45AT?QHo*IpEp@f zR;C;*WDdzN{fq$)$Ad64mmUxnN)hQi3&*HmdRmFKL70<`L){Hh%1pyVxuB>tv8-%` z9)IEEZr(p1vtPJ#9v!a9!ByA?#pP`f#B$^Bm7Q!TFNbRneJg7v+YombVO)oKJaJ-$ zs1IEF5;(cc7^P*;g%ivC1t>ZR9QJbfXOZ^SPyyGymK4La$KPOi%jM8FJz&qCh+?I2 P00000NkvXXu0mjf)HRkp diff --git a/src/assets/Combat_icon.png b/src/assets/combat_icon.png similarity index 100% rename from src/assets/Combat_icon.png rename to src/assets/combat_icon.png diff --git a/src/assets/Defence_icon.png b/src/assets/defence_icon.png similarity index 100% rename from src/assets/Defence_icon.png rename to src/assets/defence_icon.png diff --git a/src/assets/Slayer_icon.png b/src/assets/slayer_icon.png similarity index 100% rename from src/assets/Slayer_icon.png rename to src/assets/slayer_icon.png diff --git a/src/components/MainContent.vue b/src/components/MainContent.vue index 80f8169..587274f 100644 --- a/src/components/MainContent.vue +++ b/src/components/MainContent.vue @@ -10,6 +10,11 @@ export default { data() { return { mainConfig: { + statUnlocks: [ + {id: 0, name: 'Slayer level', value: {min: 1, current: 99, max: 99}, image: 'slayer_icon.png', unlock: false}, + {id: 1, name: 'Combat level', value: {min: 3, current: 126, max: 126}, image: 'combat_icon.png', unlock: false}, + {id: 2, name: 'Defence level', value: {min: 1, current: 99, max: 99}, image: 'defence_icon.png', unlock: false}, + ], pointUnlocks: [ {id: 0, name: 'Seeing red', monster_ids: [83, 3], unlock: false, masters: [5,6,7]}, {id: 1, name: 'I hope you mith me', monster_ids: [72], unlock: false, masters: [5,6,7]}, @@ -35,7 +40,7 @@ export default { {id: 3, name: 'Death Plateau', monster_ids: [96], unlock: false}, {id: 4, name: 'Death to the Dorgeshuun', monster_ids: [74], unlock: false}, {id: 5, name: 'Desert Treasure (started)', monster_ids: [34, 94], unlock: false}, - {id: 6, name: 'Dragon Slayer', monster_ids: [48, 14, 83, 12, 17, 58, 97, 72, 2, 87], alternative_text: "Dragons", unlock: false}, + {id: 6, name: 'Dragon Slayer', monster_ids: [48, 14, 83, 12, 17, 58, 97, 72], alternative_text: "Dragons", unlock: false}, {id: 7, name: 'Dragon Slayer II', monster_ids: [2, 87], unlock: false}, {id: 8, name: 'Elemental Workshop I', monster_ids: [92], unlock: false}, {id: 9, name: 'Ernest the Chicken', monster_ids: [62], unlock: false}, @@ -53,11 +58,6 @@ export default { {id: 21, name: 'Skippy and the Mogres (miniquest)', monster_ids: [73], unlock: false}, {id: 22, name: 'Waterfall Quest', monster_ids: [40], unlock: false}, ], - statUnlocks: [ - {id: 0, name: 'Slayer level', value: {min: 1, current: 99, max: 99}, image: 'Slayer_icon.png', unlock: false}, - {id: 1, name: 'Combat level', value: {min: 3, current: 126, max: 126}, image: 'Combat_icon.png', unlock: false}, - {id: 2, name: 'Defence level', value: {min: 1, current: 99, max: 99}, image: 'Defence_icon.png', unlock: false}, - ] } } }, diff --git a/src/main.js b/src/main.js index beaca5a..d0e62dd 100644 --- a/src/main.js +++ b/src/main.js @@ -18,7 +18,7 @@ const routes = [ ]; const router = new VueRouter({ - mode: 'history', + mode: 'hash', routes }); diff --git a/yarn.lock b/yarn.lock index 4f49c4c..cf5e243 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6797,10 +6797,10 @@ safe-regex@^1.1.0: resolved "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo= -sass-loader@^8.0.0: +sass-loader@^8.0.2: version "8.0.2" - resolved "https://registry.npm.taobao.org/sass-loader/download/sass-loader-8.0.2.tgz?cache=0&sync_timestamp=1578921506275&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsass-loader%2Fdownload%2Fsass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d" - integrity sha1-3r7NjDziQ8dkVPLoKQSCFQOACQ0= + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d" + integrity sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ== dependencies: clone-deep "^4.0.1" loader-utils "^1.2.3" @@ -7972,11 +7972,6 @@ vue@^2.6.10: resolved "https://registry.npm.taobao.org/vue/download/vue-2.6.11.tgz?cache=0&sync_timestamp=1580160165548&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5" integrity sha1-dllNh31LEiNEBuhONSdcbVFBJcU= -vuex@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.1.2.tgz#a2863f4005aa73f2587e55c3fadf3f01f69c7d4d" - integrity sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ== - watchpack@^1.6.0: version "1.6.0" resolved "https://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz?cache=0&sync_timestamp=1579095974142&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwatchpack%2Fdownload%2Fwatchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"