From f3cb6d75d3ab8f7ad197eaa1fa16da2b43c6f543 Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Sat, 4 Sep 2021 14:02:28 +0200 Subject: [PATCH] chore: update wow-mock --- package.json | 4 +- src/engine/data.ts | 16 ++++---- src/states/Stagger.ts | 6 +-- src/states/conditions.ts | 4 +- yarn.lock | 82 ++++++++++++++++++++++++++-------------- 5 files changed, 69 insertions(+), 43 deletions(-) diff --git a/package.json b/package.json index 41d434fe7..a6c83f4f7 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@wowts/table": "^1.0.1", "@wowts/tsaddon": "^1.2.1", "@wowts/tslib": "^1.3.1", - "@wowts/wow-mock": "^1.32.2" + "@wowts/wow-mock": "^1.32.4" }, "optionalDependencies": { "@wowts/libactionbutton-1.0-elvui": "^1.0.1", @@ -65,7 +65,7 @@ "@commitlint/config-conventional": "^13.1.0", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", - "@wowts/tstolua": "^1.13.5", + "@wowts/tstolua": "^1.13.7", "commitlint": "^13.1.0", "csv-parse": "^4.16.2", "eslint": "^7.32.0", diff --git a/src/engine/data.ts b/src/engine/data.ts index a907fd525..02d89d882 100644 --- a/src/engine/data.ts +++ b/src/engine/data.ts @@ -413,7 +413,7 @@ export class OvaleDataClass { [11327]: true, [SpellId.shadowmeld]: true, [SpellId.incarnation_king_of_the_jungle]: true, - [SpellId.subterfuge]: true, + [SpellId.subterfuge_buff]: true, [115193]: true, [SpellId.shadow_dance]: true, [185422]: true, @@ -426,7 +426,7 @@ export class OvaleDataClass { [11327]: true, [SpellId.shadow_dance]: true, [185422]: true, - [SpellId.subterfuge]: true, + [SpellId.subterfuge_buff]: true, [347037]: true, }, mantle_stealthed_buff: { @@ -449,12 +449,12 @@ export class OvaleDataClass { [106898]: true, }, roll_the_bones_buff: { - [SpellId.broadside]: true, - [SpellId.buried_treasure]: true, - [SpellId.grand_melee]: true, - [SpellId.ruthless_precision]: true, - [SpellId.skull_and_crossbones]: true, - [SpellId.true_bearing]: true, + [SpellId.broadside_buff]: true, + [SpellId.buried_treasure_buff]: true, + [SpellId.grand_melee_buff]: true, + [SpellId.ruthless_precision_buff]: true, + [SpellId.skull_and_crossbones_buff]: true, + [SpellId.true_bearing_buff]: true, }, lethal_poison_buff: { [SpellId.deadly_poison]: true, diff --git a/src/states/Stagger.ts b/src/states/Stagger.ts index aeac2ea15..906448946 100644 --- a/src/states/Stagger.ts +++ b/src/states/Stagger.ts @@ -23,9 +23,9 @@ import { isNumber } from "../tools/tools"; import { BaseState } from "./BaseState"; import { AstFunctionNode, NamedParametersOf } from "../engine/ast"; -const lightStagger = SpellId.light_stagger; -const moderateStagger = SpellId.moderate_stagger; -const heavyStagger = SpellId.heavy_stagger; +const lightStagger = SpellId.light_stagger_buff; +const moderateStagger = SpellId.moderate_stagger_buff; +const heavyStagger = SpellId.heavy_stagger_buff; const staggerDoT = 124255; let serial = 1; diff --git a/src/states/conditions.ts b/src/states/conditions.ts index c84f4245e..14a62203d 100644 --- a/src/states/conditions.ts +++ b/src/states/conditions.ts @@ -1459,14 +1459,14 @@ export class OvaleConditions { ): [Aura | undefined, Aura | undefined] { const bpAura = this.auras.getAura( target, - SpellId.blood_plague, + SpellId.blood_plague_debuff, atTime, "HARMFUL", true ); const ffAura = this.auras.getAura( target, - SpellId.frost_fever, + SpellId.frost_fever_debuff, atTime, "HARMFUL", true diff --git a/yarn.lock b/yarn.lock index 140b88cb1..fd3f1f9e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1151,21 +1151,21 @@ dependencies: "@wowts/lua" "^1.3.0" -"@wowts/tstolua@^1.13.5": - version "1.13.6" - resolved "https://registry.yarnpkg.com/@wowts/tstolua/-/tstolua-1.13.6.tgz#16a23cb6176d22858f3a6e94270fd247f07d2968" - integrity sha512-SNA5k2UwCnR6QOxBZXS4K4clkGBoqp6wJCEegMRuBcOlrNJI0BnDiJcbEAiCcvzBX6oxbrO+H6l9YQJQJ7S5Zg== +"@wowts/tstolua@^1.13.7": + version "1.13.7" + resolved "https://registry.yarnpkg.com/@wowts/tstolua/-/tstolua-1.13.7.tgz#296e22f4bf5765eb724bc237046bb7c4412b3511" + integrity sha512-Ry7C25n3vT7zLnx4J1Lp66tpsxPmHK35r2RY5zUbxioDPFvKB12ASPd8OAGcPE+Ek7V7KZtP85xaNWvn64GI1Q== dependencies: "@types/degit" "^2.8.2" - commander "^7.2.0" + commander "^8.1.0" degit "^2.8.4" typescript "^4.3.5" - webdav "^3.6.2" + webdav "^4.7.0" -"@wowts/wow-mock@^1.0.8", "@wowts/wow-mock@^1.19.0", "@wowts/wow-mock@^1.26.0", "@wowts/wow-mock@^1.32.2", "@wowts/wow-mock@^1.6.0": - version "1.32.2" - resolved "https://registry.yarnpkg.com/@wowts/wow-mock/-/wow-mock-1.32.2.tgz#af17859bed5a5f134813d1b9989e3f4524f6eb00" - integrity sha512-9Jogbdqm9UVv1oBd0jACM9erbHdPdPrWfU/P2ZvXmFBTZbiXjzTB8z7aFuNfvw1cb62Qrrs7mE8WQ1kKxvMt6g== +"@wowts/wow-mock@^1.0.8", "@wowts/wow-mock@^1.19.0", "@wowts/wow-mock@^1.26.0", "@wowts/wow-mock@^1.32.4", "@wowts/wow-mock@^1.6.0": + version "1.32.4" + resolved "https://registry.yarnpkg.com/@wowts/wow-mock/-/wow-mock-1.32.4.tgz#7d347ab696617363b28bc5808667ffa33342eebe" + integrity sha512-M5onRn9IeahEbM74XhIIuwaXlg/8xlXa2Fl4wkBeNAMCDtTjWC+4h+hqoupt6GX7ckuRGHQ8Tb/LqLaI6FZVYQ== dependencies: "@wowts/lua" "^1.6.0" "@wowts/table" "^1.0.2" @@ -1435,10 +1435,10 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base-64@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb" - integrity sha1-eAqZyE59YAJgNhURxId2E78k9rs= +base-64@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/base-64/-/base-64-1.0.0.tgz#09d0f2084e32a3fd08c2475b973788eee6ae8f4a" + integrity sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg== base@^0.11.1: version "0.11.2" @@ -1600,6 +1600,11 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== +charenc@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" + integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc= + ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" @@ -1697,10 +1702,10 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -commander@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== +commander@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-8.1.0.tgz#db36e3e66edf24ff591d639862c6ab2c52664362" + integrity sha512-mf45ldcuHSYShkplHHGKWb4TrmwQadxOn7v4WuhDJy0ZVoY5JFajaRDKD0PNe5qXzBX0rhovjTnP6Kz9LETcuA== commitlint@^13.1.0: version "13.1.0" @@ -1959,6 +1964,11 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" +crypt@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" + integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs= + cssom@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" @@ -2452,7 +2462,7 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -fast-xml-parser@^3.17.4: +fast-xml-parser@^3.19.0: version "3.19.0" resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz#cb637ec3f3999f51406dd8ff0e6fc4d83e520d01" integrity sha512-4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg== @@ -2961,7 +2971,7 @@ is-arrayish@^0.2.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= -is-buffer@^1.1.5: +is-buffer@^1.1.5, is-buffer@~1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== @@ -3686,6 +3696,11 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== +layerr@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/layerr/-/layerr-0.1.2.tgz#16c8e7fb042d3595ab15492bdad088f31d7afd15" + integrity sha512-ob5kTd9H3S4GOG2nVXyQhOu9O8nBgP555XxWPkJI0tR0JeRilfyTp8WtPdIJHLXBmHMSdEq5+KMxiYABeScsIQ== + leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -3825,6 +3840,15 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" +md5@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f" + integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g== + dependencies: + charenc "0.0.2" + crypt "0.0.2" + is-buffer "~1.1.6" + meow@^7.0.0: version "7.1.1" resolved "https://registry.yarnpkg.com/meow/-/meow-7.1.1.tgz#7c01595e3d337fcb0ec4e8eed1666ea95903d306" @@ -5305,7 +5329,7 @@ url-join@^4.0.1: resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== -url-parse@^1.4.7: +url-parse@^1.5.3: version "1.5.3" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862" integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ== @@ -5371,21 +5395,23 @@ walker@^1.0.7, walker@~1.0.5: dependencies: makeerror "1.0.x" -webdav@^3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/webdav/-/webdav-3.6.2.tgz#76e3d8e950e80698a2f1db23ef2496888662cbeb" - integrity sha512-HFRiI1jluMSPQMVgxVD6VVYNtaglO53vHG0uf7Zec+wl0A1Mei2z8/IFgAAAJMUuEWAx2AfBD5lcWhAiYA9LUw== +webdav@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/webdav/-/webdav-4.7.0.tgz#3964c72c1d5dc9854c0031b43e464f260f22476e" + integrity sha512-R1WZl/JeFPAmSEn1EPCmxSdPY8IxS/P0qnxAzBeRqEewpxVJ/UiCMJwXHLpyVsKYA1PIb1dYv+UTQsbNaQnLBw== dependencies: axios "^0.21.1" - base-64 "^0.1.0" - fast-xml-parser "^3.17.4" + base-64 "^1.0.0" + fast-xml-parser "^3.19.0" he "^1.2.0" hot-patcher "^0.5.0" + layerr "^0.1.2" + md5 "^2.3.0" minimatch "^3.0.4" nested-property "^4.0.0" path-posix "^1.0.0" url-join "^4.0.1" - url-parse "^1.4.7" + url-parse "^1.5.3" webidl-conversions@^5.0.0: version "5.0.0"