techwire/bang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into main

Browse Source
This commit is contained in:
Giulio 2022-03-16 13:33:24 +01:00
commit 4ac7721b4c
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/requirements.txt
View File

@ -5,6 +5,6 @@ greenlet==1.1.2
python-engineio==3.14.2 python-engineio==3.14.2
python-socketio==4.6.1 python-socketio==4.6.1
six==1.16.0 six==1.16.0
pytest==7.0.1 pytest==7.1.0
requests==2.27.1 requests==2.27.1
discord-webhook==0.15.0 discord-webhook==0.15.0

4
frontend/package.json
View File

@ -8,7 +8,7 @@
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
"dependencies": { "dependencies": {
"caniuse-lite": "^1.0.30001314", "caniuse-lite": "^1.0.30001317",
"core-js": "^3.16.2", "core-js": "^3.16.2",
"pretty-checkbox-vue": "^1.1.9", "pretty-checkbox-vue": "^1.1.9",
"register-service-worker": "^1.7.2", "register-service-worker": "^1.7.2",
@ -23,7 +23,7 @@
"@vue/cli-plugin-babel": "~4.5.15", "@vue/cli-plugin-babel": "~4.5.15",
"@vue/cli-plugin-eslint": "~4.5.15", "@vue/cli-plugin-eslint": "~4.5.15",
"@vue/cli-plugin-pwa": "~4.5.15", "@vue/cli-plugin-pwa": "~4.5.15",
"@vue/cli-plugin-router": "~5.0.1", "@vue/cli-plugin-router": "~5.0.3",
"@vue/cli-service": "~4.5.15", "@vue/cli-service": "~4.5.15",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"eslint": "^6.7.2", "eslint": "^6.7.2",

3
frontend/src/components/Player.vue
View File

@ -238,7 +238,8 @@ export default {
if (!this.can_target_sheriff && x.is_sheriff) if (!this.can_target_sheriff && x.is_sheriff)
return false return false
else else
return x.dist <= this.range //console.log("aa" +(this.sight-1))
return x.dist <= this.range + this.sight -1
}).map(player => { }).map(player => {
return { return {
name: player.name, name: player.name,

30
frontend/yarn.lock
View File

@ -1261,12 +1261,12 @@
dependencies: dependencies:
"@vue/cli-shared-utils" "^4.5.15" "@vue/cli-shared-utils" "^4.5.15"
"@vue/cli-plugin-router@~5.0.1": "@vue/cli-plugin-router@~5.0.3":
version "5.0.1" version "5.0.3"
resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-5.0.1.tgz#f512a2c882d3eb2c15ba387bb1e598be625ea2c4" resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-5.0.3.tgz#8413d8a6347c556ffb6a1965d6992ff625564177"
integrity sha512-Eu56AQUEK0uULgIQotZwi5eijYNBS3+znMc0u/kaI1puW3+f/qP3YCtffp5CeVcG2Kxwrx66XBI6PMHg8hPdmA== integrity sha512-9GPewake2QhmnNe1p72Cejv0jyenH+gv3+3JlZf4kPR68ncqwF7YiUjxbnJnItWgq4Zep3+YqYmQ4PsIWjMPUQ==
dependencies: dependencies:
"@vue/cli-shared-utils" "^5.0.1" "@vue/cli-shared-utils" "^5.0.3"
"@vue/cli-plugin-vuex@^4.5.15": "@vue/cli-plugin-vuex@^4.5.15":
version "4.5.15" version "4.5.15"
@ -1351,10 +1351,10 @@
semver "^6.1.0" semver "^6.1.0"
strip-ansi "^6.0.0" strip-ansi "^6.0.0"
"@vue/cli-shared-utils@^5.0.1": "@vue/cli-shared-utils@^5.0.3":
version "5.0.1" version "5.0.3"
resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-5.0.1.tgz#9e33cacefad427bbf8939f953204373ad107fbee" resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-5.0.3.tgz#e8facc759f4e2ceed4a26f33943c0005a834e4af"
integrity sha512-oL164c3yDhdLHgiFvSkXuP7z0eEY8gqTYzHHbvQJCIBtRZ/0H9Q7xICpAeMZ63lJvS2+fA5bQfv+kPII/kcjmQ== integrity sha512-xAHxFDYVohHWXOLdmGvka3ffQcRgKdACempFQkGJX74Q7OBf0zPf5WH+vQXhlR17eA3LmWdY+Nv8OfsIGim6Fg==
dependencies: dependencies:
chalk "^4.1.2" chalk "^4.1.2"
execa "^1.0.0" execa "^1.0.0"
@ -1362,7 +1362,7 @@
launch-editor "^2.2.1" launch-editor "^2.2.1"
lru-cache "^6.0.0" lru-cache "^6.0.0"
node-fetch "^2.6.7" node-fetch "^2.6.7"
node-ipc "^9.1.1" node-ipc "9.2.1"
open "^8.0.2" open "^8.0.2"
ora "^5.3.0" ora "^5.3.0"
read-pkg "^5.1.1" read-pkg "^5.1.1"
@ -2228,10 +2228,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2" lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0" lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001314: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001317:
version "1.0.30001314" version "1.0.30001317"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz#65c7f9fb7e4594fca0a333bec1d8939662377596" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz#0548fb28fd5bc259a70b8c1ffdbe598037666a1b"
integrity sha512-0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw== integrity sha512-xIZLh8gBm4dqNX0gkzrBeyI86J2eCjWzYAs40q88smG844YIrN4tVQl/RhquHvKEKImWWFIVh1Lxe5n1G/N+GQ==
case-sensitive-paths-webpack-plugin@^2.3.0: case-sensitive-paths-webpack-plugin@^2.3.0:
version "2.4.0" version "2.4.0"
@ -5396,7 +5396,7 @@ node-forge@^0.10.0:
version "0.10.0" version "0.10.0"
resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz" resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"
node-ipc@^9.1.1: node-ipc@9.2.1, node-ipc@^9.1.1:
version "9.2.1" version "9.2.1"
resolved "https://registry.npmjs.org/node-ipc/-/node-ipc-9.2.1.tgz" resolved "https://registry.npmjs.org/node-ipc/-/node-ipc-9.2.1.tgz"
dependencies: dependencies: