From 1f661738d6d4289fe7fbabd879b967e59b6ad216 Mon Sep 17 00:00:00 2001 From: Matheus Portes Lacerda Date: Wed, 25 Jun 2025 10:11:48 -0300 Subject: [PATCH] Added weapon_type Field to Weapon Entities --- .../weapons/a-thousand-blazing-suns/en.json | 3 ++- .../weapons/a-thousand-blazing-suns/pt.json | 3 ++- .../a-thousand-floating-dreams/en.json | 20 ++++++++-------- .../a-thousand-floating-dreams/pt.json | 3 ++- assets/data/weapons/absolution/en.json | 3 ++- assets/data/weapons/absolution/pt.json | 3 ++- assets/data/weapons/akuoumaru/en.json | 3 ++- assets/data/weapons/akuoumaru/pt.json | 3 ++- assets/data/weapons/alley-hunter/en.json | 3 ++- assets/data/weapons/alley-hunter/jp.json | 3 ++- assets/data/weapons/alley-hunter/pt.json | 3 ++- assets/data/weapons/amber-catalyst/en.json | 3 ++- assets/data/weapons/amenoma-kageuchi/en.json | 3 ++- assets/data/weapons/amenoma-kageuchi/jp.json | 3 ++- assets/data/weapons/amenoma-kageuchi/pt.json | 3 ++- assets/data/weapons/amos-bow/en.json | 3 ++- assets/data/weapons/amos-bow/jp.json | 3 ++- assets/data/weapons/amos-bow/pt.json | 3 ++- .../data/weapons/apprentice-s-notes/en.json | 3 ++- .../data/weapons/apprentice-s-notes/jp.json | 3 ++- .../data/weapons/apprentice-s-notes/pt.json | 3 ++- assets/data/weapons/aqua-simulacra/en.json | 3 ++- assets/data/weapons/aqua-simulacra/pt.json | 3 ++- assets/data/weapons/aquila-favonia/en.json | 3 ++- assets/data/weapons/aquila-favonia/jp.json | 3 ++- assets/data/weapons/aquila-favonia/pt.json | 3 ++- .../weapons/ash-graven-drinking-horn/en.json | 3 ++- .../weapons/ash-graven-drinking-horn/pt.json | 3 ++- .../astral-vulture-s-crimson-plumage/en.json | 3 ++- .../astral-vulture-s-crimson-plumage/pt.json | 3 ++- .../ballad-of-the-boundless-blue/en.json | 3 ++- .../ballad-of-the-boundless-blue/pt.json | 3 ++- .../data/weapons/ballad-of-the-fjords/en.json | 3 ++- .../data/weapons/ballad-of-the-fjords/pt.json | 3 ++- .../weapons/beacon-of-the-reed-sea/en.json | 3 ++- .../weapons/beacon-of-the-reed-sea/pt.json | 14 ++++++++++- .../data/weapons/beginner-s-protector/en.json | 3 ++- .../data/weapons/beginner-s-protector/jp.json | 3 ++- .../data/weapons/beginner-s-protector/pt.json | 3 ++- assets/data/weapons/black-tassel/en.json | 3 ++- assets/data/weapons/black-tassel/jp.json | 3 ++- assets/data/weapons/black-tassel/pt.json | 3 ++- assets/data/weapons/blackcliff-agate/en.json | 3 ++- assets/data/weapons/blackcliff-agate/jp.json | 3 ++- assets/data/weapons/blackcliff-agate/pt.json | 3 ++- .../data/weapons/blackcliff-longsword/en.json | 3 ++- .../data/weapons/blackcliff-longsword/jp.json | 3 ++- .../data/weapons/blackcliff-longsword/pt.json | 3 ++- assets/data/weapons/blackcliff-pole/en.json | 3 ++- assets/data/weapons/blackcliff-pole/jp.json | 3 ++- assets/data/weapons/blackcliff-pole/pt.json | 3 ++- .../data/weapons/blackcliff-slasher/en.json | 3 ++- .../data/weapons/blackcliff-slasher/jp.json | 3 ++- .../data/weapons/blackcliff-slasher/pt.json | 3 ++- assets/data/weapons/blackcliff-warbow/en.json | 3 ++- assets/data/weapons/blackcliff-warbow/jp.json | 3 ++- assets/data/weapons/blackcliff-warbow/pt.json | 3 ++- .../weapons/bloodtainted-greatsword/en.json | 3 ++- .../weapons/bloodtainted-greatsword/jp.json | 3 ++- .../weapons/bloodtainted-greatsword/pt.json | 3 ++- assets/data/weapons/calamity-of-eshu/en.json | 3 ++- assets/data/weapons/calamity-of-eshu/pt.json | 3 ++- assets/data/weapons/calamity-queller/en.json | 3 ++- assets/data/weapons/calamity-queller/pt.json | 3 ++- .../data/weapons/cashflow-supervision/en.json | 3 ++- .../data/weapons/cashflow-supervision/pt.json | 3 ++- assets/data/weapons/chain-breaker/en.json | 3 ++- assets/data/weapons/chain-breaker/pt.json | 3 ++- assets/data/weapons/cinnabar-spindle/en.json | 22 +++++++++--------- assets/data/weapons/cinnabar-spindle/pt.json | 3 ++- assets/data/weapons/cloudforged/en.json | 3 ++- assets/data/weapons/cloudforged/pt.json | 3 ++- assets/data/weapons/compound-bow/en.json | 3 ++- assets/data/weapons/compound-bow/jp.json | 3 ++- assets/data/weapons/compound-bow/pt.json | 3 ++- assets/data/weapons/cool-steel/en.json | 3 ++- assets/data/weapons/cool-steel/jp.json | 3 ++- assets/data/weapons/cool-steel/pt.json | 3 ++- .../data/weapons/crane-s-echoing-call/en.json | 20 ++++++++-------- .../data/weapons/crane-s-echoing-call/pt.json | 3 ++- assets/data/weapons/crescent-pike/en.json | 3 ++- assets/data/weapons/crescent-pike/jp.json | 3 ++- assets/data/weapons/crescent-pike/pt.json | 3 ++- .../weapons/crimson-moon-s-semblance/en.json | 3 ++- .../weapons/crimson-moon-s-semblance/pt.json | 3 ++- assets/data/weapons/dark-iron-sword/en.json | 3 ++- assets/data/weapons/dark-iron-sword/jp.json | 3 ++- assets/data/weapons/dark-iron-sword/pt.json | 3 ++- assets/data/weapons/deathmatch/en.json | 3 ++- assets/data/weapons/deathmatch/jp.json | 3 ++- assets/data/weapons/deathmatch/pt.json | 3 ++- assets/data/weapons/debate-club/en.json | 3 ++- assets/data/weapons/debate-club/jp.json | 3 ++- assets/data/weapons/debate-club/pt.json | 3 ++- .../dialogues-of-the-desert-sages/en.json | 19 +++++++-------- .../dialogues-of-the-desert-sages/pt.json | 3 ++- assets/data/weapons/dodoco-tales/en.json | 3 ++- assets/data/weapons/dodoco-tales/jp.json | 3 ++- assets/data/weapons/dodoco-tales/pt.json | 3 ++- assets/data/weapons/dragon-s-bane/en.json | 3 ++- assets/data/weapons/dragon-s-bane/jp.json | 3 ++- assets/data/weapons/dragon-s-bane/pt.json | 3 ++- assets/data/weapons/dragonspine-spear/en.json | 3 ++- assets/data/weapons/dragonspine-spear/jp.json | 3 ++- assets/data/weapons/dragonspine-spear/pt.json | 3 ++- assets/data/weapons/dull-blade/en.json | 3 ++- assets/data/weapons/dull-blade/jp.json | 3 ++- assets/data/weapons/dull-blade/pt.json | 3 ++- assets/data/weapons/earth-shaker/en.json | 3 ++- assets/data/weapons/earth-shaker/pt.json | 3 ++- assets/data/weapons/ebony-bow/en.json | 3 ++- assets/data/weapons/elegy-for-the-end/en.json | 3 ++- assets/data/weapons/elegy-for-the-end/jp.json | 3 ++- assets/data/weapons/elegy-for-the-end/pt.json | 3 ++- assets/data/weapons/emerald-orb/en.json | 3 ++- assets/data/weapons/emerald-orb/jp.json | 3 ++- assets/data/weapons/emerald-orb/pt.json | 3 ++- assets/data/weapons/end-of-the-line/en.json | 22 +++++++++--------- assets/data/weapons/end-of-the-line/pt.json | 3 ++- .../data/weapons/engulfing-lightning/en.json | 3 ++- .../data/weapons/engulfing-lightning/pt.json | 3 ++- .../data/weapons/everlasting-moonglow/en.json | 3 ++- .../data/weapons/everlasting-moonglow/pt.json | 3 ++- assets/data/weapons/eye-of-perception/en.json | 3 ++- assets/data/weapons/eye-of-perception/jp.json | 3 ++- assets/data/weapons/eye-of-perception/pt.json | 3 ++- assets/data/weapons/fading-twilight/en.json | 5 ++-- assets/data/weapons/fading-twilight/pt.json | 3 ++- .../weapons/fang-of-the-mountain-king/en.json | 14 ++++++++++- .../weapons/fang-of-the-mountain-king/pt.json | 3 ++- assets/data/weapons/favonius-codex/en.json | 3 ++- assets/data/weapons/favonius-codex/jp.json | 3 ++- assets/data/weapons/favonius-codex/pt.json | 3 ++- .../data/weapons/favonius-greatsword/en.json | 3 ++- .../data/weapons/favonius-greatsword/jp.json | 3 ++- .../data/weapons/favonius-greatsword/pt.json | 3 ++- assets/data/weapons/favonius-lance/en.json | 3 ++- assets/data/weapons/favonius-lance/jp.json | 3 ++- assets/data/weapons/favonius-lance/pt.json | 3 ++- assets/data/weapons/favonius-sword/en.json | 3 ++- assets/data/weapons/favonius-sword/jp.json | 3 ++- assets/data/weapons/favonius-sword/pt.json | 3 ++- assets/data/weapons/favonius-warbow/en.json | 3 ++- assets/data/weapons/favonius-warbow/jp.json | 3 ++- assets/data/weapons/favonius-warbow/pt.json | 3 ++- assets/data/weapons/ferrous-shadow/en.json | 3 ++- assets/data/weapons/ferrous-shadow/jp.json | 3 ++- assets/data/weapons/ferrous-shadow/pt.json | 3 ++- assets/data/weapons/festering-desire/en.json | 3 ++- assets/data/weapons/festering-desire/jp.json | 3 ++- assets/data/weapons/festering-desire/pt.json | 3 ++- assets/data/weapons/fillet-blade/en.json | 3 ++- assets/data/weapons/fillet-blade/jp.json | 3 ++- assets/data/weapons/fillet-blade/pt.json | 3 ++- .../data/weapons/finale-of-the-deep/en.json | 3 ++- .../data/weapons/finale-of-the-deep/pt.json | 3 ++- .../weapons/fleuve-cendre-ferryman/en.json | 3 ++- .../weapons/fleuve-cendre-ferryman/pt.json | 3 ++- .../weapons/flower-wreathed-feathers/en.json | 3 ++- .../weapons/flower-wreathed-feathers/pt.json | 3 ++- assets/data/weapons/flowing-purity/en.json | 3 ++- assets/data/weapons/flowing-purity/pt.json | 3 ++- assets/data/weapons/flute-of-ezpitzal/en.json | 3 ++- assets/data/weapons/flute-of-ezpitzal/pt.json | 3 ++- .../weapons/footprint-of-the-rainbow/en.json | 3 ++- .../weapons/footprint-of-the-rainbow/pt.json | 3 ++- assets/data/weapons/forest-regalia/en.json | 22 +++++++++--------- assets/data/weapons/forest-regalia/pt.json | 3 ++- assets/data/weapons/freedom-sworn/en.json | 3 ++- assets/data/weapons/freedom-sworn/jp.json | 3 ++- assets/data/weapons/freedom-sworn/pt.json | 3 ++- assets/data/weapons/frostbearer/en.json | 3 ++- assets/data/weapons/frostbearer/jp.json | 3 ++- assets/data/weapons/frostbearer/pt.json | 3 ++- .../data/weapons/fruit-of-fulfillment/en.json | 20 ++++++++-------- .../data/weapons/fruit-of-fulfillment/pt.json | 5 ++-- assets/data/weapons/fruitful-hook/en.json | 3 ++- assets/data/weapons/fruitful-hook/pt.json | 3 ++- assets/data/weapons/hakushin-ring/en.json | 3 ++- assets/data/weapons/hakushin-ring/jp.json | 3 ++- assets/data/weapons/hakushin-ring/pt.json | 3 ++- assets/data/weapons/halberd/en.json | 3 ++- assets/data/weapons/halberd/jp.json | 3 ++- assets/data/weapons/halberd/pt.json | 3 ++- assets/data/weapons/hamayumi/en.json | 3 ++- assets/data/weapons/hamayumi/jp.json | 3 ++- assets/data/weapons/hamayumi/pt.json | 3 ++- .../data/weapons/haran-geppaku-futsu/en.json | 3 ++- .../data/weapons/haran-geppaku-futsu/pt.json | 3 ++- assets/data/weapons/harbinger-of-dawn/en.json | 3 ++- assets/data/weapons/harbinger-of-dawn/jp.json | 3 ++- assets/data/weapons/harbinger-of-dawn/pt.json | 3 ++- assets/data/weapons/hunter-s-bow/en.json | 3 ++- assets/data/weapons/hunter-s-bow/jp.json | 3 ++- assets/data/weapons/hunter-s-bow/pt.json | 3 ++- assets/data/weapons/hunter-s-path/en.json | 23 ++++++++++--------- assets/data/weapons/hunter-s-path/pt.json | 3 ++- assets/data/weapons/ibis-piercer/en.json | 3 ++- assets/data/weapons/ibis-piercer/pt.json | 3 ++- assets/data/weapons/iron-point/en.json | 3 ++- assets/data/weapons/iron-point/jp.json | 3 ++- assets/data/weapons/iron-point/pt.json | 3 ++- assets/data/weapons/iron-sting/en.json | 3 ++- assets/data/weapons/iron-sting/jp.json | 3 ++- assets/data/weapons/iron-sting/pt.json | 3 ++- .../data/weapons/jadefall-s-splendor/en.json | 3 ++- .../data/weapons/jadefall-s-splendor/pt.json | 5 ++-- .../data/weapons/kagotsurube-isshin/en.json | 3 ++- .../data/weapons/kagotsurube-isshin/pt.json | 3 ++- assets/data/weapons/kagura-s-verity/en.json | 3 ++- assets/data/weapons/kagura-s-verity/pt.json | 3 ++- .../weapons/katsuragikiri-nagamasa/en.json | 3 ++- .../weapons/katsuragikiri-nagamasa/jp.json | 3 ++- .../weapons/katsuragikiri-nagamasa/pt.json | 3 ++- assets/data/weapons/key-of-khaj-nisut/en.json | 22 +++++++++--------- assets/data/weapons/key-of-khaj-nisut/pt.json | 3 ++- assets/data/weapons/king-s-squire/en.json | 22 +++++++++--------- assets/data/weapons/king-s-squire/pt.json | 3 ++- .../data/weapons/kitain-cross-spear/en.json | 3 ++- .../data/weapons/kitain-cross-spear/jp.json | 3 ++- .../data/weapons/kitain-cross-spear/pt.json | 3 ++- .../weapons/light-of-foliar-incision/en.json | 3 ++- .../weapons/light-of-foliar-incision/pt.json | 3 ++- assets/data/weapons/lion-s-roar/en.json | 3 ++- assets/data/weapons/lion-s-roar/jp.json | 3 ++- assets/data/weapons/lion-s-roar/pt.json | 3 ++- assets/data/weapons/lithic-blade/en.json | 3 ++- assets/data/weapons/lithic-blade/jp.json | 3 ++- assets/data/weapons/lithic-blade/pt.json | 3 ++- assets/data/weapons/lithic-spear/en.json | 3 ++- assets/data/weapons/lithic-spear/jp.json | 3 ++- assets/data/weapons/lithic-spear/pt.json | 3 ++- .../lost-prayer-to-the-sacred-winds/en.json | 3 ++- .../lost-prayer-to-the-sacred-winds/jp.json | 3 ++- .../lost-prayer-to-the-sacred-winds/pt.json | 3 ++- assets/data/weapons/lumidouce-elegy/en.json | 3 ++- assets/data/weapons/lumidouce-elegy/pt.json | 3 ++- .../data/weapons/luxurious-sea-lord/en.json | 3 ++- .../data/weapons/luxurious-sea-lord/pt.json | 3 ++- assets/data/weapons/magic-guide/en.json | 3 ++- assets/data/weapons/magic-guide/jp.json | 3 ++- assets/data/weapons/magic-guide/pt.json | 3 ++- assets/data/weapons/mailed-flower/en.json | 3 ++- assets/data/weapons/mailed-flower/pt.json | 3 ++- .../data/weapons/makhaira-aquamarine/en.json | 22 +++++++++--------- .../data/weapons/makhaira-aquamarine/pt.json | 3 ++- assets/data/weapons/mappa-mare/en.json | 3 ++- assets/data/weapons/mappa-mare/jp.json | 3 ++- assets/data/weapons/mappa-mare/pt.json | 3 ++- assets/data/weapons/memory-of-dust/en.json | 3 ++- assets/data/weapons/memory-of-dust/jp.json | 3 ++- assets/data/weapons/memory-of-dust/pt.json | 3 ++- assets/data/weapons/messenger/en.json | 3 ++- assets/data/weapons/messenger/jp.json | 3 ++- assets/data/weapons/messenger/pt.json | 3 ++- assets/data/weapons/missive-windspear/en.json | 5 ++-- assets/data/weapons/missive-windspear/pt.json | 3 ++- .../weapons/mistsplitter-reforged/en.json | 3 ++- .../weapons/mistsplitter-reforged/jp.json | 3 ++- .../weapons/mistsplitter-reforged/pt.json | 3 ++- .../data/weapons/mitternachts-waltz/en.json | 3 ++- .../data/weapons/mitternachts-waltz/jp.json | 3 ++- .../data/weapons/mitternachts-waltz/pt.json | 3 ++- assets/data/weapons/moonpiercer/en.json | 20 ++++++++-------- assets/data/weapons/moonpiercer/pt.json | 3 ++- .../weapons/mountain-bracing-bolt/en.json | 3 ++- .../weapons/mountain-bracing-bolt/pt.json | 3 ++- assets/data/weapons/mouun-s-moon/en.json | 3 ++- assets/data/weapons/mouun-s-moon/pt.json | 3 ++- assets/data/weapons/oathsworn-eye/en.json | 3 ++- assets/data/weapons/oathsworn-eye/pt.json | 3 ++- assets/data/weapons/old-merc-s-pal/en.json | 3 ++- assets/data/weapons/old-merc-s-pal/jp.json | 3 ++- assets/data/weapons/old-merc-s-pal/pt.json | 3 ++- .../data/weapons/otherworldly-story/en.json | 3 ++- .../data/weapons/otherworldly-story/jp.json | 3 ++- .../data/weapons/otherworldly-story/pt.json | 3 ++- assets/data/weapons/peak-patrol-song/en.json | 3 ++- assets/data/weapons/peak-patrol-song/pt.json | 3 ++- assets/data/weapons/pocket-grimoire/en.json | 3 ++- assets/data/weapons/pocket-grimoire/jp.json | 3 ++- assets/data/weapons/pocket-grimoire/pt.json | 3 ++- assets/data/weapons/polar-star/en.json | 3 ++- assets/data/weapons/polar-star/pt.json | 3 ++- .../data/weapons/portable-power-saw/en.json | 3 ++- .../data/weapons/portable-power-saw/pt.json | 3 ++- assets/data/weapons/predator/en.json | 3 ++- assets/data/weapons/predator/pt.json | 3 ++- .../weapons/primordial-jade-cutter/en.json | 3 ++- .../weapons/primordial-jade-cutter/jp.json | 3 ++- .../weapons/primordial-jade-cutter/pt.json | 3 ++- .../primordial-jade-winged-spear/en.json | 3 ++- .../primordial-jade-winged-spear/jp.json | 3 ++- .../primordial-jade-winged-spear/pt.json | 3 ++- assets/data/weapons/prospectors-drill/en.json | 3 ++- assets/data/weapons/prospectors-drill/pt.json | 3 ++- assets/data/weapons/prototype-amber/en.json | 3 ++- assets/data/weapons/prototype-amber/jp.json | 3 ++- assets/data/weapons/prototype-amber/pt.json | 3 ++- assets/data/weapons/prototype-archaic/en.json | 3 ++- assets/data/weapons/prototype-archaic/jp.json | 3 ++- assets/data/weapons/prototype-archaic/pt.json | 3 ++- .../data/weapons/prototype-crescent/en.json | 3 ++- .../data/weapons/prototype-crescent/jp.json | 3 ++- .../data/weapons/prototype-crescent/pt.json | 3 ++- assets/data/weapons/prototype-rancour/en.json | 3 ++- assets/data/weapons/prototype-rancour/jp.json | 3 ++- assets/data/weapons/prototype-rancour/pt.json | 3 ++- .../weapons/prototype-starglitter/en.json | 3 ++- .../weapons/prototype-starglitter/jp.json | 3 ++- .../weapons/prototype-starglitter/pt.json | 3 ++- assets/data/weapons/quartz/en.json | 3 ++- assets/data/weapons/rainslasher/en.json | 3 ++- assets/data/weapons/rainslasher/jp.json | 3 ++- assets/data/weapons/rainslasher/pt.json | 3 ++- assets/data/weapons/range-gauge/en.json | 3 ++- assets/data/weapons/range-gauge/pt.json | 3 ++- assets/data/weapons/raven-bow/en.json | 3 ++- assets/data/weapons/raven-bow/jp.json | 3 ++- assets/data/weapons/raven-bow/pt.json | 3 ++- assets/data/weapons/recurve-bow/en.json | 3 ++- assets/data/weapons/recurve-bow/jp.json | 3 ++- assets/data/weapons/recurve-bow/pt.json | 3 ++- .../weapons/redhorn-stonethresher/en.json | 3 ++- .../weapons/redhorn-stonethresher/pt.json | 3 ++- assets/data/weapons/rightful-reward/en.json | 3 ++- assets/data/weapons/rightful-reward/pt.json | 3 ++- assets/data/weapons/ring-of-yaxche/en.json | 3 ++- assets/data/weapons/ring-of-yaxche/pt.json | 3 ++- assets/data/weapons/royal-bow/en.json | 3 ++- assets/data/weapons/royal-bow/jp.json | 3 ++- assets/data/weapons/royal-bow/pt.json | 3 ++- assets/data/weapons/royal-greatsword/en.json | 3 ++- assets/data/weapons/royal-greatsword/jp.json | 3 ++- assets/data/weapons/royal-greatsword/pt.json | 3 ++- assets/data/weapons/royal-grimoire/en.json | 3 ++- assets/data/weapons/royal-grimoire/jp.json | 3 ++- assets/data/weapons/royal-grimoire/pt.json | 3 ++- assets/data/weapons/royal-longsword/en.json | 3 ++- assets/data/weapons/royal-longsword/jp.json | 3 ++- assets/data/weapons/royal-longsword/pt.json | 3 ++- assets/data/weapons/royal-spear/en.json | 3 ++- assets/data/weapons/royal-spear/jp.json | 3 ++- assets/data/weapons/royal-spear/pt.json | 3 ++- assets/data/weapons/rust/en.json | 3 ++- assets/data/weapons/rust/jp.json | 3 ++- assets/data/weapons/rust/pt.json | 3 ++- assets/data/weapons/sacrificial-bow/en.json | 3 ++- assets/data/weapons/sacrificial-bow/jp.json | 3 ++- assets/data/weapons/sacrificial-bow/pt.json | 3 ++- .../weapons/sacrificial-fragments/en.json | 3 ++- .../weapons/sacrificial-fragments/jp.json | 3 ++- .../weapons/sacrificial-fragments/pt.json | 3 ++- .../weapons/sacrificial-greatsword/en.json | 3 ++- .../weapons/sacrificial-greatsword/jp.json | 3 ++- .../weapons/sacrificial-greatsword/pt.json | 3 ++- assets/data/weapons/sacrificial-jade/en.json | 3 ++- assets/data/weapons/sacrificial-jade/pt.json | 3 ++- assets/data/weapons/sacrificial-sword/en.json | 3 ++- assets/data/weapons/sacrificial-sword/jp.json | 3 ++- assets/data/weapons/sacrificial-sword/pt.json | 3 ++- assets/data/weapons/sapwood-blade/en.json | 20 ++++++++-------- assets/data/weapons/sapwood-blade/pt.json | 3 ++- .../weapons/scion-of-the-blazing-sun/en.json | 3 ++- .../weapons/scion-of-the-blazing-sun/pt.json | 3 ++- .../weapons/seasoned-hunter-s-bow/en.json | 3 ++- .../weapons/seasoned-hunter-s-bow/jp.json | 3 ++- .../weapons/seasoned-hunter-s-bow/pt.json | 3 ++- .../data/weapons/sequence-of-solitude/en.json | 3 ++- .../data/weapons/sequence-of-solitude/pt.json | 3 ++- assets/data/weapons/serpent-spine/en.json | 3 ++- assets/data/weapons/serpent-spine/jp.json | 3 ++- assets/data/weapons/serpent-spine/pt.json | 3 ++- .../data/weapons/sharpshooter-s-oath/en.json | 3 ++- .../data/weapons/sharpshooter-s-oath/jp.json | 3 ++- .../data/weapons/sharpshooter-s-oath/pt.json | 3 ++- assets/data/weapons/silver-sword/en.json | 3 ++- assets/data/weapons/silver-sword/jp.json | 3 ++- assets/data/weapons/silver-sword/pt.json | 3 ++- .../weapons/silvershower-heartstrings/en.json | 3 ++- .../weapons/silvershower-heartstrings/pt.json | 3 ++- .../data/weapons/skyrider-greatsword/en.json | 3 ++- .../data/weapons/skyrider-greatsword/jp.json | 3 ++- .../data/weapons/skyrider-greatsword/pt.json | 3 ++- assets/data/weapons/skyrider-sword/en.json | 3 ++- assets/data/weapons/skyrider-sword/jp.json | 3 ++- assets/data/weapons/skyrider-sword/pt.json | 3 ++- assets/data/weapons/skyward-atlas/en.json | 3 ++- assets/data/weapons/skyward-atlas/jp.json | 3 ++- assets/data/weapons/skyward-atlas/pt.json | 3 ++- assets/data/weapons/skyward-blade/en.json | 3 ++- assets/data/weapons/skyward-blade/jp.json | 3 ++- assets/data/weapons/skyward-blade/pt.json | 3 ++- assets/data/weapons/skyward-harp/en.json | 3 ++- assets/data/weapons/skyward-harp/jp.json | 3 ++- assets/data/weapons/skyward-harp/pt.json | 3 ++- assets/data/weapons/skyward-pride/en.json | 3 ++- assets/data/weapons/skyward-pride/jp.json | 3 ++- assets/data/weapons/skyward-pride/pt.json | 3 ++- assets/data/weapons/skyward-spine/en.json | 3 ++- assets/data/weapons/skyward-spine/jp.json | 3 ++- assets/data/weapons/skyward-spine/pt.json | 3 ++- assets/data/weapons/slingshot/en.json | 3 ++- assets/data/weapons/slingshot/jp.json | 3 ++- assets/data/weapons/slingshot/pt.json | 3 ++- .../weapons/snow-tombed-starsilver/en.json | 3 ++- .../weapons/snow-tombed-starsilver/jp.json | 3 ++- .../weapons/snow-tombed-starsilver/pt.json | 3 ++- assets/data/weapons/solar-pearl/en.json | 3 ++- assets/data/weapons/solar-pearl/jp.json | 3 ++- assets/data/weapons/solar-pearl/pt.json | 3 ++- .../data/weapons/song-of-broken-pines/en.json | 3 ++- .../data/weapons/song-of-broken-pines/jp.json | 3 ++- .../data/weapons/song-of-broken-pines/pt.json | 3 ++- assets/data/weapons/song-of-stillness/en.json | 3 ++- assets/data/weapons/song-of-stillness/pt.json | 3 ++- .../splendor-of-tranquil-waters/en.json | 3 ++- .../splendor-of-tranquil-waters/pt.json | 3 ++- assets/data/weapons/staff-of-homa/en.json | 3 ++- assets/data/weapons/staff-of-homa/jp.json | 3 ++- assets/data/weapons/staff-of-homa/pt.json | 3 ++- .../staff-of-the-scarlet-sands/en.json | 20 ++++++++-------- .../staff-of-the-scarlet-sands/pt.json | 3 ++- .../data/weapons/starcaller-s-watch/en.json | 3 ++- .../data/weapons/starcaller-s-watch/pt.json | 3 ++- assets/data/weapons/sturdy-bone/en.json | 3 ++- assets/data/weapons/sturdy-bone/pt.json | 3 ++- assets/data/weapons/summit-shaper/en.json | 3 ++- assets/data/weapons/summit-shaper/jp.json | 3 ++- assets/data/weapons/summit-shaper/pt.json | 3 ++- .../weapons/sunny-morning-sleep-in/en.json | 3 ++- .../weapons/sunny-morning-sleep-in/pt.json | 3 ++- assets/data/weapons/surf-s-up/en.json | 3 ++- assets/data/weapons/surf-s-up/pt.json | 3 ++- .../data/weapons/sword-of-descension/en.json | 3 ++- .../data/weapons/sword-of-descension/jp.json | 3 ++- .../data/weapons/sword-of-descension/pt.json | 3 ++- .../weapons/sword-of-narzissenkreuz/en.json | 3 ++- .../weapons/sword-of-narzissenkreuz/pt.json | 3 ++- .../data/weapons/symphonist-of-scents/en.json | 3 ++- .../data/weapons/symphonist-of-scents/pt.json | 3 ++- assets/data/weapons/talking-stick/en.json | 3 ++- assets/data/weapons/talking-stick/pt.json | 3 ++- .../weapons/tamayuratei-no-ohanashi/en.json | 3 ++- .../weapons/tamayuratei-no-ohanashi/pt.json | 3 ++- assets/data/weapons/the-alley-flash/en.json | 3 ++- assets/data/weapons/the-alley-flash/jp.json | 3 ++- assets/data/weapons/the-alley-flash/pt.json | 3 ++- assets/data/weapons/the-bell/en.json | 3 ++- assets/data/weapons/the-bell/jp.json | 3 ++- assets/data/weapons/the-bell/pt.json | 3 ++- assets/data/weapons/the-black-sword/en.json | 3 ++- assets/data/weapons/the-black-sword/jp.json | 3 ++- assets/data/weapons/the-black-sword/pt.json | 3 ++- assets/data/weapons/the-catch/en.json | 3 ++- assets/data/weapons/the-catch/pt.json | 3 ++- .../weapons/the-dockhands-assistant/en.json | 3 ++- .../weapons/the-dockhands-assistant/pt.json | 3 ++- .../weapons/the-first-great-magic/en.json | 3 ++- .../weapons/the-first-great-magic/pt.json | 3 ++- assets/data/weapons/the-flute/en.json | 3 ++- assets/data/weapons/the-flute/jp.json | 3 ++- assets/data/weapons/the-flute/pt.json | 3 ++- assets/data/weapons/the-stringless/en.json | 3 ++- assets/data/weapons/the-stringless/jp.json | 3 ++- assets/data/weapons/the-stringless/pt.json | 3 ++- assets/data/weapons/the-unforged/en.json | 3 ++- assets/data/weapons/the-unforged/jp.json | 3 ++- assets/data/weapons/the-unforged/pt.json | 3 ++- .../data/weapons/the-viridescent-hunt/en.json | 3 ++- .../data/weapons/the-viridescent-hunt/jp.json | 3 ++- .../data/weapons/the-viridescent-hunt/pt.json | 3 ++- assets/data/weapons/the-widsith/en.json | 3 ++- assets/data/weapons/the-widsith/jp.json | 3 ++- assets/data/weapons/the-widsith/pt.json | 3 ++- .../thrilling-tales-of-dragon-slayers/en.json | 3 ++- .../thrilling-tales-of-dragon-slayers/jp.json | 3 ++- .../thrilling-tales-of-dragon-slayers/pt.json | 3 ++- assets/data/weapons/thundering-pulse/en.json | 3 ++- assets/data/weapons/thundering-pulse/jp.json | 3 ++- assets/data/weapons/thundering-pulse/pt.json | 3 ++- assets/data/weapons/tidal-shadow/en.json | 3 ++- assets/data/weapons/tidal-shadow/pt.json | 3 ++- .../weapons/tome-of-the-eternal-flow/en.json | 3 ++- .../weapons/tome-of-the-eternal-flow/pt.json | 3 ++- assets/data/weapons/toukabou-shigure/en.json | 3 ++- assets/data/weapons/toukabou-shigure/pt.json | 3 ++- .../weapons/traveler-s-handy-sword/en.json | 3 ++- .../weapons/traveler-s-handy-sword/jp.json | 3 ++- .../weapons/traveler-s-handy-sword/pt.json | 3 ++- .../weapons/tulaytullah-s-remembrance/en.json | 3 ++- .../weapons/tulaytullah-s-remembrance/pt.json | 3 ++- assets/data/weapons/twin-nephrite/en.json | 3 ++- assets/data/weapons/twin-nephrite/jp.json | 3 ++- assets/data/weapons/twin-nephrite/pt.json | 3 ++- .../en.json | 3 ++- .../pt.json | 3 ++- assets/data/weapons/uraku-misugiri/en.json | 19 +++++++-------- assets/data/weapons/uraku-misugiri/pt.json | 3 ++- assets/data/weapons/verdict/en.json | 3 ++- assets/data/weapons/verdict/pt.json | 3 ++- assets/data/weapons/vivid-notions/en.json | 3 ++- assets/data/weapons/vivid-notions/pt.json | 3 ++- assets/data/weapons/vortex-vanquisher/en.json | 3 ++- assets/data/weapons/vortex-vanquisher/jp.json | 3 ++- assets/data/weapons/vortex-vanquisher/pt.json | 3 ++- .../data/weapons/wandering-evenstar/en.json | 20 ++++++++-------- .../data/weapons/wandering-evenstar/pt.json | 3 ++- assets/data/weapons/waster-greatsword/en.json | 3 ++- assets/data/weapons/waster-greatsword/jp.json | 3 ++- assets/data/weapons/waster-greatsword/pt.json | 3 ++- assets/data/weapons/wavebreaker-s-fin/en.json | 3 ++- assets/data/weapons/wavebreaker-s-fin/pt.json | 3 ++- assets/data/weapons/waveriding-whirl/en.json | 3 ++- assets/data/weapons/waveriding-whirl/pt.json | 3 ++- .../weapons/white-iron-greatsword/en.json | 3 ++- .../weapons/white-iron-greatsword/jp.json | 3 ++- .../weapons/white-iron-greatsword/pt.json | 3 ++- assets/data/weapons/white-tassel/en.json | 3 ++- assets/data/weapons/white-tassel/jp.json | 3 ++- assets/data/weapons/white-tassel/pt.json | 3 ++- assets/data/weapons/whiteblind/en.json | 3 ++- assets/data/weapons/whiteblind/jp.json | 3 ++- assets/data/weapons/whiteblind/pt.json | 3 ++- assets/data/weapons/windblume-ode/en.json | 3 ++- assets/data/weapons/windblume-ode/jp.json | 3 ++- assets/data/weapons/windblume-ode/pt.json | 3 ++- assets/data/weapons/wine-and-song/en.json | 3 ++- assets/data/weapons/wine-and-song/jp.json | 3 ++- assets/data/weapons/wine-and-song/pt.json | 3 ++- assets/data/weapons/wolf-fang/en.json | 3 ++- assets/data/weapons/wolf-fang/pt.json | 3 ++- assets/data/weapons/wolf-s-gravestone/en.json | 3 ++- assets/data/weapons/wolf-s-gravestone/jp.json | 3 ++- assets/data/weapons/wolf-s-gravestone/pt.json | 3 ++- assets/data/weapons/xiphos-moonlight/en.json | 20 ++++++++-------- assets/data/weapons/xiphos-moonlight/pt.json | 3 ++- 537 files changed, 1244 insertions(+), 699 deletions(-) diff --git a/assets/data/weapons/a-thousand-blazing-suns/en.json b/assets/data/weapons/a-thousand-blazing-suns/en.json index 2eeec8dff..c59af7a89 100644 --- a/assets/data/weapons/a-thousand-blazing-suns/en.json +++ b/assets/data/weapons/a-thousand-blazing-suns/en.json @@ -8,5 +8,6 @@ "passiveDesc": "Gain the \"Scorching Brilliance\" effect when using an Elemental Skill or Burst: CRIT DMG increased by 20%/25%/30%/35%/40% and ATK increased by 28%/35%/42%/49%/56% for 6s. This effect can trigger once every 10s.While a \"Scorching Brilliance\" instance is active, its duration is increased by 2s after Normal or Charged attacks deal Elemental DMG. This effect can trigger once every second, and the max duration increase is 6s.Additionally, when the equipping character is in the Nightsoul's Blessing state, \"Scorching Brilliance\" effects are increased by 75%, and its duration will not count down when the equipping character is off-field.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 49, "subStat": 24 }, - "description": "A greatsword that dazzles like the rising sun. It has witnessed the extinguishing and rekindling of innumerable suns." + "description": "A greatsword that dazzles like the rising sun. It has witnessed the extinguishing and rekindling of innumerable suns.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/a-thousand-blazing-suns/pt.json b/assets/data/weapons/a-thousand-blazing-suns/pt.json index 900d09f13..f6c6332c0 100644 --- a/assets/data/weapons/a-thousand-blazing-suns/pt.json +++ b/assets/data/weapons/a-thousand-blazing-suns/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Obtém o efeito \"Brilho Escaldante\" ao usar uma Habilidade Elemental ou Supremo: Dano CRIT aumentado em 20%/25%/30%/35%/40% e ATQ aumentado em 28%/35%/42%/49%/56% por 6s. Este efeito pode ser ativado uma vez a cada 10s.Enquanto uma instância de \"Brilho Escaldante\" estiver ativa, sua duração é aumentada em 2s após ataques Normais ou Carregados causarem Dano Elemental. Este efeito pode ser ativado uma vez por segundo, e o aumento máximo de duração é de 6s.Além disso, quando o personagem estiver no estado Bênção do Espírito da Noite, aumenta o efeito \"Brilho Escaldante\" em 75%, e esse efeito não terá sua contagem regressiva quando o personagem que estiver com essa arma equipada não estiver ativo.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": null, "subStat": 0 }, - "description": "Uma espada grande que brilha como o sol nascente. Ela testemunhou o apagar e o reacender de inúmeros sóis." + "description": "Uma espada grande que brilha como o sol nascente. Ela testemunhou o apagar e o reacender de inúmeros sóis.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/a-thousand-floating-dreams/en.json b/assets/data/weapons/a-thousand-floating-dreams/en.json index 0b602bda4..20c8fb2e2 100644 --- a/assets/data/weapons/a-thousand-floating-dreams/en.json +++ b/assets/data/weapons/a-thousand-floating-dreams/en.json @@ -1,12 +1,12 @@ { - "name": "A Thousand Floating Dreams", - "type": "Catalyst", - "rarity": 5, - "baseAttack": 44, - "subStat": "Elemental Mastery", - "passiveName": "A Thousand Nights' Dawnsong", - "passiveDesc": "Party members other than the equipping character will provide the equipping character with buffs based on whether their Elemental Type is the same as the latter or not. If their Elemental Types are the same, increase Elemental Mastery by 32. If not, increase the equipping character's DMG Bonus from their Elemental Type by 10%. Each of the aforementioned effects can have up to 3 stacks. Additionally, all nearby party members other than the equipping character will have their Elemental Mastery increased by 40. Multiple such effects from multiple such weapons can stack.", - "location": "Gacha", - "ascensionMaterial": "oasis" + "name": "A Thousand Floating Dreams", + "type": "Catalyst", + "rarity": 5, + "baseAttack": 44, + "subStat": "Elemental Mastery", + "passiveName": "A Thousand Nights' Dawnsong", + "passiveDesc": "Party members other than the equipping character will provide the equipping character with buffs based on whether their Elemental Type is the same as the latter or not. If their Elemental Types are the same, increase Elemental Mastery by 32. If not, increase the equipping character's DMG Bonus from their Elemental Type by 10%. Each of the aforementioned effects can have up to 3 stacks. Additionally, all nearby party members other than the equipping character will have their Elemental Mastery increased by 40. Multiple such effects from multiple such weapons can stack.", + "location": "Gacha", + "ascensionMaterial": "oasis", + "weapon_type": "CATALYST" } - \ No newline at end of file diff --git a/assets/data/weapons/a-thousand-floating-dreams/pt.json b/assets/data/weapons/a-thousand-floating-dreams/pt.json index 914809127..6c5f0d583 100644 --- a/assets/data/weapons/a-thousand-floating-dreams/pt.json +++ b/assets/data/weapons/a-thousand-floating-dreams/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Os personagens da equipe além do personagem com esta arma equipada darão bônus ao personagem com esta arma equipada baseado no seu Tipo Elemental. Se o Tipo Elemental for o mesmo do personagem com esta arma equipada, aumentarão a Proficiência Elemental em 32/40/48/56/64. Se o Tipo Elemental for diferente do personagem com esta arma equipada, aumentarão o Bônus de Dano Elemental do Tipo Elemental do personagem com esta arma equipada em 10%/14%/18%/22%/26%. Os efeitos mencionados acima podem acumular até 3 vezes. Além disso, todos os aliados próximos além do personagem com esta arma equipada terão sua Proficiência Elemental aumentada em 40/42/44/46/48. Os efeitos de várias armas com este mesmo nome podem ser acumulados.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 58 }, - "description": "Essa lanterna ilumina os sonhos que flutuam sobre as mil noites, e a sua luz esmeralda flui de dias antigos." + "description": "Essa lanterna ilumina os sonhos que flutuam sobre as mil noites, e a sua luz esmeralda flui de dias antigos.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/absolution/en.json b/assets/data/weapons/absolution/en.json index f8f7dc0f5..973573861 100644 --- a/assets/data/weapons/absolution/en.json +++ b/assets/data/weapons/absolution/en.json @@ -8,5 +8,6 @@ "passiveDesc": "CRIT DMG increased by 20%/25%/30%/35%/40%. Increasing the value of a Bond of Life increases the DMG the equipping character deals by 16%/20%/24%/28%/32% for 6s. Max 3 stacks.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 48, "subStat": 96 }, - "description": "A rapier once wielded by a deceiver who had forsaken everything. In the past, it was primarily used as a tool when he had to disguise his identity." + "description": "A rapier once wielded by a deceiver who had forsaken everything. In the past, it was primarily used as a tool when he had to disguise his identity.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/absolution/pt.json b/assets/data/weapons/absolution/pt.json index 3a2fe9f6d..1094993f7 100644 --- a/assets/data/weapons/absolution/pt.json +++ b/assets/data/weapons/absolution/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano CRIT em 20%/25%/30%/35%/40%. Aumentar o valor de um Contrato de Vida aumentará o Dano causado pelo personagem que está com essa arma equipada em 16%/20%/24%/28%/32% por 6s. Máximo de 3 acúmulos.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 48, "subStat": 96 }, - "description": "Uma espada afiada utilizada por um trapaceiro que desistiu de tudo. No passado, ele a usava como um disfarce para a sua identidade." + "description": "Uma espada afiada utilizada por um trapaceiro que desistiu de tudo. No passado, ele a usava como um disfarce para a sua identidade.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/akuoumaru/en.json b/assets/data/weapons/akuoumaru/en.json index 15148d539..a15f03b05 100644 --- a/assets/data/weapons/akuoumaru/en.json +++ b/assets/data/weapons/akuoumaru/en.json @@ -7,5 +7,6 @@ "passiveName": "Watatsumi Wavewalker", "passiveDesc": "For every point of the entire party's combined maximum Energy capacity, the Elemental Burst DMG of the character equipping this weapon is increased by 0.12/0.15/0.18/0.21/0.24%. A maximum of 40/50/60/70/80% increased Elemental Burst DMG can be achieved this way.", "location": "Gacha", - "ascensionMaterial": "distant-sea" + "ascensionMaterial": "distant-sea", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/akuoumaru/pt.json b/assets/data/weapons/akuoumaru/pt.json index b46f27a6c..81070b548 100644 --- a/assets/data/weapons/akuoumaru/pt.json +++ b/assets/data/weapons/akuoumaru/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "O Personagem que usar esta arma terá um aumento do Dano do Supremo de 0.12%/0.15%/0.18%/0.21%/0.24% por cada 1 ponto da soma do máximo da Energia Elemental de todos os membros da equipe. O aumento de Dano do Supremo máximo obtível dessa maneira é de 40%/50%/60%/70%/80%.", "location": "Inazuma", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "A querida espada do lendário \"Akuou\". A lâmina é gigantesca e majestosa, mas é surpreendentemente fácil de brandi-la." + "description": "A querida espada do lendário \"Akuou\". A lâmina é gigantesca e majestosa, mas é surpreendentemente fácil de brandi-la.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/alley-hunter/en.json b/assets/data/weapons/alley-hunter/en.json index 21ed98a16..e75d94bd3 100755 --- a/assets/data/weapons/alley-hunter/en.json +++ b/assets/data/weapons/alley-hunter/en.json @@ -7,5 +7,6 @@ "passiveName": "Urban Guerrilla", "passiveDesc": "Every 4s a character is on the field, their ATK increases by 4/5/6/7/8% and their CRIT DMG increases by 4/5/6/7/8%. This effect has a maximum of 5 stacks and will not be reset if the character leaves the field, but will be cleared when the character takes DMG.", "location": "Gacha", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/alley-hunter/jp.json b/assets/data/weapons/alley-hunter/jp.json index 04a900709..5c2741130 100644 --- a/assets/data/weapons/alley-hunter/jp.json +++ b/assets/data/weapons/alley-hunter/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "路地奇襲", "passiveDesc": "この武器を装備したキャラクターが待機している時、1秒ごとに自身の与えるダメージ+2%。この方式で獲得できるダメージアップ効果は20%まで。4秒以上フィールド上にいると、上記ダメージアップ効果は0%になるまで、1秒毎に4%ダウンする。", - "location": "祈願" + "location": "祈願", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/alley-hunter/pt.json b/assets/data/weapons/alley-hunter/pt.json index 3597d2043..ca08794a1 100644 --- a/assets/data/weapons/alley-hunter/pt.json +++ b/assets/data/weapons/alley-hunter/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando o personagem com essa arma equipada estiver na equipe mas não no campo da batalha, o Dano causado por personagem será aumentado em 2%/2.5%/3%/3.5%/4% a cada 1s, a quantidade máxima do aumento do Dano desta maneira é de 20%/25%/30%/35%/40%. Depois de 4s de ficar no campo, o efeito de aumento do Dano será reduzido em 4%/5%/6%/7%/8% a cada 1s até que seja reduzido para 0%.", "location": "Mondstadt", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "Um arco longo e opulento intrincado. Pertenceu a um ladrão de cavalheiros que nunca foi pego." + "description": "Um arco longo e opulento intrincado. Pertenceu a um ladrão de cavalheiros que nunca foi pego.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/amber-catalyst/en.json b/assets/data/weapons/amber-catalyst/en.json index 23f473b43..cb0833a86 100755 --- a/assets/data/weapons/amber-catalyst/en.json +++ b/assets/data/weapons/amber-catalyst/en.json @@ -7,5 +7,6 @@ "passiveName": "Elemental Mastery", "passiveDesc": "Normal Attack hits increase all Elemental DMG by 6/7.5/9/10.5/12% for 6s. Max 2 stacks.", "location": "Chests", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/amenoma-kageuchi/en.json b/assets/data/weapons/amenoma-kageuchi/en.json index b0f5e90c8..1a8ac9e16 100644 --- a/assets/data/weapons/amenoma-kageuchi/en.json +++ b/assets/data/weapons/amenoma-kageuchi/en.json @@ -7,5 +7,6 @@ "passiveName": "Iwakura Succession", "passiveDesc": "After casting an Elemental Skill, gain 1 Succession Seed. This effect can be triggered once every 5s. The Succession Seed lasts for 30s. Up to 3 Succession Seeds may exist simultaneously. After using an Elemental Burst, all Succession Seeds are consumed and after 2s, the character regenerates 6/7.5/9/10.5/12 Energy for each seed consumed.", "location": "Crafting", - "ascensionMaterial": "distant-sea" + "ascensionMaterial": "distant-sea", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/amenoma-kageuchi/jp.json b/assets/data/weapons/amenoma-kageuchi/jp.json index dc456f189..fc9bba8df 100644 --- a/assets/data/weapons/amenoma-kageuchi/jp.json +++ b/assets/data/weapons/amenoma-kageuchi/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "岩蔵の胤", "passiveDesc": "元素スキルを発動した後、継続時間30秒の継承の印を1つ獲得する。この効果は5秒毎に1回のみ発動可能で、継承の印は同時に最大3つまで存在可能。元素爆発を発動すると、所持している継承の印を全て消費し、消費した継承の印1つにつき、2秒後に該当キャラクターの元素エネルギーを6ポイント回復する。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/amenoma-kageuchi/pt.json b/assets/data/weapons/amenoma-kageuchi/pt.json index 9fad28974..513a66b29 100644 --- a/assets/data/weapons/amenoma-kageuchi/pt.json +++ b/assets/data/weapons/amenoma-kageuchi/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Depois de lançar a Habilidade Elemental, ganha 1 Semente de Sucessão. Este efeito pode ser ativado uma vez a cada 5s. A Semente de Sucessão dura 30s e no máximo podem coexistir 3 sementes. Depois de lançar o Supremo, todas as Sementes de Sucessão serão eliminadas e, após 2s, o personagem restaura 6/7.5/9/10.5/12 de Energia Elemental por cada Semente de Sucessão consumida.", "location": "Inazuma", "baseDamage": { "attack": 41, "subStat": 120 }, - "description": "Uma lâmina que dizem ter sido feita sob encomenda por um famoso samurai que poderia até mesmo cortar do ar um guerreiro tengu, famoso por sua habilidade em usar sua incrível velocidade." + "description": "Uma lâmina que dizem ter sido feita sob encomenda por um famoso samurai que poderia até mesmo cortar do ar um guerreiro tengu, famoso por sua habilidade em usar sua incrível velocidade.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/amos-bow/en.json b/assets/data/weapons/amos-bow/en.json index 632fabd4c..25226f530 100755 --- a/assets/data/weapons/amos-bow/en.json +++ b/assets/data/weapons/amos-bow/en.json @@ -7,5 +7,6 @@ "passiveName": "Strong-Willed", "passiveDesc": "Increases Normal Attack and Aimed Shot DMG by 12/15/18/21/24%. Increases DMG from arrows shot by a further 8/10/12/14/16% for every 0.1s that the arrow is in flight, up to 0.5s. Stacks up to 5 times on each arrow.", "location": "Gacha", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/amos-bow/jp.json b/assets/data/weapons/amos-bow/jp.json index 7ded0f3a8..8076724fe 100644 --- a/assets/data/weapons/amos-bow/jp.json +++ b/assets/data/weapons/amos-bow/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "一心不乱", "passiveDesc": "通常攻撃と重撃のダメージ+12%。通常攻撃と重撃の矢が放った後、0.1秒毎にダメージが更に+8%となり、最大で5回上昇する。", - "location": "祈願" + "location": "祈願", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/amos-bow/pt.json b/assets/data/weapons/amos-bow/pt.json index 5a0ca05cd..9615ba97a 100644 --- a/assets/data/weapons/amos-bow/pt.json +++ b/assets/data/weapons/amos-bow/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano infligido pelo Ataque Normal e Ataque Carregado em 12%/15%/18%/21%/24%. A cada 0.1s depois de disparar uma flecha com o Ataque Normal e Ataque Carregado, terá aumento de Dano de 8%/10%/12%/14%/16%, acumulando até um máximo de 5 vezes.", "location": "Mondstadt", "baseDamage": { "attack": 46, "subStat": 108 }, - "description": "Um arco extremamente antigo que reteve seu poder, apesar de seu mestre original ter desaparecido há muito tempo. Ele extrai poder de todos e de tudo no mundo, e quanto mais longe você estiver daquilo que seu coração deseja, mais poderoso será." + "description": "Um arco extremamente antigo que reteve seu poder, apesar de seu mestre original ter desaparecido há muito tempo. Ele extrai poder de todos e de tudo no mundo, e quanto mais longe você estiver daquilo que seu coração deseja, mais poderoso será.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/apprentice-s-notes/en.json b/assets/data/weapons/apprentice-s-notes/en.json index 5d50a567d..bd20fda7e 100755 --- a/assets/data/weapons/apprentice-s-notes/en.json +++ b/assets/data/weapons/apprentice-s-notes/en.json @@ -7,5 +7,6 @@ "passiveName": "-", "passiveDesc": "-", "location": "Chest", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/apprentice-s-notes/jp.json b/assets/data/weapons/apprentice-s-notes/jp.json index 7d1a67868..aed7920cf 100644 --- a/assets/data/weapons/apprentice-s-notes/jp.json +++ b/assets/data/weapons/apprentice-s-notes/jp.json @@ -6,5 +6,6 @@ "subStat": "-", "passiveName": "-", "passiveDesc": "-", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/apprentice-s-notes/pt.json b/assets/data/weapons/apprentice-s-notes/pt.json index d48327086..939c111fb 100644 --- a/assets/data/weapons/apprentice-s-notes/pt.json +++ b/assets/data/weapons/apprentice-s-notes/pt.json @@ -5,5 +5,6 @@ "baseAttack": 23, "location": "Baús\nPontos de Investigação\nLoja do Schulz\nArma Padrão para Personagens Catalisadores", "baseDamage": { "attack": 23, "subStat": 0 }, - "description": "Notas deixadas por um estudante brilhante que deixou uma lista de magias muito úteis. Sua caligrafia é muito bonita." + "description": "Notas deixadas por um estudante brilhante que deixou uma lista de magias muito úteis. Sua caligrafia é muito bonita.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/aqua-simulacra/en.json b/assets/data/weapons/aqua-simulacra/en.json index d6e3b17e8..9a10f6930 100644 --- a/assets/data/weapons/aqua-simulacra/en.json +++ b/assets/data/weapons/aqua-simulacra/en.json @@ -7,5 +7,6 @@ "passiveName": "The Cleansing Form", "passiveDesc": "HP is increased by 16%. When there are opponents nearby, the DMG dealt by the wielder of this weapon is increased by 20%. This will take effect whether the character is on-field or not.", "location": "Gacha", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/aqua-simulacra/pt.json b/assets/data/weapons/aqua-simulacra/pt.json index 2e6b8d7ca..814e43fd0 100644 --- a/assets/data/weapons/aqua-simulacra/pt.json +++ b/assets/data/weapons/aqua-simulacra/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a Vida em 16%/20%/24%/28%/32%. Se existirem inimigos próximos, o personagem que tem esta arma equipada terá um aumento de Dano de 20%/25%/30%/35%/40%, independentemente do personagem estar ativo no campo de batalha ou não.", "location": "Liyue", "baseDamage": { "attack": 44, "subStat": 194 }, - "description": "A cor desse arco longo muda imprevisivelmente. Sob a luz, possui um brilho azulado como água." + "description": "A cor desse arco longo muda imprevisivelmente. Sob a luz, possui um brilho azulado como água.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/aquila-favonia/en.json b/assets/data/weapons/aquila-favonia/en.json index 82b4cabff..380f19381 100755 --- a/assets/data/weapons/aquila-favonia/en.json +++ b/assets/data/weapons/aquila-favonia/en.json @@ -7,5 +7,6 @@ "passiveName": "Falcon's Defiance", "passiveDesc": "ATK is increased by 20/25/30/35/40%. Triggers on taking DMG: the soul of the Falcon of the West awakens, holding the banner of the resistance aloft, regenerating HP equal to 100/115/130/145/160% of ATK and dealing 200/230/260/290/320% of ATK as DMG to surrounding enemies. This effect can only occur once every 15s.", "location": "Gacha", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/aquila-favonia/jp.json b/assets/data/weapons/aquila-favonia/jp.json index 3f8f81a18..09df81d5d 100644 --- a/assets/data/weapons/aquila-favonia/jp.json +++ b/assets/data/weapons/aquila-favonia/jp.json @@ -6,5 +6,6 @@ "subStat": "物理ダメージ", "passiveName": "西風の鷹の抗い", "passiveDesc": "攻撃力+20%。ダメージを受けると発動：抗争の旗を高く掲げる西風の鷹の魂が蘇り、攻撃力の100%分のHPを回復し、周りの敵に攻撃力の200%のダメージを与える。15秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/aquila-favonia/pt.json b/assets/data/weapons/aquila-favonia/pt.json index c85961c60..15efa2a28 100644 --- a/assets/data/weapons/aquila-favonia/pt.json +++ b/assets/data/weapons/aquila-favonia/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "O ATQ aumenta em 20%/25%/30%/35%/40%; Ativa ao receber Dano: A alma do Falcão do Leste desperta, segurando a bandeira da resistência no alto, regenerando Vida equivalente a 100%/115%/130%/145%/160% do ATQ e causando 200%/230%/260%/290%/320% do ATQ como Dano aos inimigos ao redor. Esta habilidade pode ser ativada uma vez a cada 15s.", "location": "Mondstadt", "baseDamage": { "attack": 48, "subStat": 90 }, - "description": "A alma dos Cavaleiros de Favonius. Milênios depois, ainda chama pelos ventos para expulsar todo o mal - assim como a última heroína que a manejava." + "description": "A alma dos Cavaleiros de Favonius. Milênios depois, ainda chama pelos ventos para expulsar todo o mal - assim como a última heroína que a manejava.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/ash-graven-drinking-horn/en.json b/assets/data/weapons/ash-graven-drinking-horn/en.json index 8f551c4bf..b01973757 100644 --- a/assets/data/weapons/ash-graven-drinking-horn/en.json +++ b/assets/data/weapons/ash-graven-drinking-horn/en.json @@ -8,5 +8,6 @@ "passiveDesc": "When an attack hits an opponent, deal AoE DMG equal to 40%/50%/60%/70%/80% of Max HP at the target location. This effect can be triggered once every 15s.", "location": "Version 5.0 Event - Traces of Artistry", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "A ritual vessel passed down amongst the Meztli. They say that this was once a treasure much-valued, yet never used, by the hero \"Giant\" Tupac." + "description": "A ritual vessel passed down amongst the Meztli. They say that this was once a treasure much-valued, yet never used, by the hero \"Giant\" Tupac.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/ash-graven-drinking-horn/pt.json b/assets/data/weapons/ash-graven-drinking-horn/pt.json index b3e86ac76..680817caf 100644 --- a/assets/data/weapons/ash-graven-drinking-horn/pt.json +++ b/assets/data/weapons/ash-graven-drinking-horn/pt.json @@ -7,5 +7,6 @@ "passiveName": "Garra de Tupac", "passiveDesc": "Quando um ataque acerta um oponente, causa 40%/50%/60%/70%/80% da Vida Máxima como Dano em uma AdE no local do alvo. Este efeito pode ser desencadeado uma vez a cada 15s.", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Um artefato cerimonial herdado por Meztli, dizem que é um tesouro amado, mas nunca usado pelo herói conhecido como \"Gigante\", Tupac." + "description": "Um artefato cerimonial herdado por Meztli, dizem que é um tesouro amado, mas nunca usado pelo herói conhecido como \"Gigante\", Tupac.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/astral-vulture-s-crimson-plumage/en.json b/assets/data/weapons/astral-vulture-s-crimson-plumage/en.json index 31ab0d445..00f27108a 100644 --- a/assets/data/weapons/astral-vulture-s-crimson-plumage/en.json +++ b/assets/data/weapons/astral-vulture-s-crimson-plumage/en.json @@ -8,5 +8,6 @@ "passiveDesc": "For 12s after triggering a Swirl reaction, ATK increases by 24%/30%/36%/42%/48%. In addition, when 1/2 or more characters in the party are of a different Elemental Type from the equipping character, the DMG dealt by the equipping character's Charged Attacks is increased by 20%/48% | 25%/60% | 30%/72% | 35%/84% | 40%/96% and Elemental Burst DMG dealt is increased by 10%/24% | 12.5%/30% | 15%/36% | 17.5%/42% | 20%/48%.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 46, "subStat": 144 }, - "description": "An ancient longbow crested with red feathers, a sacred relic of the Flower-Feather Clan that has been passed down from generation to generation." + "description": "An ancient longbow crested with red feathers, a sacred relic of the Flower-Feather Clan that has been passed down from generation to generation.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/astral-vulture-s-crimson-plumage/pt.json b/assets/data/weapons/astral-vulture-s-crimson-plumage/pt.json index 59dd91642..bf0e68ae2 100644 --- a/assets/data/weapons/astral-vulture-s-crimson-plumage/pt.json +++ b/assets/data/weapons/astral-vulture-s-crimson-plumage/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após desencadear uma reação de Redemoinho, o ATQ aumenta em 24%/30%/34%/38%/42% por 12s. Além disso, se houver pelo menos 1/2 personagens na equipe com um Tipo Elemental diferente do personagem que está com essa arma equipada, o Dano causado por Ataques Carregados do personagem que está com essa arma equipada aumenta em 20%/48% | 25%/60% | 30%/72% | 35%/84% | 40%/96%, e o Dano causado pelo Supremo aumenta em 10%/24% | 12.5%/30% | 15%/36% | 17.5%/42% | 20%/48%.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 46, "subStat": 144 }, - "description": "Um arco antigo com penas vermelhas. É uma relíquia sagrada do Clã das Plumas de Flores que passou de geração em geração." + "description": "Um arco antigo com penas vermelhas. É uma relíquia sagrada do Clã das Plumas de Flores que passou de geração em geração.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/ballad-of-the-boundless-blue/en.json b/assets/data/weapons/ballad-of-the-boundless-blue/en.json index 7cee0fc5c..10cf5e150 100755 --- a/assets/data/weapons/ballad-of-the-boundless-blue/en.json +++ b/assets/data/weapons/ballad-of-the-boundless-blue/en.json @@ -7,5 +7,6 @@ "passiveName": "Azure Skies", "passiveDesc": "Within 6s after Normal or Charged Attacks hit an opponent, Normal Attack DMG will be increased by 8/10/12/14/16% and Charged Attack DMG will be increased by 6/7.5/9/10.5/12%. Max 3 stacks. This effect can be triggered once every 0.3s.", "location": "Event: Waterborne Poetry", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/ballad-of-the-boundless-blue/pt.json b/assets/data/weapons/ballad-of-the-boundless-blue/pt.json index 8e78435cc..de9373c17 100644 --- a/assets/data/weapons/ballad-of-the-boundless-blue/pt.json +++ b/assets/data/weapons/ballad-of-the-boundless-blue/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Nos 6s após um Ataque Normal ou Carregado atingir um inimigo, aumenta o Dano causado pelo Ataque Normal em 8%/10%/12%/14%/16% e o Dano causado pelo Ataque Carregado em 6%/7.5%/9%/10.5%/12%. Esse efeito pode ser acumulado até 3 vezes e desencadeado uma vez a cada 0.3s.", "location": "Evento da Versão 4.1 - Poesias Aquáticas", "baseDamage": { "attack": 44, "subStat": 67 }, - "description": "Uma coleção de poesia requintada. Contém algumas poesias sobre os céus, Dandelions e outros tópicos amados pelas pessoas de Mondstadt." + "description": "Uma coleção de poesia requintada. Contém algumas poesias sobre os céus, Dandelions e outros tópicos amados pelas pessoas de Mondstadt.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/ballad-of-the-fjords/en.json b/assets/data/weapons/ballad-of-the-fjords/en.json index 8c7596060..eb24cb727 100644 --- a/assets/data/weapons/ballad-of-the-fjords/en.json +++ b/assets/data/weapons/ballad-of-the-fjords/en.json @@ -7,5 +7,6 @@ "passiveName": "Tales of the Tundra", "passiveDesc": "When there are at least 3 different Elemental Types in your party, Elemental Mastery will be increased by 120.", "location": "BP Bounty", - "ascensionMaterial": "pristine-sea" + "ascensionMaterial": "pristine-sea", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/ballad-of-the-fjords/pt.json b/assets/data/weapons/ballad-of-the-fjords/pt.json index acb35734f..df0b68bfe 100644 --- a/assets/data/weapons/ballad-of-the-fjords/pt.json +++ b/assets/data/weapons/ballad-of-the-fjords/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando houver pelo menos 3 personagens de Tipos Elementais diferentes na equipe, aumenta a Proficiência Elemental em 120/150/180/210/240 pontos.", "location": "Passe de Batalha do Gnóstico", "baseDamage": { "attack": 42, "subStat": 60 }, - "description": "Uma lança usada por aqueles que querem pegar peixes nas tundras. Não deixa ninguém escapar." + "description": "Uma lança usada por aqueles que querem pegar peixes nas tundras. Não deixa ninguém escapar.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/beacon-of-the-reed-sea/en.json b/assets/data/weapons/beacon-of-the-reed-sea/en.json index f8a4c46bf..1d93b772b 100644 --- a/assets/data/weapons/beacon-of-the-reed-sea/en.json +++ b/assets/data/weapons/beacon-of-the-reed-sea/en.json @@ -7,5 +7,6 @@ "passiveName": "Desert Watch", "passiveDesc": "After the character's Elemental Skill hits an opponent, their ATK will be increased by 20% for 8s. After the character takes DMG, their ATK will be increased by 20% for 8s. The 2 aforementioned effects can be triggered even when the character is not on the field. Additionally, when not protected by a shield, the character's Max HP will be increased by 32%.", "location": "Gacha", - "ascensionMaterial": "scorching" + "ascensionMaterial": "scorching", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/beacon-of-the-reed-sea/pt.json b/assets/data/weapons/beacon-of-the-reed-sea/pt.json index 97af634d1..aecbe0895 100644 --- a/assets/data/weapons/beacon-of-the-reed-sea/pt.json +++ b/assets/data/weapons/beacon-of-the-reed-sea/pt.json @@ -1 +1,13 @@ -{"name":"Sinal dos Mares","type":"Espadão","rarity":5,"baseAttack":46,"subStat":"Taxa Crítica","passiveName":"Materiais de Refinamento","passiveDesc":"Quando a Habilidade Elemental atinge um inimigo, aumenta o ATQ em 20%/25%/30%/35%/40% por 8s. Ao sofrer Dano, aumenta o ATQ em 20%/25%/30%/35%/40% por 8s. Os dois efeitos descritos acima podem ser desencadeados mesmo se o personagem não estiver ativo no campo de batalha. Além disso, personagens que não estiverem sob a proteção de um Escudo terão sua Vida Máxima aumentada em 32%/40%/48%/56%/64%.","location":"Oração de Evento de Arma","baseDamage":{"attack":46,"subStat":72},"description":"Um Espadão longo antiquado com uma ponta semicircular. Parece ser uma arma usada pela realeza para certas cerimônias."} \ No newline at end of file +{ + "name": "Sinal dos Mares", + "type": "Espadão", + "rarity": 5, + "baseAttack": 46, + "subStat": "Taxa Crítica", + "passiveName": "Materiais de Refinamento", + "passiveDesc": "Quando a Habilidade Elemental atinge um inimigo, aumenta o ATQ em 20%/25%/30%/35%/40% por 8s. Ao sofrer Dano, aumenta o ATQ em 20%/25%/30%/35%/40% por 8s. Os dois efeitos descritos acima podem ser desencadeados mesmo se o personagem não estiver ativo no campo de batalha. Além disso, personagens que não estiverem sob a proteção de um Escudo terão sua Vida Máxima aumentada em 32%/40%/48%/56%/64%.", + "location": "Oração de Evento de Arma", + "baseDamage": { "attack": 46, "subStat": 72 }, + "description": "Um Espadão longo antiquado com uma ponta semicircular. Parece ser uma arma usada pela realeza para certas cerimônias.", + "weapon_type": "CLAYMORE" +} diff --git a/assets/data/weapons/beginner-s-protector/en.json b/assets/data/weapons/beginner-s-protector/en.json index 062268071..4ab09f1b1 100755 --- a/assets/data/weapons/beginner-s-protector/en.json +++ b/assets/data/weapons/beginner-s-protector/en.json @@ -7,5 +7,6 @@ "passiveName": "-", "passiveDesc": "-", "location": "Chest", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/beginner-s-protector/jp.json b/assets/data/weapons/beginner-s-protector/jp.json index 47170e8be..2909f300f 100644 --- a/assets/data/weapons/beginner-s-protector/jp.json +++ b/assets/data/weapons/beginner-s-protector/jp.json @@ -6,5 +6,6 @@ "subStat": "-", "passiveName": "-", "passiveDesc": "-", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/beginner-s-protector/pt.json b/assets/data/weapons/beginner-s-protector/pt.json index e70abb9db..6d583d570 100644 --- a/assets/data/weapons/beginner-s-protector/pt.json +++ b/assets/data/weapons/beginner-s-protector/pt.json @@ -5,5 +5,6 @@ "baseAttack": 23, "location": "-", "baseDamage": { "attack": 23, "subStat": 0 }, - "description": "Uma arma tão reta quanto uma haste de bandeira. Adequado para a maioria das situações, parece imponente quando é balançada." + "description": "Uma arma tão reta quanto uma haste de bandeira. Adequado para a maioria das situações, parece imponente quando é balançada.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/black-tassel/en.json b/assets/data/weapons/black-tassel/en.json index 39ef951d6..3243ab0be 100755 --- a/assets/data/weapons/black-tassel/en.json +++ b/assets/data/weapons/black-tassel/en.json @@ -7,5 +7,6 @@ "passiveName": "Bane of the Soft", "passiveDesc": "Increases DMG against slimes by 40/50/60/70/80%.", "location": "Gacha", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/black-tassel/jp.json b/assets/data/weapons/black-tassel/jp.json index b50d849bf..6a7093bc1 100644 --- a/assets/data/weapons/black-tassel/jp.json +++ b/assets/data/weapons/black-tassel/jp.json @@ -6,5 +6,6 @@ "subStat": "HP", "passiveName": "スライム殺し", "passiveDesc": "スライムタイプの敵に対するダメージ+40%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/black-tassel/pt.json b/assets/data/weapons/black-tassel/pt.json index 077d17619..f8737d9e1 100644 --- a/assets/data/weapons/black-tassel/pt.json +++ b/assets/data/weapons/black-tassel/pt.json @@ -6,5 +6,6 @@ "subStat": "Porcentagem de Vida", "location": "Liyue", "baseDamage": { "attack": 38, "subStat": 102 }, - "description": "Bem, isso resolve o problema das borlas brancas que se mancham facilmente." + "description": "Bem, isso resolve o problema das borlas brancas que se mancham facilmente.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/blackcliff-agate/en.json b/assets/data/weapons/blackcliff-agate/en.json index 3453fe10e..49d2e548b 100755 --- a/assets/data/weapons/blackcliff-agate/en.json +++ b/assets/data/weapons/blackcliff-agate/en.json @@ -7,5 +7,6 @@ "passiveName": "Press the Advantage", "passiveDesc": "After defeating an enemy, ATK is increased by 12/15/18/21/24% for 30s. This effect has a maximum of 3 stacks, and the duration of each stack is independent of the others.", "location": "Starglitter Exchange", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/blackcliff-agate/jp.json b/assets/data/weapons/blackcliff-agate/jp.json index 523afa0ea..7daf1af0c 100644 --- a/assets/data/weapons/blackcliff-agate/jp.json +++ b/assets/data/weapons/blackcliff-agate/jp.json @@ -6,5 +6,6 @@ "subStat": "会心ダメージ", "passiveName": "勝ちに乗じる", "passiveDesc": "敵を倒した後、攻撃力+12%、継続時間30秒。最大3重まで、継続時間は加算されず、重ごとに別カウントされる。", - "location": "スターライト交換" + "location": "スターライト交換", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/blackcliff-agate/pt.json b/assets/data/weapons/blackcliff-agate/pt.json index 3fa957e9c..e13fd920a 100644 --- a/assets/data/weapons/blackcliff-agate/pt.json +++ b/assets/data/weapons/blackcliff-agate/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após derrotar um inimigo, o ATQ é aumentado em 12%/15%/18%/21%/24% por 30s. Este efeito pode ser acumulado até 3x e a duração de cada acúmulo é independente dos outros.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 120 }, - "description": "Um misterioso catalisador feito de pedra preta. Tem um brilho carrancudo ameaçador que parece pulsar em sincronia com os tremores das profundezas da terra." + "description": "Um misterioso catalisador feito de pedra preta. Tem um brilho carrancudo ameaçador que parece pulsar em sincronia com os tremores das profundezas da terra.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/blackcliff-longsword/en.json b/assets/data/weapons/blackcliff-longsword/en.json index 6796eda8e..6dc62aa43 100755 --- a/assets/data/weapons/blackcliff-longsword/en.json +++ b/assets/data/weapons/blackcliff-longsword/en.json @@ -7,5 +7,6 @@ "passiveName": "Press the Advantage", "passiveDesc": "After defeating an enemy, ATK is increased by 12/15/18/21/24% for 30s. This effect has a maximum of 3 stacks, and the duration of each stack is independent of the others.", "location": "Starglitter Exchange", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/blackcliff-longsword/jp.json b/assets/data/weapons/blackcliff-longsword/jp.json index c2a9ad6f2..b55d46306 100644 --- a/assets/data/weapons/blackcliff-longsword/jp.json +++ b/assets/data/weapons/blackcliff-longsword/jp.json @@ -6,5 +6,6 @@ "subStat": "会心ダメージ", "passiveName": "勝ちに乗じる", "passiveDesc": "敵を倒した後、攻撃力+12%、継続時間30秒。最大3重まで、継続時間は加算されず、重ごとに別カウントされる。", - "location": "スターライト交換" + "location": "スターライト交換", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/blackcliff-longsword/pt.json b/assets/data/weapons/blackcliff-longsword/pt.json index cbb7910ff..d878b95ab 100644 --- a/assets/data/weapons/blackcliff-longsword/pt.json +++ b/assets/data/weapons/blackcliff-longsword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após derrotar um inimigo, o ATQ é aumentado em 12%/15%/18%/21%/24% por 30s. Este efeito pode ser acumulado até 3x e a duração de cada acúmulo é independente dos outros.", "location": "Liyue", "baseDamage": { "attack": 44, "subStat": 80 }, - "description": "Uma espada feita de pedra negra. Tem um brilho vermelho escuro em sua lâmina preta." + "description": "Uma espada feita de pedra negra. Tem um brilho vermelho escuro em sua lâmina preta.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/blackcliff-pole/en.json b/assets/data/weapons/blackcliff-pole/en.json index f7949053d..e86ed7653 100755 --- a/assets/data/weapons/blackcliff-pole/en.json +++ b/assets/data/weapons/blackcliff-pole/en.json @@ -7,5 +7,6 @@ "passiveName": "Press the Advantage", "passiveDesc": "After defeating an enemy, ATK is increased by 12/15/18/21/24% for 30s. This effect has a maximum of 3 stacks, and the duration of each stack is independent of the others.", "location": "Starglitter Exchange", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/blackcliff-pole/jp.json b/assets/data/weapons/blackcliff-pole/jp.json index 11144c726..4133e183a 100644 --- a/assets/data/weapons/blackcliff-pole/jp.json +++ b/assets/data/weapons/blackcliff-pole/jp.json @@ -6,5 +6,6 @@ "subStat": "会心ダメージ", "passiveName": "勝ちに乗じる", "passiveDesc": "敵を倒した後、攻撃力+12%、継続時間30秒。最大3重まで、継続時間は加算されず、重ごとに別カウントされる。", - "location": "スターライト交換" + "location": "スターライト交換", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/blackcliff-pole/pt.json b/assets/data/weapons/blackcliff-pole/pt.json index 5408730f5..168c7c34a 100644 --- a/assets/data/weapons/blackcliff-pole/pt.json +++ b/assets/data/weapons/blackcliff-pole/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após derrotar um inimigo, o ATQ é aumentado em 12%/15%/18%/21%/24% por 30s. Este efeito pode ser acumulado até 3x e a duração de cada acúmulo é independente dos outros.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 120 }, - "description": "Uma arma afiada e carmesim que já foi o tesouro inestimável de um gladiador. Seu furador foi manchado pelo sangue de incontáveis bestas e homens. Uma arma feita de pedra preta e aerossiderita. Há um brilho vermelho-escuro em seu brilho frio e preto." + "description": "Uma arma afiada e carmesim que já foi o tesouro inestimável de um gladiador. Seu furador foi manchado pelo sangue de incontáveis bestas e homens. Uma arma feita de pedra preta e aerossiderita. Há um brilho vermelho-escuro em seu brilho frio e preto.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/blackcliff-slasher/en.json b/assets/data/weapons/blackcliff-slasher/en.json index d9a0c731e..ae5d59f59 100755 --- a/assets/data/weapons/blackcliff-slasher/en.json +++ b/assets/data/weapons/blackcliff-slasher/en.json @@ -7,5 +7,6 @@ "passiveName": "Press the Advantage", "passiveDesc": "After defeating an enemy, ATK is increased by 12/15/18/21/24% for 30s. This effect has a maximum of 3 stacks, and the duration of each stack is independent of the others.", "location": "Starglitter Exchange", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/blackcliff-slasher/jp.json b/assets/data/weapons/blackcliff-slasher/jp.json index b9428c068..c179b177f 100644 --- a/assets/data/weapons/blackcliff-slasher/jp.json +++ b/assets/data/weapons/blackcliff-slasher/jp.json @@ -6,5 +6,6 @@ "subStat": "会心ダメージ", "passiveName": "勝ちに乗じる", "passiveDesc": "敵を倒した後、攻撃力+12%、継続時間30秒。最大3重まで、継続時間は加算されず、重ごとに別カウントされる。", - "location": "スターライト交換" + "location": "スターライト交換", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/blackcliff-slasher/pt.json b/assets/data/weapons/blackcliff-slasher/pt.json index 1e5bab9a3..7af505f27 100644 --- a/assets/data/weapons/blackcliff-slasher/pt.json +++ b/assets/data/weapons/blackcliff-slasher/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após derrotar um inimigo, o ATQ é aumentado em 12%/15%/18%/21%/24% por 30s. Este efeito pode ser acumulado até 3x e a duração de cada acúmulo é independente dos outros.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 120 }, - "description": "Uma espada extremamente resistente da Forja do Penhasco Obscuro. Tem uma cor carmesim escura ao longo de sua lâmina." + "description": "Uma espada extremamente resistente da Forja do Penhasco Obscuro. Tem uma cor carmesim escura ao longo de sua lâmina.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/blackcliff-warbow/en.json b/assets/data/weapons/blackcliff-warbow/en.json index 2dd69ef70..9cc2dd093 100755 --- a/assets/data/weapons/blackcliff-warbow/en.json +++ b/assets/data/weapons/blackcliff-warbow/en.json @@ -7,5 +7,6 @@ "passiveName": "Press the Advantage", "passiveDesc": "After defeating an enemy, ATK is increased by 12/15/18/21/24% for 30s. This effect has a maximum of 3 stacks, and the duration of each stack is independent of the others.", "location": "Starglitter Exchange", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/blackcliff-warbow/jp.json b/assets/data/weapons/blackcliff-warbow/jp.json index 3b28d8e96..1edaca505 100644 --- a/assets/data/weapons/blackcliff-warbow/jp.json +++ b/assets/data/weapons/blackcliff-warbow/jp.json @@ -6,5 +6,6 @@ "subStat": "会心ダメージ", "passiveName": "勝ちに乗じる", "passiveDesc": "敵を倒した後、攻撃力+12%、継続時間30秒。最大3重まで、継続時間は加算されず、重ごとに別カウントされる。", - "location": "スターライト交換" + "location": "スターライト交換", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/blackcliff-warbow/pt.json b/assets/data/weapons/blackcliff-warbow/pt.json index 4825100be..0bebb3291 100644 --- a/assets/data/weapons/blackcliff-warbow/pt.json +++ b/assets/data/weapons/blackcliff-warbow/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após derrotar um inimigo, o ATQ é aumentado em 12%/15%/18%/21%/24% por 30s. Este efeito pode ser acumulado até 3x e a duração de cada acúmulo é independente dos outros.", "location": "Liyue", "baseDamage": { "attack": 44, "subStat": 80 }, - "description": "Um arco feito de Pedra Negra extremamente robusto. Requer um arqueiro com um braço forte para usar." + "description": "Um arco feito de Pedra Negra extremamente robusto. Requer um arqueiro com um braço forte para usar.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/bloodtainted-greatsword/en.json b/assets/data/weapons/bloodtainted-greatsword/en.json index 5d0ec19ac..3a24bffe9 100755 --- a/assets/data/weapons/bloodtainted-greatsword/en.json +++ b/assets/data/weapons/bloodtainted-greatsword/en.json @@ -7,5 +7,6 @@ "passiveName": "Bane of Fire and Thunder", "passiveDesc": "Increases DMG against enemies affected by Pyro or Electro by 12/15/18/21/24%.", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/bloodtainted-greatsword/jp.json b/assets/data/weapons/bloodtainted-greatsword/jp.json index b36cf5730..ade9c18a4 100644 --- a/assets/data/weapons/bloodtainted-greatsword/jp.json +++ b/assets/data/weapons/bloodtainted-greatsword/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "炎と雷の破滅", "passiveDesc": "炎元素または雷元素の影響を受けた敵に対するダメージ+12%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/bloodtainted-greatsword/pt.json b/assets/data/weapons/bloodtainted-greatsword/pt.json index 3550cad52..877b08f8e 100644 --- a/assets/data/weapons/bloodtainted-greatsword/pt.json +++ b/assets/data/weapons/bloodtainted-greatsword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano contra inimigos afetados por Pyro ou Electro em 12%/15%/18%/21%/24%.", "location": "Mondstadt", "baseDamage": { "attack": 38, "subStat": 41 }, - "description": "Uma espada de aço que quem dizem ter sido revestida com sangue de dragão, tornando-a invulnerável ao dano. Contudo, este bônus não é estendido ao seu portador." + "description": "Uma espada de aço que quem dizem ter sido revestida com sangue de dragão, tornando-a invulnerável ao dano. Contudo, este bônus não é estendido ao seu portador.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/calamity-of-eshu/en.json b/assets/data/weapons/calamity-of-eshu/en.json index af5c273fd..c7aead8ba 100644 --- a/assets/data/weapons/calamity-of-eshu/en.json +++ b/assets/data/weapons/calamity-of-eshu/en.json @@ -8,5 +8,6 @@ "passiveDesc": "While characters are protected by a Shield, DMG dealt by Normal and Charged Attacks is increased by 20%/25%/30%/35%/40%, and Normal and Charged Attack CRIT Rate is increased by 8%/10%/12%/14%/16%.", "location": "Version 5.2 Event - Iktomi Spiritseeking Scrolls", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "A ceremonial blade forged by Sanhaj, the great high priest of the Masters of the Night-Wind. In tales of bygone days, Sanhaj could use this curved blade to perform rituals, blurring the boundary between the Night Kingdom and the present world." + "description": "A ceremonial blade forged by Sanhaj, the great high priest of the Masters of the Night-Wind. In tales of bygone days, Sanhaj could use this curved blade to perform rituals, blurring the boundary between the Night Kingdom and the present world.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/calamity-of-eshu/pt.json b/assets/data/weapons/calamity-of-eshu/pt.json index a995ea0de..1d0aa5f5f 100644 --- a/assets/data/weapons/calamity-of-eshu/pt.json +++ b/assets/data/weapons/calamity-of-eshu/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Enquanto os personagens estiverem protegidos por um Escudo, o Dano causado por Ataques Normais e Carregados é aumentado em 20%/25%/30%/35%/40%, e a Taxa CRIT de Ataques Normais e Carregados é aumentada em 8%/10%/12%/14%/16%.", "location": "Evento Versão 5.2 - Pergaminhos de Clarividência Iktomi", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "Uma lâmina cerimonial forjada por Sanhaj, o sumo-sacerdote dos Mestres do Vento Noturno. Nas histórias do passado, Sanhaj podia usar essa lâmina curva para realizar rituais, apagando a linha entre o Reino da Noite e o mundo." + "description": "Uma lâmina cerimonial forjada por Sanhaj, o sumo-sacerdote dos Mestres do Vento Noturno. Nas histórias do passado, Sanhaj podia usar essa lâmina curva para realizar rituais, apagando a linha entre o Reino da Noite e o mundo.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/calamity-queller/en.json b/assets/data/weapons/calamity-queller/en.json index cdb6df22c..97292f779 100644 --- a/assets/data/weapons/calamity-queller/en.json +++ b/assets/data/weapons/calamity-queller/en.json @@ -7,5 +7,6 @@ "passiveName": "Extinguishing Precept", "passiveDesc": "Gain 12/15/18/21/24% All Elemental DMG Bonus. Obtain Consummation for 20s after using an Elemental Skill, causing ATK to increase by 3.2/4/4.8/5.6/6.4% per second. This ATK increase has a maximum of 6 stacks. When the character equipped with this weapon is not on the field, Consummation's ATK increase is doubled.", "location": "Gacha", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/calamity-queller/pt.json b/assets/data/weapons/calamity-queller/pt.json index 52dfe697e..39e4546ba 100644 --- a/assets/data/weapons/calamity-queller/pt.json +++ b/assets/data/weapons/calamity-queller/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Obtém um Bônus de Dano Elemental para todos os Elementos de 12%/15%/18%/21%/24%; após lançar uma Habilidade Elemental, obtém Consumação por 20s, fazendo com que o Ataque aumente 3.2%/4%/4.8%/5.6%/6.4% por segundo. Este efeito pode ser acumulado em até 6 vezes. Quando o personagem da equipe que estiver com esta arma equipada não for o ativo no campo de batalha, o aumento do Ataque de Consumação será duplicado.", "location": "Liyue", "baseDamage": { "attack": 49, "subStat": 36 }, - "description": "Uma arma afiada forjada de algum cristal estranho. Sua luz azul tênue parece murmurar incontáveis histórias do passado." + "description": "Uma arma afiada forjada de algum cristal estranho. Sua luz azul tênue parece murmurar incontáveis histórias do passado.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/cashflow-supervision/en.json b/assets/data/weapons/cashflow-supervision/en.json index 2837c878e..396f21ba1 100755 --- a/assets/data/weapons/cashflow-supervision/en.json +++ b/assets/data/weapons/cashflow-supervision/en.json @@ -7,5 +7,6 @@ "passiveName": "Golden Blood-Tide", "passiveDesc": "ATK is increased by 16/20/24/28/32%. When current HP increases or decreases, Normal Attack DMG will be increased by 16/20/24/28/32% and Charged Attack DMG will be increased by 14/17.5/21/24.5/28% for 4s. Max 3 stacks. This effect can be triggered once every 0.3s. When the wielder has 3 stacks, ATK SPD will be increased by 8/10/12/14/16%.", "location": "Gacha", - "ascensionMaterial": "pristine-sea" + "ascensionMaterial": "pristine-sea", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/cashflow-supervision/pt.json b/assets/data/weapons/cashflow-supervision/pt.json index af5fc8c15..d4a769c3e 100644 --- a/assets/data/weapons/cashflow-supervision/pt.json +++ b/assets/data/weapons/cashflow-supervision/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o ATQ em 16%/20%/24%/28%/32%. Quando a Vida atual aumentar ou cair, o Dano causado pelo Ataque Normal aumenta em 16%/20%/24%/28%/32%, e o Dano causado pelo Ataque Carregado em 14%/17.5%/21%/24.5%/28%. Esse efeito dura 4s, pode ser acumulado até 3 vezes e desencadeado uma vez a cada 0.3s. Quando possuir 3 acúmulos, aumenta a Vel. de ATQ em 8%/10%/12%/14%/16%.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 48, "subStat": 48 }, - "description": "Um dispositivo flutuante que pode monitorar certos fenômenos. Foi pego e modificado para servir a outros usos depois de abandonado." + "description": "Um dispositivo flutuante que pode monitorar certos fenômenos. Foi pego e modificado para servir a outros usos depois de abandonado.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/chain-breaker/en.json b/assets/data/weapons/chain-breaker/en.json index 8309e1581..287d2716d 100644 --- a/assets/data/weapons/chain-breaker/en.json +++ b/assets/data/weapons/chain-breaker/en.json @@ -8,5 +8,6 @@ "passiveDesc": "For every party member from Natlan or who has a different Elemental Type from the equipping character, the equipping character gains 4.8%/6%/7.2%/8.4%/9.6% increased ATK. When there are no less than 3 of the aforementioned characters, the equipping character gains 24/30/36/42/48 Elemental Mastery.", "location": "Forged", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "A jade-adorned longbow. The gentle winds always seem to swirl gently about its string. Legends claim that this weapon was made in a far more ancient era by a dragon artisan." + "description": "A jade-adorned longbow. The gentle winds always seem to swirl gently about its string. Legends claim that this weapon was made in a far more ancient era by a dragon artisan.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/chain-breaker/pt.json b/assets/data/weapons/chain-breaker/pt.json index 4cced2d34..665593fdc 100644 --- a/assets/data/weapons/chain-breaker/pt.json +++ b/assets/data/weapons/chain-breaker/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Para cada personagem da equipe que é de Natlan ou que tenha um Tipo Elemental diferente do personagem que está com essa arma equipada, o personagem que está com essa arma equipada ganha 4.8%/6%/7.2%/8.4%/9.6% de aumento de ATQ. Quando não houver menos que 3 dos personagens mencionados, o personagem que está com essa arma equipada ganha 24/30/36/42/48 de Proficiência Elemental.", "location": "Arco", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "Um arco longo adornado com jade, cujas cordas parecem estar sempre envoltas por uma brisa suave. Reza a lenda que foi forjado por artesãos Saurianos em tempos muito antigos." + "description": "Um arco longo adornado com jade, cujas cordas parecem estar sempre envoltas por uma brisa suave. Reza a lenda que foi forjado por artesãos Saurianos em tempos muito antigos.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/cinnabar-spindle/en.json b/assets/data/weapons/cinnabar-spindle/en.json index 83fb07c52..4ca48df07 100644 --- a/assets/data/weapons/cinnabar-spindle/en.json +++ b/assets/data/weapons/cinnabar-spindle/en.json @@ -1,12 +1,12 @@ { - "name": "Cinnabar Spindle", - "type": "Sword", - "rarity": 4, - "baseAttack": 41, - "subStat": "DEF", - "passiveName": "Spotless Heart", - "passiveDesc": "Elemental Skill DMG is increased by 40/50/60/70/80% of DEF. The effect will be triggered no more than once every 1.5s and will be cleared 0.1s after the Elemental Skill deals DMG.", - "location": "Shadows Amidst Snowstorms Event", - "ascensionMaterial": "decarabian" - } - \ No newline at end of file + "name": "Cinnabar Spindle", + "type": "Sword", + "rarity": 4, + "baseAttack": 41, + "subStat": "DEF", + "passiveName": "Spotless Heart", + "passiveDesc": "Elemental Skill DMG is increased by 40/50/60/70/80% of DEF. The effect will be triggered no more than once every 1.5s and will be cleared 0.1s after the Elemental Skill deals DMG.", + "location": "Shadows Amidst Snowstorms Event", + "ascensionMaterial": "decarabian", + "weapon_type": "SWORD" +} diff --git a/assets/data/weapons/cinnabar-spindle/pt.json b/assets/data/weapons/cinnabar-spindle/pt.json index ce27faadd..186cd6d7a 100644 --- a/assets/data/weapons/cinnabar-spindle/pt.json +++ b/assets/data/weapons/cinnabar-spindle/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Dano da Habilidade Elemental do personagem é aumentada em 40%/50%/60%/70%/80% da DEF. Este efeito só pode ser ativado uma vez a cada 1,5s e é redefinido 0,1s após a habilidade elemental causar dano.", "location": "Mondstadt", "baseDamage": { "attack": 41, "subStat": 150 }, - "description": "Uma espada feita de materiais que não pertencem a este mundo. O poder dentro dela pode até mesmo ser capaz de resistir à corrupção de um veneno que poderia corroer um poderoso dragão." + "description": "Uma espada feita de materiais que não pertencem a este mundo. O poder dentro dela pode até mesmo ser capaz de resistir à corrupção de um veneno que poderia corroer um poderoso dragão.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/cloudforged/en.json b/assets/data/weapons/cloudforged/en.json index 1ff0e1bff..5bb29112c 100644 --- a/assets/data/weapons/cloudforged/en.json +++ b/assets/data/weapons/cloudforged/en.json @@ -8,5 +8,6 @@ "passiveDesc": "After Elemental Energy is decreased, the equipping character's Elemental Mastery will increase by 40/50/60/70/80 for 18s. Max 2 stacks.", "location": "Version 4.7 Event - Mutual Security Enhancing Simulation", "baseDamage": { "attack": 42, "subStat": 36 }, - "description": "A prototype for a standard-issue weapon the Yuheng commissioned from Blackcliff Forge after having analyzed the ancient mechanisms that protected the adeptal abode upon Tianheng." + "description": "A prototype for a standard-issue weapon the Yuheng commissioned from Blackcliff Forge after having analyzed the ancient mechanisms that protected the adeptal abode upon Tianheng.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/cloudforged/pt.json b/assets/data/weapons/cloudforged/pt.json index edfbcb303..39eb40fdb 100644 --- a/assets/data/weapons/cloudforged/pt.json +++ b/assets/data/weapons/cloudforged/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Depois que a Energia Elemental diminui, a Proficiência Elemental do personagem que está com essa arma equipada aumenta em 40/50/60/70/80. Esse efeito dura 18s e pode ser acumulado até 2 vezes.", "location": "Arco", "baseDamage": { "attack": 42, "subStat": 36 }, - "description": "Após analisar os antigos mecanismos Adepti que protegem o Tianheng, a Yuheng comissionou a fabricação desse protótipo para a Forja do Penhasco Obscuro." + "description": "Após analisar os antigos mecanismos Adepti que protegem o Tianheng, a Yuheng comissionou a fabricação desse protótipo para a Forja do Penhasco Obscuro.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/compound-bow/en.json b/assets/data/weapons/compound-bow/en.json index 2db70e30f..22dda7e5b 100755 --- a/assets/data/weapons/compound-bow/en.json +++ b/assets/data/weapons/compound-bow/en.json @@ -7,5 +7,6 @@ "passiveName": "Infusion Arrow", "passiveDesc": "Normal Attack and Aimed Shot hits increase ATK by 4/5/6/7/8% and Normal Attack SPD by 1.2/1.5/1.8/2.1/2.4% for 6s. Max 4 stacks. Can only occur once every 0.3s.", "location": "Crafting", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/compound-bow/jp.json b/assets/data/weapons/compound-bow/jp.json index 6e9ad9e90..a3a24778d 100644 --- a/assets/data/weapons/compound-bow/jp.json +++ b/assets/data/weapons/compound-bow/jp.json @@ -6,5 +6,6 @@ "subStat": "物理ダメージ", "passiveName": "注入の矢", "passiveDesc": "通常攻撃と重撃が命中する時、攻撃力+4%、通常攻撃速度+1.2%。継続時間6秒、最大4重まで。0.3秒に1回のみ発動可能。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/compound-bow/pt.json b/assets/data/weapons/compound-bow/pt.json index c6716de65..38a0af1db 100644 --- a/assets/data/weapons/compound-bow/pt.json +++ b/assets/data/weapons/compound-bow/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao acertar o Ataque Normal e o Ataque Carregado, aumenta o ATQ em 4%/5%/6%/7%/8% e a VEL do Ataque Normal em 1.2%/1.5%/1.8%/2.1%/2.4% por 6s, podendo acumular até 4 vezes. Este efeito pode ser ativado uma vez a cada 0.3s.", "location": "Liyue", "baseDamage": { "attack": 41, "subStat": 150 }, - "description": "Um arco de liga de metal, com rodas que esticam a corda. De difícil manuseio, mas consegue acertar o alvo com uma força incrível." + "description": "Um arco de liga de metal, com rodas que esticam a corda. De difícil manuseio, mas consegue acertar o alvo com uma força incrível.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/cool-steel/en.json b/assets/data/weapons/cool-steel/en.json index 0a6bd02b5..d354d8469 100755 --- a/assets/data/weapons/cool-steel/en.json +++ b/assets/data/weapons/cool-steel/en.json @@ -7,5 +7,6 @@ "passiveName": "Bane of Water and Ice", "passiveDesc": "Increases DMG against enemies affected by Hydro or Cryo by 12/15/18/21/24%.", "location": "Gacha", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/cool-steel/jp.json b/assets/data/weapons/cool-steel/jp.json index d3ef9e312..fef377d23 100644 --- a/assets/data/weapons/cool-steel/jp.json +++ b/assets/data/weapons/cool-steel/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "水と氷の破滅", "passiveDesc": "水元素または氷元素の影響を受けた敵に対するダメージ+12%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/cool-steel/pt.json b/assets/data/weapons/cool-steel/pt.json index d6ce6f342..1e031ef74 100644 --- a/assets/data/weapons/cool-steel/pt.json +++ b/assets/data/weapons/cool-steel/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano contra inimigos afetados por Hydro ou Cryo em 12%/15%/18%/21%/24%.", "location": "Mondstadt", "baseDamage": { "attack": 39, "subStat": 77 }, - "description": "Uma arma laminada confiável, forjada em aço, que serve como testemunho das grandes aventuras de seu antigo mestre." + "description": "Uma arma laminada confiável, forjada em aço, que serve como testemunho das grandes aventuras de seu antigo mestre.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/crane-s-echoing-call/en.json b/assets/data/weapons/crane-s-echoing-call/en.json index 85405e511..dbf9930c1 100644 --- a/assets/data/weapons/crane-s-echoing-call/en.json +++ b/assets/data/weapons/crane-s-echoing-call/en.json @@ -1,12 +1,12 @@ { - "name": "Crane's Echoing Call", - "type": "Catalyst", - "rarity": 5, - "baseAttack": 49, - "subStat": "ATK", - "passiveName": "Cloudfall Axiom", - "passiveDesc": "After the equipping character hits an opponent with a Plunging Attack, all nearby party members' Plunging Attacks will deal 28% increased DMG for 20s. When nearby party members hit opponents with Plunging Attacks, they will restore 2.5/2.75/3/3.25/3.5 Energy to the equipping character. Energy can restored this way every 0.7s. This energy regain effect can be triggered even if the equipping character is not on the field.", - "location": "Gacha", - "ascensionMaterial": "elixir" + "name": "Crane's Echoing Call", + "type": "Catalyst", + "rarity": 5, + "baseAttack": 49, + "subStat": "ATK", + "passiveName": "Cloudfall Axiom", + "passiveDesc": "After the equipping character hits an opponent with a Plunging Attack, all nearby party members' Plunging Attacks will deal 28% increased DMG for 20s. When nearby party members hit opponents with Plunging Attacks, they will restore 2.5/2.75/3/3.25/3.5 Energy to the equipping character. Energy can restored this way every 0.7s. This energy regain effect can be triggered even if the equipping character is not on the field.", + "location": "Gacha", + "ascensionMaterial": "elixir", + "weapon_type": "CATALYST" } - \ No newline at end of file diff --git a/assets/data/weapons/crane-s-echoing-call/pt.json b/assets/data/weapons/crane-s-echoing-call/pt.json index f2b37b69f..ba64c70c7 100644 --- a/assets/data/weapons/crane-s-echoing-call/pt.json +++ b/assets/data/weapons/crane-s-echoing-call/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após o personagem que está com essa arma equipada atingir um inimigo com um Ataque Imersivo, aumenta o Dano do Ataque Imersivo de todos os membros próximos da equipe em 28%/41%/54%/67%/80% por 20s. Quando o Ataque Imersivo dos personagens próximos atinge um inimigo, regenera 2.5/2.75/3/3.25/3.5 de Energia Elemental para o personagem que está com essa arma equipada. É possível regenerar Energia Elemental uma vez a cada 0.7s dessa forma. O personagem que está com essa arma equipada pode regenerar Energia Elemental mesmo não estando ativo no campo de batalha.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 49, "subStat": 36 }, - "description": "Um leque esculpido em jade puro, ao redor do qual circula uma antiga aura de Força Adepti." + "description": "Um leque esculpido em jade puro, ao redor do qual circula uma antiga aura de Força Adepti.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/crescent-pike/en.json b/assets/data/weapons/crescent-pike/en.json index 69218fb66..8b5b8ff04 100755 --- a/assets/data/weapons/crescent-pike/en.json +++ b/assets/data/weapons/crescent-pike/en.json @@ -7,5 +7,6 @@ "passiveName": "Infusion Needle", "passiveDesc": "After picking up an Elemental Orb/Particle, Normal and Charged Attacks deal an additional 20% ATK as DMG for 5s.", "location": "Crafting", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/crescent-pike/jp.json b/assets/data/weapons/crescent-pike/jp.json index 8cb0d3d5a..94d55adcf 100644 --- a/assets/data/weapons/crescent-pike/jp.json +++ b/assets/data/weapons/crescent-pike/jp.json @@ -6,5 +6,6 @@ "subStat": "物理ダメージ", "passiveName": "注入の針", "passiveDesc": "元素粒子または元素オーブを獲得した5秒間、通常攻撃と重撃で、攻撃力の20%の追加ダメージを与える。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/crescent-pike/pt.json b/assets/data/weapons/crescent-pike/pt.json index d83f62082..949f3a8f3 100644 --- a/assets/data/weapons/crescent-pike/pt.json +++ b/assets/data/weapons/crescent-pike/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após obter um Orbe Elemental/Partícula Elemental, os Ataques Normais e Ataques Carregados causam um adicional de 20%/25%/30%/35%/40% de Dano Físico por 5s.", "location": "Liyue", "baseDamage": { "attack": 44, "subStat": 75 }, - "description": "Uma arma exótica com uma lâmina extremamente comprida no topo e uma lâmina crescente na parte de baixo. Foi parar em Liyue através de comerciantes estrangeiros. Com prática, pode causar grandes danos." + "description": "Uma arma exótica com uma lâmina extremamente comprida no topo e uma lâmina crescente na parte de baixo. Foi parar em Liyue através de comerciantes estrangeiros. Com prática, pode causar grandes danos.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/crimson-moon-s-semblance/en.json b/assets/data/weapons/crimson-moon-s-semblance/en.json index 677e5eaaa..b2fd22196 100644 --- a/assets/data/weapons/crimson-moon-s-semblance/en.json +++ b/assets/data/weapons/crimson-moon-s-semblance/en.json @@ -8,5 +8,6 @@ "passiveDesc": "Grants a Bond of Life equal to 25% of Max HP when a Charged Attack hits an opponent. This effect can be triggered up to once every 14s. In addition, when the equipping character has a Bond of Life, they gain a 12%/16%/20%/24%/28% DMG Bonus; if the value of the Bond of Life is greater than or equal to 30% of Max HP, then gain an additional 24%/32%/40%/48%/56% DMG Bonus.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 48, "subStat": 48 }, - "description": "A keen-edged weapon, luster dazzling as the crimson moon. It is said that an ancient dynasty once regarded it as a ritual object that could bridge two worlds, but none still remember the beliefs and ceremonies of that bygone age." + "description": "A keen-edged weapon, luster dazzling as the crimson moon. It is said that an ancient dynasty once regarded it as a ritual object that could bridge two worlds, but none still remember the beliefs and ceremonies of that bygone age.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/crimson-moon-s-semblance/pt.json b/assets/data/weapons/crimson-moon-s-semblance/pt.json index da1e06a7a..28ef54263 100644 --- a/assets/data/weapons/crimson-moon-s-semblance/pt.json +++ b/assets/data/weapons/crimson-moon-s-semblance/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando um Ataque Carregado atinge um inimigo, ganha um Contrato de Vida equivalente a 25% da Vida Máxima. Esse efeito pode ser desencadeado uma vez a cada 14s. Além disso, quando o personagem que está com essa arma equipada tem um Contrato de Vida, aumenta o Dano em 12%/16%/20%/24%/28%. Se o valor do Contrato de Vida for maior ou igual a 30% da Vida Máxima, então ganha 24%/32%/40%/48%/56% de aumento de Dano adicional.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 48, "subStat": 48 }, - "description": "Uma arma de gume afiado, brilho deslumbrante como a Lua Carmesim. Dizem que uma antiga dinastia a considerava um objeto ritual que poderia unir dois mundos, mas ninguém mais se lembra das crenças e cerimônias daquela era passada." + "description": "Uma arma de gume afiado, brilho deslumbrante como a Lua Carmesim. Dizem que uma antiga dinastia a considerava um objeto ritual que poderia unir dois mundos, mas ninguém mais se lembra das crenças e cerimônias daquela era passada.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/dark-iron-sword/en.json b/assets/data/weapons/dark-iron-sword/en.json index c43a1188a..ea598ae8f 100755 --- a/assets/data/weapons/dark-iron-sword/en.json +++ b/assets/data/weapons/dark-iron-sword/en.json @@ -7,5 +7,6 @@ "passiveName": "Overloaded", "passiveDesc": "Upon causing an Overloaded, Superconduct, Electro-Charged, or an Electro-infused Swirl reaction, increases Base ATK by 20/25/30/35/40% for 12s.", "location": "Talk to Chen the Sharp", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/dark-iron-sword/jp.json b/assets/data/weapons/dark-iron-sword/jp.json index 94fdecd21..3fe673eb0 100644 --- a/assets/data/weapons/dark-iron-sword/jp.json +++ b/assets/data/weapons/dark-iron-sword/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "オーバーロード", "passiveDesc": "過負荷、超電導、感電または雷元素拡散反応が発生した12秒間、攻撃力+20%。", - "location": "｢璃月港｣の快刀陳と会話" + "location": "｢璃月港｣の快刀陳と会話", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/dark-iron-sword/pt.json b/assets/data/weapons/dark-iron-sword/pt.json index 1626f476f..a5ea839cc 100644 --- a/assets/data/weapons/dark-iron-sword/pt.json +++ b/assets/data/weapons/dark-iron-sword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Depois de 12s após a ativação da reação de Sobrecarga, Supercondutor, Redemoinho Electro, aumenta o ATQ em 20%/25%/30%/35%/40%.", "location": "Liyue", "baseDamage": { "attack": 39, "subStat": 31 }, - "description": "Bem, na verdade é apenas uma espada de ferro um pouco escura." + "description": "Bem, na verdade é apenas uma espada de ferro um pouco escura.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/deathmatch/en.json b/assets/data/weapons/deathmatch/en.json index f054600b7..4397accec 100755 --- a/assets/data/weapons/deathmatch/en.json +++ b/assets/data/weapons/deathmatch/en.json @@ -7,5 +7,6 @@ "passiveName": "Gladiator", "passiveDesc": "If there are at least 2 opponents nearby, ATK is increased by 16% and DEF is increased by 16%. If there are less than 2 enemies nearby, ATK is increased by 24%.", "location": "BP Bounty", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/deathmatch/jp.json b/assets/data/weapons/deathmatch/jp.json index 0ffc07e7c..e4c6c360e 100644 --- a/assets/data/weapons/deathmatch/jp.json +++ b/assets/data/weapons/deathmatch/jp.json @@ -6,5 +6,6 @@ "subStat": "会心率", "passiveName": "剣闘士", "passiveDesc": "近くに敵が2人以上いる時、攻撃力+16%、防御力+16%。近くに敵が2人未満の時、攻撃力+24%。", - "location": "天空紀行" + "location": "天空紀行", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/deathmatch/pt.json b/assets/data/weapons/deathmatch/pt.json index e461774b3..6b3b5ec93 100644 --- a/assets/data/weapons/deathmatch/pt.json +++ b/assets/data/weapons/deathmatch/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Se houver 2 inimigos ao redor, o ATQ é aumentado em 16%/20%/24%/28%/32% e a DEF é aumentada em 16%/20%/24%/28%/32%. Se houver menos que 2 inimigos ao redor, o ATQ é aumentado em 24%/30%/36%/42%/48%.", "location": "Mondstadt", "baseDamage": { "attack": 41, "subStat": 80 }, - "description": "Uma lança afiada vermelho-sangue que era inestimável para um gladiador no passado. Sua ponta está manchada com o sangue de inúmeras bestas e pessoas." + "description": "Uma lança afiada vermelho-sangue que era inestimável para um gladiador no passado. Sua ponta está manchada com o sangue de inúmeras bestas e pessoas.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/debate-club/en.json b/assets/data/weapons/debate-club/en.json index 04a148f96..53fe8ab32 100755 --- a/assets/data/weapons/debate-club/en.json +++ b/assets/data/weapons/debate-club/en.json @@ -7,5 +7,6 @@ "passiveName": "Blunt Conclusion", "passiveDesc": "After using an Elemental Skill, Normal or Charged Attacks, on hit, deal an additional 60/75/90/105/120% ATK DMG in a small area. Effect lasts 15s. DMG can only occur once every 3s.", "location": "Gacha", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/debate-club/jp.json b/assets/data/weapons/debate-club/jp.json index 0e0775f97..f8fed570c 100644 --- a/assets/data/weapons/debate-club/jp.json +++ b/assets/data/weapons/debate-club/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "率直に話を言え", "passiveDesc": "元素スキルを発動した後、通常攻撃と重撃が命中する際に、狭範囲で攻撃力の60%のダメージを与える、継続時間15秒、ダメージは3秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/debate-club/pt.json b/assets/data/weapons/debate-club/pt.json index 76a945d37..b2cb570c7 100644 --- a/assets/data/weapons/debate-club/pt.json +++ b/assets/data/weapons/debate-club/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após usar e acertar uma Habilidade Elemental, Normal ou Ataque Carregado, causa Dano de ATQ adicional de 60%/75%/90%/105%/120% em uma área pequena por 15s. Pode ser ativado uma vez a cada 3s.", "location": "Liyue", "baseDamage": { "attack": 39, "subStat": 77 }, - "description": "Um porrete feito de aço. É a base do \"convencimento racional\"." + "description": "Um porrete feito de aço. É a base do \"convencimento racional\".", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/dialogues-of-the-desert-sages/en.json b/assets/data/weapons/dialogues-of-the-desert-sages/en.json index 4cb6c2afb..1d842d562 100644 --- a/assets/data/weapons/dialogues-of-the-desert-sages/en.json +++ b/assets/data/weapons/dialogues-of-the-desert-sages/en.json @@ -1,11 +1,12 @@ { - "name": "Dialogues of the Desert Sages", - "type": "Polearm", - "rarity": 4, - "baseAttack": 42, - "subStat": "HP", - "passiveName": "Principle of Equilibrium", - "passiveDesc": "When the wielder performs healing, restore 8 Energy. This effect can be triggered once every 10s and can occur even when the character is not on the field.", - "location": "Event: Alchemical Ascension", - "ascensionMaterial": "talisman" + "name": "Dialogues of the Desert Sages", + "type": "Polearm", + "rarity": 4, + "baseAttack": 42, + "subStat": "HP", + "passiveName": "Principle of Equilibrium", + "passiveDesc": "When the wielder performs healing, restore 8 Energy. This effect can be triggered once every 10s and can occur even when the character is not on the field.", + "location": "Event: Alchemical Ascension", + "ascensionMaterial": "talisman", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/dialogues-of-the-desert-sages/pt.json b/assets/data/weapons/dialogues-of-the-desert-sages/pt.json index 277e6a56c..b48c3ff29 100644 --- a/assets/data/weapons/dialogues-of-the-desert-sages/pt.json +++ b/assets/data/weapons/dialogues-of-the-desert-sages/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao curar, restaura 8/10/12/14/16 de Energia. Este efeito pode ser ativado uma vez a cada 10s e pode ser ativado mesmo quando o personagem não estiver em campo.", "location": "Evento da Versão 4.5 - Ascensão Alquímica", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Um caduceu simbolizando a glória da alquimia, feito de ligas especiais para combinar com seu status especial. É extremamente rígido e pesado e provavelmente causaria bastante dor se usado como um porrete." + "description": "Um caduceu simbolizando a glória da alquimia, feito de ligas especiais para combinar com seu status especial. É extremamente rígido e pesado e provavelmente causaria bastante dor se usado como um porrete.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/dodoco-tales/en.json b/assets/data/weapons/dodoco-tales/en.json index d53972523..5213fa861 100644 --- a/assets/data/weapons/dodoco-tales/en.json +++ b/assets/data/weapons/dodoco-tales/en.json @@ -7,5 +7,6 @@ "passiveName": "Dodoventure!", "passiveDesc": "Normal Attack hits on opponents increase Charged Attack DMG by 16/20/24/28/32% for 6s. Charged Attack hits on opponents increase ATK by 8/10/12/14/16% for 6s.", "location": "Midsummer Island Adventure Event", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/dodoco-tales/jp.json b/assets/data/weapons/dodoco-tales/jp.json index 216294d12..6c398946c 100644 --- a/assets/data/weapons/dodoco-tales/jp.json +++ b/assets/data/weapons/dodoco-tales/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "ドドベンチャー！", "passiveDesc": "通常攻撃が敵に命中した後の6秒間、重撃ダメージ+16%。重撃が敵に命中した後の6秒間、攻撃力+8%。", - "location": "イベント「真夏！島？大冒険！」" + "location": "イベント「真夏！島？大冒険！」", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/dodoco-tales/pt.json b/assets/data/weapons/dodoco-tales/pt.json index d44ba8949..8f6056f85 100644 --- a/assets/data/weapons/dodoco-tales/pt.json +++ b/assets/data/weapons/dodoco-tales/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Dentro de 6s após acertar um inimigo com o Ataque Normal, o Dano causado pelo Ataque Carregado aumenta em 16%/20%/24%/28%/32%. Dentro de 6s após acertar um inimigo com o Ataque Carregado, o ATQ aumenta em 8%/10%/12%/14%/16%.", "location": "Mondstadt", "baseDamage": { "attack": 41, "subStat": 120 }, - "description": "Um livro infantil com uma bela capa. Seu conteúdo é pequenas estórias infantis inofensivas, e quem as ler não poderá evitar rir.Mesmo que seu leitor já seja um adulto, ao ler tais aventuras inocentes, também acabará fascinado por elas." + "description": "Um livro infantil com uma bela capa. Seu conteúdo é pequenas estórias infantis inofensivas, e quem as ler não poderá evitar rir.Mesmo que seu leitor já seja um adulto, ao ler tais aventuras inocentes, também acabará fascinado por elas.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/dragon-s-bane/en.json b/assets/data/weapons/dragon-s-bane/en.json index 1438d85e5..f27fb0202 100755 --- a/assets/data/weapons/dragon-s-bane/en.json +++ b/assets/data/weapons/dragon-s-bane/en.json @@ -7,5 +7,6 @@ "passiveName": "Bane of Flame and Water", "passiveDesc": "Increases DMG against enemies affected by Hydro or Pyro by 20/24/28/32/36%.", "location": "Gacha", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/dragon-s-bane/jp.json b/assets/data/weapons/dragon-s-bane/jp.json index ba7750674..c67072c95 100644 --- a/assets/data/weapons/dragon-s-bane/jp.json +++ b/assets/data/weapons/dragon-s-bane/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "炎と水の破滅", "passiveDesc": "水元素または炎元素の影響を受けた敵に対するダメージ+20%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/dragon-s-bane/pt.json b/assets/data/weapons/dragon-s-bane/pt.json index 8a8f49a18..21c2caeae 100644 --- a/assets/data/weapons/dragon-s-bane/pt.json +++ b/assets/data/weapons/dragon-s-bane/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano contra inimigos afetados por Hydro ou Pyro em 20%/24%/28%/32%/36%.", "location": "Liyue", "baseDamage": { "attack": 41, "subStat": 48 }, - "description": "Uma lança decorada com um dragão dourado entrelaçado. Leve e afiada, esta arma pode muito bem matar dragões com facilidade." + "description": "Uma lança decorada com um dragão dourado entrelaçado. Leve e afiada, esta arma pode muito bem matar dragões com facilidade.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/dragonspine-spear/en.json b/assets/data/weapons/dragonspine-spear/en.json index 060d20a7a..88788433c 100644 --- a/assets/data/weapons/dragonspine-spear/en.json +++ b/assets/data/weapons/dragonspine-spear/en.json @@ -7,5 +7,6 @@ "passiveName": "Frost Burial", "passiveDesc": "Hitting an opponent with Normal and Charged Attacks has a 60% chance of forming and dropping an Everfrost Icicle above them, dealing 80% AoE ATK DMG. Opponents affected by Cryo are dealt 200% ATK DMG. Can only occur once every 10s.", "location": "Crafting", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/dragonspine-spear/jp.json b/assets/data/weapons/dragonspine-spear/jp.json index 04fb707e5..89ea2bdc6 100644 --- a/assets/data/weapons/dragonspine-spear/jp.json +++ b/assets/data/weapons/dragonspine-spear/jp.json @@ -6,5 +6,6 @@ "subStat": "物理ダメージ", "passiveName": "霜の埋葬", "passiveDesc": "通常攻撃と重撃が敵に命中した時、60%の確率で敵の上に恒氷晶核が作られ落下し、攻撃力の80%の範囲ダメージを与える。敵が氷元素の影響を受けている場合、攻撃力の200%のダメージを与える。この効果は10秒毎に1回のみ発動可能。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/dragonspine-spear/pt.json b/assets/data/weapons/dragonspine-spear/pt.json index 422f815ab..2b312d636 100644 --- a/assets/data/weapons/dragonspine-spear/pt.json +++ b/assets/data/weapons/dragonspine-spear/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Atingir um inimigo com um Ataque Normal e Ataque Carregado possui uma chance de 60%/70%/80%/90%/100% de formar e dropar um Núcleo de Cristal Eterno sobre eles, causando 80%/95%/110%/125%/140% de Dano de ATQ em uma AdE. Inimigos afetados por Cryo recebem 200%/240%/280%/320%/360% de Dano de ATQ. Pode ocorrer apenas uma vez a cada 10s.", "location": "Mondstadt", "baseDamage": { "attack": 41, "subStat": 150 }, - "description": "Uma lança criada a partir da presa de um dragão. É estranhamente quente ao toque." + "description": "Uma lança criada a partir da presa de um dragão. É estranhamente quente ao toque.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/dull-blade/en.json b/assets/data/weapons/dull-blade/en.json index d6034d856..42721258a 100755 --- a/assets/data/weapons/dull-blade/en.json +++ b/assets/data/weapons/dull-blade/en.json @@ -7,5 +7,6 @@ "passiveName": "-", "passiveDesc": "-", "location": "Chest", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/dull-blade/jp.json b/assets/data/weapons/dull-blade/jp.json index 7d73be606..aa2214306 100644 --- a/assets/data/weapons/dull-blade/jp.json +++ b/assets/data/weapons/dull-blade/jp.json @@ -6,5 +6,6 @@ "subStat": "-", "passiveName": "-", "passiveDesc": "-", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/dull-blade/pt.json b/assets/data/weapons/dull-blade/pt.json index fbfecf863..1494ab096 100644 --- a/assets/data/weapons/dull-blade/pt.json +++ b/assets/data/weapons/dull-blade/pt.json @@ -5,5 +5,6 @@ "baseAttack": 23, "location": "-", "baseDamage": { "attack": 23, "subStat": 0 }, - "description": "Sonhos de juventude e muita aventura. Se isso não for suficiente, então use a coragem para compensar." + "description": "Sonhos de juventude e muita aventura. Se isso não for suficiente, então use a coragem para compensar.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/earth-shaker/en.json b/assets/data/weapons/earth-shaker/en.json index 8433454a2..21d12f131 100644 --- a/assets/data/weapons/earth-shaker/en.json +++ b/assets/data/weapons/earth-shaker/en.json @@ -8,5 +8,6 @@ "passiveDesc": "After a party member triggers a Pyro-related reaction, the equipping character's Elemental Skill DMG is increased by 16%/20%/24%/28%/32% for 8s. This effect can be triggered even when the triggering party member is not on the field.", "location": "Forged", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "A heavy blade that people claim was beloved by the hero known as the Firethief. They say that even the Lord of Cinder Keep's flames could not burn it away." + "description": "A heavy blade that people claim was beloved by the hero known as the Firethief. They say that even the Lord of Cinder Keep's flames could not burn it away.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/earth-shaker/pt.json b/assets/data/weapons/earth-shaker/pt.json index 9f104de2d..b5df6c7a3 100644 --- a/assets/data/weapons/earth-shaker/pt.json +++ b/assets/data/weapons/earth-shaker/pt.json @@ -7,5 +7,6 @@ "passiveDesc": "Após um membro da equipe desencadear uma reação relacionada ao Pyro, o Dano da Habilidade Elemental do personagem que está com essa arma equipada é aumentado em 16%/20%/24%/28%/32% por 8s. Esse efeito também pode ser desencadeado quando o personagem que causou a reação não está em campo.", "location": "Forjada no Ferreiro", "baseDamage": {}, - "description": "A espada preferida do Ladrão das Chamas. Dizem que nem mesmo as chamas do Rei da Cidade das Cinzas foram capazes de quebrá-la." + "description": "A espada preferida do Ladrão das Chamas. Dizem que nem mesmo as chamas do Rei da Cidade das Cinzas foram capazes de quebrá-la.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/ebony-bow/en.json b/assets/data/weapons/ebony-bow/en.json index 94cc553e7..f41a36e31 100755 --- a/assets/data/weapons/ebony-bow/en.json +++ b/assets/data/weapons/ebony-bow/en.json @@ -7,5 +7,6 @@ "passiveName": "Decimate", "passiveDesc": "Increases DMG against mechanoid Ruin enemies by 40/50/60/70/80%.", "location": "Chests", - "ascensionMaterial": "" + "ascensionMaterial": "", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/elegy-for-the-end/en.json b/assets/data/weapons/elegy-for-the-end/en.json index 5cda0c5ae..3d3f30b98 100644 --- a/assets/data/weapons/elegy-for-the-end/en.json +++ b/assets/data/weapons/elegy-for-the-end/en.json @@ -7,5 +7,6 @@ "passiveName": "The Parting Refrain!", "passiveDesc": "A part of the 'Millennial Movement' that wanders amidst the winds. Increases Elemental Mastery by 60. When the Elemental Skills or Elemental Bursts of the character wielding this weapon hit opponents, that character gains a Sigil of Remembrance. This effect can be triggered once every 0.2s and can be triggered even if said character is not on the field. When you possess 4 Sigils of Remembrance, all of them will be consumed and all nearby party members will obtain the 'Millennial Movement: Farewell Song' effect for 12s. 'Millennial Movement: Farewell Song' increases Elemental Mastery by 100 and increases ATK by 20%. Once this effect is triggered, you will not gain Sigils of Remembrance for 20s. Of the many effects of the 'Millennial Movement,' buffs of the same type will not stack.", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/elegy-for-the-end/jp.json b/assets/data/weapons/elegy-for-the-end/jp.json index f59cfa869..e4b59c976 100644 --- a/assets/data/weapons/elegy-for-the-end/jp.json +++ b/assets/data/weapons/elegy-for-the-end/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "追憶と別れの歌", "passiveDesc": "風と共に流れる「千年の大楽章」の一部。元素熟知+60。元素スキルまたは元素爆発が敵に命中すると、追憶の欠片を1枚獲得する。この効果は0.2秒毎に一回のみ発動でき、待機中のキャラクターも発動できる。追憶の欠片を4枚集めると、全ての追憶の欠片を消費し、周囲のチーム全員に12秒継続する「千年の大楽章·別れの歌」効果を付与する：元素熟知+100、攻撃力+20%。発動後の20秒間、追憶の欠片を再度獲得することはできない。「千年の大楽章」のもたらす各効果中、同種類の効果は重ね掛け不可。", - "location": "祈願" + "location": "祈願", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/elegy-for-the-end/pt.json b/assets/data/weapons/elegy-for-the-end/pt.json index fe9334639..32d306f2c 100644 --- a/assets/data/weapons/elegy-for-the-end/pt.json +++ b/assets/data/weapons/elegy-for-the-end/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Uma parte do Concerto Milenar que flutua no vento. Aumenta a Proficiência Elemental em 60%/75%/90%/105%/120% pontos. Quando a Habilidade Elemental ou o Supremo atingir os inimigos, o personagem obterá um Símbolo das Lembranças, que pode ser ativado uma vez a cada 0.2s, mesmo quando o personagem não está no campo de batalha. Possuir 4 Símbolos das Lembranças faz consumir todos eles, e faz todos os personagens da equipe obterem o efeito de \"Concerto Milenar: Música da Despedida\" por 12s: A Proficiência Elemental será aumentada em 100/125/150/175/200 pontos, além disso, o ATQ será aumentado em 20%/25%/30%/35%/40%. Dentro de 20s depois da ativação, não é possível obter os Símbolos das Lembranças de novo. Entre todos os efeitos de vários valores, os efeitos do mesmo valor não podem ser acumulados.", "location": "Mondstadt", "baseDamage": { "attack": 46, "subStat": 120 }, - "description": "Um arco tão adorável quanto a lira de qualquer bardo, suas flechas perfuram o coração como um suspiro lamentável." + "description": "Um arco tão adorável quanto a lira de qualquer bardo, suas flechas perfuram o coração como um suspiro lamentável.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/emerald-orb/en.json b/assets/data/weapons/emerald-orb/en.json index a16f7b7dc..b43285a7a 100755 --- a/assets/data/weapons/emerald-orb/en.json +++ b/assets/data/weapons/emerald-orb/en.json @@ -7,5 +7,6 @@ "passiveName": "Rapids", "passiveDesc": "Upon causing a Vaporize, Electro-Charged, Frozen, or a Hydro-infused Swirl reaction, increases Base ATK by 20/25/30/35/40% for 12s.", "location": "Gacha", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/emerald-orb/jp.json b/assets/data/weapons/emerald-orb/jp.json index 8efdbc5c4..0da86bb77 100644 --- a/assets/data/weapons/emerald-orb/jp.json +++ b/assets/data/weapons/emerald-orb/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "激流", "passiveDesc": "蒸発、感電、凍結、または水元素拡散反応を起こした後12秒間、攻撃力+20%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/emerald-orb/pt.json b/assets/data/weapons/emerald-orb/pt.json index 9e4832390..054fa1c45 100644 --- a/assets/data/weapons/emerald-orb/pt.json +++ b/assets/data/weapons/emerald-orb/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Depois de 12s após a ativação da reação de Vaporização, Eletricamente Carregado, Congelamento ou Redemoinho Hydro, aumenta o ATQ em 20%/25%/30%/35%/40%.", "location": "Liyue", "baseDamage": { "attack": 40, "subStat": 20 }, - "description": "Um catalisador esculpido com uma jade rígida de Relevo de Jueyun, norte de Liyue. É pequena, leve e durável." + "description": "Um catalisador esculpido com uma jade rígida de Relevo de Jueyun, norte de Liyue. É pequena, leve e durável.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/end-of-the-line/en.json b/assets/data/weapons/end-of-the-line/en.json index 35e9b7ae6..082ea3c05 100644 --- a/assets/data/weapons/end-of-the-line/en.json +++ b/assets/data/weapons/end-of-the-line/en.json @@ -1,12 +1,12 @@ { - "name": "End of the Line", - "type": "Bow", - "rarity": 4, - "baseAttack": 42, - "subStat": "Energy Recharge", - "passiveName": "Net Snapper", - "passiveDesc": "Triggers the Flowrider effect after using an Elemental Skill, dealing 80% ATK as AoE DMG upon hitting an opponent with an attack. Flowrider will be removed after 15s or after causing 3 instances of AoE DMG. Only 1 instance of AoE DMG can be caused every 2s in this way. Flowrider can be triggered once every 12s.", - "location": "Sumeru Fishing Association", - "ascensionMaterial": "scorching" - } - \ No newline at end of file + "name": "End of the Line", + "type": "Bow", + "rarity": 4, + "baseAttack": 42, + "subStat": "Energy Recharge", + "passiveName": "Net Snapper", + "passiveDesc": "Triggers the Flowrider effect after using an Elemental Skill, dealing 80% ATK as AoE DMG upon hitting an opponent with an attack. Flowrider will be removed after 15s or after causing 3 instances of AoE DMG. Only 1 instance of AoE DMG can be caused every 2s in this way. Flowrider can be triggered once every 12s.", + "location": "Sumeru Fishing Association", + "ascensionMaterial": "scorching", + "weapon_type": "BOW" +} diff --git a/assets/data/weapons/end-of-the-line/pt.json b/assets/data/weapons/end-of-the-line/pt.json index a5509e701..719257db0 100644 --- a/assets/data/weapons/end-of-the-line/pt.json +++ b/assets/data/weapons/end-of-the-line/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Pêssego das Ondas Profundas (4), Marlim Machado de Lazurita (16), Marlim Machado de Jade (16)", "location": "Obtido na Associação de Pesca de Sumeru", "baseDamage": { "attack": 42, "subStat": 1000 }, - "description": "Parece ser um tipo de peixe extinto. Seu corpo é tão elástico, que uma corda pode ser presa a ele e fazer com que sirva como um arco." + "description": "Parece ser um tipo de peixe extinto. Seu corpo é tão elástico, que uma corda pode ser presa a ele e fazer com que sirva como um arco.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/engulfing-lightning/en.json b/assets/data/weapons/engulfing-lightning/en.json index ac49ff806..99f64d71e 100644 --- a/assets/data/weapons/engulfing-lightning/en.json +++ b/assets/data/weapons/engulfing-lightning/en.json @@ -7,5 +7,6 @@ "passiveName": "Timeless Dream: Eternal Stove", "passiveDesc": "ATK increased by 28/35/42/49/56% of Energy Recharge over the base 100%. You can gain a maximum bonus of 80/90/100/110/120% ATK. Gain 30/35/40/45/50% Energy Recharge for 12s after using an Elemental Burst.", "location": "Gacha", - "ascensionMaterial": "mask" + "ascensionMaterial": "mask", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/engulfing-lightning/pt.json b/assets/data/weapons/engulfing-lightning/pt.json index d1c676387..842d0f7d6 100644 --- a/assets/data/weapons/engulfing-lightning/pt.json +++ b/assets/data/weapons/engulfing-lightning/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "O ATQ é aumentado em 28%/35%/42%/49%/56% da Recarga de Energia acima da base de 100%. Você pode receber um Bônus máximo de 80%/90%/100%/110%/120% de ATQ. Ganha 30%/35%/40%/45%/50% de Recarga de Energia por 12s depois de usar um Supremo.", "location": "Inazuma", "baseDamage": { "attack": 46, "subStat": 120 }, - "description": "Uma naginata usada para \"cortar grama\". Qualquer exército que esteja diante desta arma provavelmente será igualmente cortado..." + "description": "Uma naginata usada para \"cortar grama\". Qualquer exército que esteja diante desta arma provavelmente será igualmente cortado...", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/everlasting-moonglow/en.json b/assets/data/weapons/everlasting-moonglow/en.json index 463881117..84bfc2b14 100644 --- a/assets/data/weapons/everlasting-moonglow/en.json +++ b/assets/data/weapons/everlasting-moonglow/en.json @@ -7,5 +7,6 @@ "passiveName": "Byakuya Kougetsu", "passiveDesc": "Healing Bonus increased by 10/12.5/15/17.5/20%, Normal Attack DMG is increased by 1/1.5/2/2.5/3% of the Max HP of the character equipping this weapon. For 12s after using an Elemental Burst, Normal Attacks that hit opponents will restore 0.6 Energy. Energy can be restored this way once every 0.1s.", "location": "Gacha", - "ascensionMaterial": "distant-sea" + "ascensionMaterial": "distant-sea", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/everlasting-moonglow/pt.json b/assets/data/weapons/everlasting-moonglow/pt.json index c13c4651b..21301352c 100644 --- a/assets/data/weapons/everlasting-moonglow/pt.json +++ b/assets/data/weapons/everlasting-moonglow/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Bônus de Cura aumentado em 10%/12.5%/15%/17.5%/20%, o Ataque Normal é aumentado em 1%/1.5%/2%/2.5%/3% da Vida Máxima do personagem equipando esta arma. Nos 12s após usar um Supremo, os Ataques Normais que acertarem oponentes recuperarão 0.6 de Energia Elemental. A Energia pode ser recuperada desta maneira uma vez a cada 0.1s.", "location": "Inazuma", "baseDamage": { "attack": 46, "subStat": 108 }, - "description": "Um lindo cordão de jaspe das profundezas do mar. Ele brilha com um brilho puro, e igualmente distante quanto o da lua." + "description": "Um lindo cordão de jaspe das profundezas do mar. Ele brilha com um brilho puro, e igualmente distante quanto o da lua.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/eye-of-perception/en.json b/assets/data/weapons/eye-of-perception/en.json index 5b0b76259..8dc8432f0 100755 --- a/assets/data/weapons/eye-of-perception/en.json +++ b/assets/data/weapons/eye-of-perception/en.json @@ -7,5 +7,6 @@ "passiveName": "Echo", "passiveDesc": "Normal and Charged Attacks have a 50% chance to fire a Bolt of Perception, dealing 240/270/300/330/360% ATK as DMG. This bolt can bounce between enemies a maximum of 4 times. This effect can occur once every 12/11/10/9/8s.", "location": "Gacha", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/eye-of-perception/jp.json b/assets/data/weapons/eye-of-perception/jp.json index b4e39b48e..4b97ed39e 100644 --- a/assets/data/weapons/eye-of-perception/jp.json +++ b/assets/data/weapons/eye-of-perception/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "響き", "passiveDesc": "通常攻撃と重撃が命中する時、50%の確率で昭心法珠を一つ発射し、敵に攻撃力の240%のダメージを与える。敵同士に最大4回跳ね返る。この効果は12秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/eye-of-perception/pt.json b/assets/data/weapons/eye-of-perception/pt.json index 2e0363b19..127ffdf5a 100644 --- a/assets/data/weapons/eye-of-perception/pt.json +++ b/assets/data/weapons/eye-of-perception/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ataques Normais e Ataques Carregados possuem 50% de chance de disparar uma Bola da Percepção, causando 240%/270%/300%/330%/360% de Dano de ATQ. Esta bola pode rebater entre os inimigos por até 4x. Este efeito pode ser ativado uma vez a cada 12/11/10/9/8s.", "location": "Liyue", "baseDamage": { "attack": 41, "subStat": 120 }, - "description": "Uma pérola negra esmaltada que se diz ter o poder de ler a pureza do coração." + "description": "Uma pérola negra esmaltada que se diz ter o poder de ler a pureza do coração.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/fading-twilight/en.json b/assets/data/weapons/fading-twilight/en.json index 289548fc8..88c3232b4 100755 --- a/assets/data/weapons/fading-twilight/en.json +++ b/assets/data/weapons/fading-twilight/en.json @@ -7,5 +7,6 @@ "passiveName": "Radiance of the Deeps", "passiveDesc": "Has three states, Evengleam, Afterglow, and Dawnblaze, which increase DMG dealt from 6%/10%/14% (R1) to 12%/20%/28% (R5) respectively. When attacks hit opponents, this weapon will switch to the next state. This weapon can change states once every 7s. The character equipping this weapon can still trigger the state switch while not on the field.", "location": "Event: Perilous Trail", - "ascensionMaterial": "aerosiderite" -} \ No newline at end of file + "ascensionMaterial": "aerosiderite", + "weapon_type": "BOW" +} diff --git a/assets/data/weapons/fading-twilight/pt.json b/assets/data/weapons/fading-twilight/pt.json index 2f574e5c6..9ef1e2918 100644 --- a/assets/data/weapons/fading-twilight/pt.json +++ b/assets/data/weapons/fading-twilight/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Possui três estados: Entardecer, Amanhecer e Alvorada. Estes estados aumentam o Dano infligido em 6%/10%/14%/7.5%/12.5%/17.5%/9%/15%/21%/10.5%/17.5%/24.5%/12%/20%/28% respectivamente. Ao atingir um inimigo com um ataque, se trocará para o próximo estado. Essa troca pode acontecer uma vez a cada 7s. Esse efeito também ocorrerá se o personagem que tiver esta arma equipada não estiver ativo no campo de batalha.", "location": "Liyue", "baseDamage": { "attack": 44, "subStat": 67 }, - "description": "Um arco precioso feito de platina, com uma gema incrustada que cintila com o brilho do crepúsculo." + "description": "Um arco precioso feito de platina, com uma gema incrustada que cintila com o brilho do crepúsculo.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/fang-of-the-mountain-king/en.json b/assets/data/weapons/fang-of-the-mountain-king/en.json index 7fd3f33bb..e74e54db8 100644 --- a/assets/data/weapons/fang-of-the-mountain-king/en.json +++ b/assets/data/weapons/fang-of-the-mountain-king/en.json @@ -1 +1,13 @@ -{"name":"Fang of the Mountain King","type":"Claymore","rarity":5,"baseAttack":49,"subStat":"CRIT Rate","passiveName":"Turquoise Hunt","passiveDesc":"Gain 1 stack of Canopy's Favor after hitting an opponent with an Elemental Skill. This can be triggered once every 0.5s. After a nearby party member triggers a Burning or Burgeon reaction, the equipping character will gain 3 stacks. This effect can be triggered once every 2s and can be triggered even when the triggering party member is off-field. Canopy's Favor: Elemental Skill and Burst DMG is increased by 10%/12.5%/15%/17.5%/20% for 6s. Max 6 stacks. Each stack is counted independently.","location":"Event Wish Exclusive","baseDamage":{"attack":49,"subStat":24},"description":"A giant sword forged from pure turquoise. Due to its greater weight than most ordinary weapons, it was named for Kongomato the Mountain King."} \ No newline at end of file +{ + "name": "Fang of the Mountain King", + "type": "Claymore", + "rarity": 5, + "baseAttack": 49, + "subStat": "CRIT Rate", + "passiveName": "Turquoise Hunt", + "passiveDesc": "Gain 1 stack of Canopy's Favor after hitting an opponent with an Elemental Skill. This can be triggered once every 0.5s. After a nearby party member triggers a Burning or Burgeon reaction, the equipping character will gain 3 stacks. This effect can be triggered once every 2s and can be triggered even when the triggering party member is off-field. Canopy's Favor: Elemental Skill and Burst DMG is increased by 10%/12.5%/15%/17.5%/20% for 6s. Max 6 stacks. Each stack is counted independently.", + "location": "Event Wish Exclusive", + "baseDamage": { "attack": 49, "subStat": 24 }, + "description": "A giant sword forged from pure turquoise. Due to its greater weight than most ordinary weapons, it was named for Kongomato the Mountain King.", + "weapon_type": "CLAYMORE" +} diff --git a/assets/data/weapons/fang-of-the-mountain-king/pt.json b/assets/data/weapons/fang-of-the-mountain-king/pt.json index b077f69a1..de24c7264 100644 --- a/assets/data/weapons/fang-of-the-mountain-king/pt.json +++ b/assets/data/weapons/fang-of-the-mountain-king/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ganha 1 acúmulo de Favor da Copa ao acertar um oponente com uma Habilidade Elemental. Isso pode ser desencadeado uma vez a cada 0.5s; após um membro da equipe próximo desencadear uma reação de Queimadura ou Germinação, o personagem que está com essa arma equipada ganhará 3 acúmulos de Favor da Copa. Este efeito pode ser desencadeado uma vez a cada 2s e pode ser desencadeado mesmo quando o personagem não é o personagem ativo. Favor da Copa: o Dano da Habilidade Elemental e do Supremo é aumentado em 10%/12.5%/15%/17.5%/20% por 6s. Máximo de 6 acúmulos. A duração de cada acúmulo é contabilizada de forma independente.", "location": "Banner de Invocação Limitado", "baseDamage": { "attack": 49, "subStat": 24 }, - "description": "Uma espada gigante forjada de turquesa pura. Recebeu o nome de Rei da Montanha pelo seu peso considerável e tamanho muito maior do que uma lâmina comum." + "description": "Uma espada gigante forjada de turquesa pura. Recebeu o nome de Rei da Montanha pelo seu peso considerável e tamanho muito maior do que uma lâmina comum.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/favonius-codex/en.json b/assets/data/weapons/favonius-codex/en.json index 0ebe974be..1348c2d40 100755 --- a/assets/data/weapons/favonius-codex/en.json +++ b/assets/data/weapons/favonius-codex/en.json @@ -7,5 +7,6 @@ "passiveName": "Windfall", "passiveDesc": "CRIT hits have a 60/70/80/90/100% chance to generate 1 Elemental Orb, which will regenerate 6 Energy for the character. Can only occur once every 12/10.5/9/7.5/6s.", "location": "Gacha", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/favonius-codex/jp.json b/assets/data/weapons/favonius-codex/jp.json index 05b705e8e..e01e92ce7 100644 --- a/assets/data/weapons/favonius-codex/jp.json +++ b/assets/data/weapons/favonius-codex/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "追い風が吹く", "passiveDesc": "会心攻撃をした時、60%の確率で少量の元素粒子を生成し、元素エネルギーを6回復する。12秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/favonius-codex/pt.json b/assets/data/weapons/favonius-codex/pt.json index 82c50cc0f..f8a1186dd 100644 --- a/assets/data/weapons/favonius-codex/pt.json +++ b/assets/data/weapons/favonius-codex/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Os Acertos Críticos possuem 60%/70%/80%/90%/100% de chance de gerar uma pequena quantidade de Partícula Elemental, que irá regenerar 6 de Energia para o Personagem. Pode ocorrer uma vez a cada 12/10.5/9/7.5/6s.", "location": "Mondstadt", "baseDamage": { "attack": 42, "subStat": 100 }, - "description": "Um livro secreto que pertencia aos estudiosos dos Cavaleiros de Favonius. Descreve o poder da matéria e da lógica." + "description": "Um livro secreto que pertencia aos estudiosos dos Cavaleiros de Favonius. Descreve o poder da matéria e da lógica.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/favonius-greatsword/en.json b/assets/data/weapons/favonius-greatsword/en.json index 915be538e..15168d81a 100755 --- a/assets/data/weapons/favonius-greatsword/en.json +++ b/assets/data/weapons/favonius-greatsword/en.json @@ -7,5 +7,6 @@ "passiveName": "Windfall", "passiveDesc": "CRIT hits have a 60/70/80/90/100% chance to generate 1 Elemental Orb, which will regenerate 6 Energy for the character. Can only occur once every 12/10.5/9/7.5/6s.", "location": "Gacha", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/favonius-greatsword/jp.json b/assets/data/weapons/favonius-greatsword/jp.json index 96a981866..fbbad8233 100644 --- a/assets/data/weapons/favonius-greatsword/jp.json +++ b/assets/data/weapons/favonius-greatsword/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "追い風が吹く", "passiveDesc": "会心攻撃をした時、60%の確率で少量の元素粒子を生成し、元素エネルギーを6回復する。12秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/favonius-greatsword/pt.json b/assets/data/weapons/favonius-greatsword/pt.json index d17417011..ddfb51cf1 100644 --- a/assets/data/weapons/favonius-greatsword/pt.json +++ b/assets/data/weapons/favonius-greatsword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Os Acertos Críticos possuem 60%/70%/80%/90%/100% de chance de gerar uma pequena quantidade de Partícula Elemental, que irá regenerar 6 de Energia para o Personagem. Pode ocorrer uma vez a cada 12/10.5/9/7.5/6s.", "location": "Mondstadt", "baseDamage": { "attack": 41, "subStat": 133 }, - "description": "Uma espada pesada cerimonial dos Cavaleiros de Favonious. Canaliza poderes elementais facilmente e é altamente destrutiva." + "description": "Uma espada pesada cerimonial dos Cavaleiros de Favonious. Canaliza poderes elementais facilmente e é altamente destrutiva.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/favonius-lance/en.json b/assets/data/weapons/favonius-lance/en.json index bf68099cd..08029a140 100755 --- a/assets/data/weapons/favonius-lance/en.json +++ b/assets/data/weapons/favonius-lance/en.json @@ -7,5 +7,6 @@ "passiveName": "Windfall", "passiveDesc": "CRIT hits have a 60/70/80/90/100% chance to generate 1 Elemental Orb, which will regenerate 6 Energy for the character. Can only occur once every 12/10.5/9/7.5/6s.", "location": "Gacha", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/favonius-lance/jp.json b/assets/data/weapons/favonius-lance/jp.json index f84f1c028..e5e0eadd1 100644 --- a/assets/data/weapons/favonius-lance/jp.json +++ b/assets/data/weapons/favonius-lance/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "追い風が吹く", "passiveDesc": "会心攻撃をした時、60%の確率で少量の元素粒子を生成し、元素エネルギーを6回復する。12秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/favonius-lance/pt.json b/assets/data/weapons/favonius-lance/pt.json index d04207189..7777d0d77 100644 --- a/assets/data/weapons/favonius-lance/pt.json +++ b/assets/data/weapons/favonius-lance/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Os Acertos Críticos possuem 60%/70%/80%/90%/100% de chance de gerar uma pequena quantidade de Partícula Elemental, que irá regenerar 6 de Energia para o Personagem. Pode ocorrer uma vez a cada 12/10.5/9/7.5/6s.", "location": "Mondstadt", "baseDamage": { "attack": 44, "subStat": 67 }, - "description": "Uma lança no estilo dos Cavaleiros de Favonius. Sua haste é reta e sua ponta flui levemente como o vento." + "description": "Uma lança no estilo dos Cavaleiros de Favonius. Sua haste é reta e sua ponta flui levemente como o vento.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/favonius-sword/en.json b/assets/data/weapons/favonius-sword/en.json index 39dcd2e5d..a48197dec 100755 --- a/assets/data/weapons/favonius-sword/en.json +++ b/assets/data/weapons/favonius-sword/en.json @@ -7,5 +7,6 @@ "passiveName": "Windfall", "passiveDesc": "CRIT hits have a 60/70/80/90/100% chance to generate 1 Elemental Orb, which will regenerate 6 Energy for the character. Can only occur once every 12/10.5/9/7.5/6s.", "location": "Gacha", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/favonius-sword/jp.json b/assets/data/weapons/favonius-sword/jp.json index 8a73cb85d..6afc369e8 100644 --- a/assets/data/weapons/favonius-sword/jp.json +++ b/assets/data/weapons/favonius-sword/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "追い風が吹く", "passiveDesc": "会心攻撃をした時、60%の確率で少量の元素粒子を生成し、元素エネルギーを6回復する。12秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/favonius-sword/pt.json b/assets/data/weapons/favonius-sword/pt.json index 31e3d33b0..3ae184cae 100644 --- a/assets/data/weapons/favonius-sword/pt.json +++ b/assets/data/weapons/favonius-sword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Os Acertos Críticos possuem 60%/70%/80%/90%/100% de chance de gerar uma pequena quantidade de Partícula Elemental, que irá regenerar 6 de Energia para o Personagem. Pode ocorrer uma vez a cada 12/10.5/9/7.5/6s.", "location": "Mondstadt", "baseDamage": { "attack": 41, "subStat": 133 }, - "description": "Uma espada longa comum usada pelos Cavaleiros de Favonius. Canalizar o poder dos elementos nunca foi tão fácil nesta arma ágil e afiada!" + "description": "Uma espada longa comum usada pelos Cavaleiros de Favonius. Canalizar o poder dos elementos nunca foi tão fácil nesta arma ágil e afiada!", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/favonius-warbow/en.json b/assets/data/weapons/favonius-warbow/en.json index 99ca747c9..830e4c315 100755 --- a/assets/data/weapons/favonius-warbow/en.json +++ b/assets/data/weapons/favonius-warbow/en.json @@ -7,5 +7,6 @@ "passiveName": "Windfall", "passiveDesc": "CRIT hits have a 60/70/80/90/100% chance to generate 1 Elemental Orb, which will regenerate 6 Energy for the character. Can only occur once every 12/10.5/9/7.5/6s.", "location": "Gacha", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/favonius-warbow/jp.json b/assets/data/weapons/favonius-warbow/jp.json index f038e75d9..f6afb2348 100644 --- a/assets/data/weapons/favonius-warbow/jp.json +++ b/assets/data/weapons/favonius-warbow/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "追い風が吹く", "passiveDesc": "会心攻撃をした時、60%の確率で少量の元素粒子を生成し、元素エネルギーを6回復する。12秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/favonius-warbow/pt.json b/assets/data/weapons/favonius-warbow/pt.json index 2bff576df..ccd300380 100644 --- a/assets/data/weapons/favonius-warbow/pt.json +++ b/assets/data/weapons/favonius-warbow/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Os Acertos Críticos possuem 60%/70%/80%/90%/100% de chance de gerar uma pequena quantidade de Partícula Elemental, que irá regenerar 6 de Energia para o Personagem. Pode ocorrer uma vez a cada 12/10.5/9/7.5/6s.", "location": "Oração", "baseDamage": { "attack": 41, "subStat": 133 }, - "description": "Um arco recurvo usado pelos Cavaleiros de Favonius. Apenas os melhores arqueiros conseguem tirar todo o seu potencial." + "description": "Um arco recurvo usado pelos Cavaleiros de Favonius. Apenas os melhores arqueiros conseguem tirar todo o seu potencial.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/ferrous-shadow/en.json b/assets/data/weapons/ferrous-shadow/en.json index 7266280ad..0327aa16c 100755 --- a/assets/data/weapons/ferrous-shadow/en.json +++ b/assets/data/weapons/ferrous-shadow/en.json @@ -7,5 +7,6 @@ "passiveName": "Unbending", "passiveDesc": "When HP falls below 70/75/80/85/90%, increases Charged Attack DMG by 30/35/40/45/50%, and Charged Attacks become much harder to interrupt.", "location": "Gacha", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/ferrous-shadow/jp.json b/assets/data/weapons/ferrous-shadow/jp.json index 9f57bb9f3..6dc280ad2 100644 --- a/assets/data/weapons/ferrous-shadow/jp.json +++ b/assets/data/weapons/ferrous-shadow/jp.json @@ -6,5 +6,6 @@ "subStat": "HP", "passiveName": "不屈", "passiveDesc": "HPが70%以下になると、重撃は中断されにくくなり、更に重撃ダメージ+30%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/ferrous-shadow/pt.json b/assets/data/weapons/ferrous-shadow/pt.json index 3180d8f01..745832ac4 100644 --- a/assets/data/weapons/ferrous-shadow/pt.json +++ b/assets/data/weapons/ferrous-shadow/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando a Vida estiver inferior a 70%/75%/80%/85%/90%, Ataques Carregados raramente são interrompidos e aumenta 30%/35%/40%/45%/50% do Ataque Carregado.", "location": "Mondstadt", "baseDamage": { "attack": 39, "subStat": 77 }, - "description": "Uma réplica da espada famosa de Arundolyn, o Leão da Luz. Maneje-a e sinta o poder de um herói lendário! Aviso: Sonhar demais pode ser prejudicial para você." + "description": "Uma réplica da espada famosa de Arundolyn, o Leão da Luz. Maneje-a e sinta o poder de um herói lendário! Aviso: Sonhar demais pode ser prejudicial para você.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/festering-desire/en.json b/assets/data/weapons/festering-desire/en.json index 53c7c65b4..d6b55442f 100644 --- a/assets/data/weapons/festering-desire/en.json +++ b/assets/data/weapons/festering-desire/en.json @@ -7,5 +7,6 @@ "passiveName": "", "passiveDesc": "Increases Elemental Skill DMG by 16/20/24/28/32% and Elemental Skill CRIT Rate by 6/7.5/9/10.5/12%.", "location": "Story Quest", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/festering-desire/jp.json b/assets/data/weapons/festering-desire/jp.json index d33ea68a7..67d869761 100644 --- a/assets/data/weapons/festering-desire/jp.json +++ b/assets/data/weapons/festering-desire/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "底なしの渇望", "passiveDesc": "元素スキルのダメージ+16%、元素スキルの会心率+6%。", - "location": "イベント「白亜と黒龍」" + "location": "イベント「白亜と黒龍」", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/festering-desire/pt.json b/assets/data/weapons/festering-desire/pt.json index 20cc38c37..50e5a0ffa 100644 --- a/assets/data/weapons/festering-desire/pt.json +++ b/assets/data/weapons/festering-desire/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta em 16%/20%/24%/28%/32% o Dano da Habilidade Elemental e em 6%/7.5%/9%/10.5%/12% a Taxa CRIT da Habilidade Elemental.", "location": "Mondstadt", "baseDamage": { "attack": 42, "subStat": 100 }, - "description": "Uma espada reta assustadora que parece ansiar pela vida. Ela verte um veneno enfraquecedor que poderia corromper até mesmo um dragão poderoso." + "description": "Uma espada reta assustadora que parece ansiar pela vida. Ela verte um veneno enfraquecedor que poderia corromper até mesmo um dragão poderoso.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/fillet-blade/en.json b/assets/data/weapons/fillet-blade/en.json index 3f38100e0..30ff548be 100755 --- a/assets/data/weapons/fillet-blade/en.json +++ b/assets/data/weapons/fillet-blade/en.json @@ -7,5 +7,6 @@ "passiveName": "Gash", "passiveDesc": "On hit, has 50% chance to deal 240/280/320/360/400% ATK DMG to a single enemy. Can only occur once every 15/14/13/12/11s.", "location": "Chests", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/fillet-blade/jp.json b/assets/data/weapons/fillet-blade/jp.json index 4eff2b90c..011eea308 100644 --- a/assets/data/weapons/fillet-blade/jp.json +++ b/assets/data/weapons/fillet-blade/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "切り捨て", "passiveDesc": "攻撃が命中すると、50%の確率で1体の敵に攻撃力の240%のダメージを与える。15秒毎に1回のみ発動可能。", - "location": "宝箱等" + "location": "宝箱等", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/fillet-blade/pt.json b/assets/data/weapons/fillet-blade/pt.json index f05428422..31ca8b7e3 100644 --- a/assets/data/weapons/fillet-blade/pt.json +++ b/assets/data/weapons/fillet-blade/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao acertar, possui 50% de chance de infligir 240%/280%/320%/360%/400% de Dano de ATQ a um único alvo. Pode ocorrer uma vez a cada 15/14/13/12/11s.", "location": "Liyue", "baseDamage": { "attack": 39, "subStat": 77 }, - "description": "Uma faca afiada com uma lâmina longa." + "description": "Uma faca afiada com uma lâmina longa.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/finale-of-the-deep/en.json b/assets/data/weapons/finale-of-the-deep/en.json index 5736021cc..1ce511a56 100644 --- a/assets/data/weapons/finale-of-the-deep/en.json +++ b/assets/data/weapons/finale-of-the-deep/en.json @@ -7,5 +7,6 @@ "passiveName": "An End Sublime", "passiveDesc": "When using an Elemental Skill, ATK will be increased by 12% for 15s, and a Bond of Life worth 25% of Max HP will be granted. This effect can be triggered once every 10s. When the Bond of Life is cleared, a maximum of 150 ATK will be gained based on 2.4% of the Bond when cleared for 15s. Bond of Life: Absorbs healing for the character based on its base value, and clears after healing equal to this value is obtained.", "location": "BP Bounty", - "ascensionMaterial": "pure-sacred-dewdrop" + "ascensionMaterial": "pure-sacred-dewdrop", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/finale-of-the-deep/pt.json b/assets/data/weapons/finale-of-the-deep/pt.json index eab3cd290..688d3aaaf 100644 --- a/assets/data/weapons/finale-of-the-deep/pt.json +++ b/assets/data/weapons/finale-of-the-deep/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao utilizar a Habilidade Elemental, aumenta o ATQ em 12/15/18/21/24% por 15s e concede um Contrato de Vida equivalente a 25% da Vida Máxima. Este efeito pode ser ativado uma vez a cada 10s. Quando o Contrato de Vida é removido, o ATQ é aumentado em 2.4/3/3.6/4.2/4.8% do valor removido por 15s, podendo ser aumentado até 150/187.5/225/262.5/300 pontos.", "location": "Obtido na forja", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "Essa lâmina é silenciosa como as profundezas misteriosas do oceano. É ainda mais antiga do que sua afiliação pode insinuar." + "description": "Essa lâmina é silenciosa como as profundezas misteriosas do oceano. É ainda mais antiga do que sua afiliação pode insinuar.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/fleuve-cendre-ferryman/en.json b/assets/data/weapons/fleuve-cendre-ferryman/en.json index fb15324fd..2ef40784f 100644 --- a/assets/data/weapons/fleuve-cendre-ferryman/en.json +++ b/assets/data/weapons/fleuve-cendre-ferryman/en.json @@ -7,5 +7,6 @@ "passiveName": "Ironbone", "passiveDesc": "Increases Elemental Skill CRIT Rate by 8%. Additionally, increases Energy Recharge by 16% for 5s after using an Elemental Skill.s", "location": "Fontaine Fishing Association", - "ascensionMaterial": "ancient-chord" + "ascensionMaterial": "ancient-chord", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/fleuve-cendre-ferryman/pt.json b/assets/data/weapons/fleuve-cendre-ferryman/pt.json index 167c721b1..f60e3edad 100644 --- a/assets/data/weapons/fleuve-cendre-ferryman/pt.json +++ b/assets/data/weapons/fleuve-cendre-ferryman/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a Taxa CRIT da Habilidade Elemental em 8/10/12/14/16%. Além disso, após utilizar a Habilidade Elemental, aumenta a Recarga de Energia em 16/20/24/28/32% por 5s.", "location": "Resgatado na Associação de Pesca de Fontaine", "baseDamage": { "attack": 42, "subStat": 100 }, - "description": "Um cano de cobre abandonado que foi usado como arma. Era famoso, ou infame, dependendo de onde estivesse." + "description": "Um cano de cobre abandonado que foi usado como arma. Era famoso, ou infame, dependendo de onde estivesse.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/flower-wreathed-feathers/en.json b/assets/data/weapons/flower-wreathed-feathers/en.json index 8d1969696..37d3d845c 100644 --- a/assets/data/weapons/flower-wreathed-feathers/en.json +++ b/assets/data/weapons/flower-wreathed-feathers/en.json @@ -8,5 +8,6 @@ "passiveDesc": "Decreases Gliding Stamina consumption by 15%. When using Aimed Shots, the DMG dealt by Charged Attacks increases by 6%/7.5%/9%/10.5%/12% every 0.5s. This effect can stack up to 6 times and will be removed 10s after leaving Aiming Mode.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "A longbow that burns like a flame. The feathers that adorn it are said to have come from the ancient tyrant Ngoubou." + "description": "A longbow that burns like a flame. The feathers that adorn it are said to have come from the ancient tyrant Ngoubou.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/flower-wreathed-feathers/pt.json b/assets/data/weapons/flower-wreathed-feathers/pt.json index d944c9d0c..7645b3199 100644 --- a/assets/data/weapons/flower-wreathed-feathers/pt.json +++ b/assets/data/weapons/flower-wreathed-feathers/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Diminui o consumo de Stamina ao Planar em 15%. Ao usar Disparo com Mira, o Dano causado por Ataques Carregados aumenta em 6%/7.5%/9%/10.5%/12% a cada 0.5s. Esse efeito pode acumular até 6 vezes e será removido 10s após sair do Modo de Mira.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Um arco longo que queima como uma chama. Dizem que as penas que o decoram vieram do antigo tirano, Ngoubou." + "description": "Um arco longo que queima como uma chama. Dizem que as penas que o decoram vieram do antigo tirano, Ngoubou.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/flowing-purity/en.json b/assets/data/weapons/flowing-purity/en.json index d37922c8f..f0d0c6dc0 100644 --- a/assets/data/weapons/flowing-purity/en.json +++ b/assets/data/weapons/flowing-purity/en.json @@ -7,5 +7,6 @@ "passiveName": "Unfinished Masterpiece", "passiveDesc": "When using an Elemental Skill, All Elemental DMG Bonus will be increased by 8% for 15s, and a Bond of Life worth 24% of Max HP will be granted. This effect can be triggered once every 10s. When the Bond of Life is cleared, every 1,000 HP cleared in the process will provide 2% All Elemental DMG Bonus. Up to a maximum of 12% All Elemental DMG can be gained this way. This effect lasts 15s. Bond of Life: Absorbs healing for the character based on its base value, and clears after healing equal to this value is obtained.", "location": "BP Bounty", - "ascensionMaterial": "pure-sacred-dewdrop" + "ascensionMaterial": "pure-sacred-dewdrop", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/flowing-purity/pt.json b/assets/data/weapons/flowing-purity/pt.json index 463fc97c7..81dc9da77 100644 --- a/assets/data/weapons/flowing-purity/pt.json +++ b/assets/data/weapons/flowing-purity/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao utilizar a Habilidade Elemental, aumenta todos os Bônus de Dano Elemental em 8/10/12/14/16% por 15s e concede um Contrato de Vida equivalente a 24% da Vida Máxima. Este efeito pode ser ativado uma vez a cada 10s. Quando o Contrato de Vida é removido, aumenta em 2/2.5/3/3.5/4% o Bônus de Dano Elemental de todos os Elementos a cada 1.000 Pontos de Vida removidos. Em um máximo de 12/15/18/21/24% de Bônus de Dano Elemental de todos os Elementos, esse efeito dura 15s.", "location": "Obtido na forja", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "Uma antologia de roteiros com uma forma estranha. Todos os roteiros escritos por Coppelius estão registrados dentro dele." + "description": "Uma antologia de roteiros com uma forma estranha. Todos os roteiros escritos por Coppelius estão registrados dentro dele.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/flute-of-ezpitzal/en.json b/assets/data/weapons/flute-of-ezpitzal/en.json index 251f2b9d1..6c8f5cff8 100644 --- a/assets/data/weapons/flute-of-ezpitzal/en.json +++ b/assets/data/weapons/flute-of-ezpitzal/en.json @@ -6,5 +6,6 @@ "subStat": "DEF Percentage", "location": "Forged", "baseDamage": { "attack": 41, "subStat": 150 }, - "description": "A peculiarly shaped jade longsword that has been passed down amongst the Masters of the Night-Wind as a \"priestly flute.\"" + "description": "A peculiarly shaped jade longsword that has been passed down amongst the Masters of the Night-Wind as a \"priestly flute.\"", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/flute-of-ezpitzal/pt.json b/assets/data/weapons/flute-of-ezpitzal/pt.json index b2b28359e..972adb734 100644 --- a/assets/data/weapons/flute-of-ezpitzal/pt.json +++ b/assets/data/weapons/flute-of-ezpitzal/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a DEF em 16%/20%/24%/28%/32% por 15s após utilizar a Habilidade Elemental.", "location": "Ferreiro", "baseDamage": { "attack": 41, "subStat": 150 }, - "description": "Uma lâmina de jade feita de forma peculiar. Nas lendas dos Mestres do Vento Noturno, ela é conhecida como a ritualística \"Flauta do Sacerdote\"." + "description": "Uma lâmina de jade feita de forma peculiar. Nas lendas dos Mestres do Vento Noturno, ela é conhecida como a ritualística \"Flauta do Sacerdote\".", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/footprint-of-the-rainbow/en.json b/assets/data/weapons/footprint-of-the-rainbow/en.json index 10c747179..733d5db5e 100644 --- a/assets/data/weapons/footprint-of-the-rainbow/en.json +++ b/assets/data/weapons/footprint-of-the-rainbow/en.json @@ -6,5 +6,6 @@ "subStat": "DEF Percentage", "location": "Forged", "baseDamage": { "attack": 42, "subStat": 113 }, - "description": "A keen polearm forged from jade. It gives off rainbow-hued light when exposed to sunlight." + "description": "A keen polearm forged from jade. It gives off rainbow-hued light when exposed to sunlight.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/footprint-of-the-rainbow/pt.json b/assets/data/weapons/footprint-of-the-rainbow/pt.json index 513e34e6e..45e15fb52 100644 --- a/assets/data/weapons/footprint-of-the-rainbow/pt.json +++ b/assets/data/weapons/footprint-of-the-rainbow/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a DEF em 16%/20%/24%/28%/32% por 15s após utilizar a Habilidade Elemental.", "location": "Forjar", "baseDamage": { "attack": 42, "subStat": 113 }, - "description": "Uma lança afiada forjada em jade, que pode refletir um brilho iridescente sob a luz do sol." + "description": "Uma lança afiada forjada em jade, que pode refletir um brilho iridescente sob a luz do sol.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/forest-regalia/en.json b/assets/data/weapons/forest-regalia/en.json index 6b0c5d0b0..849f56e0c 100644 --- a/assets/data/weapons/forest-regalia/en.json +++ b/assets/data/weapons/forest-regalia/en.json @@ -1,12 +1,12 @@ { - "name": "Forest Regalia", - "type": "Claymore", - "rarity": 4, - "baseAttack": 44, - "subStat": "Energy Recharge", - "passiveName": "Forest Sanctuary", - "passiveDesc": "After triggering Burning, Quicken, Aggravate, Spread, Bloom, Hyperbloom, or Burgeon, a Leaf of Consciousness will be created around the character for a maximum of 10s. When picked up, the Leaf will grant the character 60 Elemental Mastery for 12s. Only 1 Leaf can be generated this way every 20s. This effect can still be triggered if the character is not on the field. The Leaf of Consciousness' effect cannot stack.", - "location": "Crafting", - "ascensionMaterial": "talisman" - } - \ No newline at end of file + "name": "Forest Regalia", + "type": "Claymore", + "rarity": 4, + "baseAttack": 44, + "subStat": "Energy Recharge", + "passiveName": "Forest Sanctuary", + "passiveDesc": "After triggering Burning, Quicken, Aggravate, Spread, Bloom, Hyperbloom, or Burgeon, a Leaf of Consciousness will be created around the character for a maximum of 10s. When picked up, the Leaf will grant the character 60 Elemental Mastery for 12s. Only 1 Leaf can be generated this way every 20s. This effect can still be triggered if the character is not on the field. The Leaf of Consciousness' effect cannot stack.", + "location": "Crafting", + "ascensionMaterial": "talisman", + "weapon_type": "CLAYMORE" +} diff --git a/assets/data/weapons/forest-regalia/pt.json b/assets/data/weapons/forest-regalia/pt.json index fa3023928..87faef5b3 100644 --- a/assets/data/weapons/forest-regalia/pt.json +++ b/assets/data/weapons/forest-regalia/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após desencadear Queimaduras, Aceleração, Intensificação, Propagação, Florescimento, Superflorescimento ou Germinação, uma Folha da Consciência será criada em volta do personagem por no máximo 10s. Quando coletada, a Folha da Consciência aumentará a Proficiência Elemental do personagem em 60/75/90/105/120 por 12s. Apenas 1 Folha pode ser criada dessa forma a cada 20s. Esse efeito ainda pode ser desencadeado mesmo se o personagem não estiver em campo. O efeito da Folha da Consciência não pode ser acumulado.", "location": "Forja", "baseDamage": { "attack": 44, "subStat": 6.7 }, - "description": "Uma arma obtida através de uma das histórias dos Aranara. Ela tomou a forma de um espadão que é capaz de cortar os inimigos da floresta." + "description": "Uma arma obtida através de uma das histórias dos Aranara. Ela tomou a forma de um espadão que é capaz de cortar os inimigos da floresta.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/freedom-sworn/en.json b/assets/data/weapons/freedom-sworn/en.json index 8a8c2a378..40eb712f7 100644 --- a/assets/data/weapons/freedom-sworn/en.json +++ b/assets/data/weapons/freedom-sworn/en.json @@ -7,5 +7,6 @@ "passiveName": "Revolutionary Chorale", "passiveDesc": "A part of the \"Millennial Movement\" that wanders amidst the winds. Increases DMG by 10%/12.5%/15%/17.5%/20%. When the character wielding this weapon triggers Elemental Reactions, they gain a Sigil of Rebellion. This effect can be triggered once every 0.5s and can be triggered even if said character is not on the field.When you possess 2 Sigils of Rebellion, all of them will be consumed and all nearby party members will obtain \"Millennial Movement: Song of Resistance\" for 12s. \"Millennial Movement: Song of Resistance\" increases Normal, Charged, and Plunging Attack DMG by 16%/20%/24%/28%/32% and increases ATK by 20%/25%/30%/35%/40%. Once this effect is triggered, you will not gain Sigils of Rebellion for 20s.Of the many effects of the \"Millennial Movement,\" buffs of the same type will not stack.", "location": "Gacha", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/freedom-sworn/jp.json b/assets/data/weapons/freedom-sworn/jp.json index 452808cad..cc4598e10 100644 --- a/assets/data/weapons/freedom-sworn/jp.json +++ b/assets/data/weapons/freedom-sworn/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "執行と抗争の歌", "passiveDesc": "風と共に流れる「千年の大楽章」の一部。与えるダメージ+10%。元素反応を起こすと、奮起の欠片を1枚獲得する。この効果は0.5秒内に1回のみ発動でき、待機中のキャラクターも発動できる。奮起の欠片を2枚集めると、全ての奮起の欠片を消費し、周囲のチーム全員に12秒継続する「千年の大楽章·抗争の歌」効果を付与する：通常攻撃、重撃、落下攻撃のダメージ+16%、攻撃力+20%。発動後20秒の間、奮起の欠片を再度獲得することはできない。「千年の大楽章」のもたらす各効果中、同種類の効果は重ね掛け不可。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/freedom-sworn/pt.json b/assets/data/weapons/freedom-sworn/pt.json index 01155bce0..e56e4faca 100644 --- a/assets/data/weapons/freedom-sworn/pt.json +++ b/assets/data/weapons/freedom-sworn/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Uma parte do \"Concerto Milenar\" que flutua no vento. Aumenta o Dano causado em 10%/12.5%/15%/17.5%/20%. Quando ativa a Reação Elemental, o personagem obterá um Símbolo da Resistência, que pode ser ativado uma vez a cada 0.5s, mesmo quando o personagem não está no campo de batalha. Possuir 2 Símbolos da Resistência faz consumir todos eles, e faz todos os personagens da equipe obterem o efeito de \"Concerto Milenar: Canção da Resistência\" por 12s: Aumenta o Dano de Ataque Normal, Ataque Carregado, Ataque Imersivo em 16%/20%/24%/28%/32%, além disso o ATQ será aumentado em 20%/25%/30%/35%/40%. Dentro de 20s depois da ativação, não é possível obter os Símbolos da Resistência de novo. Entre todos os efeitos de vários valores, os efeitos do mesmo valor não podem ser acumulados.", "location": "Mondstadt", "baseDamage": { "attack": 46, "subStat": 43 }, - "description": "Uma espada azul como canção antediluviana e tão aguçada quanto os juramentos de liberdade prestados na Terra do Vento." + "description": "Uma espada azul como canção antediluviana e tão aguçada quanto os juramentos de liberdade prestados na Terra do Vento.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/frostbearer/en.json b/assets/data/weapons/frostbearer/en.json index 64b86d517..8b40d6e8b 100644 --- a/assets/data/weapons/frostbearer/en.json +++ b/assets/data/weapons/frostbearer/en.json @@ -7,5 +7,6 @@ "passiveName": "", "passiveDesc": "Hitting an opponent with Normal and Charged Attacks has a 60% chance of forming and dropping an Everfrost Icicle above them, dealing 80% AoE ATK DMG. Opponents affected by Cryo are dealt 200% ATK DMG. Can only occur once every 10s.", "location": "Crafting", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/frostbearer/jp.json b/assets/data/weapons/frostbearer/jp.json index af5ac0c79..d2bff9c79 100644 --- a/assets/data/weapons/frostbearer/jp.json +++ b/assets/data/weapons/frostbearer/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "霜の埋葬", "passiveDesc": "通常攻撃と重撃が敵に命中した時、60%の確率で敵の上に恒氷晶核が作られ落下し、攻撃力の80%の範囲ダメージを与える。敵が氷元素の影響を受けている場合、攻撃力の200%のダメージを与える。この効果は10秒毎に1回のみ発動可能。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/frostbearer/pt.json b/assets/data/weapons/frostbearer/pt.json index 55a848057..9cbccd10d 100644 --- a/assets/data/weapons/frostbearer/pt.json +++ b/assets/data/weapons/frostbearer/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Atingir um inimigo com um Ataque Normal e Ataque Carregado possui uma chance de 60%/70%/80%/90%/100% de formar e dropar um Núcleo de Cristal Eterno sobre eles, causando 80%/95%/110%/125%/140% de Dano de ATQ em uma AdE. Inimigos afetados por Cryo recebem 200%/240%/280%/320%/360% de Dano de ATQ. Pode ocorrer apenas uma vez a cada 10s.", "location": "Mondstadt", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Uma fruta que possui uma aura estranha e gélida. Uma leve sensação de agonia emana dela." + "description": "Uma fruta que possui uma aura estranha e gélida. Uma leve sensação de agonia emana dela.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/fruit-of-fulfillment/en.json b/assets/data/weapons/fruit-of-fulfillment/en.json index c823046ca..087f99cc6 100644 --- a/assets/data/weapons/fruit-of-fulfillment/en.json +++ b/assets/data/weapons/fruit-of-fulfillment/en.json @@ -1,12 +1,12 @@ { - "name": "Fruit of Fulfillment", - "type": "Catalyst", - "rarity": 4, - "baseAttack": 42, - "subStat": "Energy Recharge", - "passiveName": "Full Circle", - "passiveDesc": "Obtain the 'Wax and Wane' effect after an Elemental Reaction is triggered, gaining 24 Elemental Mastery while losing 5% ATK. For every 0.3s, 1 stack of Wax and Wane can be gained. Max 5 stacks. For every 6s that go by without an Elemental Reaction being triggered, 1 stack will be lost. This effect can be triggered even when the character is off-field.", - "location": "Crafting", - "ascensionMaterial": "oasis" + "name": "Fruit of Fulfillment", + "type": "Catalyst", + "rarity": 4, + "baseAttack": 42, + "subStat": "Energy Recharge", + "passiveName": "Full Circle", + "passiveDesc": "Obtain the 'Wax and Wane' effect after an Elemental Reaction is triggered, gaining 24 Elemental Mastery while losing 5% ATK. For every 0.3s, 1 stack of Wax and Wane can be gained. Max 5 stacks. For every 6s that go by without an Elemental Reaction being triggered, 1 stack will be lost. This effect can be triggered even when the character is off-field.", + "location": "Crafting", + "ascensionMaterial": "oasis", + "weapon_type": "CATALYST" } - \ No newline at end of file diff --git a/assets/data/weapons/fruit-of-fulfillment/pt.json b/assets/data/weapons/fruit-of-fulfillment/pt.json index 14f6c6093..c53bca9e8 100644 --- a/assets/data/weapons/fruit-of-fulfillment/pt.json +++ b/assets/data/weapons/fruit-of-fulfillment/pt.json @@ -7,6 +7,7 @@ "passiveName": "Bênção da Floresta", "passiveDesc": "Ao causar uma Reação Elemental, obtém o efeito \"Excesso de Falta\", que aumenta a Proficiência Elemental em 24/27/30/33/36 e reduz o ATQ em 5%. Apenas 1 acúmulo de Excesso de Falta poderá ser obitido a cada 0.3s. Máximo de 5 acúmulos. 1 acúmulo será perdido a cada 6s que passar sem que uma Reação Elemental seja desencadeada. Esse efeito pode ser desencadeado mesmo se o personagem estiver fora de campo.", "location": "Forja", - "baseDamage": { "attack": 42, "subStat": 10.0 }, - "description": "Uma fruta obtida através de uma das histórias dos Aranara. Ela tem o poder de conquistar qualquer crise." + "baseDamage": { "attack": 42, "subStat": 10 }, + "description": "Uma fruta obtida através de uma das histórias dos Aranara. Ela tem o poder de conquistar qualquer crise.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/fruitful-hook/en.json b/assets/data/weapons/fruitful-hook/en.json index 0500f588a..55ba70fcb 100644 --- a/assets/data/weapons/fruitful-hook/en.json +++ b/assets/data/weapons/fruitful-hook/en.json @@ -8,5 +8,6 @@ "passiveDesc": "Increase Plunging Attack CRIT Rate by 16%/20%/24%/28%/32%; After a Plunging Attack hits an opponent, Normal, Charged, and Plunging Attack DMG increased by 16%/20%/24%/28%/32% for 10s.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 44, "subStat": 6 }, - "description": "Bold Burkina from the Scions of the Canopy once made this weapon with the hero Tenoch's help — all for the sake of obtaining Flamegranates unmatched throughout Natlan." + "description": "Bold Burkina from the Scions of the Canopy once made this weapon with the hero Tenoch's help — all for the sake of obtaining Flamegranates unmatched throughout Natlan.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/fruitful-hook/pt.json b/assets/data/weapons/fruitful-hook/pt.json index 56ad62c59..2abe02f79 100644 --- a/assets/data/weapons/fruitful-hook/pt.json +++ b/assets/data/weapons/fruitful-hook/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a Taxa CRIT dos Ataques Imersivos em 16%/20%/24%/28%/32%. Quando um Ataque Imersivo atinge um inimigo, aumenta o Dano causado pelos Ataques Normais, Carregados e Imersivos em 16%/20%/24%/28%/32% por 10s.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "O audacioso Burkina, dos Descendentes das Copas, construiu esta arma com a ajuda do herói Tenoch — tudo para obter Fogorromãs incomparáveis em Natlan." + "description": "O audacioso Burkina, dos Descendentes das Copas, construiu esta arma com a ajuda do herói Tenoch — tudo para obter Fogorromãs incomparáveis em Natlan.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/hakushin-ring/en.json b/assets/data/weapons/hakushin-ring/en.json index 25e5475d9..20ff4d208 100644 --- a/assets/data/weapons/hakushin-ring/en.json +++ b/assets/data/weapons/hakushin-ring/en.json @@ -7,5 +7,6 @@ "passiveName": "Sakura Saiguu", "passiveDesc": "After the character equipped with this weapon triggers an Electro elemental reaction, nearby party members of an Elemental Type involved in the elemental reaction receive a 10/12.5/15/17.5/20% Elemental DMG Bonus for their element, lasting 6s. Elemental Bonuses gained in this way cannot be stacked.", "location": "Crafting", - "ascensionMaterial": "distant-sea" + "ascensionMaterial": "distant-sea", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/hakushin-ring/jp.json b/assets/data/weapons/hakushin-ring/jp.json index 67dba17a9..6b9015c6e 100644 --- a/assets/data/weapons/hakushin-ring/jp.json +++ b/assets/data/weapons/hakushin-ring/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "櫻の斎宮", "passiveDesc": "この武器を装備したキャラクターが雷元素に関連する反応を起こした時、周囲チーム内にてその反応に関わった元素タイプのキャラクターは強化効果を獲得する。強化効果：該当元素タイプの元素ダメージ+10%、継続時間6秒。この方式で獲得する元素ダメージアップ効果は重ね掛けできない。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/hakushin-ring/pt.json b/assets/data/weapons/hakushin-ring/pt.json index cb51cbcbe..e466bacdb 100644 --- a/assets/data/weapons/hakushin-ring/pt.json +++ b/assets/data/weapons/hakushin-ring/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Depois de o personagem com essa arma equipada desencadear uma reação Electro, os membros da equipe ao redor com Tipo Elemental envolvidos na reação terão Dano Adicional do Elemento em 10%/12.5%/15%/17.5%/20%, por 6s. O Dano adicional obtido pelo personagem dessa forma não pode ser acumulado.", "location": "Inazuma", "baseDamage": { "attack": 44, "subStat": 67 }, - "description": "Um catalisador que guarda a memória de Kitsune Saiguu dos tempos passados. E, ainda assim, esse dispositivo é apenas um recipiente empobrecido para toda a amplitude do seu pensamento." + "description": "Um catalisador que guarda a memória de Kitsune Saiguu dos tempos passados. E, ainda assim, esse dispositivo é apenas um recipiente empobrecido para toda a amplitude do seu pensamento.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/halberd/en.json b/assets/data/weapons/halberd/en.json index 6d0d2e5b6..12b797237 100755 --- a/assets/data/weapons/halberd/en.json +++ b/assets/data/weapons/halberd/en.json @@ -7,5 +7,6 @@ "passiveName": "Heavy", "passiveDesc": "Normal Attacks deal an additional 160/200/240/280/320% DMG. Can only occur once every 10s.", "location": "Chests", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/halberd/jp.json b/assets/data/weapons/halberd/jp.json index f810c455a..e083d0924 100644 --- a/assets/data/weapons/halberd/jp.json +++ b/assets/data/weapons/halberd/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "過重", "passiveDesc": "通常攻撃が命中した敵1体に攻撃力の160%の追加ダメージを与える。10秒毎に1回のみ発動可能。", - "location": "宝箱等" + "location": "宝箱等", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/halberd/pt.json b/assets/data/weapons/halberd/pt.json index dff5beb9e..cb0159c78 100644 --- a/assets/data/weapons/halberd/pt.json +++ b/assets/data/weapons/halberd/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ataques Normais causam um adicional de 200%/240%/280%/320% de Dano ao oponente atingido. Este efeito pode ser ativado uma vez a cada 10s.", "location": "Liyue", "baseDamage": { "attack": 40, "subStat": 51 }, - "description": "Uma arma de fogo com uma lâmina de machado montada no topo que pode causar muito dano. É a arma preferida entre os Oficiais de Millelith." + "description": "Uma arma de fogo com uma lâmina de machado montada no topo que pode causar muito dano. É a arma preferida entre os Oficiais de Millelith.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/hamayumi/en.json b/assets/data/weapons/hamayumi/en.json index 070008520..f5c2c6981 100644 --- a/assets/data/weapons/hamayumi/en.json +++ b/assets/data/weapons/hamayumi/en.json @@ -7,5 +7,6 @@ "passiveName": "Full Draw", "passiveDesc": "Increases Normal Attack DMG by 16/20/24/28/32% and Charged Attack DMG by 12/15/18/21/24%. When the equipping character's Energy reaches 100%, this effect is increased by 100%.", "location": "Crafting", - "ascensionMaterial": "narukami" + "ascensionMaterial": "narukami", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/hamayumi/jp.json b/assets/data/weapons/hamayumi/jp.json index 1f3659dfe..2467be830 100644 --- a/assets/data/weapons/hamayumi/jp.json +++ b/assets/data/weapons/hamayumi/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "浅瀨の弭", "passiveDesc": "通常攻撃のダメージ+16%、重撃のダメージ+12%。この武器を装備したキャラクターの元素エネルギーが満タンの場合、該当効果が2倍になる。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/hamayumi/pt.json b/assets/data/weapons/hamayumi/pt.json index 94a60ff90..e1508b08c 100644 --- a/assets/data/weapons/hamayumi/pt.json +++ b/assets/data/weapons/hamayumi/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano de ATQ Normal em 16%/20%/24%/28%/32% e o Dano de ATQ Carregado em 12%/15%/18%/21%/24%. Quando a Energia Elemental do personagem equipado com essa arma é igual a 100%, esse efeito aumenta 100%.", "location": "Inazuma", "baseDamage": { "attack": 41, "subStat": 120 }, - "description": "Uma certa bruxa do templo tinha este arco de guerra. Foi feito com uma excelente habilidade, e ele é complexo e robusto." + "description": "Uma certa bruxa do templo tinha este arco de guerra. Foi feito com uma excelente habilidade, e ele é complexo e robusto.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/haran-geppaku-futsu/en.json b/assets/data/weapons/haran-geppaku-futsu/en.json index 31e61c1c0..5b97e41cb 100644 --- a/assets/data/weapons/haran-geppaku-futsu/en.json +++ b/assets/data/weapons/haran-geppaku-futsu/en.json @@ -7,5 +7,6 @@ "passiveName": "Honed Flow", "passiveDesc": "Obtain 12/15/18/21/24% All Elemental DMG Bonus. When other nearby party members use Elemental Skills, the character equipping this weapon will gain 1 Wavespike stack. Max 2 stacks. This effect can be triggered once every 0.3s. When the character equipping this weapon uses an Elemental Skill, all stacks of Wavespike will be consumed to gain Rippling Upheaval: each stack of Wavespike consumed will increase Normal Attack DMG by 20/25/30/35/40% for 8s.", "location": "Gacha", - "ascensionMaterial": "narukami" + "ascensionMaterial": "narukami", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/haran-geppaku-futsu/pt.json b/assets/data/weapons/haran-geppaku-futsu/pt.json index f208ff7ef..d5023f590 100644 --- a/assets/data/weapons/haran-geppaku-futsu/pt.json +++ b/assets/data/weapons/haran-geppaku-futsu/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Obtém 12%/15%/18%/21%/24% de bônus de Dano de todos os elementos. Quando os outros personagens da equipe usam Habilidades Elementais, gerarão um acúmulo do efeito \"Ondulação\" para o personagem que tem esta arma equipada. Esse efeito é acumulável no máximo 2 vezes e pode ser desencadeado uma vez a cada 0.3s. Quando o personagem que tiver esta arma equipada lançar sua Habilidade Elemental, se tiver acúmulos de \"Ondulação\", consumirá os acúmulos existentes e obterá \"Maremoto\", cada acúmulo consumido aumenta o Dano do Ataque Normal em 20%/25%/30%/35%/40% por 8s.", "location": "Inazuma", "baseDamage": { "attack": 46, "subStat": 72 }, - "description": "Uma obra da linhagem Futsu. Seu nome tem como origem devido à maneira que lembra uma onda violenta do mar." + "description": "Uma obra da linhagem Futsu. Seu nome tem como origem devido à maneira que lembra uma onda violenta do mar.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/harbinger-of-dawn/en.json b/assets/data/weapons/harbinger-of-dawn/en.json index 57a387515..695319988 100755 --- a/assets/data/weapons/harbinger-of-dawn/en.json +++ b/assets/data/weapons/harbinger-of-dawn/en.json @@ -7,5 +7,6 @@ "passiveName": "Vigorous", "passiveDesc": "When HP is above 90%, increases CRIT Rate by 14/18/22/24/28%.", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/harbinger-of-dawn/jp.json b/assets/data/weapons/harbinger-of-dawn/jp.json index 2ea3ad4a3..0215481f9 100644 --- a/assets/data/weapons/harbinger-of-dawn/jp.json +++ b/assets/data/weapons/harbinger-of-dawn/jp.json @@ -6,5 +6,6 @@ "subStat": "会心ダメージ", "passiveName": "奮い立てる", "passiveDesc": "HPが90%以上の時、会心率+14%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/harbinger-of-dawn/pt.json b/assets/data/weapons/harbinger-of-dawn/pt.json index bdc32dcc8..1a9a4b8e9 100644 --- a/assets/data/weapons/harbinger-of-dawn/pt.json +++ b/assets/data/weapons/harbinger-of-dawn/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando a Vida estiver acima de 90%, aumenta a Taxa Crítica em 14%/17.5%/21%/24.5%/28%.", "location": "Mondstadt", "baseDamage": { "attack": 39, "subStat": 102 }, - "description": "Uma espada que, uma vez, brilhou como o sol. O portador desta espada será abençoado com um bônus de \"boa sensação\". O material refletivo em sua lâmina já se desgastou há muito tempo." + "description": "Uma espada que, uma vez, brilhou como o sol. O portador desta espada será abençoado com um bônus de \"boa sensação\". O material refletivo em sua lâmina já se desgastou há muito tempo.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/hunter-s-bow/en.json b/assets/data/weapons/hunter-s-bow/en.json index 8cc3c32e1..97fd07edb 100755 --- a/assets/data/weapons/hunter-s-bow/en.json +++ b/assets/data/weapons/hunter-s-bow/en.json @@ -7,5 +7,6 @@ "passiveName": "-", "passiveDesc": "-", "location": "Chest", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/hunter-s-bow/jp.json b/assets/data/weapons/hunter-s-bow/jp.json index 0810fb20f..43f61631c 100644 --- a/assets/data/weapons/hunter-s-bow/jp.json +++ b/assets/data/weapons/hunter-s-bow/jp.json @@ -6,5 +6,6 @@ "subStat": "-", "passiveName": "-", "passiveDesc": "-", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/hunter-s-bow/pt.json b/assets/data/weapons/hunter-s-bow/pt.json index 21016e70c..7457c4623 100644 --- a/assets/data/weapons/hunter-s-bow/pt.json +++ b/assets/data/weapons/hunter-s-bow/pt.json @@ -5,5 +5,6 @@ "baseAttack": 23, "location": "-", "baseDamage": { "attack": 23, "subStat": 0 }, - "description": "A melodia de um caçador consiste em dois tipos de sons: o som do tensionamento da corda do seu arco e o som da flecha atravessando o ar." + "description": "A melodia de um caçador consiste em dois tipos de sons: o som do tensionamento da corda do seu arco e o som da flecha atravessando o ar.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/hunter-s-path/en.json b/assets/data/weapons/hunter-s-path/en.json index 93644a697..f075372ea 100644 --- a/assets/data/weapons/hunter-s-path/en.json +++ b/assets/data/weapons/hunter-s-path/en.json @@ -1,11 +1,12 @@ -{ - "name": "Hunter's Path", - "type": "Bow", - "rarity": 5, - "baseAttack": 44, - "subStat": "CRIT Rate", - "passiveName": "At the End of the Beast-Paths", - "passiveDesc": "Gain 12% All Elemental DMG Bonus. Obtain the Tireless Hunt effect after hitting an opponent with a Charged Attack. This effect increases Charged Attack DMG by 160% of Elemental Mastery. This effect will be removed after 12 Charged Attacks or 10s. Only 1 instance of Tireless Hunt can be gained every 12s.", - "location": "Gacha Banner", - "ascensionMaterial": "scorching" -} +{ + "name": "Hunter's Path", + "type": "Bow", + "rarity": 5, + "baseAttack": 44, + "subStat": "CRIT Rate", + "passiveName": "At the End of the Beast-Paths", + "passiveDesc": "Gain 12% All Elemental DMG Bonus. Obtain the Tireless Hunt effect after hitting an opponent with a Charged Attack. This effect increases Charged Attack DMG by 160% of Elemental Mastery. This effect will be removed after 12 Charged Attacks or 10s. Only 1 instance of Tireless Hunt can be gained every 12s.", + "location": "Gacha Banner", + "ascensionMaterial": "scorching", + "weapon_type": "BOW" +} diff --git a/assets/data/weapons/hunter-s-path/pt.json b/assets/data/weapons/hunter-s-path/pt.json index c480bbb93..c0ea9c4c7 100644 --- a/assets/data/weapons/hunter-s-path/pt.json +++ b/assets/data/weapons/hunter-s-path/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ganha 12%/15%/18%/21%/24% de Bônus de Dano de todos os Elementos. Obtém o efeito“Caça Incansável”ao acertar um oponente com um Ataque Carregado. Esse efeito aumenta o Dano do Ataque Carregado em 160%/200%/240%/280%/320% da Proficiência Elemental. Esse efeito será removido depois 12 Ataques Carregados ou após 10s. Só é possível obter 1 efeito de Caça Incansável a cada 12s.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 9.6 }, - "description": "Este arco adornado foi feito usando galhos brancos preciosos. Ele já derrotou inúmeras bestas malignas que tentaram infiltrar a floresta." + "description": "Este arco adornado foi feito usando galhos brancos preciosos. Ele já derrotou inúmeras bestas malignas que tentaram infiltrar a floresta.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/ibis-piercer/en.json b/assets/data/weapons/ibis-piercer/en.json index bd49a84f6..cf92f8050 100755 --- a/assets/data/weapons/ibis-piercer/en.json +++ b/assets/data/weapons/ibis-piercer/en.json @@ -7,5 +7,6 @@ "passiveName": "Secret Wisdom's Favor", "passiveDesc": "The character's Elemental Mastery will increase by 40/50/60/70/80 within 6s after Charged Attacks hit opponents. Max 2 stacks. This effect can triggered once every 0.5s.", "location": "Event: Duel! The Summoners' Summit!", - "ascensionMaterial": "talisman" + "ascensionMaterial": "talisman", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/ibis-piercer/pt.json b/assets/data/weapons/ibis-piercer/pt.json index a27666ee7..fe20f9f9b 100644 --- a/assets/data/weapons/ibis-piercer/pt.json +++ b/assets/data/weapons/ibis-piercer/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Nos 6s após um Ataque Carregado atingir um inimigo, aumenta a Proficiência Elemental do personagem em 40/50/60/70/80. Esse efeito pode ser acumulado até 2 vezes e desencadeado uma vez a cada 0.5s.", "location": "Obtido no Evento \"Duelo das Invocações!\" na versão 3.7", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "Um arco dourado forjado a partir da descrição de uma história. Se você usá-lo como uma arma comum, também pode pensar nele como parte de um mundo fictício extraído de suas páginas." + "description": "Um arco dourado forjado a partir da descrição de uma história. Se você usá-lo como uma arma comum, também pode pensar nele como parte de um mundo fictício extraído de suas páginas.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/iron-point/en.json b/assets/data/weapons/iron-point/en.json index 2c73036b3..5999727a1 100755 --- a/assets/data/weapons/iron-point/en.json +++ b/assets/data/weapons/iron-point/en.json @@ -7,5 +7,6 @@ "passiveName": "-", "passiveDesc": "-", "location": "Chest", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/iron-point/jp.json b/assets/data/weapons/iron-point/jp.json index 5b7f9eb7e..c0abf39ff 100644 --- a/assets/data/weapons/iron-point/jp.json +++ b/assets/data/weapons/iron-point/jp.json @@ -6,5 +6,6 @@ "subStat": "-", "passiveName": "-", "passiveDesc": "-", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/iron-point/pt.json b/assets/data/weapons/iron-point/pt.json index 3c19b6d15..eacc4b490 100644 --- a/assets/data/weapons/iron-point/pt.json +++ b/assets/data/weapons/iron-point/pt.json @@ -5,5 +5,6 @@ "baseAttack": 33, "location": "-", "baseDamage": { "attack": 33, "subStat": 0 }, - "description": "Afiada e pontiaguda em sua extremidade, é uma arma balanceada e bastante popular entre os viajantes." + "description": "Afiada e pontiaguda em sua extremidade, é uma arma balanceada e bastante popular entre os viajantes.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/iron-sting/en.json b/assets/data/weapons/iron-sting/en.json index cf7033345..10c6f4e85 100755 --- a/assets/data/weapons/iron-sting/en.json +++ b/assets/data/weapons/iron-sting/en.json @@ -7,5 +7,6 @@ "passiveName": "Infusion Stinger", "passiveDesc": "Dealing Elemental DMG increases all DMG by 6% for 6s. Max 2 stacks. Can only occur once every 1s.", "location": "Crafting", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/iron-sting/jp.json b/assets/data/weapons/iron-sting/jp.json index 2c9ef3f6a..de87c7c81 100644 --- a/assets/data/weapons/iron-sting/jp.json +++ b/assets/data/weapons/iron-sting/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "注入の棘", "passiveDesc": "元素ダメージを与えた後の6秒間、キャラクターの与えるダメージ+6%、最大2重まで。1秒毎に1回のみ発動可能。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/iron-sting/pt.json b/assets/data/weapons/iron-sting/pt.json index 082c74d09..c56be24d7 100644 --- a/assets/data/weapons/iron-sting/pt.json +++ b/assets/data/weapons/iron-sting/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "6s após ao causar Dano Elemental, aumenta todos os Danos em 6%/7.5%/9%/10.5%/12%. Este efeito pode acumular até 2 vezes e pode ser ativado uma vez a cada 1s.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 36 }, - "description": "Espada exótica que de alguma forma acabou nas mãos dos comerciantes de Liyue. É leve, ágil e afiada." + "description": "Espada exótica que de alguma forma acabou nas mãos dos comerciantes de Liyue. É leve, ágil e afiada.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/jadefall-s-splendor/en.json b/assets/data/weapons/jadefall-s-splendor/en.json index 838411cfd..81b210f7a 100755 --- a/assets/data/weapons/jadefall-s-splendor/en.json +++ b/assets/data/weapons/jadefall-s-splendor/en.json @@ -7,5 +7,6 @@ "passiveName": "Primordial Jade Regalia", "passiveDesc": "For 3s after using an Elemental Burst or creating a shield, the equipping character can gain the Primordial Jade Regalia effect: Restore 4.5/5/5.5/6/6.5 Energy every 2.5s, and gain 0.3/0.5/0.7/0.9/1.1% Elemental DMG Bonus for their corresponding Elemental Type for every 1,000 Max HP they possess, up to 12/20/28/36/44%. Primordial Jade Regalia will still take effect even if the equipping character is not on the field.", "location": "Gacha", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/jadefall-s-splendor/pt.json b/assets/data/weapons/jadefall-s-splendor/pt.json index 2d37bd1b0..ee8b93fa2 100644 --- a/assets/data/weapons/jadefall-s-splendor/pt.json +++ b/assets/data/weapons/jadefall-s-splendor/pt.json @@ -5,8 +5,9 @@ "baseAttack": 46, "subStat": "Porcentagem de Vida", "passiveName": "Presente de Jade Primordial", - "passiveDesc": "Nos 3s após lançar um Supremo ou criar um Escudo, gera o efeito “Presente de Jade Primordial”: regenera 4.5/5/5.5/6/6.5 de Energia Elemental a cada 2.5s, e concede um Bônus de Dano Elemental do Tipo Elemental correspondente do personagem que tem esta arma equipada de 0.3%/0.5%/0.7%/0.9%/1.1% para cada 1.000 pontos de Sua Vida Máxima. É possível aumentar em até 12%/20%/28%/36%/44%. O efeito \"Presente de Jade Primordial\" pode ser desencadeado mesmo se o personagem que tem esta arma equipada não estiver ativo no campo de batalha.", + "passiveDesc": "Nos 3s após lançar um Supremo ou criar um Escudo, gera o efeito “Presente de Jade Primordial”: regenera 4.5/5/5.5/6/6.5 de Energia Elemental a cada 2.5s, e concede um Bônus de Dano Elemental do Tipo Elemental correspondente do personagem que tem esta arma equipada de 0.3%/0.5%/0.7%/0.9%/1.1% para cada 1.000 pontos de Sua Vida Máxima. É possível aumentar em até 12%/20%/28%/36%/44%. O efeito \"Presente de Jade Primordial\" pode ser desencadeado mesmo se o personagem que tem esta arma equipada não estiver ativo no campo de batalha.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 46, "subStat": 108 }, - "description": "Um recipiente ritualístico esculpido de jade que reflete o brilho dos céus e águas cristalinas." + "description": "Um recipiente ritualístico esculpido de jade que reflete o brilho dos céus e águas cristalinas.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/kagotsurube-isshin/en.json b/assets/data/weapons/kagotsurube-isshin/en.json index 039dab4fc..18a145ad8 100755 --- a/assets/data/weapons/kagotsurube-isshin/en.json +++ b/assets/data/weapons/kagotsurube-isshin/en.json @@ -7,5 +7,6 @@ "passiveName": "Isshin Art Clarity", "passiveDesc": "When a Normal, Charged, or Plunging Attack hits an opponent, it will whip up a Hewing Gale, dealing AoE DMG equal to 180% of ATK and increasing ATK by 15% for 8s. This effect can be triggered once every 8s.", "location": "Quest: Ere the End, a Glance Back", - "ascensionMaterial": "mask" + "ascensionMaterial": "mask", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/kagotsurube-isshin/pt.json b/assets/data/weapons/kagotsurube-isshin/pt.json index 6cbb7a74c..77860e96d 100644 --- a/assets/data/weapons/kagotsurube-isshin/pt.json +++ b/assets/data/weapons/kagotsurube-isshin/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando um Ataque Normal, Ataque Carregado ou Ataque Imersivo atinge um inimigo, criará Vento Cortador, que infligirá Dano em AdE equivalente a 180% do ATQ e aumenta o ATQ em 15% por 8s. Esse efeito pode ser desencadeado uma vez a cada 8s.", "location": "Inazuma", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Esta lâmina famosa foi forjada em uma nação distante do norte. Contudo, o nome \"Isshin\" foi manchado com muitos atos sombrios em sua jornada para casa." + "description": "Esta lâmina famosa foi forjada em uma nação distante do norte. Contudo, o nome \"Isshin\" foi manchado com muitos atos sombrios em sua jornada para casa.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/kagura-s-verity/en.json b/assets/data/weapons/kagura-s-verity/en.json index db84157de..cc951d4ec 100644 --- a/assets/data/weapons/kagura-s-verity/en.json +++ b/assets/data/weapons/kagura-s-verity/en.json @@ -7,5 +7,6 @@ "passiveName": "Kagura Dance of the Sacred Sakura", "passiveDesc": "Gains the Kagura Dance effect when using an Elemental Skill, causing the Elemental Skill DMG of the character wielding this weapon to increase by 12/15/18/21/24% for 16s. Max 3 stacks. This character will gain 12/15/18/21/24% All Elemental DMG Bonus when they possess 3 stacks.", "location": "Gacha", - "ascensionMaterial": "mask" + "ascensionMaterial": "mask", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/kagura-s-verity/pt.json b/assets/data/weapons/kagura-s-verity/pt.json index a7aac7da9..f73608f09 100644 --- a/assets/data/weapons/kagura-s-verity/pt.json +++ b/assets/data/weapons/kagura-s-verity/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao usar a Habilidade Elemental, obtém o efeito de \"Dança Kagura\", o qual aumenta o Dano da Habilidade Elemental em 12%/15%/18%/21%/24% do personagem que tiver esta arma equipada. Este efeito dura 16s e pode ser acumulado em até 3 vezes. Ao obter 3 acúmulos, o personagem obtém 12%/15%/18%/21%/24% de Bônus de Dano de todos os Elementos.", "location": "Inazuma", "baseDamage": { "attack": 46, "subStat": 144 }, - "description": "Sino usado para a execução da Dança Kagura, abençoado pela própria Guuji. O cheiro da Sakura Sagrada ainda permanece nele." + "description": "Sino usado para a execução da Dança Kagura, abençoado pela própria Guuji. O cheiro da Sakura Sagrada ainda permanece nele.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/katsuragikiri-nagamasa/en.json b/assets/data/weapons/katsuragikiri-nagamasa/en.json index 8109b2e38..97d996d69 100644 --- a/assets/data/weapons/katsuragikiri-nagamasa/en.json +++ b/assets/data/weapons/katsuragikiri-nagamasa/en.json @@ -7,5 +7,6 @@ "passiveName": "Samurai Conduct", "passiveDesc": "Increases Elemental Skill DMG by 6/7.5/9/10.5/12%. After Elemental Skill hits an opponent, the character loses 3 Energy but regenerates 3/3.5/4/4.5/5 Energy every 2s for the next 6s. This effect can occur once every 10s. Can be triggered even when the character is not on the field.", "location": "Crafting", - "ascensionMaterial": "narukami" + "ascensionMaterial": "narukami", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/katsuragikiri-nagamasa/jp.json b/assets/data/weapons/katsuragikiri-nagamasa/jp.json index 9b05bee81..e0d0fa0fa 100644 --- a/assets/data/weapons/katsuragikiri-nagamasa/jp.json +++ b/assets/data/weapons/katsuragikiri-nagamasa/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "名士の振舞", "passiveDesc": "元素スキルのダメージ+6%。元素スキルが命中した時、キャラクターは元素エネルギーを3ポイント失う。その後の6秒間、2秒毎に元素エネルギーを3ポイント獲得する。この効果は10秒毎に1回のみ発動でき、待機中のキャラクターも発動できる。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/katsuragikiri-nagamasa/pt.json b/assets/data/weapons/katsuragikiri-nagamasa/pt.json index f8a64ec28..42226d512 100644 --- a/assets/data/weapons/katsuragikiri-nagamasa/pt.json +++ b/assets/data/weapons/katsuragikiri-nagamasa/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano causado pela Habilidade Elemental em 6%/7.5%/9%/10.5%/12%. Quando o personagem acerta no inimigo com sua Habilidade Elemental, ele perde 3 pontos de Energia Elemental e dentro dos 6s posteriores ele restaura 3/3.5/4/4.5/5 pontos de Energia Elemental a cada 2s. Esse efeito só pode ser ativado uma vez a cada 10s. Quando o personagem não está em campo ele também pode ser ativado.", "location": "Inazuma", "baseDamage": { "attack": 42, "subStat": 10 }, - "description": "Uma espada forjada em Tatarasuna. Pesada e resistente." + "description": "Uma espada forjada em Tatarasuna. Pesada e resistente.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/key-of-khaj-nisut/en.json b/assets/data/weapons/key-of-khaj-nisut/en.json index 9df4a6472..32ac4800a 100644 --- a/assets/data/weapons/key-of-khaj-nisut/en.json +++ b/assets/data/weapons/key-of-khaj-nisut/en.json @@ -1,12 +1,12 @@ { - "name": "Key of Khaj-Nisut", - "type": "Sword", - "rarity": 5, - "baseAttack": 44, - "subStat": "HP", - "passiveName": "Sunken Song of the Sands", - "passiveDesc": "HP increased by 20%. When an Elemental Skill hits opponents, you gain the Grand Hymn effect for 20s. This effect increases the equipping character's Elemental Mastery by 0.12% of their Max HP. This effect can trigger once every 0.3s. Max 3 stacks. When this effect gains 3 stacks, or when the third stack's duration is refreshed, the Elemental Mastery of all nearby party members will be increased by 0.2% of the equipping character's max HP for 20s.", - "location": "Gacha", - "ascensionMaterial": "talisman" - } - \ No newline at end of file + "name": "Key of Khaj-Nisut", + "type": "Sword", + "rarity": 5, + "baseAttack": 44, + "subStat": "HP", + "passiveName": "Sunken Song of the Sands", + "passiveDesc": "HP increased by 20%. When an Elemental Skill hits opponents, you gain the Grand Hymn effect for 20s. This effect increases the equipping character's Elemental Mastery by 0.12% of their Max HP. This effect can trigger once every 0.3s. Max 3 stacks. When this effect gains 3 stacks, or when the third stack's duration is refreshed, the Elemental Mastery of all nearby party members will be increased by 0.2% of the equipping character's max HP for 20s.", + "location": "Gacha", + "ascensionMaterial": "talisman", + "weapon_type": "SWORD" +} diff --git a/assets/data/weapons/key-of-khaj-nisut/pt.json b/assets/data/weapons/key-of-khaj-nisut/pt.json index cb7f863da..5f1f1c344 100644 --- a/assets/data/weapons/key-of-khaj-nisut/pt.json +++ b/assets/data/weapons/key-of-khaj-nisut/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a Vida em 20%/25%/30%/35%/40%. Quando uma Habilidade Elemental acerta os oponentes, gera o efeito \"Grande Poema\" que dura 20s. Esse efeito aumenta a Proficiência Elemental do personagem que está com essa arma equipada baseada em 0.12%/0.15%/0.18%/0.21%/0.24% de sua Vida Máxima. Esse efeito pode ser desencadeado uma vez a cada 0.3s, acumulando até 3 vezes. Quando acumular 3 vezes ou quando a duração do 3º acúmulo for redefinida, aumentará a Proficiência Elemental de todos os personagens da equipe próximos baseada em 0.2%/0.25%/0.3%/0.35%/0.4% da Vida Máxima do personagem que está com essa arma equipada por 20s.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 14.4 }, - "description": "Um dos pares de cetros feitos com obsidiana. Dizem que pode ser usado como chave para abrir a porta do paraíso escondido sob o mar de areia." + "description": "Um dos pares de cetros feitos com obsidiana. Dizem que pode ser usado como chave para abrir a porta do paraíso escondido sob o mar de areia.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/king-s-squire/en.json b/assets/data/weapons/king-s-squire/en.json index 81ac0bccc..e9c3ce441 100644 --- a/assets/data/weapons/king-s-squire/en.json +++ b/assets/data/weapons/king-s-squire/en.json @@ -1,12 +1,12 @@ { - "name": "King's Squire", - "type": "Bow", - "rarity": 4, - "baseAttack": 41, - "subStat": "ATK", - "passiveName": "Labyrinth Lord's Instruction", - "passiveDesc": "Obtain the Teachings of the Forest effect when unleashing Elemental Skills and Bursts, increasing Elemental Mastery by 60 for 12s. This effect will be removed when switching characters. When the Teachings of the Forest effect ends or is removed, it will deal 100% of ATK as DMG to 1 nearby opponent. The Teachings of the Forest effect can be triggered once every 20s.", - "location": "Crafting", - "ascensionMaterial": "scorching" - } - \ No newline at end of file + "name": "King's Squire", + "type": "Bow", + "rarity": 4, + "baseAttack": 41, + "subStat": "ATK", + "passiveName": "Labyrinth Lord's Instruction", + "passiveDesc": "Obtain the Teachings of the Forest effect when unleashing Elemental Skills and Bursts, increasing Elemental Mastery by 60 for 12s. This effect will be removed when switching characters. When the Teachings of the Forest effect ends or is removed, it will deal 100% of ATK as DMG to 1 nearby opponent. The Teachings of the Forest effect can be triggered once every 20s.", + "location": "Crafting", + "ascensionMaterial": "scorching", + "weapon_type": "BOW" +} diff --git a/assets/data/weapons/king-s-squire/pt.json b/assets/data/weapons/king-s-squire/pt.json index b5182ef56..35f3b786b 100644 --- a/assets/data/weapons/king-s-squire/pt.json +++ b/assets/data/weapons/king-s-squire/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Obtém o efeito \"Ensinamentos da Floresta\" ao desencadear Habilidades Elementais e Supremos, aumentando a Proficiência Elemental em 60/80/100/120/140 por 12s. Este efeito será removido ao trocar de personagens. Quando o efeito de Ensinamentos da Floresta termina ou é removido, irá causar 100%/120%/140%/160%/180% de ATQ como Dano a 1 oponente próximo. O efeito de Ensinamentos da Floresta pode ser desencadeado uma vez a cada 20s.", "location": "Forja", "baseDamage": { "attack": 41, "subStat": 120 }, - "description": "Uma arma obtida através de uma das histórias dos Aranara. Ela tomou a forma de um arco que é capaz de perfurar os inimigos da floresta." + "description": "Uma arma obtida através de uma das histórias dos Aranara. Ela tomou a forma de um arco que é capaz de perfurar os inimigos da floresta.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/kitain-cross-spear/en.json b/assets/data/weapons/kitain-cross-spear/en.json index 4479c265c..0f1b0da74 100644 --- a/assets/data/weapons/kitain-cross-spear/en.json +++ b/assets/data/weapons/kitain-cross-spear/en.json @@ -7,5 +7,6 @@ "passiveName": "Samurai Conduct", "passiveDesc": "Increases Elemental Skill DMG by 6/7.5/9/10.5/12%. After Elemental Skill hits an opponent, the character loses 3 Energy but regenerates 3/3.5/4/4.5/5 Energy every 2s for the next 6s. This effect can occur once every 10s. Can be triggered even when the character is not on the field.", "location": "Crafting", - "ascensionMaterial": "mask" + "ascensionMaterial": "mask", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/kitain-cross-spear/jp.json b/assets/data/weapons/kitain-cross-spear/jp.json index c00e4a5af..65f891136 100644 --- a/assets/data/weapons/kitain-cross-spear/jp.json +++ b/assets/data/weapons/kitain-cross-spear/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "名士の振舞", "passiveDesc": "元素スキルのダメージ+6%。元素スキルが命中した時、キャラクターは元素エネルギーを3ポイント失う。その後の6秒間、2秒毎に元素エネルギーを3ポイント獲得する。この効果は10秒毎に1回のみ発動でき、待機中のキャラクターも発動できる。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/kitain-cross-spear/pt.json b/assets/data/weapons/kitain-cross-spear/pt.json index fa87995e4..f876dd290 100644 --- a/assets/data/weapons/kitain-cross-spear/pt.json +++ b/assets/data/weapons/kitain-cross-spear/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano causado pela Habilidade Elemental em 6%/7.5%/9%/10.5%/12%. Quando o personagem acerta no inimigo com sua Habilidade Elemental, ele perde 3 pontos de Energia Elemental e dentro dos 6s posteriores ele restaura 3/3.5/4/4.5/5 pontos de Energia Elemental a cada 2s. Esse efeito só pode ser ativado uma vez a cada 10s. Quando o personagem não está em campo ele também pode ser ativado.", "location": "Inazuma", "baseDamage": { "attack": 44, "subStat": 24 }, - "description": "Uma lança especial que foi usada por um guerreiro famoso que guardava o Tatarigami da Ilha Yashiori." + "description": "Uma lança especial que foi usada por um guerreiro famoso que guardava o Tatarigami da Ilha Yashiori.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/light-of-foliar-incision/en.json b/assets/data/weapons/light-of-foliar-incision/en.json index 679806fbe..aefecab59 100644 --- a/assets/data/weapons/light-of-foliar-incision/en.json +++ b/assets/data/weapons/light-of-foliar-incision/en.json @@ -7,5 +7,6 @@ "passiveName": "Whitemoon Bristle", "passiveDesc": "CRIT Rate is increased by 4%. After Normal Attacks deal Elemental DMG, the Foliar Incision effect will be obtained, increasing DMG dealt by Normal Attacks and Elemental Skills by 120% of Elemental Mastery.", "location": "Gacha", - "ascensionMaterial": "talisman" + "ascensionMaterial": "talisman", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/light-of-foliar-incision/pt.json b/assets/data/weapons/light-of-foliar-incision/pt.json index 5afb666c0..ec105d101 100644 --- a/assets/data/weapons/light-of-foliar-incision/pt.json +++ b/assets/data/weapons/light-of-foliar-incision/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a Taxa CRIT em 4%/5%/6%/7%8%. Quando o Ataque Normal causa Dano elemental, obtém o efeito \"Poda\": aumenta o Dano causado pelos Ataques Normais e pela Habilidade Elemental. O aumento de Dano é equivalente a 120%/150%/180%/210%/240% da Proficiência Elemental. Esse efeito desaparecerá depois de ser ativado 28 vezes ou após 12s. Só é possível desencadear o efeito \"Poda\" uma vez a cada 12s.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 192 }, - "description": "Uma lâmina ornamentada feita de preciosos ramos brancos. No passado cortou incontáveis sujeiras que percorreram a floresta contaminada." + "description": "Uma lâmina ornamentada feita de preciosos ramos brancos. No passado cortou incontáveis sujeiras que percorreram a floresta contaminada.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/lion-s-roar/en.json b/assets/data/weapons/lion-s-roar/en.json index d4f65c14c..ea07cf7dd 100755 --- a/assets/data/weapons/lion-s-roar/en.json +++ b/assets/data/weapons/lion-s-roar/en.json @@ -7,5 +7,6 @@ "passiveName": "Bane of Fire and Thunder", "passiveDesc": "Increases DMG against enemies affected by Pyro or Electro by 20/24/28/32/36%.", "location": "Gacha", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/lion-s-roar/jp.json b/assets/data/weapons/lion-s-roar/jp.json index 4d47629ec..c11a0f946 100644 --- a/assets/data/weapons/lion-s-roar/jp.json +++ b/assets/data/weapons/lion-s-roar/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "炎と雷の破滅", "passiveDesc": "炎元素または雷元素の影響を受けた敵に対するダメージ+20%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/lion-s-roar/pt.json b/assets/data/weapons/lion-s-roar/pt.json index baad73b8b..842235df4 100644 --- a/assets/data/weapons/lion-s-roar/pt.json +++ b/assets/data/weapons/lion-s-roar/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano contra inimigos afetados por Pyro ou Electro em 20%/24%/28%/32%/36%.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Uma lâmina afiada com inserções luxuosas que de alguma forma não comprometeu sua durabilidade e nitidez. O som que emite ao fazer cortes pelo ar é como o rugido de leões." + "description": "Uma lâmina afiada com inserções luxuosas que de alguma forma não comprometeu sua durabilidade e nitidez. O som que emite ao fazer cortes pelo ar é como o rugido de leões.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/lithic-blade/en.json b/assets/data/weapons/lithic-blade/en.json index cb0ff3500..1af64cc40 100755 --- a/assets/data/weapons/lithic-blade/en.json +++ b/assets/data/weapons/lithic-blade/en.json @@ -7,5 +7,6 @@ "passiveName": "Lithic Axiom - Unity", "passiveDesc": "For every character in the party who hails from Liyue, the character who equips this weapon gains 6/7/8/9/10% ATK increase and 2/3/4/5/6% CRIT Rate increase.", "location": "Gacha", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/lithic-blade/jp.json b/assets/data/weapons/lithic-blade/jp.json index 46ce66c74..836527ed7 100644 --- a/assets/data/weapons/lithic-blade/jp.json +++ b/assets/data/weapons/lithic-blade/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "千岩訣·同心", "passiveDesc": "チームに璃月出身のキャラクターが1人いる毎に、この武器を装備したキャラクターの攻撃力+7%、会心率+3%。最大4重まで。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/lithic-blade/pt.json b/assets/data/weapons/lithic-blade/pt.json index bc6831d69..b657715d7 100644 --- a/assets/data/weapons/lithic-blade/pt.json +++ b/assets/data/weapons/lithic-blade/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Por cada personagem de Liyue que possua na Equipe, aumenta o ATQ do personagem que equipar essa arma em 7%/8%/9%/10%/11% e aumenta sua Taxa CRIT em 3%/4%/5%/6%/7%. Esse efeito pode ser acumulado no máximo 4 vezes.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 9 }, - "description": "Uma espada grande esculpida e cinzelada na própria base de Liyue." + "description": "Uma espada grande esculpida e cinzelada na própria base de Liyue.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/lithic-spear/en.json b/assets/data/weapons/lithic-spear/en.json index b6bbc38f3..716630a5a 100755 --- a/assets/data/weapons/lithic-spear/en.json +++ b/assets/data/weapons/lithic-spear/en.json @@ -7,5 +7,6 @@ "passiveName": "Lithic Axiom - Unity", "passiveDesc": "For every character in the party who hails from Liyue, the character who equips this weapon gains 7/8/9/10/11% ATK increase and a 3/4/5/6/7% CRIT Rate increase. This effect stacks up to 4 times.", "location": "Gacha", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/lithic-spear/jp.json b/assets/data/weapons/lithic-spear/jp.json index ed083e047..0d254fece 100644 --- a/assets/data/weapons/lithic-spear/jp.json +++ b/assets/data/weapons/lithic-spear/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "千岩訣·同心", "passiveDesc": "チームに璃月出身のキャラクターが1人いる毎に、この武器を装備したキャラクターの攻撃力+7%、会心率+3%。最大4重まで。", - "location": "祈願" + "location": "祈願", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/lithic-spear/pt.json b/assets/data/weapons/lithic-spear/pt.json index fdd4066e9..fbb30dedc 100644 --- a/assets/data/weapons/lithic-spear/pt.json +++ b/assets/data/weapons/lithic-spear/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Por cada personagem de Liyue que possua na Equipe, aumenta o ATQ do personagem que equipar essa arma em 7%/8%/9%/10%/11% e aumenta sua Taxa CRIT em 3%/4%/5%/6%/7%. Esse efeito pode ser acumulado no máximo 4 vezes.", "location": "Liyue", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "Uma lança forjada com pedras da floresta de Guyun. Sua robustez é conhecida por não haver outra igual." + "description": "Uma lança forjada com pedras da floresta de Guyun. Sua robustez é conhecida por não haver outra igual.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/lost-prayer-to-the-sacred-winds/en.json b/assets/data/weapons/lost-prayer-to-the-sacred-winds/en.json index 3672e3df7..f8c07c8c0 100755 --- a/assets/data/weapons/lost-prayer-to-the-sacred-winds/en.json +++ b/assets/data/weapons/lost-prayer-to-the-sacred-winds/en.json @@ -7,5 +7,6 @@ "passiveName": "Boundless Blessing", "passiveDesc": "Increases Movement SPD by 10%. When in battle, earn a 6/8/10/12/14% Elemental DMG Bonus every 4s. Max 4 stacks. Lasts until the character falls or leaves combat.", "location": "Gacha", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/lost-prayer-to-the-sacred-winds/jp.json b/assets/data/weapons/lost-prayer-to-the-sacred-winds/jp.json index b46459b1e..cb475243b 100644 --- a/assets/data/weapons/lost-prayer-to-the-sacred-winds/jp.json +++ b/assets/data/weapons/lost-prayer-to-the-sacred-winds/jp.json @@ -6,5 +6,6 @@ "subStat": "会心率", "passiveName": "果てしない恵み", "passiveDesc": "移動速度+10%。フィールドにいる時、4秒毎に元素ダメージ+8%、最大4重まで。キャラが退場または戦闘不能まで有効。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/lost-prayer-to-the-sacred-winds/pt.json b/assets/data/weapons/lost-prayer-to-the-sacred-winds/pt.json index fd1a4792c..bd9ff6caa 100644 --- a/assets/data/weapons/lost-prayer-to-the-sacred-winds/pt.json +++ b/assets/data/weapons/lost-prayer-to-the-sacred-winds/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a Veloc. Mov. em 10%. Durante a batalha, ganha um adicional de 8%/10%/12%/14%/16% de Dano Elemental a cada 4s, sendo capaz de acumular até 4 vezes. Dura até o último personagem ser abatido ou trocar de personagem.", "location": "Mondstadt", "baseDamage": { "attack": 46, "subStat": 72 }, - "description": "Um livro educacional escrito por habitantes anônimos que adoravam o vento. Foi abençoado pelo vento por sua fidelidade e influência ao longo dos milênios." + "description": "Um livro educacional escrito por habitantes anônimos que adoravam o vento. Foi abençoado pelo vento por sua fidelidade e influência ao longo dos milênios.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/lumidouce-elegy/en.json b/assets/data/weapons/lumidouce-elegy/en.json index c2a89a02c..b27026b9e 100644 --- a/assets/data/weapons/lumidouce-elegy/en.json +++ b/assets/data/weapons/lumidouce-elegy/en.json @@ -7,5 +7,6 @@ "passiveName": "Bright Dawn Overture", "passiveDesc": "ATK increased by 15%. After the equipping character triggers Burning on an opponent or deals Dendro DMG to Burning opponents, the DMG dealt is increased by 18%. This effect lasts for 8s, max 2 stacks. When 2 stacks are reached or when the duration is refreshed at 2 stacks, restore 12 Energy. Energy can be restored this way once every 12s. The 2 aforementioned effects can be triggered even when the character is off-field.", "location": "Gacha", - "ascensionMaterial": "pristine-sea" + "ascensionMaterial": "pristine-sea", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/lumidouce-elegy/pt.json b/assets/data/weapons/lumidouce-elegy/pt.json index 9e9752538..44f14e4a4 100644 --- a/assets/data/weapons/lumidouce-elegy/pt.json +++ b/assets/data/weapons/lumidouce-elegy/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o ATQ em 15%/19%/23%/27%31%. Quando o personagem que está com essa arma equipada desencadeia Queimadura ou causa Dano Dendro a oponentes com Queimaduras, aumenta o Dano causado em 18%/23%/28%/33%/38%. Esse efeito dura 8s e pode ser acumulado até 2 vezes. Quando atingir 2 acúmulos ou a duração dos 2 acúmulos for redefinida, regenera 12/13/14/15/16 de Energia Elemental. É possível regenerar Energia Elemental dessa forma uma vez a cada 12s. Esses dois efeitos também são aplicáveis a personagens que não estão ativos no campo de batalha.", "location": "Banner de Invocação Limitado", "baseDamage": { "attack": 46, "subStat": 72 }, - "description": "Uma lança magnífica adornada com cristal azul. Dizem que foi o tesouro de um certo lendário Duelista Representante — no entanto, nunca foi usada nem uma vez sequer." + "description": "Uma lança magnífica adornada com cristal azul. Dizem que foi o tesouro de um certo lendário Duelista Representante — no entanto, nunca foi usada nem uma vez sequer.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/luxurious-sea-lord/en.json b/assets/data/weapons/luxurious-sea-lord/en.json index f3341f50f..9ff476767 100644 --- a/assets/data/weapons/luxurious-sea-lord/en.json +++ b/assets/data/weapons/luxurious-sea-lord/en.json @@ -7,5 +7,6 @@ "passiveName": "Oceanic Victory", "passiveDesc": "Increases Elemental Burst DMG by 12/15/18/21/24%. When Elemental Burst hits opponents, there is a 100% chance of summoning a huge onrush of tuna that charges and deals 100/125/150/175/200% ATK as AoE DMG. This effect can occur once every 15s.", "location": "Moonlight Merriment Event", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/luxurious-sea-lord/pt.json b/assets/data/weapons/luxurious-sea-lord/pt.json index 914286cc4..f1ec128b8 100644 --- a/assets/data/weapons/luxurious-sea-lord/pt.json +++ b/assets/data/weapons/luxurious-sea-lord/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano do Supremo em 12%/15%/18%/21%/24%. Quando o Supremo acerta os oponentes, existe 100% de chance de invocar uma tuna titânica que avança e causa 100%/125%/150%/175%/200% do ATQ como Dano em uma AdE. Este efeito pode ocorrer uma vez a cada 15s.", "location": "Liyue", "baseDamage": { "attack": 41, "subStat": 12 }, - "description": "O grande rei do oceano. Após ter sido desidratado, serve como uma boa arma, bem como um alimento de emergência." + "description": "O grande rei do oceano. Após ter sido desidratado, serve como uma boa arma, bem como um alimento de emergência.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/magic-guide/en.json b/assets/data/weapons/magic-guide/en.json index 2c10566a8..741e19074 100755 --- a/assets/data/weapons/magic-guide/en.json +++ b/assets/data/weapons/magic-guide/en.json @@ -7,5 +7,6 @@ "passiveName": "Bane of Storm and Tide", "passiveDesc": "Increases DMG against enemies affected by Hydro or Electro by 12/15/18/21/24%.", "location": "Gacha", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/magic-guide/jp.json b/assets/data/weapons/magic-guide/jp.json index 5f73a2af0..c93a4dfd8 100644 --- a/assets/data/weapons/magic-guide/jp.json +++ b/assets/data/weapons/magic-guide/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "水と雷の破滅", "passiveDesc": "水元素または雷元素の影響を受けた敵に対するダメージ+12%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/magic-guide/pt.json b/assets/data/weapons/magic-guide/pt.json index 6511dbc96..13d38ba2e 100644 --- a/assets/data/weapons/magic-guide/pt.json +++ b/assets/data/weapons/magic-guide/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano contra inimigos afetados por Hydro ou Electro em 12%/15%/18%/21%/24%.", "location": "Mondstadt", "baseDamage": { "attack": 38, "subStat": 41 }, - "description": "12ª edição. Uma reedição com correção da 11ª edição e novas adições baseadas nos desenvolvimentos atuais." + "description": "12ª edição. Uma reedição com correção da 11ª edição e novas adições baseadas nos desenvolvimentos atuais.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/mailed-flower/en.json b/assets/data/weapons/mailed-flower/en.json index 878c7b962..99294599e 100644 --- a/assets/data/weapons/mailed-flower/en.json +++ b/assets/data/weapons/mailed-flower/en.json @@ -7,5 +7,6 @@ "passiveName": "Whispers of Wind and Flower", "passiveDesc": "Within 8s after the character's Elemental Skill hits an opponent or the character triggers an Elemental Reaction, their ATK and Elemental Mastery will be increased by 12% and 48 respectively.", "location": "Windblume's Breath Event", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/mailed-flower/pt.json b/assets/data/weapons/mailed-flower/pt.json index a949c6349..8bed3c458 100644 --- a/assets/data/weapons/mailed-flower/pt.json +++ b/assets/data/weapons/mailed-flower/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Nos 8s depois da Habilidade Elemental atingir um inimigo ou desencadear uma Reação Elemental, aumenta o ATQ em 12%/15%/18%/21%/24% e a Proficiência Elemental em 48/60/72/84/96 respectivamente.", "location": "Evento da Versão 3.5 - Suspiro da brisa Florescente", "baseDamage": { "attack": 44, "subStat": 24 }, - "description": "Um Espadão com linhas finas e elegantes, adornada com laços festivos e flores." + "description": "Um Espadão com linhas finas e elegantes, adornada com laços festivos e flores.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/makhaira-aquamarine/en.json b/assets/data/weapons/makhaira-aquamarine/en.json index a4b5106bc..6287badd4 100644 --- a/assets/data/weapons/makhaira-aquamarine/en.json +++ b/assets/data/weapons/makhaira-aquamarine/en.json @@ -1,12 +1,12 @@ { - "name": "Makhaira Aquamarine", - "type": "Claymore", - "rarity": 4, - "baseAttack": 42, - "subStat": "Elemental Mastery", - "passiveName": "Desert Pavilion", - "passiveDesc": "The following effect will trigger every 10s: The equipping character will gain 24% of their Elemental Mastery as bonus ATK for 12s, with nearby party members gaining 30% of this buff for the same duration. Multiple instances of this weapon can allow this buff to stack. This effect will still trigger even if the character is not on the field.", - "location": "Gacha", - "ascensionMaterial": "scorching" - } - \ No newline at end of file + "name": "Makhaira Aquamarine", + "type": "Claymore", + "rarity": 4, + "baseAttack": 42, + "subStat": "Elemental Mastery", + "passiveName": "Desert Pavilion", + "passiveDesc": "The following effect will trigger every 10s: The equipping character will gain 24% of their Elemental Mastery as bonus ATK for 12s, with nearby party members gaining 30% of this buff for the same duration. Multiple instances of this weapon can allow this buff to stack. This effect will still trigger even if the character is not on the field.", + "location": "Gacha", + "ascensionMaterial": "scorching", + "weapon_type": "CLAYMORE" +} diff --git a/assets/data/weapons/makhaira-aquamarine/pt.json b/assets/data/weapons/makhaira-aquamarine/pt.json index 7502c0c35..f2a00304d 100644 --- a/assets/data/weapons/makhaira-aquamarine/pt.json +++ b/assets/data/weapons/makhaira-aquamarine/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "A cada 10s, gera os seguintes efeitos: aumenta o ATQ do personagem que está com essa arma equipada baseado em 24%/30%/36%/42%/48% da sua Proficiência Elemental. Os demais personagens próximos da equipe ganham 30% desse bônus. Esses efeitos duram 12s. É possível acumular esses efeitos equipando vários exemplares desta mesma arma. Esse efeito será desencadeado mesmo que o personagem não esteja ativo no campo de batalha.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 42, "subStat": 36 }, - "description": "Um espadão antigo que brilha como a própria água. Nem mesmo os milhares de anos de erosão da areia conseguiram tirar o fio impecável de sua lâmina." + "description": "Um espadão antigo que brilha como a própria água. Nem mesmo os milhares de anos de erosão da areia conseguiram tirar o fio impecável de sua lâmina.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/mappa-mare/en.json b/assets/data/weapons/mappa-mare/en.json index f16308a6b..3c7645d87 100755 --- a/assets/data/weapons/mappa-mare/en.json +++ b/assets/data/weapons/mappa-mare/en.json @@ -7,5 +7,6 @@ "passiveName": "Infusion Scroll", "passiveDesc": "Triggering an Elemental reaction grants a 8/10/12/14/16% Elemental DMG Bonus for 10s. Max 2 stacks.", "location": "Crafting", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/mappa-mare/jp.json b/assets/data/weapons/mappa-mare/jp.json index c681ac61c..d3e1c3248 100644 --- a/assets/data/weapons/mappa-mare/jp.json +++ b/assets/data/weapons/mappa-mare/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "注入の巻", "passiveDesc": "元素反応を起こした後、元素ダメージ+8%、継続時間10秒、最大2重まで。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/mappa-mare/pt.json b/assets/data/weapons/mappa-mare/pt.json index 3034af2ed..5b1fd2d44 100644 --- a/assets/data/weapons/mappa-mare/pt.json +++ b/assets/data/weapons/mappa-mare/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ativar uma reação Elemental concede um adicional de 8%/10%/12%/14%/16% de Dano Elemental por 10s, podendo acumular até 2 vezes.", "location": "Liyue", "baseDamage": { "attack": 44, "subStat": 24 }, - "description": "Um mapa bastante detalhado sobre as águas ao redor de Teyvat. É um documento valioso que apareceu nas rotas comerciais de Liyue." + "description": "Um mapa bastante detalhado sobre as águas ao redor de Teyvat. É um documento valioso que apareceu nas rotas comerciais de Liyue.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/memory-of-dust/en.json b/assets/data/weapons/memory-of-dust/en.json index 387f05504..38060a4ec 100755 --- a/assets/data/weapons/memory-of-dust/en.json +++ b/assets/data/weapons/memory-of-dust/en.json @@ -7,5 +7,6 @@ "passiveName": "Golden Majesty", "passiveDesc": "Increase Shield Strength by 20/25/30/35/40%. Scoring hits on opponents increases ATK by 4/5/6/7/8% for 8s. Max 5 stacks. Can only occur once every 0.3s. While protected by a shield, this ATK increase effect is increased by 100%.", "location": "Gacha", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/memory-of-dust/jp.json b/assets/data/weapons/memory-of-dust/jp.json index 54f67ab99..3fcccbb45 100644 --- a/assets/data/weapons/memory-of-dust/jp.json +++ b/assets/data/weapons/memory-of-dust/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "金璋君臨", "passiveDesc": "シールド強化+20%。攻撃が命中した8秒間、攻撃力+4%。この効果は最大5重まで、0.3秒毎に1回のみ発動可能。また、シールド状態の時、攻撃力アップの効果量が2倍になる。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/memory-of-dust/pt.json b/assets/data/weapons/memory-of-dust/pt.json index e9921acf8..08cd6a0ce 100644 --- a/assets/data/weapons/memory-of-dust/pt.json +++ b/assets/data/weapons/memory-of-dust/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a força do Escudo em 20%/25%/30%/35%/40%. Acertar ataques em inimigos aumenta o ataque em 4%/5%/6%/7%/8% por 8s. Acumula até 5 vezes. Pode ocorrer apenas uma vez a cada 0.3s. Enquanto estiver protegido por um escudo, esse efeito de ataque é aumentado em 100%.", "location": "Liyue", "baseDamage": { "attack": 46, "subStat": 108 }, - "description": "Uma fechadura de pedra contendo memórias distantes. Suas infinitas transformações revelam seu poder interior." + "description": "Uma fechadura de pedra contendo memórias distantes. Suas infinitas transformações revelam seu poder interior.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/messenger/en.json b/assets/data/weapons/messenger/en.json index 70c5f06b7..48fd7f53f 100755 --- a/assets/data/weapons/messenger/en.json +++ b/assets/data/weapons/messenger/en.json @@ -7,5 +7,6 @@ "passiveName": "Archer's Message", "passiveDesc": "Aimed Shot hits on weak spots deal an additional 100/125/150/175/200% ATK DMG as CRIT DMG. Can only occur once every 10s.", "location": "Chest", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/messenger/jp.json b/assets/data/weapons/messenger/jp.json index 311e125cd..8e98f7866 100644 --- a/assets/data/weapons/messenger/jp.json +++ b/assets/data/weapons/messenger/jp.json @@ -6,5 +6,6 @@ "subStat": "会心ダメージ", "passiveName": "矢文", "passiveDesc": "重撃が弱点に命中した場合、追加で攻撃力100%のダメージを与え、必ず会心ダメージとなる。10秒毎に1回のみ発動可能。", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/messenger/pt.json b/assets/data/weapons/messenger/pt.json index b7766fd19..c4cd3f913 100644 --- a/assets/data/weapons/messenger/pt.json +++ b/assets/data/weapons/messenger/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao acertar um ponto fraco com Ataque Carregado, causa um adicional de 100%/125%/150%/175%/200% de Dano de ATQ como Dano Crítico. Este efeito pode ser ativado uma vez a cada 10s.", "location": "Liyue", "baseDamage": { "attack": 40, "subStat": 68 }, - "description": "Um arco básico de madeira. Dizem que ele foi usado para comunicações de longa distância." + "description": "Um arco básico de madeira. Dizem que ele foi usado para comunicações de longa distância.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/missive-windspear/en.json b/assets/data/weapons/missive-windspear/en.json index 2d7966848..c83544eda 100755 --- a/assets/data/weapons/missive-windspear/en.json +++ b/assets/data/weapons/missive-windspear/en.json @@ -7,5 +7,6 @@ "passiveName": "The Wind Unattained", "passiveDesc": "Within 10s after an Elemental Reaction is triggered, ATK is increased by 12/15/18/21/24% and Elemental Mastery is increased by 48/60/72/84/96.", "location": "Event: Of Ballads and Brews", - "ascensionMaterial": "boreal" -} \ No newline at end of file + "ascensionMaterial": "boreal", + "weapon_type": "POLEARM" +} diff --git a/assets/data/weapons/missive-windspear/pt.json b/assets/data/weapons/missive-windspear/pt.json index c58d3e152..443319856 100644 --- a/assets/data/weapons/missive-windspear/pt.json +++ b/assets/data/weapons/missive-windspear/pt.json @@ -7,5 +7,6 @@ "passiveDesc": "Nos 10s depois de desencadear uma Reação Elemental, aumenta o ATQ em 12%/15%/18%/21%/24% e a Proficiência Elemental em 48/60/72/84/96 pontos.", "location": "Evento da 3.1 \"Canção das Taças\" Obtendo 200 pontos de animação do festival.", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Um estandarte que pode guiar os ventos. Os ventos que sopram por lugares idílicos nem sempre são suaves." + "description": "Um estandarte que pode guiar os ventos. Os ventos que sopram por lugares idílicos nem sempre são suaves.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/mistsplitter-reforged/en.json b/assets/data/weapons/mistsplitter-reforged/en.json index ce97c2481..02308b46a 100644 --- a/assets/data/weapons/mistsplitter-reforged/en.json +++ b/assets/data/weapons/mistsplitter-reforged/en.json @@ -7,5 +7,6 @@ "passiveName": "Mistsplitter's Edge", "passiveDesc": "Gain a 12% Elemental DMG Bonus for every element and receive the might of Mistsplitter's Emblem. At stack levels 1/2/3, Mistsplitter's Emblem provides a 8/16/28% Elemental DMG Bonus for the character's Elemental Type. The character will obtain 1 stack of Mistsplitter's Emblem in each of the following scenarios: Normal Attack deals Elemental DMG (stack lasts 5s), casting Elemental Burst (stack lasts 10s); Energy is less than 100% (stack disappears when Energy is full). Each stack's duration is calculated independently.", "location": "Gacha", - "ascensionMaterial": "distant-sea" + "ascensionMaterial": "distant-sea", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/mistsplitter-reforged/jp.json b/assets/data/weapons/mistsplitter-reforged/jp.json index d338883a6..82e5a8f95 100644 --- a/assets/data/weapons/mistsplitter-reforged/jp.json +++ b/assets/data/weapons/mistsplitter-reforged/jp.json @@ -6,5 +6,6 @@ "subStat": "会心ダメージ", "passiveName": "霧切の御腰物", "passiveDesc": "全元素ダメージ+12%、「霧切の巴紋」の効果を獲得できる。霧切の巴紋を1/2/3層有する時、自身元素タイプの元素ダメージ+8/16/28%。霧切の巴紋は次の各状況において獲得できる。通常攻撃で元素ダメージを与えた時、継続時間5秒の霧切の巴紋を1層獲得する。元素爆発を発動した時、継続時間10秒の霧切の巴紋を1層獲得する。また、キャラクターの元素エネルギーが100%未満の場合、霧切の巴紋を1層獲得する、この霧切の巴紋は元素エネルギーが満タンになると消失する。霧切の巴紋の継続時間は層ごとに独立している。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/mistsplitter-reforged/pt.json b/assets/data/weapons/mistsplitter-reforged/pt.json index 8654579c7..9680e90f6 100644 --- a/assets/data/weapons/mistsplitter-reforged/pt.json +++ b/assets/data/weapons/mistsplitter-reforged/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ganha um Dano adicional elemental para todos os elementos de 12%/15%/18%/21%/24% e pode também ganhar o poder do Selo Quebra-nuvens. Selo Quebra-nuvens: Nos acúmulos 1/2/3 do Selo Quebra-nuvens obtém Dano adicional do próprio Elemento em 8/16/28%/10/20/35%/12/24/42%/14/28/49%/16/32/56%. Nas situações abaixo, cada personagem obtém 1 acúmulo de Selo Quebra-nuvens: quando o ATQ Normal causa Dano Elemental, dura 5s; quando libera Supremo, dura 10s; além disso, quando a Energia Elemental do personagem é inferior a 100%, irá obter 1 acúmulo do Selo Quebra-nuvens, que desaparecerá quando a Energia Elemental do personagem estiver cheia. O tempo de cada acúmulo de Selo Quebra-nuvens é contado individualmente.", "location": "Inazuma", "baseDamage": { "attack": 48, "subStat": 96 }, - "description": "Uma espada que emite uma luz violeta forte. O nome \"reforjada\" é devido a outrora ela estar quebrada." + "description": "Uma espada que emite uma luz violeta forte. O nome \"reforjada\" é devido a outrora ela estar quebrada.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/mitternachts-waltz/en.json b/assets/data/weapons/mitternachts-waltz/en.json index 33969f693..7fca84324 100644 --- a/assets/data/weapons/mitternachts-waltz/en.json +++ b/assets/data/weapons/mitternachts-waltz/en.json @@ -7,5 +7,6 @@ "passiveName": "Evernight Duet", "passiveDesc": "Normal Attack hits on opponents increase Elemental Skill DMG by 20/25/30/35/40% for 5s. Elemental Skill hits on opponents increase Normal Attack DMG by 20/25/30/35/40% for 5s.", "location": "Gacha", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/mitternachts-waltz/jp.json b/assets/data/weapons/mitternachts-waltz/jp.json index 1406e31b3..6ca082abf 100644 --- a/assets/data/weapons/mitternachts-waltz/jp.json +++ b/assets/data/weapons/mitternachts-waltz/jp.json @@ -6,5 +6,6 @@ "subStat": "物理ダメージ", "passiveName": "極夜のデュエット", "passiveDesc": "通常攻撃が敵に命中した後の5秒間、元素スキルのダメージ+20%。元素スキルが敵に命中した後の5秒間、通常攻撃のダメージ+20%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/mitternachts-waltz/pt.json b/assets/data/weapons/mitternachts-waltz/pt.json index 6c13be1ff..6a9f5f425 100644 --- a/assets/data/weapons/mitternachts-waltz/pt.json +++ b/assets/data/weapons/mitternachts-waltz/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Dentro de 5s após acertar um inimigo com o Ataque Normal, o Dano causado pela Habilidade Elemental aumenta em 20%/25%/30%/35%/40%. Dentro de 5s após acertar um inimigo com a Habilidade Elemental, o Dano do Ataque Normal aumenta 20%/25%/30%/35%/40%.", "location": "Mondstadt", "baseDamage": { "attack": 42, "subStat": 113 }, - "description": "Um arco que possui cores como as da noite de ilusões e de pecados." + "description": "Um arco que possui cores como as da noite de ilusões e de pecados.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/moonpiercer/en.json b/assets/data/weapons/moonpiercer/en.json index 24fb60142..9f49e6eb6 100644 --- a/assets/data/weapons/moonpiercer/en.json +++ b/assets/data/weapons/moonpiercer/en.json @@ -1,12 +1,12 @@ { - "name": "Moonpiercer", - "type": "Polearm", - "rarity": 4, - "baseAttack": 44, - "subStat": "Elemental Mastery", - "passiveName": "Stillwood Moonshadow", - "passiveDesc": "After triggering Burning, Quicken, Aggravate, Spread, Bloom, Hyperbloom, or Burgeon, a Leaf of Revival will be created around the character for a maximum of 10s. When picked up, the Leaf will grant the character 16% ATK for 12s. Only 1 Leaf can be generated this way every 20s. This effect can still be triggered if the character is not on the field.", - "location": "Crafting", - "ascensionMaterial": "oasis" + "name": "Moonpiercer", + "type": "Polearm", + "rarity": 4, + "baseAttack": 44, + "subStat": "Elemental Mastery", + "passiveName": "Stillwood Moonshadow", + "passiveDesc": "After triggering Burning, Quicken, Aggravate, Spread, Bloom, Hyperbloom, or Burgeon, a Leaf of Revival will be created around the character for a maximum of 10s. When picked up, the Leaf will grant the character 16% ATK for 12s. Only 1 Leaf can be generated this way every 20s. This effect can still be triggered if the character is not on the field.", + "location": "Crafting", + "ascensionMaterial": "oasis", + "weapon_type": "POLEARM" } - \ No newline at end of file diff --git a/assets/data/weapons/moonpiercer/pt.json b/assets/data/weapons/moonpiercer/pt.json index c97565ffb..4781081d1 100644 --- a/assets/data/weapons/moonpiercer/pt.json +++ b/assets/data/weapons/moonpiercer/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após desencadear Queimadura, Aceleração, Intensificação, Propagação, Florescimento, Superflorescimento ou Germinação, uma Folha do Renascimento será criada em volta do personagem por no máximo 10s. Quando coletada, a Folha do Renascimento aumentará o ATQ do personagem em 16%/20%/24%/28%/32% por 12s. Apenas 1 Folha pode ser criada dessa forma a cada 20s. Esse efeito ainda pode ser desencadeado mesmo se o personagem não estiver em campo.", "location": "Forja", "baseDamage": { "attack": 44, "subStat": 24 }, - "description": "Uma arma obtida através de uma das histórias dos Aranara. Ela tomou a forma de uma flecha gigantesca e pode ser usada como uma lança." + "description": "Uma arma obtida através de uma das histórias dos Aranara. Ela tomou a forma de uma flecha gigantesca e pode ser usada como uma lança.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/mountain-bracing-bolt/en.json b/assets/data/weapons/mountain-bracing-bolt/en.json index 750a92d06..263fc5d9d 100644 --- a/assets/data/weapons/mountain-bracing-bolt/en.json +++ b/assets/data/weapons/mountain-bracing-bolt/en.json @@ -8,5 +8,6 @@ "passiveDesc": "Decreases Climbing Stamina Consumption by 15% and increases Elemental Skill DMG by 12%/15%/18%/21%/24%. Also, after other nearby party members use Elemental Skills, the equipping character's Elemental Skill DMG will also increase by 12%/15%/18%/21%/24% for 8s.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 44, "subStat": 67 }, - "description": "This polearm was once jointly forged by the craftsmen in the mines as a sacrifice to the spirits of the mountains." + "description": "This polearm was once jointly forged by the craftsmen in the mines as a sacrifice to the spirits of the mountains.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/mountain-bracing-bolt/pt.json b/assets/data/weapons/mountain-bracing-bolt/pt.json index ad9340f4e..e8326aa6c 100644 --- a/assets/data/weapons/mountain-bracing-bolt/pt.json +++ b/assets/data/weapons/mountain-bracing-bolt/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Reduz o consumo de Stamina ao escalar em 15% e aumenta o Dano causado pela Habilidade Elemental em 12%/15%/18%/21%/24%. Além disso, quando os outros personagens próximos da equipe lançam sua Habilidade Elemental, aumenta o Dano da Habilidade Elemental do personagem que está com essa arma equipada em mais 12%/15%/18%/21%/24% por 8s.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 67 }, - "description": "Esta arma de haste foi feita por artesãos nas minas como um sacrifício para os espíritos das montanhas." + "description": "Esta arma de haste foi feita por artesãos nas minas como um sacrifício para os espíritos das montanhas.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/mouun-s-moon/en.json b/assets/data/weapons/mouun-s-moon/en.json index aee4e4eb7..5460da10f 100644 --- a/assets/data/weapons/mouun-s-moon/en.json +++ b/assets/data/weapons/mouun-s-moon/en.json @@ -7,5 +7,6 @@ "passiveName": "Watatsumi Wavewalker", "passiveDesc": "For every point of the entire party's combined maximum Energy capacity, the Elemental Burst DMG of the character equipping this weapon is increased by 0.12/0.15/0.18/0.21/0.24%. A maximum of 40/50/60/70/80% increased Elemental Burst DMG can be achieved this way.", "location": "Gacha", - "ascensionMaterial": "narukami" + "ascensionMaterial": "narukami", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/mouun-s-moon/pt.json b/assets/data/weapons/mouun-s-moon/pt.json index 2c8136f24..aebb393a1 100644 --- a/assets/data/weapons/mouun-s-moon/pt.json +++ b/assets/data/weapons/mouun-s-moon/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "O Personagem que usar esta arma terá um aumento do Dano do Supremo de 0.12%/0.15%/0.18%/0.21%/0.24% por cada 1 ponto da soma do máximo da Energia Elemental de todos os membros da equipe. O aumento de Dano do Supremo máximo obtível dessa maneira é de 40%/50%/60%/70%/80%.", "location": "Inazuma", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "Um arco de guerra adorável feito de conchas e coral. Um brilho lúgubre flui ao longo de seus braços coloridos à luz da lua." + "description": "Um arco de guerra adorável feito de conchas e coral. Um brilho lúgubre flui ao longo de seus braços coloridos à luz da lua.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/oathsworn-eye/en.json b/assets/data/weapons/oathsworn-eye/en.json index 33a9170b4..190c773de 100644 --- a/assets/data/weapons/oathsworn-eye/en.json +++ b/assets/data/weapons/oathsworn-eye/en.json @@ -7,5 +7,6 @@ "passiveName": "People of the Faltering Light", "passiveDesc": "Increases Energy Recharge by 24/30/36/42/48% for 10s after using an Elemental Skill.", "location": "Three Realms Gateway Offering Event", - "ascensionMaterial": "distant-sea" + "ascensionMaterial": "distant-sea", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/oathsworn-eye/pt.json b/assets/data/weapons/oathsworn-eye/pt.json index ac56da5bc..36703aef9 100644 --- a/assets/data/weapons/oathsworn-eye/pt.json +++ b/assets/data/weapons/oathsworn-eye/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após usar a Habilidade Elemental, a Recarga de Energia aumenta em 24%/30%/36%/42%/48% por 10s.", "location": "Inazuma", "baseDamage": { "attack": 44, "subStat": 6 }, - "description": "Um tesouro nacional do Reino de Byakuya guardado no Dainichi Mikoshi. Com a chegada do Deus Serpente, este item foi usado para autenticar grandes juramentos e desejos." + "description": "Um tesouro nacional do Reino de Byakuya guardado no Dainichi Mikoshi. Com a chegada do Deus Serpente, este item foi usado para autenticar grandes juramentos e desejos.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/old-merc-s-pal/en.json b/assets/data/weapons/old-merc-s-pal/en.json index 9562a9b8a..1cb1406d1 100755 --- a/assets/data/weapons/old-merc-s-pal/en.json +++ b/assets/data/weapons/old-merc-s-pal/en.json @@ -7,5 +7,6 @@ "passiveName": "-", "passiveDesc": "-", "location": "Chest", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/old-merc-s-pal/jp.json b/assets/data/weapons/old-merc-s-pal/jp.json index c4a3969f4..38ea5cafa 100644 --- a/assets/data/weapons/old-merc-s-pal/jp.json +++ b/assets/data/weapons/old-merc-s-pal/jp.json @@ -6,5 +6,6 @@ "subStat": "-", "passiveName": "-", "passiveDesc": "-", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/old-merc-s-pal/pt.json b/assets/data/weapons/old-merc-s-pal/pt.json index 86c79861a..842b1dc88 100644 --- a/assets/data/weapons/old-merc-s-pal/pt.json +++ b/assets/data/weapons/old-merc-s-pal/pt.json @@ -5,5 +5,6 @@ "baseAttack": 33, "location": "-", "baseDamage": { "attack": 33, "subStat": 0 }, - "description": "Uma grande espada testada em batalhas, passou por muitos momentos árduos." + "description": "Uma grande espada testada em batalhas, passou por muitos momentos árduos.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/otherworldly-story/en.json b/assets/data/weapons/otherworldly-story/en.json index 4e4364514..490587671 100755 --- a/assets/data/weapons/otherworldly-story/en.json +++ b/assets/data/weapons/otherworldly-story/en.json @@ -7,5 +7,6 @@ "passiveName": "Energy Shower", "passiveDesc": "Each Elemental Orb or Particle collected restores 1/1.25/1.5/1.75/2% HP.", "location": "Chests", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/otherworldly-story/jp.json b/assets/data/weapons/otherworldly-story/jp.json index d47ee3023..74ee0f9f7 100644 --- a/assets/data/weapons/otherworldly-story/jp.json +++ b/assets/data/weapons/otherworldly-story/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "エネルギーシャワー", "passiveDesc": "元素オーブまたは元素粒子を獲得した時、HPを1%回復する。", - "location": "宝箱等" + "location": "宝箱等", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/otherworldly-story/pt.json b/assets/data/weapons/otherworldly-story/pt.json index 526283234..f65ea2d09 100644 --- a/assets/data/weapons/otherworldly-story/pt.json +++ b/assets/data/weapons/otherworldly-story/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Coletar um Orbe ou Partícula Elemental restaura 1%/1.25%/1.5%/1.75%/2% da Vida.", "location": "Mondstadt", "baseDamage": { "attack": 39, "subStat": 85 }, - "description": "Um romance de fantasia barato sem valor referencial. Os seus poderes, obviamente, também servem apenas na sua imaginação." + "description": "Um romance de fantasia barato sem valor referencial. Os seus poderes, obviamente, também servem apenas na sua imaginação.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/peak-patrol-song/en.json b/assets/data/weapons/peak-patrol-song/en.json index 30fb5d47e..416289052 100644 --- a/assets/data/weapons/peak-patrol-song/en.json +++ b/assets/data/weapons/peak-patrol-song/en.json @@ -8,5 +8,6 @@ "passiveDesc": "Gain \"Ode to Flowers\" after Normal or Plunging Attacks hit an opponent: DEF increases by 8%/10%/12%/14%/16% and gain a 10%/12.5%/15%/17.5%/20% All Elemental DMG Bonus for 6s. Max 2 stacks. Can trigger once per 0.1s. When this effect reaches 2 stacks or the 2nd stack's duration is refreshed, increase all nearby party members' All Elemental DMG Bonus by 8%/10%/12%/14%/16% for every 1,000 DEF the equipping character has, up to a maximum of 25.6%/32%/38.4%/44.8%/51.2%, for 15s.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 44, "subStat": 180 }, - "description": "An obsidian blade of unparalleled sharpness, light as a song. It was modified by a certain artisan to come equipped with a record-playing detachable Phlogiston Device." + "description": "An obsidian blade of unparalleled sharpness, light as a song. It was modified by a certain artisan to come equipped with a record-playing detachable Phlogiston Device.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/peak-patrol-song/pt.json b/assets/data/weapons/peak-patrol-song/pt.json index b5650b638..c0e9ac1b0 100644 --- a/assets/data/weapons/peak-patrol-song/pt.json +++ b/assets/data/weapons/peak-patrol-song/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando um Ataque Normal ou Imersivo atinge um inimigo, obtém \"Canção de Glória\": aumenta DEF em 8%/10%/12%/14%/16% e obtém 10%/12.5%/15%/17.5%/20% de bônus de Dano de todos os Elementos por 6s e acumula até 2 vezes. Esse efeito pode ser desencadeado uma vez a cada 0.1s. Quando esse efeito alcançar ou possuir 2 acúmulos, sua duração será redefinida, para então, com base em cada 1.000 de DEF do personagem que está com essa arma equipada, aumentar o bônus de Dano de todos os Elementos para todos os membros da equipe em 8%/10%/12%/14%/16%, podendo aumentar até 25.6%/32%/38.4%/44.8%/51.2% por 15s.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 180 }, - "description": "Uma lâmina de obsidiana de afiação incomparável, leve como uma canção. Foi modificada por um certo artesão para vir equipada com um dispositivo de Flogisto destacável que toca discos." + "description": "Uma lâmina de obsidiana de afiação incomparável, leve como uma canção. Foi modificada por um certo artesão para vir equipada com um dispositivo de Flogisto destacável que toca discos.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/pocket-grimoire/en.json b/assets/data/weapons/pocket-grimoire/en.json index e6b44155e..5fbdba26e 100755 --- a/assets/data/weapons/pocket-grimoire/en.json +++ b/assets/data/weapons/pocket-grimoire/en.json @@ -7,5 +7,6 @@ "passiveName": "-", "passiveDesc": "-", "location": "Chest", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/pocket-grimoire/jp.json b/assets/data/weapons/pocket-grimoire/jp.json index a28e12291..30510ce9e 100644 --- a/assets/data/weapons/pocket-grimoire/jp.json +++ b/assets/data/weapons/pocket-grimoire/jp.json @@ -6,5 +6,6 @@ "subStat": "-", "passiveName": "-", "passiveDesc": "-", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/pocket-grimoire/pt.json b/assets/data/weapons/pocket-grimoire/pt.json index 3d851fec3..7ef7df7a9 100644 --- a/assets/data/weapons/pocket-grimoire/pt.json +++ b/assets/data/weapons/pocket-grimoire/pt.json @@ -5,5 +5,6 @@ "baseAttack": 33, "location": "-", "baseDamage": { "attack": 33, "subStat": 0 }, - "description": "Um caderno cuidadosamente compilado com os elementos essenciais necessários para passar em um exame de mágica." + "description": "Um caderno cuidadosamente compilado com os elementos essenciais necessários para passar em um exame de mágica.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/polar-star/en.json b/assets/data/weapons/polar-star/en.json index b68227d97..d7975c462 100644 --- a/assets/data/weapons/polar-star/en.json +++ b/assets/data/weapons/polar-star/en.json @@ -7,5 +7,6 @@ "passiveName": "Daylight's Augury", "passiveDesc": "Elemental Skill and Elemental Burst DMG increased by 12/15/18/21/24%. After a Normal Attack, Charged Attack, Elemental Skill or Elemental Burst hits an opponent, 1 stack of Ashen Nightstar will be gained for 12s. When 1/2/3/4 stacks of Ashen Nightstar are present, ATK is increased by (10/12.5/15/17.5/20)/(20/25/30/35/40)/(30/37.5/45/52.5/60)/(48/60/72/84/96)%. The stack of Ashen Nightstar created by the Normal Attack, Charged Attack, Elemental Skill or Elemental Burst will be counted independently of the others.", "location": "Gacha", - "ascensionMaterial": "mask" + "ascensionMaterial": "mask", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/polar-star/pt.json b/assets/data/weapons/polar-star/pt.json index 4720a7ef8..5a31d0c0c 100644 --- a/assets/data/weapons/polar-star/pt.json +++ b/assets/data/weapons/polar-star/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano causado por Habilidade Elemental e Supremo em 12%/15%/18%/21%/24%; Depois que o Ataque Normal, Ataque Carregado, Habilidade Elemental ou Supremo acerta o inimigo, gera 1 efeito \"Estrela Polar da Noite Branca\" por 12s. Quando tiver 1/2/3/4 acúmulos de \"Estrela Polar da Noite Branca\", o ATQ é aumentado em 10/20/30/48%/12.5/25/37.5/60%/15/30/45/72%/17.5/35/52.5/84%/20/40/60/96%. Os efeitos de \"Estrela Polar da Noite Branca\" gerados por Ataque Normal, Ataque Carregado, Habilidade Elemental ou Supremo são individuais.", "location": "-", "baseDamage": { "attack": 46, "subStat": 72 }, - "description": "Um arco imaculado que é tão afiado quanto as geleiras do extremo norte." + "description": "Um arco imaculado que é tão afiado quanto as geleiras do extremo norte.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/portable-power-saw/en.json b/assets/data/weapons/portable-power-saw/en.json index 7e49fd720..58822dc85 100755 --- a/assets/data/weapons/portable-power-saw/en.json +++ b/assets/data/weapons/portable-power-saw/en.json @@ -7,5 +7,6 @@ "passiveName": "Sea Shanty", "passiveDesc": "When the wielder is healed or heals others, they will gain a Stoic's Symbol that lasts 30s, up to a maximum of 3 Symbols. When using their Elemental Skill or Burst, all Symbols will be consumed and the Roused effect will be granted for 10s. For each Symbol consumed, gain 40/50/60/70/80 Elemental Mastery, and 2s after the effect occurs, 2/2.5/3/3.5/4 Energy per Symbol consumed will be restored for said character. The Roused effect can be triggered once every 15s, and Symbols can be gained even when the character is not on the field.", "location": "Gacha", - "ascensionMaterial": "pristine-sea" + "ascensionMaterial": "pristine-sea", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/portable-power-saw/pt.json b/assets/data/weapons/portable-power-saw/pt.json index a5836771b..2d860de75 100644 --- a/assets/data/weapons/portable-power-saw/pt.json +++ b/assets/data/weapons/portable-power-saw/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando o personagem é curado ou cura, concede o Sinal da Tenacidade por 30s. É possível acumular até 3 Sinais da Tenacidade. Ao lançar a Habilidade Elemental ou o Supremo, consome todos os Sinais da Tenacidade e gera por 10s o efeito \"Ascendendo\": para cada Sinal da Tenacidade consumido, aumenta a Proficiência Elemental em 40/50/60/70/80 pontos, e 2s após gerar esse efeito, cada Sinal da Tenacidade Consumido regenerará 2/2.5/3/3.5/4 de Energia Elemental para o personagem que está com essa arma equipada. É possível desencadear o efeito \"Ascendendo\" uma vez a cada 15s. Também é possível obter o Sinal da Tenacidade quando o personagem não está ativo no campo de batalha.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 41, "subStat": 120 }, - "description": "Uma serra elétrica vintage rara de se ver hoje em dia. Era uma ferramenta usada por trabalhadores em todos os cantos." + "description": "Uma serra elétrica vintage rara de se ver hoje em dia. Era uma ferramenta usada por trabalhadores em todos os cantos.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/predator/en.json b/assets/data/weapons/predator/en.json index 2eb4a6fce..2adeeddc6 100644 --- a/assets/data/weapons/predator/en.json +++ b/assets/data/weapons/predator/en.json @@ -7,5 +7,6 @@ "passiveName": "Strong Strike", "passiveDesc": "This weapon's effect is only applied on the following platform(s):'PlayStation Network' Dealing Cryo DMG to opponents increases this character's Normal and Charged Attack DMG by 10% for 6s. This effect can have a maximum of 2 stacks. Additionally, when Aloy equips Predator, ATK is increased by 66.", "location": "Given via the Mail on PS4/PS5 between Version 2.1–2.2, obtainable on PC/Mobile via cross save", - "ascensionMaterial": "narukami" + "ascensionMaterial": "narukami", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/predator/pt.json b/assets/data/weapons/predator/pt.json index c931ade69..1f94ccb8f 100644 --- a/assets/data/weapons/predator/pt.json +++ b/assets/data/weapons/predator/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano de ATQ Normal em 16% e o Dano de ATQ Carregado em 12%. Quando a Energia Elemental do personagem equipado com essa arma é igual a 100%, esse efeito aumenta 100%.", "location": "-", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Um arco com um design único. Isto não deve pertencer a este mundo." + "description": "Um arco com um design único. Isto não deve pertencer a este mundo.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/primordial-jade-cutter/en.json b/assets/data/weapons/primordial-jade-cutter/en.json index fcb1dcbaf..01d204d04 100644 --- a/assets/data/weapons/primordial-jade-cutter/en.json +++ b/assets/data/weapons/primordial-jade-cutter/en.json @@ -7,5 +7,6 @@ "passiveName": "Protector's Virtue", "passiveDesc": "HP increased by 20%/25%/30%/35%/40%. Additionally, provides an ATK Bonus based on 1.2%/1.5%/1.8%/2.1%/2.4% of the wielder's Max HP.", "location": "Gacha", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/primordial-jade-cutter/jp.json b/assets/data/weapons/primordial-jade-cutter/jp.json index 73df65943..6e026e8fd 100644 --- a/assets/data/weapons/primordial-jade-cutter/jp.json +++ b/assets/data/weapons/primordial-jade-cutter/jp.json @@ -6,5 +6,6 @@ "subStat": "会心率", "passiveName": "護国の無垢なる心", "passiveDesc": "HP上限+20%。また、キャラクターのHP上限の1.2%分、攻撃力がアップする。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/primordial-jade-cutter/pt.json b/assets/data/weapons/primordial-jade-cutter/pt.json index 5e3e7e502..c48f47a7e 100644 --- a/assets/data/weapons/primordial-jade-cutter/pt.json +++ b/assets/data/weapons/primordial-jade-cutter/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a Vida em 20%/25%/30%/35%/40%. Além disso, o Personagem que equipar esta arma terá um Bônus de ATQ de 1.2%/1.5%/1.8%/2.1%/2.4% com base na Vida Máxima.", "location": "Liyue", "baseDamage": { "attack": 44, "subStat": 96 }, - "description": "Uma espada para cerimônias feita com essência de jade puro esculpido delicadamente. O ar que produz quando balança emite um som parecido a um suspiro." + "description": "Uma espada para cerimônias feita com essência de jade puro esculpido delicadamente. O ar que produz quando balança emite um som parecido a um suspiro.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/primordial-jade-winged-spear/en.json b/assets/data/weapons/primordial-jade-winged-spear/en.json index f2c122a77..1e72a2fca 100755 --- a/assets/data/weapons/primordial-jade-winged-spear/en.json +++ b/assets/data/weapons/primordial-jade-winged-spear/en.json @@ -7,5 +7,6 @@ "passiveName": "Eagle Spear of Justice", "passiveDesc": "On hit, increases ATK by 3.2/3.9/4.6/5.3/6% for 6s. Max 7 stacks. Can only occur once every 0.3s. Full stacks increase Skill DMG by 12/16/20/24/28%.", "location": "Gacha", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/primordial-jade-winged-spear/jp.json b/assets/data/weapons/primordial-jade-winged-spear/jp.json index 5d041178f..cf9a32af6 100644 --- a/assets/data/weapons/primordial-jade-winged-spear/jp.json +++ b/assets/data/weapons/primordial-jade-winged-spear/jp.json @@ -6,5 +6,6 @@ "subStat": "会心率", "passiveName": "正義を貫く鳶の槍", "passiveDesc": "敵に命中した時、自身の攻撃力+3.2%、継続時間6秒、最大7重まで。0.3秒に1回のみ発動できる。7重まで発動すると与えるダメージ+12%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/primordial-jade-winged-spear/pt.json b/assets/data/weapons/primordial-jade-winged-spear/pt.json index 3a7bd5496..c1e5aa220 100644 --- a/assets/data/weapons/primordial-jade-winged-spear/pt.json +++ b/assets/data/weapons/primordial-jade-winged-spear/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao acertar, aumenta o Dano em 3.2%/3.9%/4.6%/5.3%/6% por 6s. Pode acumular até 7 vezes. Pode ocorrer uma vez a cada 0.3s. O acúmulo máximo aumenta o Dano em 12%/15%/18%/21%/24%.", "location": "Liyue", "baseDamage": { "attack": 48, "subStat": 48 }, - "description": "Uma lança pesada e afiada feita de jade. Usada para derrotar monstros marinhos poderosos e pré-históricos." + "description": "Uma lança pesada e afiada feita de jade. Usada para derrotar monstros marinhos poderosos e pré-históricos.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/prospectors-drill/en.json b/assets/data/weapons/prospectors-drill/en.json index 1dee000a9..2f2775020 100644 --- a/assets/data/weapons/prospectors-drill/en.json +++ b/assets/data/weapons/prospectors-drill/en.json @@ -9,5 +9,6 @@ "location": "Event Wish Exclusive", "ascensionMaterial": "ancient-chord", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "A long-handled drill that you can rarely find nowadays. It was often used in delving and in carving stones." + "description": "A long-handled drill that you can rarely find nowadays. It was often used in delving and in carving stones.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/prospectors-drill/pt.json b/assets/data/weapons/prospectors-drill/pt.json index 374cff955..27e3606a2 100644 --- a/assets/data/weapons/prospectors-drill/pt.json +++ b/assets/data/weapons/prospectors-drill/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando é curado ou cura, concede o Sinal da União por 30s, é possível acumular 3 Sinais da União. Ao lançar uma Habilidade Elemental ou Supremo, consome todos os Sinais da União e gera por 10s o efeito \"Resistência\": para cada Sinal da União consumido, aumenta o ATQ em 3%/4%/5%/6%/7% e o Bônus de Dano Elemental em 7%/8.5%/10%/11.5%/13%. É possível desencadear o efeito \"Resistência\" uma vez a cada 15s. Também é possível obter o Sinal da União quando o personagem não está ativo no campo de batalha.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "Uma furadeira longa que raramente é vista hoje em dia. Costumava ser usada em exploração e entalhamento de pedras." + "description": "Uma furadeira longa que raramente é vista hoje em dia. Costumava ser usada em exploração e entalhamento de pedras.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/prototype-amber/en.json b/assets/data/weapons/prototype-amber/en.json index 264681240..9f59208bb 100755 --- a/assets/data/weapons/prototype-amber/en.json +++ b/assets/data/weapons/prototype-amber/en.json @@ -7,5 +7,6 @@ "passiveName": "Gilding", "passiveDesc": "Using an Elemental Burst regenerates 4/4.5/5/5.5/6 Energy every 2s for 6s. Additionally, all party members will regenerate 4/4.5/5/5.5/6% HP every 2s for this duration.", "location": "Crafting", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/prototype-amber/jp.json b/assets/data/weapons/prototype-amber/jp.json index c71e8e9d1..5d07c22cf 100644 --- a/assets/data/weapons/prototype-amber/jp.json +++ b/assets/data/weapons/prototype-amber/jp.json @@ -6,5 +6,6 @@ "subStat": "HP", "passiveName": "炊金", "passiveDesc": "元素爆発を発動した後の6秒間、2秒毎に元素エネルギーを4回復し、チーム全員のHPを2秒毎に4%回復する。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/prototype-amber/pt.json b/assets/data/weapons/prototype-amber/pt.json index 858f7d481..6bff223e0 100644 --- a/assets/data/weapons/prototype-amber/pt.json +++ b/assets/data/weapons/prototype-amber/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao usar o Supremo, regenera 4/4.5/5/5.5/6 de Energia a cada 2s por 6s. Todos os membros da Equipe regenerarão 4%/4.5%/5%/5.5%/6% de Vida a cada 2s.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Um catalisador dourado, guardado secretamente na Forja do Penhasco Obscuro. Parece brilhar com a própria luz do céu." + "description": "Um catalisador dourado, guardado secretamente na Forja do Penhasco Obscuro. Parece brilhar com a própria luz do céu.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/prototype-archaic/en.json b/assets/data/weapons/prototype-archaic/en.json index d587e4fc5..7804da073 100755 --- a/assets/data/weapons/prototype-archaic/en.json +++ b/assets/data/weapons/prototype-archaic/en.json @@ -7,5 +7,6 @@ "passiveName": "Crush", "passiveDesc": "On hit, Normal or Charged Attacks have a 50% chance to deal an additional 240/300/360/420/480% ATK DMG to enemies within a small radius. Can only occur once every 15s.", "location": "Crafting", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/prototype-archaic/jp.json b/assets/data/weapons/prototype-archaic/jp.json index d5fe0a186..6e22d2da6 100644 --- a/assets/data/weapons/prototype-archaic/jp.json +++ b/assets/data/weapons/prototype-archaic/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "粉砕", "passiveDesc": "通常攻撃と重撃が命中する時、50%の確率で狭範囲の敵に攻撃力の240%の追加ダメージを与える。15秒毎に1回のみ発動可能。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/prototype-archaic/pt.json b/assets/data/weapons/prototype-archaic/pt.json index 907e76b42..6aa550129 100644 --- a/assets/data/weapons/prototype-archaic/pt.json +++ b/assets/data/weapons/prototype-archaic/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao acertar um Ataque Normal ou um Ataque Carregado, possui 50% de chance de causar 240%/300%/360%/420%/480% de Dano de ATQ adicional em uma área pequena. Este efeito pode ser ativado uma vez a cada 15s.", "location": "Liyue", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "Um espadão antigo descoberto no Penhasco Obscuro. Ao brandi-lo, dá a sensação de como se fosse possível cortar o espaço." + "description": "Um espadão antigo descoberto no Penhasco Obscuro. Ao brandi-lo, dá a sensação de como se fosse possível cortar o espaço.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/prototype-crescent/en.json b/assets/data/weapons/prototype-crescent/en.json index d4a8f07c9..4c0711f9d 100755 --- a/assets/data/weapons/prototype-crescent/en.json +++ b/assets/data/weapons/prototype-crescent/en.json @@ -7,5 +7,6 @@ "passiveName": "Unreturning", "passiveDesc": "Aimed Shot hits on weak points increase Movement SPD by 10% and ATK by 6% for 10s.", "location": "Crafting", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/prototype-crescent/jp.json b/assets/data/weapons/prototype-crescent/jp.json index f08aa4206..8c9e76aae 100644 --- a/assets/data/weapons/prototype-crescent/jp.json +++ b/assets/data/weapons/prototype-crescent/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "帰らない", "passiveDesc": "重撃が弱点に命中した場合、移動速度+10%、攻撃力+36%、継続時間10秒。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/prototype-crescent/pt.json b/assets/data/weapons/prototype-crescent/pt.json index d41441acd..ec7f50c5a 100644 --- a/assets/data/weapons/prototype-crescent/pt.json +++ b/assets/data/weapons/prototype-crescent/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Os ataques de Ataques Carregados em pontos fracos aumentam a Veloc. Mov. em 10% e ATQ em 36%/45%/54%/63%/72% por 10s.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Um arco de protótipo descoberto na Forja do Penhasco Obscuro. A flecha disparada deste arco brilha como um raio de luar." + "description": "Um arco de protótipo descoberto na Forja do Penhasco Obscuro. A flecha disparada deste arco brilha como um raio de luar.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/prototype-rancour/en.json b/assets/data/weapons/prototype-rancour/en.json index cca3d33b6..cb0b89918 100755 --- a/assets/data/weapons/prototype-rancour/en.json +++ b/assets/data/weapons/prototype-rancour/en.json @@ -7,5 +7,6 @@ "passiveName": "Smashed Stone", "passiveDesc": "On hit, Normal or Charged Attacks increase Base ATK and DEF by 4/4.5/5/5.5/6% for 6s. Max 4 stacks. Can only occur once every 0.3s.", "location": "Crafting", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/prototype-rancour/jp.json b/assets/data/weapons/prototype-rancour/jp.json index 9e1044245..fe3c6ee21 100644 --- a/assets/data/weapons/prototype-rancour/jp.json +++ b/assets/data/weapons/prototype-rancour/jp.json @@ -6,5 +6,6 @@ "subStat": "物理ダメージ", "passiveName": "岩砕き", "passiveDesc": "通常攻撃または重撃が命中すると、攻撃力と防御力+4%、継続時間6秒、最大4重まで。0.3秒毎に1回のみ発動可能。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/prototype-rancour/pt.json b/assets/data/weapons/prototype-rancour/pt.json index a80259361..1c450d77b 100644 --- a/assets/data/weapons/prototype-rancour/pt.json +++ b/assets/data/weapons/prototype-rancour/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao acertar um Ataque Normal ou Ataque Carregado, o ATQ e a DEF aumentam 4%/5%/6%/7%/8%, com duração de 6s, acumulando até 4 vezes. Este efeito pode ser ativado uma vez a cada 0.3s.", "location": "Liyue", "baseDamage": { "attack": 44, "subStat": 75 }, - "description": "Uma antiga espada longa descoberta na Forja do Penhasco Obscuro que corta pedras como uma faca quente na manteiga." + "description": "Uma antiga espada longa descoberta na Forja do Penhasco Obscuro que corta pedras como uma faca quente na manteiga.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/prototype-starglitter/en.json b/assets/data/weapons/prototype-starglitter/en.json index dc09e3ae7..79618583b 100755 --- a/assets/data/weapons/prototype-starglitter/en.json +++ b/assets/data/weapons/prototype-starglitter/en.json @@ -7,5 +7,6 @@ "passiveName": "Magic Affinity", "passiveDesc": "After using an Elemental Skill, increases Normal and Charged Attack DMG by 8% for 12s. Max 2 stacks.", "location": "Crafting", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/prototype-starglitter/jp.json b/assets/data/weapons/prototype-starglitter/jp.json index 1f5f2576e..f8a55f7cd 100644 --- a/assets/data/weapons/prototype-starglitter/jp.json +++ b/assets/data/weapons/prototype-starglitter/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "魔力親和", "passiveDesc": "元素スキルを発動した後、通常攻撃と重撃のダメージ+8%、継続時間12秒、最大2重まで。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/prototype-starglitter/pt.json b/assets/data/weapons/prototype-starglitter/pt.json index 2cc6ad959..6b6cb6e7e 100644 --- a/assets/data/weapons/prototype-starglitter/pt.json +++ b/assets/data/weapons/prototype-starglitter/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após usar uma Habilidade Elemental, aumenta o Dano do Ataque Normal e Ataque Carregado em 8%/10%/12%/14%/16% por 12s, podendo acumular até 2 vezes.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 100 }, - "description": "Um rancor descoberto na Forja do Penhasco Obscuro. Os vislumbres ao longo da borda afiada são como estrelas na noite." + "description": "Um rancor descoberto na Forja do Penhasco Obscuro. Os vislumbres ao longo da borda afiada são como estrelas na noite.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/quartz/en.json b/assets/data/weapons/quartz/en.json index 23b0679e4..ee4e56ae7 100755 --- a/assets/data/weapons/quartz/en.json +++ b/assets/data/weapons/quartz/en.json @@ -7,5 +7,6 @@ "passiveName": "Residual Heat", "passiveDesc": "Upon causing an Overloaded, Melt, Burning, Vaporize, or a Pyro-infused Swirl reaction, increases Base ATK by 20/25/30/35/40% for 12s.", "location": "Chests", - "ascensionMaterial": "" + "ascensionMaterial": "", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/rainslasher/en.json b/assets/data/weapons/rainslasher/en.json index 879dec5cf..a316680b7 100755 --- a/assets/data/weapons/rainslasher/en.json +++ b/assets/data/weapons/rainslasher/en.json @@ -7,5 +7,6 @@ "passiveName": "Bane of Storm and Tide", "passiveDesc": "Increases DMG against enemies affected by Hydro or Electro by 20/25/30/35/40%.", "location": "Gacha", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/rainslasher/jp.json b/assets/data/weapons/rainslasher/jp.json index 7b7e7c943..c636dbce5 100644 --- a/assets/data/weapons/rainslasher/jp.json +++ b/assets/data/weapons/rainslasher/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "水と雷の破滅", "passiveDesc": "水元素または雷元素の影響を受けた敵に対するダメージ+20%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/rainslasher/pt.json b/assets/data/weapons/rainslasher/pt.json index 256cc61f7..2b8d6e3b6 100644 --- a/assets/data/weapons/rainslasher/pt.json +++ b/assets/data/weapons/rainslasher/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano contra inimigos afetados por Hydro ou Electro em 20%/24%/28%/32%/36%.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 36 }, - "description": "Uma espada grande fluorescente sem ponta afiada que esmaga os inimigos com força brutal." + "description": "Uma espada grande fluorescente sem ponta afiada que esmaga os inimigos com força brutal.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/range-gauge/en.json b/assets/data/weapons/range-gauge/en.json index 1ebe67027..f0fc1eeec 100755 --- a/assets/data/weapons/range-gauge/en.json +++ b/assets/data/weapons/range-gauge/en.json @@ -7,5 +7,6 @@ "passiveName": "Masons' Ditty", "passiveDesc": "When the wielder is healed or heals others, they will gain a Unity's Symbol that lasts 30s, up to a maximum of 3 Symbols. When using their Elemental Skill or Burst, all Symbols will be consumed and the Struggle effect will be granted for 10s. For each Symbol consumed, gain 3/4/5/6/7% ATK and 7/8.5/10/11.5/% All Elemental DMG Bonus. The Struggle effect can be triggered once every 15s, and Symbols can be gained even when the character is not on the field.", "location": "Gacha", - "ascensionMaterial": "ancient-chord" + "ascensionMaterial": "ancient-chord", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/range-gauge/pt.json b/assets/data/weapons/range-gauge/pt.json index c70fe83d0..cda9f03fd 100644 --- a/assets/data/weapons/range-gauge/pt.json +++ b/assets/data/weapons/range-gauge/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando é curado ou cura, concede o Sinal da União por 30s, é possível acumular 3 Sinais da União. Ao lançar uma Habilidade Elemental ou Supremo, consome todos os Sinais da União e gera por 10s o efeito \"Resistência\": para cada Sinal da União consumido, aumenta o ATQ em 3%/4%/5%/6%/7% e o Bônus de Dano Elemental em 7%/8.5%/10%/11.5%/13%. É possível desencadear o efeito \"Resistência\" uma vez a cada 15s. Também é possível obter o Sinal da União quando o personagem não está ativo no campo de batalha.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "Um instrumento de medida que raramente é visto hoje em dia. É capaz de disparar flechas." + "description": "Um instrumento de medida que raramente é visto hoje em dia. É capaz de disparar flechas.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/raven-bow/en.json b/assets/data/weapons/raven-bow/en.json index 1d3641d54..bec1a781d 100755 --- a/assets/data/weapons/raven-bow/en.json +++ b/assets/data/weapons/raven-bow/en.json @@ -7,5 +7,6 @@ "passiveName": "Bane of Flame and Water", "passiveDesc": "Increases DMG against enemies affected by Hydro or Pyro by 12/15/18/21/24%.", "location": "Gacha", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/raven-bow/jp.json b/assets/data/weapons/raven-bow/jp.json index 89635fa2b..faebfdf21 100644 --- a/assets/data/weapons/raven-bow/jp.json +++ b/assets/data/weapons/raven-bow/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "炎と水の破滅", "passiveDesc": "水元素または炎元素の影響を受けた敵に対するダメージ+12%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/raven-bow/pt.json b/assets/data/weapons/raven-bow/pt.json index f3dba48eb..15308cfe9 100644 --- a/assets/data/weapons/raven-bow/pt.json +++ b/assets/data/weapons/raven-bow/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano contra inimigos afetados por Hydro ou Pyro em 12%/15%/18%/21%/24%.", "location": "Mondstadt", "baseDamage": { "attack": 40, "subStat": 20 }, - "description": "Os corvos são conhecidos como mensageiros da morte. O arco é decorado com penas de corvo que prenunciam a morte iminente de qualquer alvo." + "description": "Os corvos são conhecidos como mensageiros da morte. O arco é decorado com penas de corvo que prenunciam a morte iminente de qualquer alvo.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/recurve-bow/en.json b/assets/data/weapons/recurve-bow/en.json index 926ac97b1..80c0ebe61 100755 --- a/assets/data/weapons/recurve-bow/en.json +++ b/assets/data/weapons/recurve-bow/en.json @@ -7,5 +7,6 @@ "passiveName": "Cull the Weak", "passiveDesc": "Defeating an opponent restores 8/10/12/14/16% HP.", "location": "Chest", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/recurve-bow/jp.json b/assets/data/weapons/recurve-bow/jp.json index a966ad460..9721edeb3 100644 --- a/assets/data/weapons/recurve-bow/jp.json +++ b/assets/data/weapons/recurve-bow/jp.json @@ -6,5 +6,6 @@ "subStat": "HP", "passiveName": "刈り取る", "passiveDesc": "敵を倒したとき、HPを8%回復する。", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/recurve-bow/pt.json b/assets/data/weapons/recurve-bow/pt.json index 8c81af192..1da69df7b 100644 --- a/assets/data/weapons/recurve-bow/pt.json +++ b/assets/data/weapons/recurve-bow/pt.json @@ -6,5 +6,6 @@ "subStat": "Porcentagem de Vida", "location": "Mondstadt", "baseDamage": { "attack": 38, "subStat": 102 }, - "description": "Dizem que é possível caçar águias em pleno voo com este arco, mas, na verdade, depende muito das habilidades do arqueiro também." + "description": "Dizem que é possível caçar águias em pleno voo com este arco, mas, na verdade, depende muito das habilidades do arqueiro também.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/redhorn-stonethresher/en.json b/assets/data/weapons/redhorn-stonethresher/en.json index d174c5849..861e61500 100644 --- a/assets/data/weapons/redhorn-stonethresher/en.json +++ b/assets/data/weapons/redhorn-stonethresher/en.json @@ -7,5 +7,6 @@ "passiveName": "Gokadaiou Otogibanashi", "passiveDesc": "DEF is increased by 28/35/42/49/56%. Normal and Charged Attack DMG is increased by 40/50/60/70/80% of DEF.", "location": "Gacha", - "ascensionMaterial": "narukami" + "ascensionMaterial": "narukami", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/redhorn-stonethresher/pt.json b/assets/data/weapons/redhorn-stonethresher/pt.json index 1b9aeb7e8..45cae10e9 100644 --- a/assets/data/weapons/redhorn-stonethresher/pt.json +++ b/assets/data/weapons/redhorn-stonethresher/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "DEF é aumentada em 28%/35%/42%/49%/56%. Dano do Ataque Normal e Carregado é aumentado em 40%/50%/60%/70%/80% da DEF.", "location": "Inazuma", "baseDamage": { "attack": 44, "subStat": 192 }, - "description": "De acordo com seu dono anterior, esta arma é o \"Leão Heroico, Poderoso e de Chifres Vermelhos Destruidores de Pedras\" que pode fazer com que qualquer monstro saia correndo com sua cauda entre suas pernas." + "description": "De acordo com seu dono anterior, esta arma é o \"Leão Heroico, Poderoso e de Chifres Vermelhos Destruidores de Pedras\" que pode fazer com que qualquer monstro saia correndo com sua cauda entre suas pernas.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/rightful-reward/en.json b/assets/data/weapons/rightful-reward/en.json index 1fc128477..94b69d861 100644 --- a/assets/data/weapons/rightful-reward/en.json +++ b/assets/data/weapons/rightful-reward/en.json @@ -7,5 +7,6 @@ "passiveName": "Tip of the Spear", "passiveDesc": "When the wielder is healed, restore 8 Energy. This effect can be triggered once every 10s, and can occur even when the character is not on the field.", "location": "BP Bounty", - "ascensionMaterial": "pristine-sea" + "ascensionMaterial": "pristine-sea", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/rightful-reward/pt.json b/assets/data/weapons/rightful-reward/pt.json index 3a9c4c070..1e314393c 100644 --- a/assets/data/weapons/rightful-reward/pt.json +++ b/assets/data/weapons/rightful-reward/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao ser curado, restaura 8/10/12/14/16 de Energia. Este efeito pode ser ativado uma vez a cada 10s e pode ser ativado mesmo quando o personagem não estiver em campo.", "location": "Obtido na forja", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "Uma lança afiada. Somente a ponta dela permanece recentemente manchada de sangue." + "description": "Uma lança afiada. Somente a ponta dela permanece recentemente manchada de sangue.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/ring-of-yaxche/en.json b/assets/data/weapons/ring-of-yaxche/en.json index dd4304c14..8d4d0a311 100644 --- a/assets/data/weapons/ring-of-yaxche/en.json +++ b/assets/data/weapons/ring-of-yaxche/en.json @@ -8,5 +8,6 @@ "passiveDesc": "Using an Elemental Skill grants the Jade-Forged Crown effect: Every 1,000 Max HP will increase the Normal Attack DMG dealt by the equipping character by 0.6%/0.7%/0.8%/0.9%/1% for 10s. Normal Attack DMG can be increased this way by a maximum of 16%/20%/24%/28%/32%.", "location": "Forged", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "This jade vessel was created by a hero of yesteryear. Legend has it that it once shot the giant dragon that dwelt in the volcano down from the skies." + "description": "This jade vessel was created by a hero of yesteryear. Legend has it that it once shot the giant dragon that dwelt in the volcano down from the skies.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/ring-of-yaxche/pt.json b/assets/data/weapons/ring-of-yaxche/pt.json index 1909afb6b..c53800e48 100644 --- a/assets/data/weapons/ring-of-yaxche/pt.json +++ b/assets/data/weapons/ring-of-yaxche/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ganha o efeito Coroa Forjada em Jade ao usar uma Habilidade Elemental: Cada 1.000 de Vida Máxima aumentará o Dano causado do Ataque Normal em 0.6%/0.7%/0.8%/0.9%/1% por 10s. O Dano do Ataque Normal pode ser aumentado dessa forma em um máximo de 16%/20%/24%/28%/32%.", "location": "Catalisador", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Um artefato de jade dos gêmeos heróis de outrora. Dizem que derrotou o dragão do céu que controlava o vulcão." + "description": "Um artefato de jade dos gêmeos heróis de outrora. Dizem que derrotou o dragão do céu que controlava o vulcão.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/royal-bow/en.json b/assets/data/weapons/royal-bow/en.json index 1187d5026..488e5eed7 100755 --- a/assets/data/weapons/royal-bow/en.json +++ b/assets/data/weapons/royal-bow/en.json @@ -7,5 +7,6 @@ "passiveName": "Focus", "passiveDesc": "Upon damaging an enemy, increases CRIT Rate by 8%. Max 5 stacks. A CRIT hit removes all stacks.", "location": "Starglitter Exchange", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/royal-bow/jp.json b/assets/data/weapons/royal-bow/jp.json index 4746c9089..0b98edf59 100644 --- a/assets/data/weapons/royal-bow/jp.json +++ b/assets/data/weapons/royal-bow/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "集中", "passiveDesc": "攻撃が敵にダメージを与えた時、会心率+8%、最大5重まで。攻撃会心発生時、効果がクリアされる。", - "location": "スターライト交換" + "location": "スターライト交換", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/royal-bow/pt.json b/assets/data/weapons/royal-bow/pt.json index 8cd019928..5a24b8c54 100644 --- a/assets/data/weapons/royal-bow/pt.json +++ b/assets/data/weapons/royal-bow/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao atingir um oponente, aumenta a Taxa Crítica em 8%/10%/12%/14%/16%, acumulando no máximo 5 vezes. Causar Dano Crítico remove todos os acúmulos.", "location": "Mondstadt", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Um velho arco real que pertencia aos antigos governantes de Mondstadt. Inúmeras gerações depois, a corda do arco ainda está firme e ainda pode disparar flechas com grande força." + "description": "Um velho arco real que pertencia aos antigos governantes de Mondstadt. Inúmeras gerações depois, a corda do arco ainda está firme e ainda pode disparar flechas com grande força.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/royal-greatsword/en.json b/assets/data/weapons/royal-greatsword/en.json index 8d890d0b3..1d1b3f297 100755 --- a/assets/data/weapons/royal-greatsword/en.json +++ b/assets/data/weapons/royal-greatsword/en.json @@ -7,5 +7,6 @@ "passiveName": "Focus", "passiveDesc": "Upon damaging an enemy, increases CRIT Rate by 8%. Max 5 stacks. A CRIT hit removes all stacks.", "location": "Starglitter Exchange", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/royal-greatsword/jp.json b/assets/data/weapons/royal-greatsword/jp.json index 905cd4768..c086e2a91 100644 --- a/assets/data/weapons/royal-greatsword/jp.json +++ b/assets/data/weapons/royal-greatsword/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "集中", "passiveDesc": "攻撃が敵にダメージを与えた時、会心率+8%、最大5重まで。攻撃会心発生時、効果がクリアされる。", - "location": "スターライト交換" + "location": "スターライト交換", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/royal-greatsword/pt.json b/assets/data/weapons/royal-greatsword/pt.json index 1b630a124..3de4a3acf 100644 --- a/assets/data/weapons/royal-greatsword/pt.json +++ b/assets/data/weapons/royal-greatsword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao atingir um oponente, aumenta a Taxa Crítica em 8%/10%/12%/14%/16%, acumulando no máximo 5 vezes. Causar Dano Crítico remove todos os acúmulos.", "location": "Mondstadt", "baseDamage": { "attack": 44, "subStat": 6 }, - "description": "Uma velha espada grande que pertencia aos antigos governantes de Mondstadt. É fabricado com materiais da melhor qualidade e resistiu a prova do tempo. Uma arma para ser usada apenas pela realeza." + "description": "Uma velha espada grande que pertencia aos antigos governantes de Mondstadt. É fabricado com materiais da melhor qualidade e resistiu a prova do tempo. Uma arma para ser usada apenas pela realeza.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/royal-grimoire/en.json b/assets/data/weapons/royal-grimoire/en.json index 93780832b..f6e5c6c97 100755 --- a/assets/data/weapons/royal-grimoire/en.json +++ b/assets/data/weapons/royal-grimoire/en.json @@ -7,5 +7,6 @@ "passiveName": "Focus", "passiveDesc": "Upon damaging an enemy, increases CRIT Rate by 8%. Max 5 stacks. A CRIT hit removes all stacks.", "location": "Starglitter Exchange", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/royal-grimoire/jp.json b/assets/data/weapons/royal-grimoire/jp.json index de5a5d81b..7c565c9c1 100644 --- a/assets/data/weapons/royal-grimoire/jp.json +++ b/assets/data/weapons/royal-grimoire/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "集中", "passiveDesc": "攻撃が敵にダメージを与えた時、会心率+8%、最大5重まで。攻撃会心発生時、効果がクリアされる。", - "location": "スターライト交換" + "location": "スターライト交換", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/royal-grimoire/pt.json b/assets/data/weapons/royal-grimoire/pt.json index cbab6b411..a235401ce 100644 --- a/assets/data/weapons/royal-grimoire/pt.json +++ b/assets/data/weapons/royal-grimoire/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao atingir um oponente, aumenta a Taxa Crítica em 8%/10%/12%/14%/16%, acumulando no máximo 5 vezes. Causar Dano Crítico remove todos os acúmulos.", "location": "Mondstadt", "baseDamage": { "attack": 44, "subStat": 6 }, - "description": "Um livro que pertenceu a um feiticeiro da realeza de Mondstadt. Guarda feitiços e relatos históricos verdadeiros e extensos." + "description": "Um livro que pertenceu a um feiticeiro da realeza de Mondstadt. Guarda feitiços e relatos históricos verdadeiros e extensos.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/royal-longsword/en.json b/assets/data/weapons/royal-longsword/en.json index a66d8a2ed..e394b77f3 100755 --- a/assets/data/weapons/royal-longsword/en.json +++ b/assets/data/weapons/royal-longsword/en.json @@ -7,5 +7,6 @@ "passiveName": "Focus", "passiveDesc": "Upon damaging an enemy, increases CRIT Rate by 8%. Max 5 stacks. A CRIT hit removes all stacks.", "location": "Starglitter Exchange", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/royal-longsword/jp.json b/assets/data/weapons/royal-longsword/jp.json index 01ceb5ad3..602583da7 100644 --- a/assets/data/weapons/royal-longsword/jp.json +++ b/assets/data/weapons/royal-longsword/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "集中", "passiveDesc": "攻撃が敵にダメージを与えた時、会心率+8%、最大5重まで。攻撃会心発生時、効果がクリアされる。", - "location": "スターライト交換" + "location": "スターライト交換", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/royal-longsword/pt.json b/assets/data/weapons/royal-longsword/pt.json index 32ae63f5f..5f29b3320 100644 --- a/assets/data/weapons/royal-longsword/pt.json +++ b/assets/data/weapons/royal-longsword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao atingir um oponente, aumenta a Taxa Crítica em 8%/10%/12%/14%/16%, acumulando no máximo 5 vezes. Causar Dano Crítico remove todos os acúmulos.", "location": "Mondstadt", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Uma velha espada longa que pertencia aos antigos governantes de Mondstadt. Requintadamente trabalhada, as esculturas e enfeites testemunham a estatura de seu dono." + "description": "Uma velha espada longa que pertencia aos antigos governantes de Mondstadt. Requintadamente trabalhada, as esculturas e enfeites testemunham a estatura de seu dono.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/royal-spear/en.json b/assets/data/weapons/royal-spear/en.json index 5307ac248..4bdfecc0c 100644 --- a/assets/data/weapons/royal-spear/en.json +++ b/assets/data/weapons/royal-spear/en.json @@ -7,5 +7,6 @@ "passiveName": "Focus", "passiveDesc": "Upon damaging an opponent, increases CRIT Rate by 8%. Max 5 stacks. A CRIT Hit removes all stacks.", "location": "Starglitter Exchange", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/royal-spear/jp.json b/assets/data/weapons/royal-spear/jp.json index 33bfc9a6d..9f58d2f74 100644 --- a/assets/data/weapons/royal-spear/jp.json +++ b/assets/data/weapons/royal-spear/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "集中", "passiveDesc": "攻撃が敵にダメージを与えた時、会心率+8%、最大5重まで。攻撃会心発生時、効果がクリアされる。", - "location": "スターライト交換" + "location": "スターライト交換", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/royal-spear/pt.json b/assets/data/weapons/royal-spear/pt.json index 06b228357..b4d592d62 100644 --- a/assets/data/weapons/royal-spear/pt.json +++ b/assets/data/weapons/royal-spear/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao atingir um oponente, aumenta a Taxa Crítica em 8%/10%/12%/14%/16%, acumulando no máximo 5 vezes. Causar Dano Crítico remove todos os acúmulos.", "location": "Mondstadt", "baseDamage": { "attack": 44, "subStat": 6 }, - "description": "Esta lança outrora valorizada por um membro da antiga nobreza que governou Mondstadt há muito tempo. Embora nunca tenha visto a luz do dia, ela ainda é incomparavelmente afiada." + "description": "Esta lança outrora valorizada por um membro da antiga nobreza que governou Mondstadt há muito tempo. Embora nunca tenha visto a luz do dia, ela ainda é incomparavelmente afiada.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/rust/en.json b/assets/data/weapons/rust/en.json index ea8f8c09d..116b30c7c 100755 --- a/assets/data/weapons/rust/en.json +++ b/assets/data/weapons/rust/en.json @@ -7,5 +7,6 @@ "passiveName": "Rapid Firing", "passiveDesc": "Increases Normal Attack DMG by 40/50/60/70/80% but decreases Aimed Shot DMG by 8/9/10/11/12%", "location": "Gacha", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/rust/jp.json b/assets/data/weapons/rust/jp.json index d8f2bcbdc..a076d5d90 100644 --- a/assets/data/weapons/rust/jp.json +++ b/assets/data/weapons/rust/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "速射の弓", "passiveDesc": "通常攻撃のダメージ+40%、重撃のダメージ-10%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/rust/pt.json b/assets/data/weapons/rust/pt.json index 47c1f0483..b8ab5e7f6 100644 --- a/assets/data/weapons/rust/pt.json +++ b/assets/data/weapons/rust/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano do Ataque Normal em 40%/50%/60%/70%/80% mas diminui o Dano do Ataque Carregado em 10%.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Um arco de ferro completamente enferrujado. Uma pessoa comum não teria forças para sequer levantá-lo, muito menos dispará-lo." + "description": "Um arco de ferro completamente enferrujado. Uma pessoa comum não teria forças para sequer levantá-lo, muito menos dispará-lo.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/sacrificial-bow/en.json b/assets/data/weapons/sacrificial-bow/en.json index 578548dec..4aff178d2 100755 --- a/assets/data/weapons/sacrificial-bow/en.json +++ b/assets/data/weapons/sacrificial-bow/en.json @@ -7,5 +7,6 @@ "passiveName": "Composed", "passiveDesc": "After damaging an opponent with an Elemental Skill, the skill has a 40/50/60/70/80% chance to end its own CD. Can only occur once every 30/26/22/18/14s.", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/sacrificial-bow/jp.json b/assets/data/weapons/sacrificial-bow/jp.json index cf6d5f4f6..49c124ad7 100644 --- a/assets/data/weapons/sacrificial-bow/jp.json +++ b/assets/data/weapons/sacrificial-bow/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "落ち着き", "passiveDesc": "元素スキルが敵にダメージを与えた時、40%の確率で該当スキルのクールタイムをリセットする。30秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/sacrificial-bow/pt.json b/assets/data/weapons/sacrificial-bow/pt.json index 2d3030d4a..960bd1c11 100644 --- a/assets/data/weapons/sacrificial-bow/pt.json +++ b/assets/data/weapons/sacrificial-bow/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao causar dano contra um oponente com Habilidade Elemental, a habilidade possui 40%/50%/60%/70%/80% de chance de redefinir o tempo de Recarga desta habilidade. Este efeito pode ser ativado apenas uma vez a cada 30/26/22/19/16 segundos.", "location": "Mondstadt", "baseDamage": { "attack": 44, "subStat": 67 }, - "description": "Um arco de caça decorativo que foi petrificada pelo tempo. Os acessórios inseridos ainda estão visíveis. Garante um grande poder ao seu portador." + "description": "Um arco de caça decorativo que foi petrificada pelo tempo. Os acessórios inseridos ainda estão visíveis. Garante um grande poder ao seu portador.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/sacrificial-fragments/en.json b/assets/data/weapons/sacrificial-fragments/en.json index 28f93891b..9b0303807 100755 --- a/assets/data/weapons/sacrificial-fragments/en.json +++ b/assets/data/weapons/sacrificial-fragments/en.json @@ -7,5 +7,6 @@ "passiveName": "Composed", "passiveDesc": "After damaging an opponent with an Elemental Skill, the skill has a 40/50/60/70/80% chance to end its own CD. Can only occur once every 30/26/22/18/14s.", "location": "Gacha", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/sacrificial-fragments/jp.json b/assets/data/weapons/sacrificial-fragments/jp.json index 42e97b0eb..c80a0050b 100644 --- a/assets/data/weapons/sacrificial-fragments/jp.json +++ b/assets/data/weapons/sacrificial-fragments/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "落ち着き", "passiveDesc": "元素スキルが敵にダメージを与えた時、40%の確率で該当スキルのクールタイムをリセットする。30秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/sacrificial-fragments/pt.json b/assets/data/weapons/sacrificial-fragments/pt.json index dff5a6594..0ecb9e3be 100644 --- a/assets/data/weapons/sacrificial-fragments/pt.json +++ b/assets/data/weapons/sacrificial-fragments/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao causar dano contra um oponente com Habilidade Elemental, a habilidade possui 40%/50%/60%/70%/80% de chance de redefinir o tempo de Recarga desta habilidade. Este efeito pode ser ativado apenas uma vez a cada 30/26/22/19/16 segundos.", "location": "Mondstadt", "baseDamage": { "attack": 41, "subStat": 48 }, - "description": "Um guia desgastado, cujo texto não é mais legível. Um item amaldiçoado erodido pelos ventos do tempo." + "description": "Um guia desgastado, cujo texto não é mais legível. Um item amaldiçoado erodido pelos ventos do tempo.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/sacrificial-greatsword/en.json b/assets/data/weapons/sacrificial-greatsword/en.json index b14e434b4..efa8e17d9 100755 --- a/assets/data/weapons/sacrificial-greatsword/en.json +++ b/assets/data/weapons/sacrificial-greatsword/en.json @@ -7,5 +7,6 @@ "passiveName": "Composed", "passiveDesc": "After damaging an opponent with an Elemental Skill, the skill has a 40/50/60/70/80% chance to end its own CD. Can only occur once every 30/26/22/18/14s.", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/sacrificial-greatsword/jp.json b/assets/data/weapons/sacrificial-greatsword/jp.json index 2fa61277f..8a3a26156 100644 --- a/assets/data/weapons/sacrificial-greatsword/jp.json +++ b/assets/data/weapons/sacrificial-greatsword/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "落ち着き", "passiveDesc": "元素スキルが敵にダメージを与えた時、40%の確率で該当スキルのクールタイムをリセットする。30秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/sacrificial-greatsword/pt.json b/assets/data/weapons/sacrificial-greatsword/pt.json index c58c98bd1..e7991271e 100644 --- a/assets/data/weapons/sacrificial-greatsword/pt.json +++ b/assets/data/weapons/sacrificial-greatsword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao causar dano contra um oponente com Habilidade Elemental, a habilidade possui 40%/50%/60%/70%/80% de chance de redefinir o tempo de Recarga desta habilidade. Este efeito pode ser ativado apenas uma vez a cada 30/26/22/19/16 segundos.", "location": "Mondstadt", "baseDamage": { "attack": 44, "subStat": 67 }, - "description": "Um espadão decorativo que foi petrificado com o tempo. Ainda é possível ver os seus adereços. Concede ao portador o poder de suportar os ventos do tempo." + "description": "Um espadão decorativo que foi petrificado com o tempo. Ainda é possível ver os seus adereços. Concede ao portador o poder de suportar os ventos do tempo.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/sacrificial-jade/en.json b/assets/data/weapons/sacrificial-jade/en.json index bec224d20..296a716b6 100644 --- a/assets/data/weapons/sacrificial-jade/en.json +++ b/assets/data/weapons/sacrificial-jade/en.json @@ -7,5 +7,6 @@ "passiveName": "Jade Circulation", "passiveDesc": "When not on the field for more than 5s, Max HP will be increased by 32% and Elemental Mastery will be increased by 40. These effects will be canceled after the wielder has been on the field for 10s.", "location": "BP Bounty", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/sacrificial-jade/pt.json b/assets/data/weapons/sacrificial-jade/pt.json index f74d0e6f4..e73be03cb 100644 --- a/assets/data/weapons/sacrificial-jade/pt.json +++ b/assets/data/weapons/sacrificial-jade/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando não estiver em campo por mais de 5s, aumenta a Vida Máxima em 32/40/48/56/64% e a Proficiência Elemental em 40/50/60/70/80 pontos. Quando o personagem com esta arma equipada entrar no campo de batalha, este efeito desaparecerá após 10s.", "location": "Passe de Batalha do Gnóstico", "baseDamage": { "attack": 41, "subStat": 80 }, - "description": "Um antigo pingente de jade que brilha como água cristalina. Parece ter sido usado em cerimônias antigas." + "description": "Um antigo pingente de jade que brilha como água cristalina. Parece ter sido usado em cerimônias antigas.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/sacrificial-sword/en.json b/assets/data/weapons/sacrificial-sword/en.json index 3038d0328..a717e3948 100755 --- a/assets/data/weapons/sacrificial-sword/en.json +++ b/assets/data/weapons/sacrificial-sword/en.json @@ -7,5 +7,6 @@ "passiveName": "Composed", "passiveDesc": "After damaging an opponent with an Elemental Skill, the skill has a 40/50/60/70/80% chance to end its own CD. Can only occur once every 30/26/22/18/14s.", "location": "Gacha", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/sacrificial-sword/jp.json b/assets/data/weapons/sacrificial-sword/jp.json index e410531a8..990f57c39 100644 --- a/assets/data/weapons/sacrificial-sword/jp.json +++ b/assets/data/weapons/sacrificial-sword/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "落ち着き", "passiveDesc": "元素スキルが敵にダメージを与えた時、40%の確率で該当スキルのクールタイムをリセットする。30秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/sacrificial-sword/pt.json b/assets/data/weapons/sacrificial-sword/pt.json index ecbb8edac..6da70391e 100644 --- a/assets/data/weapons/sacrificial-sword/pt.json +++ b/assets/data/weapons/sacrificial-sword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao causar dano contra um oponente com Habilidade Elemental, a habilidade possui 40%/50%/60%/70%/80% de chance de redefinir o tempo de Recarga desta habilidade. Este efeito pode ser ativado apenas uma vez a cada 30/26/22/19/16 segundos.", "location": "Mondstadt", "baseDamage": { "attack": 41, "subStat": 133 }, - "description": "Uma espada decorativa que foi petrificada pelo tempo. Os acessórios inseridos ainda estão visíveis. Garante um grande poder ao seu portador." + "description": "Uma espada decorativa que foi petrificada pelo tempo. Os acessórios inseridos ainda estão visíveis. Garante um grande poder ao seu portador.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/sapwood-blade/en.json b/assets/data/weapons/sapwood-blade/en.json index 3becb90d1..e684291f8 100644 --- a/assets/data/weapons/sapwood-blade/en.json +++ b/assets/data/weapons/sapwood-blade/en.json @@ -1,12 +1,12 @@ { - "name": "Sapwood Blade", - "type": "Sword", - "rarity": 4, - "baseAttack": 44, - "subStat": "Energy Recharge", - "passiveName": "Forest Sanctuary", - "passiveDesc": "After triggering Burning, Quicken, Aggravate, Spread, Bloom, Hyperbloom, or Burgeon, a Leaf of Consciousness will be created around the character for a maximum of 10s. When picked up, the Leaf will grant the character 60 Elemental Mastery for 12s. Only 1 Leaf can be generated this way every 20s. This effect can still be triggered if the character is not on the field. The Leaf of Consciousness' effect cannot stack.", - "location": "Crafting", - "ascensionMaterial": "talisman" + "name": "Sapwood Blade", + "type": "Sword", + "rarity": 4, + "baseAttack": 44, + "subStat": "Energy Recharge", + "passiveName": "Forest Sanctuary", + "passiveDesc": "After triggering Burning, Quicken, Aggravate, Spread, Bloom, Hyperbloom, or Burgeon, a Leaf of Consciousness will be created around the character for a maximum of 10s. When picked up, the Leaf will grant the character 60 Elemental Mastery for 12s. Only 1 Leaf can be generated this way every 20s. This effect can still be triggered if the character is not on the field. The Leaf of Consciousness' effect cannot stack.", + "location": "Crafting", + "ascensionMaterial": "talisman", + "weapon_type": "SWORD" } - \ No newline at end of file diff --git a/assets/data/weapons/sapwood-blade/pt.json b/assets/data/weapons/sapwood-blade/pt.json index 67716bc0f..770027906 100644 --- a/assets/data/weapons/sapwood-blade/pt.json +++ b/assets/data/weapons/sapwood-blade/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após desencadear Queimaduras, Aceleração, Intensificação, Propagação, Florescimento, Superflorescimento ou Germinação, uma Folha da Consciência será criada em volta do personagem por no máximo 10s. Quando coletada, a Folha da Consciência aumentará a Proficiência Elemental do personagem em 60/75/90/105/120 por 12s. Apenas 1 Folha pode ser criada dessa forma a cada 20s. Esse efeito ainda pode ser desencadeado mesmo se o personagem não estiver em campo. O efeito da Folha da Consciência não pode ser acumulado.", "location": "Forja", "baseDamage": { "attack": 44, "subStat": 6.7 }, - "description": "Uma arma obtida através de uma das histórias dos Aranara. Ela tomou a forma de uma espada que é capaz de cortar os inimigos da floresta." + "description": "Uma arma obtida através de uma das histórias dos Aranara. Ela tomou a forma de uma espada que é capaz de cortar os inimigos da floresta.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/scion-of-the-blazing-sun/en.json b/assets/data/weapons/scion-of-the-blazing-sun/en.json index 6f7e6478c..536ed8f4d 100644 --- a/assets/data/weapons/scion-of-the-blazing-sun/en.json +++ b/assets/data/weapons/scion-of-the-blazing-sun/en.json @@ -7,5 +7,6 @@ "passiveName": "The Way of Sunfire", "passiveDesc": "After a Charged Attack hits an opponent, a Sunfire Arrow will descend upon the opponent hit, dealing 60% ATK as DMG, and applying the Heartsearer effect to the opponent damaged by said Arrow for 10s. Opponents affected by Heartsearer take 28% more Charged Attack DMG from the wielder. A Sunfire Arrow can be triggered once every 10s.", "location": "BP Bounty", - "ascensionMaterial": "scorching" + "ascensionMaterial": "scorching", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/scion-of-the-blazing-sun/pt.json b/assets/data/weapons/scion-of-the-blazing-sun/pt.json index 14766d106..863448167 100644 --- a/assets/data/weapons/scion-of-the-blazing-sun/pt.json +++ b/assets/data/weapons/scion-of-the-blazing-sun/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando um Ataque Carregado atinge um inimigo, fará cair uma Flecha Solar no inimigo atingido, causando Dano equivalente a 60/75/90/105/120% do ATQ e aplicando o efeito \"Coração Flamejante\" no inimigo atingido pela Flecha Solar por 10s. Aumenta o Dano causado pelo personagem que está com essa arma equipada contra inimigos afetados por \"Coração Flamejante\" em 28/35/42/49/56%. A Flecha Solar pode ser desencadeada uma vez a cada 10s.", "location": "Passe de Batalha do Gnóstico", "baseDamage": { "attack": 44, "subStat": 40 }, - "description": "Um Arco Longo antigo que é um vestígio da era antiga do Rei Deshret. Um texto antigo indecifrável e padrões solenes foram entalhados nele." + "description": "Um Arco Longo antigo que é um vestígio da era antiga do Rei Deshret. Um texto antigo indecifrável e padrões solenes foram entalhados nele.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/seasoned-hunter-s-bow/en.json b/assets/data/weapons/seasoned-hunter-s-bow/en.json index 40c3bb32c..3f59cb73d 100755 --- a/assets/data/weapons/seasoned-hunter-s-bow/en.json +++ b/assets/data/weapons/seasoned-hunter-s-bow/en.json @@ -7,5 +7,6 @@ "passiveName": "-", "passiveDesc": "-", "location": "Chest", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/seasoned-hunter-s-bow/jp.json b/assets/data/weapons/seasoned-hunter-s-bow/jp.json index 2d56729b8..aab33ed21 100644 --- a/assets/data/weapons/seasoned-hunter-s-bow/jp.json +++ b/assets/data/weapons/seasoned-hunter-s-bow/jp.json @@ -6,5 +6,6 @@ "subStat": "-", "passiveName": "-", "passiveDesc": "-", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/seasoned-hunter-s-bow/pt.json b/assets/data/weapons/seasoned-hunter-s-bow/pt.json index ad5d75bd7..925de4a86 100644 --- a/assets/data/weapons/seasoned-hunter-s-bow/pt.json +++ b/assets/data/weapons/seasoned-hunter-s-bow/pt.json @@ -5,5 +5,6 @@ "baseAttack": 33, "location": "-", "baseDamage": { "attack": 33, "subStat": 0 }, - "description": "Um arco antigo, mas bem conservado. Pode ser considerado a extensão do braço de um arqueiro quando é utilizado." + "description": "Um arco antigo, mas bem conservado. Pode ser considerado a extensão do braço de um arqueiro quando é utilizado.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/sequence-of-solitude/en.json b/assets/data/weapons/sequence-of-solitude/en.json index a1631da22..aae163ae5 100644 --- a/assets/data/weapons/sequence-of-solitude/en.json +++ b/assets/data/weapons/sequence-of-solitude/en.json @@ -8,5 +8,6 @@ "passiveDesc": "When an attack hits an opponent, deal AoE DMG equal to 40%/50%/60%/70%/80% of Max HP at the target location. This effect can be triggered once every 15s.", "location": "Version 5.6 Event - Whirling Waltz", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "A mechanical longbow purpose-built for long shots and silent kills. Its twang is swallowed up amidst the night, the note lengthy and cold." + "description": "A mechanical longbow purpose-built for long shots and silent kills. Its twang is swallowed up amidst the night, the note lengthy and cold.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/sequence-of-solitude/pt.json b/assets/data/weapons/sequence-of-solitude/pt.json index 1e87c9f24..6b71942bd 100644 --- a/assets/data/weapons/sequence-of-solitude/pt.json +++ b/assets/data/weapons/sequence-of-solitude/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando um ataque acerta um oponente, causa 40%/50%/60%/70%/80% da Vida Máxima como Dano em uma AdE no local do alvo. Este efeito pode ser desencadeado uma vez a cada 15s.", "location": "Evento da Versão 5.6 - Valsa Rodopiante", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Um arco longo mecânico feito para disparos à longa distância e ataques silenciosos. Seu som é engolido pela noite, numa nota longa e fria." + "description": "Um arco longo mecânico feito para disparos à longa distância e ataques silenciosos. Seu som é engolido pela noite, numa nota longa e fria.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/serpent-spine/en.json b/assets/data/weapons/serpent-spine/en.json index ee09867cc..585f58a78 100755 --- a/assets/data/weapons/serpent-spine/en.json +++ b/assets/data/weapons/serpent-spine/en.json @@ -7,5 +7,6 @@ "passiveName": "Wavesplitter", "passiveDesc": "Every 4s a character is on the field, they will deal 6% more DMG and take 3% more DMG. This effect has a maximum of 5 stacks and will not be reset if the character leaves the field, but will be cleared when the character takes DMG.", "location": "BP Bounty", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/serpent-spine/jp.json b/assets/data/weapons/serpent-spine/jp.json index e260da29e..7a18873a2 100644 --- a/assets/data/weapons/serpent-spine/jp.json +++ b/assets/data/weapons/serpent-spine/jp.json @@ -6,5 +6,6 @@ "subStat": "会心率", "passiveName": "波乗り", "passiveDesc": "フィールドにいる時、4秒毎に、与えるダメージ+6%、被ダメージ+3%。最大5重まで、退場後もリセットされず、攻撃を受けると効果数-1。", - "location": "天空紀行" + "location": "天空紀行", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/serpent-spine/pt.json b/assets/data/weapons/serpent-spine/pt.json index 1240c52e5..81bae37ec 100644 --- a/assets/data/weapons/serpent-spine/pt.json +++ b/assets/data/weapons/serpent-spine/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando o jogador está em combate, a cada 4s aumenta o dano causado em 6%/7%/8%/9%/10% e 3%/2.7%/2.4%/2.2%/2% do Dano recebido. Este efeito pode ser acumulado até 5 vezes, não sendo redefinido após o personagem sair de campo, mas reduzirá 1 camada do efeito quando o personagem receber Dano.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 60 }, - "description": "Uma arma rara cuja origem são os oceanos antigos. Ao brandi-la, é possível ouvir as ondas do mar." + "description": "Uma arma rara cuja origem são os oceanos antigos. Ao brandi-la, é possível ouvir as ondas do mar.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/sharpshooter-s-oath/en.json b/assets/data/weapons/sharpshooter-s-oath/en.json index 2e197d661..807997e0b 100755 --- a/assets/data/weapons/sharpshooter-s-oath/en.json +++ b/assets/data/weapons/sharpshooter-s-oath/en.json @@ -7,5 +7,6 @@ "passiveName": "Precise", "passiveDesc": "Increases DMG against weak spots by 24/30/36/42/48%.", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/sharpshooter-s-oath/jp.json b/assets/data/weapons/sharpshooter-s-oath/jp.json index 9fbcc0aa4..f689be9b0 100644 --- a/assets/data/weapons/sharpshooter-s-oath/jp.json +++ b/assets/data/weapons/sharpshooter-s-oath/jp.json @@ -6,5 +6,6 @@ "subStat": "会心ダメージ", "passiveName": "精密射撃", "passiveDesc": "弱点に対するダメージ+24%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/sharpshooter-s-oath/pt.json b/assets/data/weapons/sharpshooter-s-oath/pt.json index fa9af69b5..4ea595d25 100644 --- a/assets/data/weapons/sharpshooter-s-oath/pt.json +++ b/assets/data/weapons/sharpshooter-s-oath/pt.json @@ -6,5 +6,6 @@ "subStat": "Dano Crítico", "location": "Mondstadt", "baseDamage": { "attack": 39, "subStat": 102 }, - "description": "Este poderoso arco pertencia a um grande arqueiro. Contudo, emana um aroma bastante forte, o tornando inadequado para caças." + "description": "Este poderoso arco pertencia a um grande arqueiro. Contudo, emana um aroma bastante forte, o tornando inadequado para caças.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/silver-sword/en.json b/assets/data/weapons/silver-sword/en.json index 6d88f92d7..8ea1e0cd1 100755 --- a/assets/data/weapons/silver-sword/en.json +++ b/assets/data/weapons/silver-sword/en.json @@ -7,5 +7,6 @@ "passiveName": "-", "passiveDesc": "-", "location": "Chest", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/silver-sword/jp.json b/assets/data/weapons/silver-sword/jp.json index bdf868579..803fcd9be 100644 --- a/assets/data/weapons/silver-sword/jp.json +++ b/assets/data/weapons/silver-sword/jp.json @@ -6,5 +6,6 @@ "subStat": "-", "passiveName": "-", "passiveDesc": "-", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/silver-sword/pt.json b/assets/data/weapons/silver-sword/pt.json index 6b05ff6dc..0c818ff36 100644 --- a/assets/data/weapons/silver-sword/pt.json +++ b/assets/data/weapons/silver-sword/pt.json @@ -5,5 +5,6 @@ "baseAttack": 33, "location": "-", "baseDamage": { "attack": 33, "subStat": 0 }, - "description": "Uma espada para afastar os demônios. Todos sabem que ela é feita de liga de prata e não de prata pura." + "description": "Uma espada para afastar os demônios. Todos sabem que ela é feita de liga de prata e não de prata pura.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/silvershower-heartstrings/en.json b/assets/data/weapons/silvershower-heartstrings/en.json index 0901f0164..372804dec 100644 --- a/assets/data/weapons/silvershower-heartstrings/en.json +++ b/assets/data/weapons/silvershower-heartstrings/en.json @@ -8,5 +8,6 @@ "passiveDesc": "The equipping character can gain the Remedy effect. When they possess 1/2/3 Remedy stacks, Max HP will increase by 12%/24%/40% | 15%/30%/50% | 18%/36%/60% | 21%/42%/70% | 24%/48%/80%. 1 stack may be gained when the following conditions are met: 1 stack for 25s when using an Elemental Skill; 1 stack for 25s when the value of a Bond of Life value increases; 1 stack for 20s for performing healing. Stacks can still be triggered when the equipping character is not on the field. Each stack's duration is counted independently. In addition, when 3 stacks are active, Elemental Burst CRIT Rate will be increased by 28%/35%/42%/49%/56%. This effect will be canceled 4s after falling under 3 stacks.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 44, "subStat": 144 }, - "description": "Legendary bow of the fairies. Whether on the stage or the battlefield, it can easily touch the hearts of the listener." + "description": "Legendary bow of the fairies. Whether on the stage or the battlefield, it can easily touch the hearts of the listener.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/silvershower-heartstrings/pt.json b/assets/data/weapons/silvershower-heartstrings/pt.json index c96b9eb47..87fbe81eb 100644 --- a/assets/data/weapons/silvershower-heartstrings/pt.json +++ b/assets/data/weapons/silvershower-heartstrings/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "O personagem equipado pode obter o efeito \"Remédio\". Quando eles possuem 1/2/3 acúmulos de \"Remédio\", sua Vida Máxima aumentará em 12%/24%/40% | 15%/30%/50% | 18%/36%/60% | 21%/42%/70% | 24%/48%/80%. Eles podem obter 1 acúmulo nas seguintes situações: 1 ao usar uma Habilidade Elemental por 25s; 1 ao aumentar o valor do Contrato de Vida por 25s; 1 ao iniciar Cura por 20s. Isso ainda pode ser ativado quando o personagem equipado não está em campo. A duração de cada acúmulo é contada independentemente. Além disso, quando você tem 3 acúmulos, a Taxa CRIT do Supremo será aumentada em 28%/35%/42%/49%/56%. Este efeito será cancelado 4s após você ficar com menos de 3 acúmulos.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 144 }, - "description": "Um arco espiritual lendário. Não importa se nos palcos ou nas batalhas, ele pode tocar facilmente o coração de todos os seus ouvintes." + "description": "Um arco espiritual lendário. Não importa se nos palcos ou nas batalhas, ele pode tocar facilmente o coração de todos os seus ouvintes.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/skyrider-greatsword/en.json b/assets/data/weapons/skyrider-greatsword/en.json index 28cbca695..ffef178f8 100755 --- a/assets/data/weapons/skyrider-greatsword/en.json +++ b/assets/data/weapons/skyrider-greatsword/en.json @@ -7,5 +7,6 @@ "passiveName": "Courage", "passiveDesc": "On hit, Normal or Charged Attacks increase ATK by 6/7/8/9/10% for 6s. Max 4 stacks. Can only occur once every 0.5s.", "location": "Stuck inside a stone in Guyun Stone Forest", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/skyrider-greatsword/jp.json b/assets/data/weapons/skyrider-greatsword/jp.json index 998e6b517..58da28da0 100644 --- a/assets/data/weapons/skyrider-greatsword/jp.json +++ b/assets/data/weapons/skyrider-greatsword/jp.json @@ -6,5 +6,6 @@ "subStat": "物理ダメージ", "passiveName": "勇気", "passiveDesc": "通常攻撃と重撃が命中すると、攻撃力+6%、継続時間6秒、最大4重まで。0.5秒毎に1回のみ発動可能。", - "location": "宝箱等" + "location": "宝箱等", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/skyrider-greatsword/pt.json b/assets/data/weapons/skyrider-greatsword/pt.json index 56743e71a..b54384c6b 100644 --- a/assets/data/weapons/skyrider-greatsword/pt.json +++ b/assets/data/weapons/skyrider-greatsword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao acertar um Ataque Normal ou Carregado, aumenta o ATQ e DEF em 6%/7%/8%/9%/10% por 6s, podendo ser acumulado até 4 vezes. Este efeito pode ser ativado uma vez a cada 0.5s.", "location": "Liyue", "baseDamage": { "attack": 39, "subStat": 96 }, - "description": "Um espadão de aço confiável. Uma certa pessoa tentou usá-lo como espada voadora... pela segunda vez." + "description": "Um espadão de aço confiável. Uma certa pessoa tentou usá-lo como espada voadora... pela segunda vez.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/skyrider-sword/en.json b/assets/data/weapons/skyrider-sword/en.json index 8a79546a9..e3c54d038 100755 --- a/assets/data/weapons/skyrider-sword/en.json +++ b/assets/data/weapons/skyrider-sword/en.json @@ -7,5 +7,6 @@ "passiveName": "Determination", "passiveDesc": "Using an Elemental Burst grants a 12/15/18/21/24% increase in ATK and Movement SPD for 12s.", "location": "Gacha", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/skyrider-sword/jp.json b/assets/data/weapons/skyrider-sword/jp.json index 315b2a4b2..2538c9c55 100644 --- a/assets/data/weapons/skyrider-sword/jp.json +++ b/assets/data/weapons/skyrider-sword/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "決心", "passiveDesc": "元素爆発を発動した後、攻撃力と移動速度+12%、継続時間15秒。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/skyrider-sword/pt.json b/assets/data/weapons/skyrider-sword/pt.json index 0a60e29bc..ba944eae5 100644 --- a/assets/data/weapons/skyrider-sword/pt.json +++ b/assets/data/weapons/skyrider-sword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao usar o Supremo, concede um aumento de 12%/15%/18%/21%/24% no ATQ e Veloc. Mov. por 15s.", "location": "Liyue", "baseDamage": { "attack": 38, "subStat": 113 }, - "description": "Uma espada de aço confiável. Uma certa pessoa tentou usá-la como espada voadora..." + "description": "Uma espada de aço confiável. Uma certa pessoa tentou usá-la como espada voadora...", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/skyward-atlas/en.json b/assets/data/weapons/skyward-atlas/en.json index cab1afec9..8ffa54164 100755 --- a/assets/data/weapons/skyward-atlas/en.json +++ b/assets/data/weapons/skyward-atlas/en.json @@ -7,5 +7,6 @@ "passiveName": "Wandering Clouds", "passiveDesc": "Increases Elemental DMG Bonus by 12/15/18/21/24%. Normal Attack hits have a 50% chance to earn the favor of the clouds. which actively seek out nearby enemies to attack for 15s, dealing 160/200/240/280/320% ATK DMG. Can only occur once every 30s.", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/skyward-atlas/jp.json b/assets/data/weapons/skyward-atlas/jp.json index 802de581d..2ae169c7e 100644 --- a/assets/data/weapons/skyward-atlas/jp.json +++ b/assets/data/weapons/skyward-atlas/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "四方浮遊する霊雲", "passiveDesc": "元素ダメージ+12%。通常攻撃が命中した時、50%の確率で高天流雲の好意を獲得し、15秒以内に自分から周囲の敵を攻撃すると、攻撃力の160%相当のダメージを与える。30秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/skyward-atlas/pt.json b/assets/data/weapons/skyward-atlas/pt.json index a95a47962..1bc0e52ac 100644 --- a/assets/data/weapons/skyward-atlas/pt.json +++ b/assets/data/weapons/skyward-atlas/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Bônus do Dano Elemental em 12%/15%/18%/21%/24%. O Ataque normal possui 50% de chance de ganhar a graça das nuvens, que buscam ativamente por inimigos ao redor para atacar por 15s, causando 160%/200%/240%/280%/320% de Dano de ATQ. Este efeito pode ser ativado uma vez a cada 30s.", "location": "Mondstadt", "baseDamage": { "attack": 48, "subStat": 72 }, - "description": "Um atlas das nuvens que simboliza Dvalin e o Arconte Anemo, seu antigo mestre. Detalha os ventos e as nuvens das regiões do norte e contém o poder dos céus e dos ventos." + "description": "Um atlas das nuvens que simboliza Dvalin e o Arconte Anemo, seu antigo mestre. Detalha os ventos e as nuvens das regiões do norte e contém o poder dos céus e dos ventos.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/skyward-blade/en.json b/assets/data/weapons/skyward-blade/en.json index b7988e514..8a9a51873 100755 --- a/assets/data/weapons/skyward-blade/en.json +++ b/assets/data/weapons/skyward-blade/en.json @@ -7,5 +7,6 @@ "passiveName": "Sky-Piercing Fang", "passiveDesc": "CRIT Rate increased by 4%. Gains Skypiercing Might upon using an Elemental Burst:\nIncreases Movement SPD by 10%, increases ATK SPD by 10%, and increases the DMG of Normal and Charged Attack hits by 20% for 12s.", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/skyward-blade/jp.json b/assets/data/weapons/skyward-blade/jp.json index d2a47ea9c..565b8c19e 100644 --- a/assets/data/weapons/skyward-blade/jp.json +++ b/assets/data/weapons/skyward-blade/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "高天を貫く牙", "passiveDesc": "会心率+4%；元素爆発を使用すると衝天の勢いを獲得する：移動速度+10%、攻撃速度+10%、通常攻撃と重撃が命中する際に、攻撃力の20%のダメージを与える、継続時間12秒。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/skyward-blade/pt.json b/assets/data/weapons/skyward-blade/pt.json index f15f57e80..42b35be03 100644 --- a/assets/data/weapons/skyward-blade/pt.json +++ b/assets/data/weapons/skyward-blade/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "A Taxa Crítica aumenta em 4%/5%/6%/7%/8%. Obtém a Perfuração Celestial ao usar o Supremo: Aumenta a Veloc. Mov. em 10%/10%/10%/10%/10%, aumenta a Velocidade de Ataque em 10%/10%/10%/10%/10%. Quando o Ataque Normal e o Ataque Carregado atingirem, causará um Dano Adicional de 20%/25%/30%/35%/40% por 12s.", "location": "Mondstadt", "baseDamage": { "attack": 46, "subStat": 120 }, - "description": "A espada de um cavaleiro que simboliza a honra restaurada de Dvalin. As bênçãos do Arconte Anemo repousam sobre a lâmina mais cheia, imbuindo a espada com os poderes do céu e do vento." + "description": "A espada de um cavaleiro que simboliza a honra restaurada de Dvalin. As bênçãos do Arconte Anemo repousam sobre a lâmina mais cheia, imbuindo a espada com os poderes do céu e do vento.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/skyward-harp/en.json b/assets/data/weapons/skyward-harp/en.json index 2ce80dee9..7004b17eb 100755 --- a/assets/data/weapons/skyward-harp/en.json +++ b/assets/data/weapons/skyward-harp/en.json @@ -7,5 +7,6 @@ "passiveName": "Echoing Ballad", "passiveDesc": "Increases CRIT DMG by 20/25/30/35/40%. Hits have a 60/70/80/90/100% chance to inflict a small AoE attack, dealing 100% Physical ATK DMG. Can only occur once every 4s.", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/skyward-harp/jp.json b/assets/data/weapons/skyward-harp/jp.json index 90af787c9..e7037ae80 100644 --- a/assets/data/weapons/skyward-harp/jp.json +++ b/assets/data/weapons/skyward-harp/jp.json @@ -6,5 +6,6 @@ "subStat": "会心率", "passiveName": "天に響く詩", "passiveDesc": "会心ダメージ+20%。攻撃が命中した時、60%の確率で狭範囲内の敵に攻撃力の125%の物理ダメージを与える。4秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/skyward-harp/pt.json b/assets/data/weapons/skyward-harp/pt.json index 6835ddda8..ff89f706d 100644 --- a/assets/data/weapons/skyward-harp/pt.json +++ b/assets/data/weapons/skyward-harp/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano Crítico em 20%/25%/30%/35%/40%. Ao acertar, possui 60%/70%/80%/90%/125% de chance de infligir um pequeno ataque AdE, causando 100% de Dano de ATQ Físico. Pode ser ativada uma vez a cada 4/3.5/3/2.5/2s.", "location": "Mondstadt", "baseDamage": { "attack": 48, "subStat": 48 }, - "description": "Um grande arco que simboliza o vínculo entre Dvalin e o Arconte Anemo. O som do disparo das flechas é como música para os ouvidos do Arconte do Vento. Contém poderes dos céus e do vento." + "description": "Um grande arco que simboliza o vínculo entre Dvalin e o Arconte Anemo. O som do disparo das flechas é como música para os ouvidos do Arconte do Vento. Contém poderes dos céus e do vento.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/skyward-pride/en.json b/assets/data/weapons/skyward-pride/en.json index 37fcde4e7..d34afa17c 100755 --- a/assets/data/weapons/skyward-pride/en.json +++ b/assets/data/weapons/skyward-pride/en.json @@ -7,5 +7,6 @@ "passiveName": "Sky-Ripping Dragon Spine", "passiveDesc": "Increases all DMG by 8/10/12/14/16%. After using an Elemental Burst, Normal or Charged Attack, on hit, creates a vacuum blade that does 80/100/120/140/160% Physical DMG to enemies along its path. Lasts for 20s or 8 vacuum blades.", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/skyward-pride/jp.json b/assets/data/weapons/skyward-pride/jp.json index 7727fb288..9ca610eb2 100644 --- a/assets/data/weapons/skyward-pride/jp.json +++ b/assets/data/weapons/skyward-pride/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "晴れ空を裂く龍の骨", "passiveDesc": "与えるダメージ+8%。元素爆発を発動した後、通常攻撃と重撃が命中すると真空の刃を放ち、経路上の敵に攻撃力の80%のダメージを与える、継続時間20秒または真空の刃を8回発動するまで。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/skyward-pride/pt.json b/assets/data/weapons/skyward-pride/pt.json index 368637419..248afe7b9 100644 --- a/assets/data/weapons/skyward-pride/pt.json +++ b/assets/data/weapons/skyward-pride/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano em 8%/10%/12%/14%/16%. Depois de usar o Supremo, Ataque Normal ou Ataque Carregado, cria uma lâmina de vácuo que causa 80%/100%/120%/140%/160% de Dano Físico aos oponentes ao longo do caminho. Dura 20s ou 8 lâminas de vácuo.", "location": "Mondstadt", "baseDamage": { "attack": 48, "subStat": 8 }, - "description": "Um espadão que simboliza o orgulho de Dvalin nos céus. Quando é utilizada, emite um som que representa a força de Dvalin e o poder de Anemo." + "description": "Um espadão que simboliza o orgulho de Dvalin nos céus. Quando é utilizada, emite um som que representa a força de Dvalin e o poder de Anemo.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/skyward-spine/en.json b/assets/data/weapons/skyward-spine/en.json index 977f5fee9..550a05083 100755 --- a/assets/data/weapons/skyward-spine/en.json +++ b/assets/data/weapons/skyward-spine/en.json @@ -7,5 +7,6 @@ "passiveName": "Black Wing", "passiveDesc": "Increases CRIT Rate by 8% and increases Normal ATK SPD by 12%. Additionally, Normal and Charged Attacks hits on enemies have a 50% chance to trigger a vacuum blade that deals 40% of ATK as DMG in a small AoE. This effect can occur no more than once every 2s.", "location": "Gacha", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/skyward-spine/jp.json b/assets/data/weapons/skyward-spine/jp.json index 5bf82f104..17dc04403 100644 --- a/assets/data/weapons/skyward-spine/jp.json +++ b/assets/data/weapons/skyward-spine/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "黒翼を切り裂く鋭牙", "passiveDesc": "会心率+8%、通常攻撃速度+12%。通常攻撃と重撃が命中時、50%の確率で真空刃を発動し、攻撃力の40%の狭範囲ダメージを与える。2秒毎に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/skyward-spine/pt.json b/assets/data/weapons/skyward-spine/pt.json index afaa1ab6f..a7a80de13 100644 --- a/assets/data/weapons/skyward-spine/pt.json +++ b/assets/data/weapons/skyward-spine/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "A Taxa Crítica aumenta 8%/10%/12%/14%/16%, a VEL do Ataque Normal aumenta 12%/12%/12%/12%/12%. Além disso, o Ataque Normal e o Ataque Carregado ao atingir o inimigo possuem 50%/50%/50%/50%/50% de chance de criar uma Lâmina de Vácuo que causa 40%/55%/70%/85%/100% de Dano de ATQ adicional em uma área. Este efeito pode ser ativado uma vez a cada 2s.", "location": "Mondstadt", "baseDamage": { "attack": 48, "subStat": 80 }, - "description": "Lança que simboliza a determinação firme de Dvalin. O eixo vertical desta arma aponta para o céu, carregado a força do céu e do vento." + "description": "Lança que simboliza a determinação firme de Dvalin. O eixo vertical desta arma aponta para o céu, carregado a força do céu e do vento.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/slingshot/en.json b/assets/data/weapons/slingshot/en.json index 85cef035c..192174a85 100755 --- a/assets/data/weapons/slingshot/en.json +++ b/assets/data/weapons/slingshot/en.json @@ -7,5 +7,6 @@ "passiveName": "Slingshot", "passiveDesc": "If a Normal Attack or Aimed Shot hits a target within 0.3s of being fired, increases DMG by 36/42/48/54/60%; otherwise, it decreases DMG by 10%.", "location": "Gacha", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/slingshot/jp.json b/assets/data/weapons/slingshot/jp.json index 39eaca9bc..09d90657b 100644 --- a/assets/data/weapons/slingshot/jp.json +++ b/assets/data/weapons/slingshot/jp.json @@ -6,5 +6,6 @@ "subStat": "会心率", "passiveName": "弾弓", "passiveDesc": "通常攻撃または重撃の矢が発射した後、0.3秒以内に敵に命中した場合、与えるダメージ+36%。0.3秒以上の場合、与えるダメージ-10%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/slingshot/pt.json b/assets/data/weapons/slingshot/pt.json index 8a122ed7c..82c5d94b4 100644 --- a/assets/data/weapons/slingshot/pt.json +++ b/assets/data/weapons/slingshot/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Se a flecha do Ataque Normal e do Ataque Carregado atingir um alvo dentro de 0.3s após o disparo, o Dano é aumentado em 36%/42%/48%/54%/60%. Caso contrário, o Dano é diminuído em 10%.", "location": "Liyue", "baseDamage": { "attack": 38, "subStat": 68 }, - "description": "Na verdade, é um arco. Depois de incontáveis experimentos e melhorias, o mestre criador de estilingues acabou criando um arco." + "description": "Na verdade, é um arco. Depois de incontáveis experimentos e melhorias, o mestre criador de estilingues acabou criando um arco.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/snow-tombed-starsilver/en.json b/assets/data/weapons/snow-tombed-starsilver/en.json index 606a86e16..954caddb0 100644 --- a/assets/data/weapons/snow-tombed-starsilver/en.json +++ b/assets/data/weapons/snow-tombed-starsilver/en.json @@ -7,5 +7,6 @@ "passiveName": "Frost Burial", "passiveDesc": "Hitting an opponent with Normal and Charged Attacks has a 60% chance of forming and dropping an Everfrost Icicle above them, dealing 80% AoE ATK DMG. Opponents affected by Cryo are dealt 200% ATK DMG. Can only occur once every 10s.", "location": "Crafting", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/snow-tombed-starsilver/jp.json b/assets/data/weapons/snow-tombed-starsilver/jp.json index 9802b30f9..10036c452 100644 --- a/assets/data/weapons/snow-tombed-starsilver/jp.json +++ b/assets/data/weapons/snow-tombed-starsilver/jp.json @@ -6,5 +6,6 @@ "subStat": "物理ダメージ", "passiveName": "霜の埋葬", "passiveDesc": "通常攻撃と重撃が敵に命中した時、60%の確率で敵の上に恒氷晶核が作られ落下し、攻撃力の80%の範囲ダメージを与える。敵が氷元素の影響を受けている場合、攻撃力の200%のダメージを与える。この効果は10秒毎に1回のみ発動可能。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/snow-tombed-starsilver/pt.json b/assets/data/weapons/snow-tombed-starsilver/pt.json index 473ce1f0a..63845556e 100644 --- a/assets/data/weapons/snow-tombed-starsilver/pt.json +++ b/assets/data/weapons/snow-tombed-starsilver/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Atingir um inimigo com um Ataque Normal e Ataque Carregado possui uma chance de 60%/70%/80%/90%/100% de formar e dropar um Núcleo de Cristal Eterno sobre eles, causando 80%/95%/110%/125%/140% de Dano de ATQ em uma AdE. Inimigos afetados por Cryo recebem 200%/240%/280%/320%/360% de Dano de ATQ. Pode ocorrer apenas uma vez a cada 10s.", "location": "Mondstadt", "baseDamage": { "attack": 44, "subStat": 75 }, - "description": "Um Espadão antigo escondido dentro de uma pintura. Forjado de Prata Estrelada, possui o poder de cortar o gelo." + "description": "Um Espadão antigo escondido dentro de uma pintura. Forjado de Prata Estrelada, possui o poder de cortar o gelo.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/solar-pearl/en.json b/assets/data/weapons/solar-pearl/en.json index 1e0d43874..e63679cea 100755 --- a/assets/data/weapons/solar-pearl/en.json +++ b/assets/data/weapons/solar-pearl/en.json @@ -7,5 +7,6 @@ "passiveName": "Solar Shine", "passiveDesc": "Normal Attack hits increase Elemental Skill and Elemental Burst DMG by 20/25/30/35/40% for 6s. Likewise, Elemental Skill or Elemental Burst hits increase Normal Attack DMG by 20/25/30/35/40% for 6s.", "location": "BP Bounty", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/solar-pearl/jp.json b/assets/data/weapons/solar-pearl/jp.json index af0ee3bfb..f980444f0 100644 --- a/assets/data/weapons/solar-pearl/jp.json +++ b/assets/data/weapons/solar-pearl/jp.json @@ -6,5 +6,6 @@ "subStat": "会心率", "passiveName": "日月の輝き", "passiveDesc": "通常攻撃が命中した後、6秒間元素スキルと元素爆発のダメージ+20%。元素スキルまたは元素爆発が命中した後、6秒間通常攻撃のダメージ+20%。", - "location": "天空紀行" + "location": "天空紀行", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/solar-pearl/pt.json b/assets/data/weapons/solar-pearl/pt.json index a15c380bc..731462295 100644 --- a/assets/data/weapons/solar-pearl/pt.json +++ b/assets/data/weapons/solar-pearl/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Dentro de 6s após acertar um Ataque Normal, o Dano da Habilidade Elemental e do Supremo aumentam em 20%/25%/30%/35%/40%. Dentro de 6s após acertar uma Habilidade Elemental e o Supremo, o Dano do Ataque Normal aumenta 20%/25%/30%/35%/40%.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 60 }, - "description": "Abriga a luz do sol e da lua, uma pérola feita de materiais desconhecidos pulsa com uma força calorosa." + "description": "Abriga a luz do sol e da lua, uma pérola feita de materiais desconhecidos pulsa com uma força calorosa.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/song-of-broken-pines/en.json b/assets/data/weapons/song-of-broken-pines/en.json index ae35c1089..41f3c53b3 100644 --- a/assets/data/weapons/song-of-broken-pines/en.json +++ b/assets/data/weapons/song-of-broken-pines/en.json @@ -7,5 +7,6 @@ "passiveName": "Rebel's Banner Hymn", "passiveDesc": "A part of the 'Millennial Movement' that wanders amidst the winds. Increases ATK by 16%, and when Normal or Charged Attacks hit opponents, the character gains a Sigil of Whispers. This effect can be triggered once every 0.3s. When you possess four Sigils of 'Whispers, all of them will be consumed and all nearby party members will obtain the 'Millennial Movement: Banner-Hymn' effect for 12s. 'Millennial Movement: Banner-Hymn' increases Normal ATK SPD by 12% and increases ATK by 20%. Once this effect is triggered, you will not gain Sigils of Whispers for 20s. Of the many effects of the 'Millennial Movement', buffs of the same type will not stack.", "location": "Gacha", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/song-of-broken-pines/jp.json b/assets/data/weapons/song-of-broken-pines/jp.json index 7fda4f3da..1e6fda47a 100644 --- a/assets/data/weapons/song-of-broken-pines/jp.json +++ b/assets/data/weapons/song-of-broken-pines/jp.json @@ -6,5 +6,6 @@ "subStat": "物理ダメージ", "passiveName": "反抗と旗掲げの歌", "passiveDesc": "風と共に流れる「千年の大楽章」の一部。攻撃力+16%。通常攻撃または重撃が敵に命中すると、囁きの欠片を1枚獲得する。この効果は0.3秒毎に1回のみ発動できる。囁きの欠片を4枚集めると、全ての囁きの欠片を消費し、周囲のチーム全員に12秒継続する「千年の大楽章·旗掲げの歌」効果を付与する：通常攻撃速度+12%、攻撃力+20%。発動後の20秒間、囁きの欠片を再度獲得することはできない。「千年の大楽章」のもたらす各効果中、同種類の効果は重ね掛け不可。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/song-of-broken-pines/pt.json b/assets/data/weapons/song-of-broken-pines/pt.json index ae2f65da1..68664a6d3 100644 --- a/assets/data/weapons/song-of-broken-pines/pt.json +++ b/assets/data/weapons/song-of-broken-pines/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Uma parte do Concerto Milenar que flutua no vento. Aumenta o ATQ em 16%/20%/24%/28%/32%. Quando Ataque Normal ou Ataque Carregado atingir os inimigos, o personagem obterá um Símbolo dos Suspiros, que pode ser ativado uma vez a cada 0.3s. Possuir 4 Símbolos dos Sussurros faz consumir todos eles, e faz todos os personagens da equipe obterem o efeito de \"Concerto Milenar: Música do Levantar da Bandeira\" por 12s: A Vel. de Ataque Normal será aumentada em 12%/15%/18%/21%/24%, além disso o ATQ será aumentado em 20%/25%/30%/35%/40%. Dentro de 20s depois da ativação, não é possível obter os Símbolos dos Sussurros de novo. Entre todos os efeitos de vários valores, os efeitos do mesmo valor não podem ser acumulados.", "location": "Mondstadt", "baseDamage": { "attack": 49, "subStat": 45 }, - "description": "Uma espada grande tão leve quanto o suspiro de grama na brisa, mas tão impiedosa para os corruptos quanto um tufão." + "description": "Uma espada grande tão leve quanto o suspiro de grama na brisa, mas tão impiedosa para os corruptos quanto um tufão.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/song-of-stillness/en.json b/assets/data/weapons/song-of-stillness/en.json index b66b8c72e..b2edf8314 100644 --- a/assets/data/weapons/song-of-stillness/en.json +++ b/assets/data/weapons/song-of-stillness/en.json @@ -7,5 +7,6 @@ "passiveName": "Benthic Pulse", "passiveDesc": "After the wielder is healed, they will deal 16% more DMG for 8s. This can be triggered even when the character is not on the field.", "location": "BP Bounty", - "ascensionMaterial": "ancient-chord" + "ascensionMaterial": "ancient-chord", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/song-of-stillness/pt.json b/assets/data/weapons/song-of-stillness/pt.json index 7951ae118..d674671c5 100644 --- a/assets/data/weapons/song-of-stillness/pt.json +++ b/assets/data/weapons/song-of-stillness/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao ser curado, aumenta o Dano em 16/20/24/28/32% por 8s. Pode ser ativado mesmo quando o personagem não estiver no campo de batalha.", "location": "Obtido na forja", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Um arco longo com uma aparência estranha, semelhante a uma criatura marinha, que parece não emitir som quando a corda é tensionada." + "description": "Um arco longo com uma aparência estranha, semelhante a uma criatura marinha, que parece não emitir som quando a corda é tensionada.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/splendor-of-tranquil-waters/en.json b/assets/data/weapons/splendor-of-tranquil-waters/en.json index a9ed1028e..31707aa4d 100755 --- a/assets/data/weapons/splendor-of-tranquil-waters/en.json +++ b/assets/data/weapons/splendor-of-tranquil-waters/en.json @@ -7,5 +7,6 @@ "passiveName": "Dawn and Dusk by the Lake", "passiveDesc": "When the equipping character's current HP increases or decreases, Elemental Skill DMG dealt will be increased by 8/10/12/14/16% for 6s. Max 3 stacks. This effect can be triggered once every 0.2s. When other party members' current HP increases or decreases, the equipping character's Max HP will be increased by 14/17.5/21/24.5/28% for 6s. Max 2 stacks. This effect can be triggered once every 0.2s. The aforementioned effects can be triggered even if the wielder is off-field.", "location": "Gacha", - "ascensionMaterial": "pure-sacred-dewdrop" + "ascensionMaterial": "pure-sacred-dewdrop", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/splendor-of-tranquil-waters/pt.json b/assets/data/weapons/splendor-of-tranquil-waters/pt.json index a788c0f45..1e642878e 100644 --- a/assets/data/weapons/splendor-of-tranquil-waters/pt.json +++ b/assets/data/weapons/splendor-of-tranquil-waters/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando a Vida do personagem que está com essa arma equipada aumenta ou cai, aumenta o Dano causado por sua Habilidade Elemental em 8%/10%/12%/14%/16%. Esse efeito dura 6s, pode ser acumulado 3 vezes e pode ser desencadeado uma vez a cada 0.2s. Quando a Vida dos outros personagens da equipe aumenta ou cai, aumenta a Vida Máxima do personagem que está com essa arma equipada em 14%/17.5%/21%/24.5%/28%. Esse efeito dura 6s, pode ser acumulado até 2 vezes e pode ser desencadeado uma vez a cada 0.2s. O efeito pode ser ativado mesmo que o personagem com a arma equipada não esteja ativo no campo de batalha.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 192 }, - "description": "Um cetro em torno do qual gira água pura. Em dias passados, ele costumava simbolizar a mais alta autoridade sobre os mares." + "description": "Um cetro em torno do qual gira água pura. Em dias passados, ele costumava simbolizar a mais alta autoridade sobre os mares.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/staff-of-homa/en.json b/assets/data/weapons/staff-of-homa/en.json index c13b27eac..bd24010a7 100644 --- a/assets/data/weapons/staff-of-homa/en.json +++ b/assets/data/weapons/staff-of-homa/en.json @@ -7,5 +7,6 @@ "passiveName": "Reckless Cinnabar", "passiveDesc": "HP increased by 20/25/30/35/40%. Additionally, provides an ATK Bonus based on 0.8/1/1.2/1.4/1.6% of the wielder's Max HP. When the wielder's HP is less than 50%, this ATK Bonus is increased by an additional 1/1.2/1.4/1.6/1.8% of Max HP.", "location": "Gacha", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/staff-of-homa/jp.json b/assets/data/weapons/staff-of-homa/jp.json index e92ca1ac9..c2dba39ce 100644 --- a/assets/data/weapons/staff-of-homa/jp.json +++ b/assets/data/weapons/staff-of-homa/jp.json @@ -6,5 +6,6 @@ "subStat": "会心ダメージ", "passiveName": "縛り無き朱色の蝶", "passiveDesc": "HP上限+20%。また、キャラクターのHP上限の0.8%分、攻撃力がアップする。キャラクターのHPが50%未満の時、攻撃力が更にHP上限の1%分アップする。", - "location": "祈願" + "location": "祈願", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/staff-of-homa/pt.json b/assets/data/weapons/staff-of-homa/pt.json index ced33a43f..29c27c3b2 100644 --- a/assets/data/weapons/staff-of-homa/pt.json +++ b/assets/data/weapons/staff-of-homa/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a Vida em 20%/25%/30%/35%/40%. Além disso, o Personagem que equipar esta arma terá um Bônus de ATQ de 0.8%/1%/1.2%/1.4%/1.6% com base na Vida Máxima. Quando a Vida do Personagem que equipar essa arma cair para abaixo de 50%, seu ATQ aumentará 1%/1.2%/1.4%/1.6%/1.8% com base em sua Vida Máxima.", "location": "Liyue", "baseDamage": { "attack": 46, "subStat": 144 }, - "description": "Um bastão vermelho utilizado em um antigo ritual que não se pratica há muito tempo." + "description": "Um bastão vermelho utilizado em um antigo ritual que não se pratica há muito tempo.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/staff-of-the-scarlet-sands/en.json b/assets/data/weapons/staff-of-the-scarlet-sands/en.json index 8974e9860..2ab1c3356 100644 --- a/assets/data/weapons/staff-of-the-scarlet-sands/en.json +++ b/assets/data/weapons/staff-of-the-scarlet-sands/en.json @@ -1,12 +1,12 @@ { - "name": "Moonpiercer", - "type": "Polearm", - "rarity": 5, - "baseAttack": 44, - "subStat": "CRIT Rate", - "passiveName": "Heat Haze at Horizon's End", - "passiveDesc": "The equipping character gains 52% of their Elemental Mastery as bonus ATK. When an Elemental Skill hits opponents, the Dream of the Scarlet Sands effect will be gained for 10s: The equipping character will gain 28% of their Elemental Mastery as bonus ATK. Max 3 stacks.", - "location": "Gacha", - "ascensionMaterial": "oasis" + "name": "Moonpiercer", + "type": "Polearm", + "rarity": 5, + "baseAttack": 44, + "subStat": "CRIT Rate", + "passiveName": "Heat Haze at Horizon's End", + "passiveDesc": "The equipping character gains 52% of their Elemental Mastery as bonus ATK. When an Elemental Skill hits opponents, the Dream of the Scarlet Sands effect will be gained for 10s: The equipping character will gain 28% of their Elemental Mastery as bonus ATK. Max 3 stacks.", + "location": "Gacha", + "ascensionMaterial": "oasis", + "weapon_type": "POLEARM" } - \ No newline at end of file diff --git a/assets/data/weapons/staff-of-the-scarlet-sands/pt.json b/assets/data/weapons/staff-of-the-scarlet-sands/pt.json index e1223cbb2..1f57cb4bc 100644 --- a/assets/data/weapons/staff-of-the-scarlet-sands/pt.json +++ b/assets/data/weapons/staff-of-the-scarlet-sands/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Obtém Bônus de ATQ baseado em 52%/65%/785/91%/104% da Proficiência Elemental do personagem que está com essa arma equipada. Quando a Habilidade Elemental atinge um inimigo, gera por 10s o efeito \"Sonhos de Areias Escarlates\": obtém Bônus de ATQ baseado em 28%/35%/42%/49%/56% da Proficiência Elemental do personagem que está com essa arma equipada. Esse efeito pode ser acumulado até 3 vezes.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": null, "subStat": 0 }, - "description": "Um dos pares de cetros feitos com obsidiana. Dizem que esses artefatos eram usados para guiar o povo do deserto, mas hoje em dia não há ninguém capaz de distinguir a aparência real desta relíquia." + "description": "Um dos pares de cetros feitos com obsidiana. Dizem que esses artefatos eram usados para guiar o povo do deserto, mas hoje em dia não há ninguém capaz de distinguir a aparência real desta relíquia.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/starcaller-s-watch/en.json b/assets/data/weapons/starcaller-s-watch/en.json index 3868ee676..6e20a0b39 100644 --- a/assets/data/weapons/starcaller-s-watch/en.json +++ b/assets/data/weapons/starcaller-s-watch/en.json @@ -8,5 +8,6 @@ "passiveDesc": "Increases Elemental Mastery by 100/125/150/175/200. Gain the \"Mirror of Night\" effect within 15s after the equipping character creates a shield: The current active party member deals 28%/35%/42%/49%/56% increased DMG to nearby opponents. You can gain the \"Mirror of Night\" effect once every 14s.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 44, "subStat": 58 }, - "description": "A statue carved in the shape of an eagle, a sacred relic of the Masters of the Night-Wind that has been passed down from generation to generation." + "description": "A statue carved in the shape of an eagle, a sacred relic of the Masters of the Night-Wind that has been passed down from generation to generation.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/starcaller-s-watch/pt.json b/assets/data/weapons/starcaller-s-watch/pt.json index 1d1c9114d..26fe96fa3 100644 --- a/assets/data/weapons/starcaller-s-watch/pt.json +++ b/assets/data/weapons/starcaller-s-watch/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a Proficiência Elemental em 100/125/150/175/200. Nos 15s após o personagem que está com essa arma equipada criar um escudo, obtém o efeito \"Espelho da Noite\": aumenta o Dano causado pelo personagem ativo da equipe contra os inimigos próximos em 28%/35%/42%/49%/56%. O efeito \"Espelho da Noite\" pode ser obtido uma vez a cada 14s.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 58 }, - "description": "Uma estátua esculpida na forma de uma águia. Um relicário sagrado passado de geração em geração entre os Mestres do Vento Noturno." + "description": "Uma estátua esculpida na forma de uma águia. Um relicário sagrado passado de geração em geração entre os Mestres do Vento Noturno.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/sturdy-bone/en.json b/assets/data/weapons/sturdy-bone/en.json index 8c668e99d..e324ab46c 100644 --- a/assets/data/weapons/sturdy-bone/en.json +++ b/assets/data/weapons/sturdy-bone/en.json @@ -8,5 +8,6 @@ "passiveDesc": "Sprint or Alternate Sprint Stamina Consumption decreased by 15%. Additionally, after using Sprint or Alternate Sprint, Normal Attack DMG is increased by 16%/20%/24%/28%/32% of ATK. This effect expires after triggering 18 times or 7s.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "A longsword made of bone that has only grown harder after being hit and swung countless times. It is said that this was the hero Wanjiru's reliable weapon." + "description": "A longsword made of bone that has only grown harder after being hit and swung countless times. It is said that this was the hero Wanjiru's reliable weapon.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/sturdy-bone/pt.json b/assets/data/weapons/sturdy-bone/pt.json index 3b3097a71..c0336a75d 100644 --- a/assets/data/weapons/sturdy-bone/pt.json +++ b/assets/data/weapons/sturdy-bone/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Reduz o consumo de Stamina de Correr ou de Habilidades que substituem Correr em 15%. Além disso, ao Correr ou usar uma Habilidade que substitui Correr, aumenta o Dano causado por Ataques Normais. O valor do aumento é baseado em 16%/20%/24%/28%/32% do ATQ. Esse efeito desaparecerá depois ser desencadeado 18 vezes ou depois de 7s.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 60 }, - "description": "Uma espada longa feita de osso que se tornou ainda mais resistente após ter sido golpeada e balançada inúmeras vezes. Diz-se que esta era a arma fiel do herói Wanjiru." + "description": "Uma espada longa feita de osso que se tornou ainda mais resistente após ter sido golpeada e balançada inúmeras vezes. Diz-se que esta era a arma fiel do herói Wanjiru.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/summit-shaper/en.json b/assets/data/weapons/summit-shaper/en.json index 6b55420b8..3eff9659c 100644 --- a/assets/data/weapons/summit-shaper/en.json +++ b/assets/data/weapons/summit-shaper/en.json @@ -7,5 +7,6 @@ "passiveName": "", "passiveDesc": "Increases Shield Strength by 20/25/30/35/40%. Scoring hits on opponents increases ATK by 4/5/6/7/8% for 8s. Max 5 stacks. Can only occur once every 0.3s. While protected by a shield, this ATK increase effect is increased by 100%.", "location": "Gacha", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/summit-shaper/jp.json b/assets/data/weapons/summit-shaper/jp.json index 20c7f284d..29a315dd6 100644 --- a/assets/data/weapons/summit-shaper/jp.json +++ b/assets/data/weapons/summit-shaper/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "金璋君臨", "passiveDesc": "シールド強化+20%。攻撃が命中した8秒間、攻撃力+4%。この効果は最大5重まで、0.3秒毎に1回のみ発動可能。また、シールド状態の時、攻撃力アップの効果量が2倍になる。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/summit-shaper/pt.json b/assets/data/weapons/summit-shaper/pt.json index 75ec1a5c5..b40b0903d 100644 --- a/assets/data/weapons/summit-shaper/pt.json +++ b/assets/data/weapons/summit-shaper/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a força do Escudo em 20%/25%/30%/35%/40%. Acertar ataques em inimigos aumenta o ataque em 4%/5%/6%/7%/8% por 8s. Acumula até 5 vezes. Pode ocorrer apenas uma vez a cada 0.3s. Enquanto estiver protegido por um escudo, esse efeito de ataque é aumentado em 100%.", "location": "Liyue", "baseDamage": { "attack": 46, "subStat": 108 }, - "description": "Um símbolo de um pacto lendário, esta lâmina afiada uma vez cortou o pico de uma montanha." + "description": "Um símbolo de um pacto lendário, esta lâmina afiada uma vez cortou o pico de uma montanha.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/sunny-morning-sleep-in/en.json b/assets/data/weapons/sunny-morning-sleep-in/en.json index e1263a40d..7c79a2d0e 100644 --- a/assets/data/weapons/sunny-morning-sleep-in/en.json +++ b/assets/data/weapons/sunny-morning-sleep-in/en.json @@ -8,5 +8,6 @@ "passiveDesc": "Elemental Mastery increases by 120/150/180/210/240 for 6s after triggering Swirl. Elemental Mastery increases by 96/120/144/168/192 for 9s after the wielder's Elemental Skill hits an opponent. Elemental Mastery increases by 32/40/48/56/64 for 30s after the wielder's Elemental Burst hits an opponent.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 44, "subStat": 58 }, - "description": "A bell lantern forged from purple jade. They say it brings sweet dreams when placed beside one's pillow." + "description": "A bell lantern forged from purple jade. They say it brings sweet dreams when placed beside one's pillow.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/sunny-morning-sleep-in/pt.json b/assets/data/weapons/sunny-morning-sleep-in/pt.json index 9f1ca40f8..b6e229768 100644 --- a/assets/data/weapons/sunny-morning-sleep-in/pt.json +++ b/assets/data/weapons/sunny-morning-sleep-in/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a Proficiência Elemental em 120/150/180/210/240 por 6s após desencadear um Redemoinho. A Proficiência Elemental aumenta em 96/120/144/168/192 por 9s após a Habilidade Elemental atingir um oponente. A Proficiência Elemental aumenta em 32/40/48/56/64 por 30s após o Supremo do portador atingir um oponente.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 58 }, - "description": "Um sino-lanterna forjado com puro jade púrpura, diz-se que, ao ser colocado ao lado do travesseiro, pode trazer sonhos felizes." + "description": "Um sino-lanterna forjado com puro jade púrpura, diz-se que, ao ser colocado ao lado do travesseiro, pode trazer sonhos felizes.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/surf-s-up/en.json b/assets/data/weapons/surf-s-up/en.json index aeeb86e2d..f4afaed4f 100644 --- a/assets/data/weapons/surf-s-up/en.json +++ b/assets/data/weapons/surf-s-up/en.json @@ -8,5 +8,6 @@ "passiveDesc": "Max HP increased by 20%/25%/30%/35%/40%. Once every 15s, for the 14s after using an Elemental Skill: Gain 4 Scorching Summer stacks. Each stack increases Normal Attack DMG by 12%/15%/18%/21%/24%. For the duration of the effect, once every 1.5s, lose 1 stack after a Normal Attack hits an opponent; once every 1.5s, gain 1 stack after triggering a Vaporize reaction on an opponent. Max 4 Scorching Summer stacks.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 44, "subStat": 192 }, - "description": "A commemorative item originally reserved for the champion of the \"First All-Tribe Surfing Championship.\" Since said tournament is currently in the preparatory stage, the prize is in temporary storage at the Leisurely Puffer, with the shop owner as its custodian." + "description": "A commemorative item originally reserved for the champion of the \"First All-Tribe Surfing Championship.\" Since said tournament is currently in the preparatory stage, the prize is in temporary storage at the Leisurely Puffer, with the shop owner as its custodian.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/surf-s-up/pt.json b/assets/data/weapons/surf-s-up/pt.json index c5b217b46..2fdedfa11 100644 --- a/assets/data/weapons/surf-s-up/pt.json +++ b/assets/data/weapons/surf-s-up/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a Vida Máxima em 20%/25%/30%/35%/40%. A cada 15s, o seguinte ocorrerá nos 14s após usar uma Habilidade Elemental: ganha 4 acúmulos de Verão Escaldante. Cada acúmulo aumenta o Dano do Ataque Normal em 12%/15%/18%/21%/24%. Nessa duração, uma vez a cada 1.5s: remove 1 acúmulo após um Ataque Normal acertar um oponente. Uma vez a cada 1.5s: acrescenta 1 acúmulo após desencadear uma reação de Vaporização em um oponente. O efeito Verão Escaldante pode ser acumulado até 4 vezes.", "location": "Catalisador", "baseDamage": { "attack": 44, "subStat": 192 }, - "description": "Originalmente reservado como lembrança para o campeão do \"Primeiro Campeonato de Corrida de Surfe de Todas as Tribos\". Dado que o evento continua em fase de preparação, o prêmio foi temporariamente armazenado no \"Flutuador Viajante\", sob a guarda do proprietário." + "description": "Originalmente reservado como lembrança para o campeão do \"Primeiro Campeonato de Corrida de Surfe de Todas as Tribos\". Dado que o evento continua em fase de preparação, o prêmio foi temporariamente armazenado no \"Flutuador Viajante\", sob a guarda do proprietário.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/sword-of-descension/en.json b/assets/data/weapons/sword-of-descension/en.json index 742d6bcd1..b22de30ea 100644 --- a/assets/data/weapons/sword-of-descension/en.json +++ b/assets/data/weapons/sword-of-descension/en.json @@ -7,5 +7,6 @@ "passiveName": "Descension", "passiveDesc": "Hitting enemies with Normal or Charged Attacks grants a 50% chance to deal 200% ATK as DMG in a small AoE. This effect can only occur once every 10s. Additionally, if the Traveler equips the Sword of Descension, their ATK is increased by 66.", "location": "Given via the Mail on PS4/PS5, obtainable on PC/Mobile via cross save", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/sword-of-descension/jp.json b/assets/data/weapons/sword-of-descension/jp.json index 5a8aedfed..68c05e3a1 100644 --- a/assets/data/weapons/sword-of-descension/jp.json +++ b/assets/data/weapons/sword-of-descension/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "降世", "passiveDesc": "\"PlayStation Network\"でプレイする時のみ有効。\\n通常攻撃と重撃が命中時50%の確率で攻撃力の200%の狭範囲ダメージを与える。10秒毎に1回のみ発動可能。旅人が降臨の剣を装備すると、さらに攻撃力+66。", - "location": "PS4版特典" + "location": "PS4版特典", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/sword-of-descension/pt.json b/assets/data/weapons/sword-of-descension/pt.json index 15bd29e32..29a4da611 100644 --- a/assets/data/weapons/sword-of-descension/pt.json +++ b/assets/data/weapons/sword-of-descension/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Efetivo apenas para jogadores da seguinte plataforma: \"PlayStation Network\" Acertar oponentes com um Ataque Normal ou Carregado concede 50% de chance de causar 200% do ATQ como Dano em uma pequena AdE. Este efeito pode ocorrer apenas uma vez a cada 10s. Adicionalmente, se o/a Viajante equipar a Espada do Advento, seu ATQ é aumentado em 66.", "location": "Mondstadt", "baseDamage": { "attack": 39, "subStat": 77 }, - "description": "Uma espada de artesanato único. Não parece pertencer a este mundo." + "description": "Uma espada de artesanato único. Não parece pertencer a este mundo.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/sword-of-narzissenkreuz/en.json b/assets/data/weapons/sword-of-narzissenkreuz/en.json index 9bbdbe4b7..dc799600e 100644 --- a/assets/data/weapons/sword-of-narzissenkreuz/en.json +++ b/assets/data/weapons/sword-of-narzissenkreuz/en.json @@ -7,5 +7,6 @@ "passiveName": "Holy Sword", "passiveDesc": "In countless stories, the weapon that befits the legendary hero is also the key to opening all gates, required to surpass the climax and reach destiny's denouement.", "location": "Quest: Waking from the Great Dream", - "ascensionMaterial": "Fragment of an Ancient Chord" + "ascensionMaterial": "Fragment of an Ancient Chord", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/sword-of-narzissenkreuz/pt.json b/assets/data/weapons/sword-of-narzissenkreuz/pt.json index 5cc22c1a0..24a4c246b 100644 --- a/assets/data/weapons/sword-of-narzissenkreuz/pt.json +++ b/assets/data/weapons/sword-of-narzissenkreuz/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando o personagem com esta arma equipada não possui um Arkhe: quando Ataques Normais, Ataques Carregados ou Ataques Imersivos acertam, uma explosão de energia Pneuma ou Ousia será liberada, causando 160%/200%/240%/280%/320% do ATQ como Dano. Este efeito pode ser ativado uma vez a cada 12 segundos. O tipo de explosão de energia é determinado pelo tipo atual da Espada da Cruz de Narcissus.", "location": "Série de Missões de Mundo - Pistas de Narcissus", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Uma espada cujo poder desapareceu quando a história chegou ao fim. Agora, ela partirá em uma nova jornada com o poder que permanece dentro dela, o qual comemora um certo grande sonho." + "description": "Uma espada cujo poder desapareceu quando a história chegou ao fim. Agora, ela partirá em uma nova jornada com o poder que permanece dentro dela, o qual comemora um certo grande sonho.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/symphonist-of-scents/en.json b/assets/data/weapons/symphonist-of-scents/en.json index b340c1ff6..f0781cd6d 100644 --- a/assets/data/weapons/symphonist-of-scents/en.json +++ b/assets/data/weapons/symphonist-of-scents/en.json @@ -8,5 +8,6 @@ "passiveDesc": "ATK is increased by 12%/15%/18%/21%/24%. When the equipping character is off-field, ATK is increased by an additional 12%/15%/18%/21%/24%. After initiating healing, the equipping character and the character(s) they have healed will obtain the \"Sweet Echoes\" effect, increasing their ATK by 32%/40%/48%/56%/64% for 3s. This effect can be triggered even if the equipping character is off-field.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 46, "subStat": 144 }, - "description": "An elegantly built polearm, said to have been a conductor's baton wielded by a great musician to bridge tune and taste." + "description": "An elegantly built polearm, said to have been a conductor's baton wielded by a great musician to bridge tune and taste.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/symphonist-of-scents/pt.json b/assets/data/weapons/symphonist-of-scents/pt.json index 746e4eb66..83cebbef1 100644 --- a/assets/data/weapons/symphonist-of-scents/pt.json +++ b/assets/data/weapons/symphonist-of-scents/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o ATQ em 12%/15%/18%/21%/24%. Quando o personagem que está com essa arma equipada não estiver ativo, aumenta o ATQ em mais 12%/15%/18%/21%/24%. Depois de curar, o personagem que está com essa arma equipada e o curado obterão o efeito \"Doce Ressonância\", aumentando o ATQ em 32%/40%/48%/56%/64% por 3s. Esse efeito pode ser desencadeado mesmo quando o personagem que está com essa arma equipada não estiver ativo.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 46, "subStat": 144 }, - "description": "Uma lança elegante, dizem que foi a batuta de um maestro, empunhada por um grande músico para ser a ponte entre a música e o bom gosto." + "description": "Uma lança elegante, dizem que foi a batuta de um maestro, empunhada por um grande músico para ser a ponte entre a música e o bom gosto.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/talking-stick/en.json b/assets/data/weapons/talking-stick/en.json index b015f38c7..904a6eeb5 100644 --- a/assets/data/weapons/talking-stick/en.json +++ b/assets/data/weapons/talking-stick/en.json @@ -7,5 +7,6 @@ "passiveName": "The Silver Tongue", "passiveDesc": "ATK will be increased by 16% for 15s after being affected by Pyro. This effect can be triggered once every 12s. All Elemental DMG Bonus will be increased by 12% for 15s after being affected by Hydro, Cryo, Electro, or Dendro. This effect can be triggered once every 12s.", "location": "BP Bounty", - "ascensionMaterial": "oasis" + "ascensionMaterial": "oasis", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/talking-stick/pt.json b/assets/data/weapons/talking-stick/pt.json index 1d96ee22e..410813017 100644 --- a/assets/data/weapons/talking-stick/pt.json +++ b/assets/data/weapons/talking-stick/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Nos 15s seguintes após ser afetado por Pyro, aumenta o ATQ em 16/20/24/28/32%. Esse efeito pode ser desencadeado uma vez a cada 12s. Nos 15s após ser afetado por Hydro, Cryo, Electro ou Dendro, fornece Bônus de Dano de todos os Elementos de 12/15/18/21/24%. Esse efeito pode ser desencadeado uma vez a cada 12s.", "location": "Passe de Batalha do Gnóstico", "baseDamage": { "attack": 44, "subStat": 40 }, - "description": "A maioria das pessoas acha que esse porrete com obsidiana incrustrada é bem convincente." + "description": "A maioria das pessoas acha que esse porrete com obsidiana incrustrada é bem convincente.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/tamayuratei-no-ohanashi/en.json b/assets/data/weapons/tamayuratei-no-ohanashi/en.json index 0077f6146..70d1681ea 100644 --- a/assets/data/weapons/tamayuratei-no-ohanashi/en.json +++ b/assets/data/weapons/tamayuratei-no-ohanashi/en.json @@ -8,5 +8,6 @@ "passiveDesc": "Increase ATK by 20%/25%/30%/35%/40% and Movement SPD by 10% for 10s when using an Elemental Skill.", "location": "Version 5.4 Event - Enchanted Tales of the Mikawa Festival", "baseDamage": { "attack": 44, "subStat": 67 }, - "description": "Once upon a time, there was a youkai that roamed Inazuma in the form of a lantern's flame. This must once have been one of its vessels." + "description": "Once upon a time, there was a youkai that roamed Inazuma in the form of a lantern's flame. This must once have been one of its vessels.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/tamayuratei-no-ohanashi/pt.json b/assets/data/weapons/tamayuratei-no-ohanashi/pt.json index f04d8d08e..383c929f7 100644 --- a/assets/data/weapons/tamayuratei-no-ohanashi/pt.json +++ b/assets/data/weapons/tamayuratei-no-ohanashi/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o ATQ e a Veloc. Mov. em 20%/25%/30%/35%/40% e 10%, respectivamente, por 10s ao usar uma Habilidade Elemental.", "location": "Evento da Versão 5.4 - Contos Encantados do Festival Mikawa", "baseDamage": { "attack": 44, "subStat": 67 }, - "description": "No passado, existiu um Youkai que percorria Inazuma em forma de uma lanterna de fogos de artifício. Esta deve ter sido uma das lanternas em que ele habitou." + "description": "No passado, existiu um Youkai que percorria Inazuma em forma de uma lanterna de fogos de artifício. Esta deve ter sido uma das lanternas em que ele habitou.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/the-alley-flash/en.json b/assets/data/weapons/the-alley-flash/en.json index a4b403000..a9796bd9a 100755 --- a/assets/data/weapons/the-alley-flash/en.json +++ b/assets/data/weapons/the-alley-flash/en.json @@ -7,5 +7,6 @@ "passiveName": "Itinerant Hero", "passiveDesc": "Continuosly sprinting for at least 1s increases ATK by 28% for 6s. This effect cannot stack.", "location": "Gacha", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/the-alley-flash/jp.json b/assets/data/weapons/the-alley-flash/jp.json index edc56f156..28be63965 100644 --- a/assets/data/weapons/the-alley-flash/jp.json +++ b/assets/data/weapons/the-alley-flash/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "路地遊侠", "passiveDesc": "キャラクターが与えるダメージ+12%。ダメージを受けると、このダメージアップ効果は5秒間無効になる。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/the-alley-flash/pt.json b/assets/data/weapons/the-alley-flash/pt.json index a1e3b551d..9b1103877 100644 --- a/assets/data/weapons/the-alley-flash/pt.json +++ b/assets/data/weapons/the-alley-flash/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano causado pelo Personagem em 12%/15%/18%/21%/24%. Ao sofrer Dano, esse efeito de aumento de Dano não ocorrerá por 5s.", "location": "Mondstadt", "baseDamage": { "attack": 45, "subStat": 12 }, - "description": "Uma espada negra, tão escura quanto a noite. Pertenceu a um ladrão que vagava pelas ruas à noite." + "description": "Uma espada negra, tão escura quanto a noite. Pertenceu a um ladrão que vagava pelas ruas à noite.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/the-bell/en.json b/assets/data/weapons/the-bell/en.json index 790610bc6..ed8ebd722 100755 --- a/assets/data/weapons/the-bell/en.json +++ b/assets/data/weapons/the-bell/en.json @@ -7,5 +7,6 @@ "passiveName": "Rebellious Guardian", "passiveDesc": "Taking DMG generates a shield which absorbs DMG up to 20/23/26/29/32% of Max HP. This shield lasts for 10s or until broken, and can only be triggered once every 45s. While protected by the shield, the character gains 12/15/18/21/24% increased DMG.", "location": "Gacha", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/the-bell/jp.json b/assets/data/weapons/the-bell/jp.json index 42868e6d3..7ff08893e 100644 --- a/assets/data/weapons/the-bell/jp.json +++ b/assets/data/weapons/the-bell/jp.json @@ -6,5 +6,6 @@ "subStat": "HP", "passiveName": "反逆の守護者", "passiveDesc": "ダメージを受けた時、HP上限の20%に相当するダメージを吸収できるシールドを生成する。継続時間は最大10秒まで。45秒毎に1回のみ発動可能。シールドが存在する時、キャラクターの与えるダメージ+12%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/the-bell/pt.json b/assets/data/weapons/the-bell/pt.json index e7a7020d6..b68f54943 100644 --- a/assets/data/weapons/the-bell/pt.json +++ b/assets/data/weapons/the-bell/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao receber dano, cria um escudo que absorve o equivalente a 20%/23%/26%/29%/32% da Vida Máxima por 10s ou até o escudo desparecer. Pode ser ativado uma vez a cada 45/45/45/45/45s. Quando o personagem estiver com o escudo, o Dano causado aumenta 12%/15%/18%/21%/24%.", "location": "Mondstadt", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Um espadão pesado com um relógio, mas seus mecanismos internos foram danificados." + "description": "Um espadão pesado com um relógio, mas seus mecanismos internos foram danificados.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/the-black-sword/en.json b/assets/data/weapons/the-black-sword/en.json index da2e464a0..82587149b 100755 --- a/assets/data/weapons/the-black-sword/en.json +++ b/assets/data/weapons/the-black-sword/en.json @@ -7,5 +7,6 @@ "passiveName": "Justice", "passiveDesc": "Increases DMG dealt by Normal and Charged Attacks by 20%.\nAdditionally, regenerates 60% of ATK as HP when Normal and Charged Attacks score a CRIT Hit. This effect can occur once every 5s.", "location": "BP Bounty", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/the-black-sword/jp.json b/assets/data/weapons/the-black-sword/jp.json index 0ebfa95b3..b34a90b34 100644 --- a/assets/data/weapons/the-black-sword/jp.json +++ b/assets/data/weapons/the-black-sword/jp.json @@ -6,5 +6,6 @@ "subStat": "会心率", "passiveName": "正義", "passiveDesc": "通常攻撃と重撃ダメージ+20%。さらに通常攻撃と重撃が会心時、攻撃力の60%分のHPを回復する。5秒に1回のみ発動可能。", - "location": "天空紀行" + "location": "天空紀行", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/the-black-sword/pt.json b/assets/data/weapons/the-black-sword/pt.json index 12e3b0adb..c01eed7dc 100644 --- a/assets/data/weapons/the-black-sword/pt.json +++ b/assets/data/weapons/the-black-sword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o dano causado pelos Ataques Normais e Carregados em 20%/25%/30%/35%/40%, regenera 60%/70%/80%/90%/100% do ATQ como Vida quando o Ataque Normal ou Ataque Carregado atingir Crítico. Este efeito pode ser ativado uma vez a cada 5s.", "location": "Mondstadt", "baseDamage": { "attack": 42, "subStat": 60 }, - "description": "Uma espada longa que anseia por conflito e combate. Dizem-se que mergulha seu portador em um desejo violento de se manchar de sangue em um massacre." + "description": "Uma espada longa que anseia por conflito e combate. Dizem-se que mergulha seu portador em um desejo violento de se manchar de sangue em um massacre.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/the-catch/en.json b/assets/data/weapons/the-catch/en.json index 21dad835f..c2c8915db 100644 --- a/assets/data/weapons/the-catch/en.json +++ b/assets/data/weapons/the-catch/en.json @@ -7,5 +7,6 @@ "passiveName": "Shanty", "passiveDesc": "Increases Elemental Burst DMG by 16/20/24/28/32% and Elemental Burst CRIT Rate by 6/7.5/9/10.5/12%.", "location": "Inazuma Fishing Association", - "ascensionMaterial": "mask" + "ascensionMaterial": "mask", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/the-catch/pt.json b/assets/data/weapons/the-catch/pt.json index b7dadf487..b7663f605 100644 --- a/assets/data/weapons/the-catch/pt.json +++ b/assets/data/weapons/the-catch/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Acará Raimei(3) Fugu(10) Fugu Amargo(10) Recipiente para Saquê de Ako(1)", "location": "Inazuma", "baseDamage": { "attack": 42, "subStat": 10 }, - "description": "Num passado distante, esta era a amada lança de um famoso bandido de Inazuma." + "description": "Num passado distante, esta era a amada lança de um famoso bandido de Inazuma.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/the-dockhands-assistant/en.json b/assets/data/weapons/the-dockhands-assistant/en.json index d64b79c76..a10a76ac2 100644 --- a/assets/data/weapons/the-dockhands-assistant/en.json +++ b/assets/data/weapons/the-dockhands-assistant/en.json @@ -9,5 +9,6 @@ "location": "Event Wish Exclusive", "baseDamage": { "attack": 42, "subStat": 90 }, "ascensionMaterial": "pure-sacred-dewdrop", - "description": "A convenient cutting tool that you can rarely find nowadays. You can replace the blades as they are dulled by usage." + "description": "A convenient cutting tool that you can rarely find nowadays. You can replace the blades as they are dulled by usage.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/the-dockhands-assistant/pt.json b/assets/data/weapons/the-dockhands-assistant/pt.json index 384327e6c..74159cf6a 100644 --- a/assets/data/weapons/the-dockhands-assistant/pt.json +++ b/assets/data/weapons/the-dockhands-assistant/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando o personagem é curado ou cura, concede o Sinal da Tenacidade por 30s. É possível acumular até 3 Sinais da Tenacidade. Ao lançar a Habilidade Elemental ou o Supremo, consome todos os Sinais da Tenacidade e gera por 10s o efeito \"Ascendendo\": para cada Sinal da Tenacidade consumido, aumenta a Proficiência Elemental em 40/50/60/70/80 pontos, e 2s após gerar esse efeito, cada Sinal da Tenacidade Consumido regenerará 2/2.5/3/3.5/4 de Energia Elemental para o personagem que está com essa arma equipada. É possível desencadear o efeito \"Ascendendo\" uma vez a cada 15s. Também é possível obter o Sinal da Tenacidade quando o personagem não está ativo no campo de batalha.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Uma ferramenta de corte conveniente que raramente é vista hoje em dia. Você pode substituir as lâminas cegas quando usa elas." + "description": "Uma ferramenta de corte conveniente que raramente é vista hoje em dia. Você pode substituir as lâminas cegas quando usa elas.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/the-first-great-magic/en.json b/assets/data/weapons/the-first-great-magic/en.json index 74290abd1..e69953dea 100644 --- a/assets/data/weapons/the-first-great-magic/en.json +++ b/assets/data/weapons/the-first-great-magic/en.json @@ -7,5 +7,6 @@ "passiveName": "Parsifal the Great", "passiveDesc": "DMG dealt by Charged Attacks increased by 16%. For every party member with the same Elemental Type as the wielder (including the wielder themselves), gain 1 Gimmick stack. For every party member with a different Elemental Type from the wielder, gain 1 Theatrics stack. When the wielder has 1/2/3 or more Gimmick stacks, ATK will be increased by 16%/32%/48%. When the wielder has 1/2/3 or more Theatrics stacks, Movement SPD will be increased by 4%/7%/10%.", "location": "Gacha", - "ascensionMaterial": "ancient-chord" + "ascensionMaterial": "ancient-chord", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/the-first-great-magic/pt.json b/assets/data/weapons/the-first-great-magic/pt.json index fd508a4ba..e5282b4c5 100644 --- a/assets/data/weapons/the-first-great-magic/pt.json +++ b/assets/data/weapons/the-first-great-magic/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano do Ataque Carregado em 16/20/24/28/32%. Para cada personagem na equipe com o mesmo Tipo Elemental que o personagem que está com essa arma equipada (incluindo o personagem que está com a arma equipada), obtém 1 acúmulo do efeito \"Método\". Para cada personagem de Tipo Elemental diferente, obtém 1 acúmulo do efeito \"Atuação\". Quando possuir 1/2/3 ou mais acúmulos do efeito \"Método\", o ATQ aumentará 16%/32%/48% | 20%/40%/60% | 24%/48%/72% | 28%/56%/84% | 32%/64%/96%. Quando possuir 1/2/3 ou mais acúmulos do efeito \"Atuação\", aumenta a Veloc. Mov. em 4%/7%/10% | 6%/9%/12% | 8%/11%/14% | 10%/13%/16% | 12%/15%/18%.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 46, "subStat": 144 }, - "description": "Um adereço de performance usado pela antiga \"Grande Mágica\", que acabou revelando-se um notável armamento." + "description": "Um adereço de performance usado pela antiga \"Grande Mágica\", que acabou revelando-se um notável armamento.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/the-flute/en.json b/assets/data/weapons/the-flute/en.json index 0601a440c..c63dd3b39 100755 --- a/assets/data/weapons/the-flute/en.json +++ b/assets/data/weapons/the-flute/en.json @@ -7,5 +7,6 @@ "passiveName": "Chord", "passiveDesc": "Normal or Charged Attacks grant Harmonic on hits. Gaining 5 Harmonics triggers the power of music and deals 100/125/150/175/200% ATK DMG to surrounding enemies. Harmonics last up to 30s, and a maximum of 1 can be gained every 0.5s.", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/the-flute/jp.json b/assets/data/weapons/the-flute/jp.json index 6a43f193c..291614252 100644 --- a/assets/data/weapons/the-flute/jp.json +++ b/assets/data/weapons/the-flute/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "和音", "passiveDesc": "通常攻撃または重撃が命中すると、100%の確率で和音を1個獲得する。和音を5個集めると、音律の力を放ち、周囲の敵に攻撃力の100%のダメージを与える。和音は最大30秒存在し、0.5秒毎に最大1個獲得可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/the-flute/pt.json b/assets/data/weapons/the-flute/pt.json index 43e68342c..ead12ef8d 100644 --- a/assets/data/weapons/the-flute/pt.json +++ b/assets/data/weapons/the-flute/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "O Ataque Normal ou Ataque Carregado concede um Acorde. Obter 5 Acordes ativa o poder da música e causa 100%/125%/150%/175%/200% de Dano de ATQ aos inimigos ao redor. Os Acordes duram até 30s e pode-se ganhar 1 Acorde a cada 0.5s.", "location": "Mondstadt", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Abaixo da poeira, há uma lâmina fina e luxuosamente decorada. Seus movimentos são suaves como o vento." + "description": "Abaixo da poeira, há uma lâmina fina e luxuosamente decorada. Seus movimentos são suaves como o vento.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/the-stringless/en.json b/assets/data/weapons/the-stringless/en.json index 669ee48b2..0f8112c86 100755 --- a/assets/data/weapons/the-stringless/en.json +++ b/assets/data/weapons/the-stringless/en.json @@ -7,5 +7,6 @@ "passiveName": "Arrowless Song", "passiveDesc": "Increases Elemental Skill and Elemental Burst DMG by 24/30/36/42/48%.", "location": "Gacha", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/the-stringless/jp.json b/assets/data/weapons/the-stringless/jp.json index 789b723f2..743f14986 100644 --- a/assets/data/weapons/the-stringless/jp.json +++ b/assets/data/weapons/the-stringless/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "矢なしの詩", "passiveDesc": "元素スキルと元素爆発のダメージ+24%。", - "location": "祈願" + "location": "祈願", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/the-stringless/pt.json b/assets/data/weapons/the-stringless/pt.json index 4ea59faea..01293636c 100644 --- a/assets/data/weapons/the-stringless/pt.json +++ b/assets/data/weapons/the-stringless/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano da Habilidade Elemental e do Supremo em 24%/30%/36%/42%/48%.", "location": "Mondstadt", "baseDamage": { "attack": 42, "subStat": 36 }, - "description": "Um arco que serviu como um instrumento extraordinário. Não é mais capaz de fazer pessoas dançarem." + "description": "Um arco que serviu como um instrumento extraordinário. Não é mais capaz de fazer pessoas dançarem.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/the-unforged/en.json b/assets/data/weapons/the-unforged/en.json index 388b6b780..60cc60aaa 100644 --- a/assets/data/weapons/the-unforged/en.json +++ b/assets/data/weapons/the-unforged/en.json @@ -7,5 +7,6 @@ "passiveName": "Golden Majesty", "passiveDesc": "Increases Shield Strength by 20/25/30/35/40%, scoring hits on opponents increases ATK by 4/5/6/7/8% for 8s. Max 5 stacks. Can only occur once every 0.3s. While protected by a shield this ATK increase effect is increased by 100%", "location": "Gacha", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/the-unforged/jp.json b/assets/data/weapons/the-unforged/jp.json index 78655cf37..38ab11b01 100644 --- a/assets/data/weapons/the-unforged/jp.json +++ b/assets/data/weapons/the-unforged/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "金璋君臨", "passiveDesc": "シールド強化+20%。攻撃が命中した8秒間、攻撃力+4%。この効果は最大5重まで、0.3秒毎に1回のみ発動可能。また、シールド状態の時、攻撃力アップの効果量が2倍になる。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/the-unforged/pt.json b/assets/data/weapons/the-unforged/pt.json index 292a97f01..b86a58ae1 100644 --- a/assets/data/weapons/the-unforged/pt.json +++ b/assets/data/weapons/the-unforged/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a força do Escudo em 20%/25%/30%/35%/40%. Acertar ataques em inimigos aumenta o ataque em 4%/5%/6%/7%/8% por 8s. Acumula até 5 vezes. Pode ocorrer apenas uma vez a cada 0.3s. Enquanto estiver protegido por um escudo, esse efeito de ataque é aumentado em 100%.", "location": "Liyue", "baseDamage": { "attack": 46, "subStat": 108 }, - "description": "Capaz de afastar tanto os espíritos malignos quanto as pessoas maléficas, este Espadão sem fio parece possuir o poder divino." + "description": "Capaz de afastar tanto os espíritos malignos quanto as pessoas maléficas, este Espadão sem fio parece possuir o poder divino.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/the-viridescent-hunt/en.json b/assets/data/weapons/the-viridescent-hunt/en.json index d67c57196..f126e86cb 100755 --- a/assets/data/weapons/the-viridescent-hunt/en.json +++ b/assets/data/weapons/the-viridescent-hunt/en.json @@ -7,5 +7,6 @@ "passiveName": "Verdant Wind", "passiveDesc": "Upon hit, Normal and Aimed Shot Attacks have a 50% chance to generate a Cyclone, which will continuously attract surrounding enemies, dealing 40% of ATK as DMG to these enemies every 0.5s for 4s. This effect can only occur once every 14s.", "location": "BP Bounty", - "ascensionMaterial": "decarabian" + "ascensionMaterial": "decarabian", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/the-viridescent-hunt/jp.json b/assets/data/weapons/the-viridescent-hunt/jp.json index 8482bab95..a9e8e91af 100644 --- a/assets/data/weapons/the-viridescent-hunt/jp.json +++ b/assets/data/weapons/the-viridescent-hunt/jp.json @@ -6,5 +6,6 @@ "subStat": "会心率", "passiveName": "蒼翠の風", "passiveDesc": "通常攻撃と重撃が命中時、50%の確率で風の目を生成し、近くの敵を吸い寄せる。0.5秒毎に敵に攻撃力の40%のダメージを与える。継続時間4秒、14秒毎に1回のみ発動可能。", - "location": "天空紀行" + "location": "天空紀行", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/the-viridescent-hunt/pt.json b/assets/data/weapons/the-viridescent-hunt/pt.json index e5b957106..e70d41ba4 100644 --- a/assets/data/weapons/the-viridescent-hunt/pt.json +++ b/assets/data/weapons/the-viridescent-hunt/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao acertar um Ataque Normal ou Ataque com Mira, possui 50% de chance de gerar um Ciclone que atacará continuamente os inimigos ao redor, causando 40%/50%/60%/70%/80% de Dano de ATQ a esses inimigos a cada 0.5s por 4s. Este efeito pode ser ativado uma vez a cada 14/13/12/11/10s.", "location": "Mondstadt", "baseDamage": { "attack": 42, "subStat": 60 }, - "description": "Um arco de caça verde puro. Isso pertenceu a um certo caçador cuja casa era a floresta." + "description": "Um arco de caça verde puro. Isso pertenceu a um certo caçador cuja casa era a floresta.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/the-widsith/en.json b/assets/data/weapons/the-widsith/en.json index ffaa9c8a9..f86e995d0 100755 --- a/assets/data/weapons/the-widsith/en.json +++ b/assets/data/weapons/the-widsith/en.json @@ -7,5 +7,6 @@ "passiveName": "Debut", "passiveDesc": "When the character takes the field, they gain a random theme song for 10s:\nRecitative: Increases Base ATK by 60%\nInterlude: Elemental Mastery is increased by 240\nAria: Increases all Elemental DMG by 48%\nCan only occur once every 30s", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/the-widsith/jp.json b/assets/data/weapons/the-widsith/jp.json index 15d3d3066..6d692be59 100644 --- a/assets/data/weapons/the-widsith/jp.json +++ b/assets/data/weapons/the-widsith/jp.json @@ -6,5 +6,6 @@ "subStat": "会心ダメージ", "passiveName": "序曲", "passiveDesc": "キャラ登場時、ランダムにテーマ曲を1つ獲得する、継続時間10秒。30秒毎に1回のみ発動可能。叙唱：攻撃力+60%。詠唱：全元素ダメージ+48%。間奏曲：元素熟知+240。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/the-widsith/pt.json b/assets/data/weapons/the-widsith/pt.json index 1293d6d79..62b72ceb9 100644 --- a/assets/data/weapons/the-widsith/pt.json +++ b/assets/data/weapons/the-widsith/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao entrar no campo de batalha, o personagem ganha uma música temática aleatória por 10s. Pode ser ativada uma vez a cada 30s. Recitativa: O ATQ é aumentado em 60%/75%/90%/105%/120%; Aria: Aumenta todos os Danos Elementais em 48%/60%/72%/84%/96%; Interlúdio: A Proficiência Elemental é aumentada em 240/300/360/420/480.", "location": "Mondstadt", "baseDamage": { "attack": 42, "subStat": 120 }, - "description": "Um caderno pesado cheio de partituras. Apesar de já estar bastante danificado, ainda há muito poder que pode ser encontrado nas palavras escritas." + "description": "Um caderno pesado cheio de partituras. Apesar de já estar bastante danificado, ainda há muito poder que pode ser encontrado nas palavras escritas.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/thrilling-tales-of-dragon-slayers/en.json b/assets/data/weapons/thrilling-tales-of-dragon-slayers/en.json index 42436d9c0..cbcf7a584 100755 --- a/assets/data/weapons/thrilling-tales-of-dragon-slayers/en.json +++ b/assets/data/weapons/thrilling-tales-of-dragon-slayers/en.json @@ -7,5 +7,6 @@ "passiveName": "Legacy", "passiveDesc": "When switching characters, the new character taking the field has their ATK increased by 24/30/36/42/48% for 10s. This effect can only occur once every 20s.", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/thrilling-tales-of-dragon-slayers/jp.json b/assets/data/weapons/thrilling-tales-of-dragon-slayers/jp.json index c500f6916..a7f924e0a 100644 --- a/assets/data/weapons/thrilling-tales-of-dragon-slayers/jp.json +++ b/assets/data/weapons/thrilling-tales-of-dragon-slayers/jp.json @@ -6,5 +6,6 @@ "subStat": "HP", "passiveName": "伝承", "passiveDesc": "キャラを切り替えると、次に登場するキャラの攻撃力+24%、継続時間10秒。20秒に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/thrilling-tales-of-dragon-slayers/pt.json b/assets/data/weapons/thrilling-tales-of-dragon-slayers/pt.json index 83f65f477..c1e380cf7 100644 --- a/assets/data/weapons/thrilling-tales-of-dragon-slayers/pt.json +++ b/assets/data/weapons/thrilling-tales-of-dragon-slayers/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao mudar de personagem, o ATQ do novo personagem é aumentado em 24%/30%/36%/42%/48% por 10s. Este efeito pode ser ativado uma vez a cada 20s.", "location": "Mondstadt", "baseDamage": { "attack": 39, "subStat": 77 }, - "description": "Uma história fictícia de um grupo de 5 heróis em uma viagem de caça de dragões. Possui péssima caligrafia e está mal estruturada, porém transmite a importância de não cometer erros." + "description": "Uma história fictícia de um grupo de 5 heróis em uma viagem de caça de dragões. Possui péssima caligrafia e está mal estruturada, porém transmite a importância de não cometer erros.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/thundering-pulse/en.json b/assets/data/weapons/thundering-pulse/en.json index 1c0f82645..e106f8de9 100644 --- a/assets/data/weapons/thundering-pulse/en.json +++ b/assets/data/weapons/thundering-pulse/en.json @@ -7,5 +7,6 @@ "passiveName": "Rule By Thunder", "passiveDesc": "Increases ATK by 20% and grants the might of the Thunder Emblem. At stack levels 1/2/3, the Thunder Emblem increases Normal Attack DMG by 12/24/40%. The character will obtain 1 stack of Thunder Emblem in each of the following scenarios: Normal Attack deals DMG (stack lasts 5s), casting Elemental Skill (stack lasts 10s); Energy is less than 100% (stack disappears when Energy is full). Each stack's duration is calculated independently.", "location": "Gacha", - "ascensionMaterial": "narukami" + "ascensionMaterial": "narukami", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/thundering-pulse/jp.json b/assets/data/weapons/thundering-pulse/jp.json index 1d8535c33..ffcdd8b6b 100644 --- a/assets/data/weapons/thundering-pulse/jp.json +++ b/assets/data/weapons/thundering-pulse/jp.json @@ -6,5 +6,6 @@ "subStat": "会心ダメージ", "passiveName": "飛雷の御執", "passiveDesc": "攻撃力+20%、「飛雷の巴紋」の効果を獲得できる。飛雷の巴紋を1/2/3層有する時、通常攻撃のダメージ+12/24/40%。飛雷の巴紋は次の各状況において獲得できる。通常攻撃でダメージを与えた時、継続時間5秒の飛雷の巴紋を1層獲得する。元素スキルを発動した時、継続時間10秒の飛雷の巴紋を1層獲得する。また、キャラクターの元素エネルギーが100%未満の場合、飛雷の巴紋を1層獲得する、この飛雷の巴紋は元素エネルギーが満タンになると消失する。飛雷の巴紋の継続時間は層ごとに独立している。", - "location": "祈願" + "location": "祈願", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/thundering-pulse/pt.json b/assets/data/weapons/thundering-pulse/pt.json index 25f1e8043..14fcd5b65 100644 --- a/assets/data/weapons/thundering-pulse/pt.json +++ b/assets/data/weapons/thundering-pulse/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Ataque em 20%/25%/30%/35%/40%, e concede a grandeza do Selo da Trovoada. Nas cargas 1/2/3, o Selo de Trovoada aumenta o Dano do Ataque Normal em 12/24/40%/15/30/50%/18/36/60%/21/42/70%/24/48/80%. O personagem obterá uma carga de Selo da Trovoada nos seguintes cenários: Ataque Normal que causa Dano (a carga dura 5s), lançar uma Habilidade Elemental (carga dura 10s); Energia Elemental menor que 100% (carga desaparece quando a energia está completa). A duração de cada carga é calculada independentemente uma da outra.", "location": "Inazuma", "baseDamage": { "attack": 46, "subStat": 144 }, - "description": "Um Arco Longo que foi dado a alguém pela Shogun. Ele emite raios que nunca se apagam." + "description": "Um Arco Longo que foi dado a alguém pela Shogun. Ele emite raios que nunca se apagam.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/tidal-shadow/en.json b/assets/data/weapons/tidal-shadow/en.json index 63faf0a7a..3ecbf396d 100644 --- a/assets/data/weapons/tidal-shadow/en.json +++ b/assets/data/weapons/tidal-shadow/en.json @@ -7,5 +7,6 @@ "passiveName": "White Cruising Wave", "passiveDesc": "After the wielder is healed, ATK will be increased by 24% for 8s. This can be triggered even when the character is not on the field.", "location": "BP Bounty", - "ascensionMaterial": "pristine-sea" + "ascensionMaterial": "pristine-sea", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/tidal-shadow/pt.json b/assets/data/weapons/tidal-shadow/pt.json index c4e7353b3..e2a1af07e 100644 --- a/assets/data/weapons/tidal-shadow/pt.json +++ b/assets/data/weapons/tidal-shadow/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após receber cura, aumenta o ATQ em 24/30/36/42/48% por 8s. Pode ser ativado mesmo quando o personagem não estiver em campo.", "location": "Obtido na forja", "baseDamage": { "attack": 42, "subStat": 90 }, - "description": "Uma espada modelo padrão intrincada para os oficiais de alto-escalão e capitães da antiga marinha de Fontaine." + "description": "Uma espada modelo padrão intrincada para os oficiais de alto-escalão e capitães da antiga marinha de Fontaine.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/tome-of-the-eternal-flow/en.json b/assets/data/weapons/tome-of-the-eternal-flow/en.json index 6ad9c1457..edf85fa03 100755 --- a/assets/data/weapons/tome-of-the-eternal-flow/en.json +++ b/assets/data/weapons/tome-of-the-eternal-flow/en.json @@ -7,5 +7,6 @@ "passiveName": "Aeon Wave", "passiveDesc": "HP is increased by 16/20/24/28/32%. When current HP increases or decreases, Charged Attack DMG will be increased by 14/18/22/26/30% for 4s. Max 3 stacks, can be triggered once every 0.3s. When you have 3 stacks or refresh a third stack's duration, 8/9/10/11/12 Energy will be restored. This Energy restoration effect can be triggered once every 12s.", "location": "Gacha", - "ascensionMaterial": "pure-sacred-dewdrop" + "ascensionMaterial": "pure-sacred-dewdrop", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/tome-of-the-eternal-flow/pt.json b/assets/data/weapons/tome-of-the-eternal-flow/pt.json index dd4f32d08..0db45e645 100644 --- a/assets/data/weapons/tome-of-the-eternal-flow/pt.json +++ b/assets/data/weapons/tome-of-the-eternal-flow/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a Vida em 16%/20%/24%/28%/32%. Quando a Vida atual aumentar ou cair, aumenta o Dano do Ataque Carregado em 14%/18%/22%/26%/30%. Esse efeito dura 4s, pode ser acumulado até 3 vezes e desencadeado uma vez a cada 0.3s. Ao possuir 3 acúmulos ou quando redefinir a duração dos 3 acúmulos, regenera 8/9/10/11/12 de Energia Elemental. É possível regenerar Energia Elemental uma vez a cada 12s dessa forma.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 192 }, - "description": "Um manual passado de geração em geração num centro de treinamento submarino. Hoje, ninguém sabe da sua existência." + "description": "Um manual passado de geração em geração num centro de treinamento submarino. Hoje, ninguém sabe da sua existência.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/toukabou-shigure/en.json b/assets/data/weapons/toukabou-shigure/en.json index a805cd85b..7a137a677 100755 --- a/assets/data/weapons/toukabou-shigure/en.json +++ b/assets/data/weapons/toukabou-shigure/en.json @@ -7,5 +7,6 @@ "passiveName": "Kaidan: Rainfall Earthbinder", "passiveDesc": "After an attack hits opponents, it will inflict an instance of Cursed Parasol upon one of them for 10s. This effect can be triggered once every 15s. If this opponent is defeated during Cursed Parasol's duration, Cursed Parasol's CD will be refreshed immediately. The character wielding this weapon will deal 16/20/24/28/32% more DMG to the opponent affected by Cursed Parasol.", "location": "Akitsu Kimodameshi Event", - "ascensionMaterial": "narukami" + "ascensionMaterial": "narukami", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/toukabou-shigure/pt.json b/assets/data/weapons/toukabou-shigure/pt.json index 384a923c9..67b8d2269 100644 --- a/assets/data/weapons/toukabou-shigure/pt.json +++ b/assets/data/weapons/toukabou-shigure/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao atingir os inimigos com um ataque, aplicará o estado de \"Assombração do Guarda-Chuva\" em um inimigo por 10s. Esse efeito pode ser desencadeado uma vez a cada 15s; caso esse inimigo seja derrotado na duração do efeito, redefinirá o tempo de recarga dele. Os inimigos sob o estado “Assombração do Guarda-Chuva” receberão Dano aumentado em 16%/20%/24%/28%/32% de personagens que tenham esta arma equipada.", "location": "Obtido no Evento \"Akitsu Kimodameshi\" na versão 3.3", "baseDamage": { "attack": 42, "subStat": 36 }, - "description": "Um guarda-chuva especial feito de papel e óleo. Apesar de longas viagens poderem fazer alguém se acostumar com o vento e a chuva, talvez ainda exista razão para admirar uma cena chuvosa sob esse guarda-chuva." + "description": "Um guarda-chuva especial feito de papel e óleo. Apesar de longas viagens poderem fazer alguém se acostumar com o vento e a chuva, talvez ainda exista razão para admirar uma cena chuvosa sob esse guarda-chuva.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/traveler-s-handy-sword/en.json b/assets/data/weapons/traveler-s-handy-sword/en.json index f9fb5951d..04693df4c 100755 --- a/assets/data/weapons/traveler-s-handy-sword/en.json +++ b/assets/data/weapons/traveler-s-handy-sword/en.json @@ -7,5 +7,6 @@ "passiveName": "Journey", "passiveDesc": "Each Elemental Orb or Particle collected restores 1/1.25/1.5/1.75/2% HP.", "location": "Chest", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/traveler-s-handy-sword/jp.json b/assets/data/weapons/traveler-s-handy-sword/jp.json index 39d4ad7fd..c88660a84 100644 --- a/assets/data/weapons/traveler-s-handy-sword/jp.json +++ b/assets/data/weapons/traveler-s-handy-sword/jp.json @@ -6,5 +6,6 @@ "subStat": "防御力", "passiveName": "旅路", "passiveDesc": "元素オーブまたは元素粒子を獲得した時、HPを1%回復する。", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/traveler-s-handy-sword/pt.json b/assets/data/weapons/traveler-s-handy-sword/pt.json index 5a48c4bd7..b44c17ebb 100644 --- a/assets/data/weapons/traveler-s-handy-sword/pt.json +++ b/assets/data/weapons/traveler-s-handy-sword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Cada Orbe ou Partícula Elemental coletada restaura 1%/1.25%/1.5%/1.75%/2% da Vida.", "location": "Mondstadt", "baseDamage": { "attack": 40, "subStat": 64 }, - "description": "Uma espada de aço que esconde tesouras, lupas, entre outros itens úteis de viagem em sua bainha." + "description": "Uma espada de aço que esconde tesouras, lupas, entre outros itens úteis de viagem em sua bainha.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/tulaytullah-s-remembrance/en.json b/assets/data/weapons/tulaytullah-s-remembrance/en.json index dc4eca23f..aee89ac93 100644 --- a/assets/data/weapons/tulaytullah-s-remembrance/en.json +++ b/assets/data/weapons/tulaytullah-s-remembrance/en.json @@ -7,5 +7,6 @@ "passiveName": "Bygone Azure Teardrop", "passiveDesc": "Normal Attack SPD is increased by 10%. After the wielder unleashes an Elemental Skill, Normal Attack DMG will increase by 4.8% every second for 14s. After this character hits an opponent with a Normal Attack during this duration, Normal Attack DMG will be increased by 9.6%. This increase can be triggered once every 0.3s.", "location": "Gacha", - "ascensionMaterial": "scorching" + "ascensionMaterial": "scorching", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/tulaytullah-s-remembrance/pt.json b/assets/data/weapons/tulaytullah-s-remembrance/pt.json index 8eb7316d4..3801d58ad 100644 --- a/assets/data/weapons/tulaytullah-s-remembrance/pt.json +++ b/assets/data/weapons/tulaytullah-s-remembrance/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a Vel. do Ataque Normal em 10%/12.5%/15%/17.5%/20%. Nos 14s após lançar a Habilidade Elemental: o Dano causado por Ataques Normais aumenta em 4.8%/6%/7.2%/8.4%/9.6% a cada segundo; ao atingir os oponentes com um Ataque Normal, o Dano causado pelo Ataque Normal aumentará em 9.6%/12%/14.4%/16.8%/19.2%. Este efeito pode ser desencadeado até 1 vez a cada 0.3s. Enquanto este efeito estiver ativo, o Dano causado por Ataques Normais através do efeito descrito acima aumentará em até no máximo 48%/60%/72%/84%/96%. Este efeito é removido quando o personagem deixa o campo de batalha. Ao lançar a Habilidade Elemental novamente, o efeito será reiniciado.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 48, "subStat": 96 }, - "description": "Um sino feito de safira e prata pura. Seus ecos são claros, mas distantes." + "description": "Um sino feito de safira e prata pura. Seus ecos são claros, mas distantes.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/twin-nephrite/en.json b/assets/data/weapons/twin-nephrite/en.json index 9e84423c2..d5f568990 100755 --- a/assets/data/weapons/twin-nephrite/en.json +++ b/assets/data/weapons/twin-nephrite/en.json @@ -7,5 +7,6 @@ "passiveName": "Guerilla Tactic", "passiveDesc": "Defeating an enemy increases Movement SPD and ATK by 12/14/16/18/20% for 15s.", "location": "Chests", - "ascensionMaterial": "elixir" + "ascensionMaterial": "elixir", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/twin-nephrite/jp.json b/assets/data/weapons/twin-nephrite/jp.json index 160dfa61d..89cd6d405 100644 --- a/assets/data/weapons/twin-nephrite/jp.json +++ b/assets/data/weapons/twin-nephrite/jp.json @@ -6,5 +6,6 @@ "subStat": "会心率", "passiveName": "襲撃戦術", "passiveDesc": "敵を倒した後15秒間、移動速度と攻撃力+12%。", - "location": "宝箱等" + "location": "宝箱等", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/twin-nephrite/pt.json b/assets/data/weapons/twin-nephrite/pt.json index e71597bcd..83fa71efa 100644 --- a/assets/data/weapons/twin-nephrite/pt.json +++ b/assets/data/weapons/twin-nephrite/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao derrotar um inimigo, aumenta a Veloc. Mov. e o ATQ em 12%/14%/16%/18%/20% por 15s.", "location": "Liyue", "baseDamage": { "attack": 40, "subStat": 34 }, - "description": "Um pingente de jade colocado junto entre duas pedras de jade." + "description": "Um pingente de jade colocado junto entre duas pedras de jade.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/ultimate-overlord-s-mega-magic-sword/en.json b/assets/data/weapons/ultimate-overlord-s-mega-magic-sword/en.json index a21923a3f..48bc7b3a0 100755 --- a/assets/data/weapons/ultimate-overlord-s-mega-magic-sword/en.json +++ b/assets/data/weapons/ultimate-overlord-s-mega-magic-sword/en.json @@ -7,5 +7,6 @@ "passiveName": "Melussistance!", "passiveDesc": "ATK increased by 12/15/18/21/24%. That's not all! The support from all Melusines you've helped in Merusea Village fills you with strength! Based on the number of them you've helped, your ATK is increased by up to an additional 12/15/18/21/24%.", "location": "Event: Roses and Muskets", - "ascensionMaterial": "pristine-sea" + "ascensionMaterial": "pristine-sea", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/ultimate-overlord-s-mega-magic-sword/pt.json b/assets/data/weapons/ultimate-overlord-s-mega-magic-sword/pt.json index 09ed5dce9..19a7e0cb9 100644 --- a/assets/data/weapons/ultimate-overlord-s-mega-magic-sword/pt.json +++ b/assets/data/weapons/ultimate-overlord-s-mega-magic-sword/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o ATQ em 12%/15%/18%/21%/24%. Mas não só isso! As Melusines da Vila Marusea lhe oferecem todo seu apoio, de forma que segundo a quantidade de Melusines que você já ajudou, o ATQ pode aumentar em até 12%/15%/18%/21%/24% a mais.", "location": "Evento da Versão 4.3 - Rosas e Pistolas", "baseDamage": { "attack": 44, "subStat": 67 }, - "description": "Uma espada mágica que só pode ser empunhada por quem comandar os mares. Como foi feita com materiais especiais à prova d'água, não ficará encharcada mesmo que seja mergulhada na água. Pode-se dizer que ela é invencível!" + "description": "Uma espada mágica que só pode ser empunhada por quem comandar os mares. Como foi feita com materiais especiais à prova d'água, não ficará encharcada mesmo que seja mergulhada na água. Pode-se dizer que ela é invencível!", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/uraku-misugiri/en.json b/assets/data/weapons/uraku-misugiri/en.json index b031abf74..d7df1914a 100644 --- a/assets/data/weapons/uraku-misugiri/en.json +++ b/assets/data/weapons/uraku-misugiri/en.json @@ -1,11 +1,12 @@ { - "name": "Uraku Misugiri", - "type": "Sword", - "rarity": 5, - "baseAttack": 44, - "subStat": "CRIT DMG", - "passiveName": "Brocade Bloom, Shrine Sword", - "passiveDesc": "Normal Attack DMG is increased by 16/20/24/28/32% and Elemental Skill DMG is increased by 24/30/36/42/48%. After a nearby active character deals Geo DMG, the aforementioned effects increase by 100% for 15s. Additionally, the wielder's DEF is increased by 20/25/30/35/40%.", - "location": "Gacha", - "ascensionMaterial": "distant-sea" + "name": "Uraku Misugiri", + "type": "Sword", + "rarity": 5, + "baseAttack": 44, + "subStat": "CRIT DMG", + "passiveName": "Brocade Bloom, Shrine Sword", + "passiveDesc": "Normal Attack DMG is increased by 16/20/24/28/32% and Elemental Skill DMG is increased by 24/30/36/42/48%. After a nearby active character deals Geo DMG, the aforementioned effects increase by 100% for 15s. Additionally, the wielder's DEF is increased by 20/25/30/35/40%.", + "location": "Gacha", + "ascensionMaterial": "distant-sea", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/uraku-misugiri/pt.json b/assets/data/weapons/uraku-misugiri/pt.json index 985d7c1b9..b7e179e44 100644 --- a/assets/data/weapons/uraku-misugiri/pt.json +++ b/assets/data/weapons/uraku-misugiri/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano do Ataque Normal em 16%/20%/24%/28%/32%. Aumenta o Dano da Habilidade Elemental em 24%/30%/36%/42%/48%. Quando um personagem ativo próximo causa Dano Geo, os efeitos mencionados acima serão aumentados em 100% por 15s. Além disso, a DEF do personagem que está com essa arma equipada aumenta em 20%/25%/30%/35%/40%.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 44, "subStat": 192 }, - "description": "Uma espada forjada sob a supervisão do ilustre Urakusai. Reza a lenda que ela nunca tirou a vida de nenhum ser vivo nos últimos séculos." + "description": "Uma espada forjada sob a supervisão do ilustre Urakusai. Reza a lenda que ela nunca tirou a vida de nenhum ser vivo nos últimos séculos.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/verdict/en.json b/assets/data/weapons/verdict/en.json index 2e0b9a53c..5f6f3d287 100755 --- a/assets/data/weapons/verdict/en.json +++ b/assets/data/weapons/verdict/en.json @@ -7,5 +7,6 @@ "passiveName": "Many Oaths of Dawn and Dusk", "passiveDesc": "Increases ATK by 20/25/30/35/40%. When characters in your party obtain Elemental Shards from Crystallize reactions, the equipping character will gain 1 Seal, increasing Elemental Skill DMG by 18/22.5/27/31.5/36%. The Seal lasts for 15s, and the equipped may have up to 2 Seals at once. All of the equipper's Seals will disappear 0.2s after their Elemental Skill deals DMG.", "location": "Gacha", - "ascensionMaterial": "ancient-chord" + "ascensionMaterial": "ancient-chord", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/verdict/pt.json b/assets/data/weapons/verdict/pt.json index a866f31e0..835f3282a 100644 --- a/assets/data/weapons/verdict/pt.json +++ b/assets/data/weapons/verdict/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o ATQ em 20%/25%/30%/35%/40%. Quando o personagem da equipe obtém um Fragmento gerado por Cristalização, concede ao personagem que está com essa arma equipada 1 \"Selo do Juramento\", aumentando o Dano causado por sua Habilidade Elemental em 18%/22.5%/27%/31.5%/36%. O Selo do Juramento dura 15s e pode ser acumulado até duas vezes. Todos os Selos do Juramento serão removidos 0.2s após o personagem que está com essa arma equipada causar Dano de Habilidade Elemental.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 48, "subStat": 48 }, - "description": "Uma espada usada por uma jovem donzela que abandonou o nome de sua família, manchada com o sangue de inimigos e de familiares." + "description": "Uma espada usada por uma jovem donzela que abandonou o nome de sua família, manchada com o sangue de inimigos e de familiares.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/vivid-notions/en.json b/assets/data/weapons/vivid-notions/en.json index 03296467b..8ad1b1036 100644 --- a/assets/data/weapons/vivid-notions/en.json +++ b/assets/data/weapons/vivid-notions/en.json @@ -8,5 +8,6 @@ "passiveDesc": "ATK is increased by 28%/35%/42%/49%/56%. When you use a Plunging Attack, you will gain the \"Dawn's First Hue\" effect: Plunging Attack CRIT DMG is increased by 28%/35%/42%/49%/56%. When you use an Elemental Skill or Burst, you will gain the \"Twilight's Splendor\" effect: Plunging Attack CRIT DMG is increased by 40%/50%/60%/70%/80%. The two effects above each last for 15s, and will be canceled 0.1s after the ground impact hits a target.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 48, "subStat": 96 }, - "description": "A trophy made from gemstones from the Collective of Plenty and crystals from the Flower-Feather Clan. It is said to have once belonged to a legendary wrestler." + "description": "A trophy made from gemstones from the Collective of Plenty and crystals from the Flower-Feather Clan. It is said to have once belonged to a legendary wrestler.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/vivid-notions/pt.json b/assets/data/weapons/vivid-notions/pt.json index c0213724e..ebf53cd9b 100644 --- a/assets/data/weapons/vivid-notions/pt.json +++ b/assets/data/weapons/vivid-notions/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o ATQ em 28%/35%/42%/49%/56%. Ao fazer um Ataque Imersivo, obtém o efeito \"Cores do Crepúsculo\": aumenta o Dano CRIT causado pelo Ataque Imersivo em 28%/35%/42%/49%/56%. Quando lançar uma Habilidade Elemental ou Supremo, obtém o efeito \"Esplendor do Crepúsculo\": aumenta o Dano CRIT causado pelo Ataque Imersivo em 40%/50%/60%/70%/80%. Esses efeitos possuem cada um uma duração de 15s, e serão removidos 0.1s após a Onda Mergulhadora atingir o alvo.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 48, "subStat": 96 }, - "description": "Um troféu feito de gemas do Coletivo da Fartura e cristais do Clã das Plumas de Flores. Dizem que pertenceu a um lendário lutador." + "description": "Um troféu feito de gemas do Coletivo da Fartura e cristais do Clã das Plumas de Flores. Dizem que pertenceu a um lendário lutador.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/vortex-vanquisher/en.json b/assets/data/weapons/vortex-vanquisher/en.json index 92d9ba1fb..5fd7a438e 100644 --- a/assets/data/weapons/vortex-vanquisher/en.json +++ b/assets/data/weapons/vortex-vanquisher/en.json @@ -7,5 +7,6 @@ "passiveName": "Golden Majesty", "passiveDesc": "Increases Shield Strength by 20/25/30/35/40%, scoring hits on opponents increases ATK by 4/5/6/7/8% for 8s. Max 5 stacks. Can only occur once every 0.3s. While protected by a shield this ATK increase effect is increased by 100%", "location": "Gacha", - "ascensionMaterial": "aerosiderite" + "ascensionMaterial": "aerosiderite", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/vortex-vanquisher/jp.json b/assets/data/weapons/vortex-vanquisher/jp.json index 4c52e7df3..0539db290 100644 --- a/assets/data/weapons/vortex-vanquisher/jp.json +++ b/assets/data/weapons/vortex-vanquisher/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "金璋君臨", "passiveDesc": "シールド強化+20%。攻撃が命中した8秒間、攻撃力+4%。この効果は最大5重まで、0.3秒毎に1回のみ発動可能。また、シールド状態の時、攻撃力アップの効果量が2倍になる。", - "location": "祈願" + "location": "祈願", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/vortex-vanquisher/pt.json b/assets/data/weapons/vortex-vanquisher/pt.json index 1db83e80d..e3955adfa 100644 --- a/assets/data/weapons/vortex-vanquisher/pt.json +++ b/assets/data/weapons/vortex-vanquisher/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta a força do Escudo em 20%/25%/30%/35%/40%. Acertar ataques em inimigos aumenta o ataque em 4%/5%/6%/7%/8% por 8s. Acumula até 5 vezes. Pode ocorrer apenas uma vez a cada 0.3s. Enquanto estiver protegido por um escudo, esse efeito de ataque é aumentado em 100%.", "location": "Liyue", "baseDamage": { "attack": 46, "subStat": 108 }, - "description": "Esta lança afiada pode aparentemente perfurar qualquer coisa. Quando balançada, quase se pode ver a fenda que ela rasga no ar." + "description": "Esta lança afiada pode aparentemente perfurar qualquer coisa. Quando balançada, quase se pode ver a fenda que ela rasga no ar.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/wandering-evenstar/en.json b/assets/data/weapons/wandering-evenstar/en.json index 002817a9d..8bbe2d7aa 100644 --- a/assets/data/weapons/wandering-evenstar/en.json +++ b/assets/data/weapons/wandering-evenstar/en.json @@ -1,12 +1,12 @@ { - "name": "Wandering Evenstar", - "type": "Catalyst", - "rarity": 4, - "baseAttack": 42, - "subStat": "Elemental Mastery", - "passiveName": "Wildling Nightstar", - "passiveDesc": "The following effect will trigger every 10s: The equipping character will gain 24% of their Elemental Mastery as bonus ATK for 12s, with nearby party members gaining 30% of this buff for the same duration. Multiple instances of this weapon can allow this buff to stack. This effect will still trigger even if the character is not on the field.", - "location": "Gacha", - "ascensionMaterial": "oasis" + "name": "Wandering Evenstar", + "type": "Catalyst", + "rarity": 4, + "baseAttack": 42, + "subStat": "Elemental Mastery", + "passiveName": "Wildling Nightstar", + "passiveDesc": "The following effect will trigger every 10s: The equipping character will gain 24% of their Elemental Mastery as bonus ATK for 12s, with nearby party members gaining 30% of this buff for the same duration. Multiple instances of this weapon can allow this buff to stack. This effect will still trigger even if the character is not on the field.", + "location": "Gacha", + "ascensionMaterial": "oasis", + "weapon_type": "CATALYST" } - \ No newline at end of file diff --git a/assets/data/weapons/wandering-evenstar/pt.json b/assets/data/weapons/wandering-evenstar/pt.json index d631d9363..232807c86 100644 --- a/assets/data/weapons/wandering-evenstar/pt.json +++ b/assets/data/weapons/wandering-evenstar/pt.json @@ -7,5 +7,6 @@ "passiveName": "Estrela da Floresta Selvagem", "passiveDesc": "A cada 10s, gera os seguintes efeitos: aumenta o ATQ do personagem que está com essa arma equipada baseado em 24%/30%/36%/42%/48% da sua Proficiência Elemental. Os demais personagens próximos da equipe ganham 30% desse bônus. Esses efeitos duram 12s. É possível acumular esses efeitos equipando vários exemplares desta mesma arma. Esse efeito será desencadeado mesmo que o personagem não esteja ativo no campo de batalha.", "baseDamage": { "attack": 42, "subStat": 36 }, - "description": "Originalmente era um dispositivo antigo com qual os estudiosos observavam e faziam cálculos de fenomenos astronômicos. Agora serve como um canal de energia e um catalisador." + "description": "Originalmente era um dispositivo antigo com qual os estudiosos observavam e faziam cálculos de fenomenos astronômicos. Agora serve como um canal de energia e um catalisador.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/waster-greatsword/en.json b/assets/data/weapons/waster-greatsword/en.json index 5e2947140..71645efc2 100755 --- a/assets/data/weapons/waster-greatsword/en.json +++ b/assets/data/weapons/waster-greatsword/en.json @@ -7,5 +7,6 @@ "passiveName": "-", "passiveDesc": "-", "location": "Chest", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/waster-greatsword/jp.json b/assets/data/weapons/waster-greatsword/jp.json index ca52484f8..3dbe6d64a 100644 --- a/assets/data/weapons/waster-greatsword/jp.json +++ b/assets/data/weapons/waster-greatsword/jp.json @@ -6,5 +6,6 @@ "subStat": "-", "passiveName": "-", "passiveDesc": "-", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/waster-greatsword/pt.json b/assets/data/weapons/waster-greatsword/pt.json index 455a21139..b0e92e7b5 100644 --- a/assets/data/weapons/waster-greatsword/pt.json +++ b/assets/data/weapons/waster-greatsword/pt.json @@ -5,5 +5,6 @@ "baseAttack": 23, "location": "-", "baseDamage": { "attack": 23, "subStat": 0 }, - "description": "Uma chapa de ferro resistente, que pode ser boa o suficiente para separar montanhas com força de vontade suficiente." + "description": "Uma chapa de ferro resistente, que pode ser boa o suficiente para separar montanhas com força de vontade suficiente.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/wavebreaker-s-fin/en.json b/assets/data/weapons/wavebreaker-s-fin/en.json index f2704d5ab..c027177d6 100644 --- a/assets/data/weapons/wavebreaker-s-fin/en.json +++ b/assets/data/weapons/wavebreaker-s-fin/en.json @@ -7,5 +7,6 @@ "passiveName": "Watatsumi Wavewalker", "passiveDesc": "For every point of the entire party's combined maximum Energy capacity, the Elemental Burst DMG of the character equipping this weapon is increased by 0.12/0.15/0.18/0.21/0.24%. A maximum of 40/50/60/70/80% increased Elemental Burst DMG can be achieved this way.", "location": "Gacha", - "ascensionMaterial": "mask" + "ascensionMaterial": "mask", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/wavebreaker-s-fin/pt.json b/assets/data/weapons/wavebreaker-s-fin/pt.json index 66cac02ba..c38d26798 100644 --- a/assets/data/weapons/wavebreaker-s-fin/pt.json +++ b/assets/data/weapons/wavebreaker-s-fin/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "O Personagem que usar esta arma terá um aumento do Dano do Supremo de 0.12%/0.15%/0.18%/0.21%/0.24% por cada 1 ponto da soma do máximo da Energia Elemental de todos os membros da equipe. O aumento de Dano do Supremo máximo obtível dessa maneira é de 40%/50%/60%/70%/80%.", "location": "Inazuma", "baseDamage": { "attack": 45, "subStat": 30 }, - "description": "Uma naginata forjada a partir de um material luminescente das profundezas do oceano. No passado pertenceu ao povo tengu." + "description": "Uma naginata forjada a partir de um material luminescente das profundezas do oceano. No passado pertenceu ao povo tengu.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/waveriding-whirl/en.json b/assets/data/weapons/waveriding-whirl/en.json index f4aa6aa3f..bce265239 100644 --- a/assets/data/weapons/waveriding-whirl/en.json +++ b/assets/data/weapons/waveriding-whirl/en.json @@ -8,5 +8,6 @@ "passiveDesc": "Decreases Swimming Stamina consumption by 15%. In addition, for 10s after using an Elemental Skill, Max HP is increased by 20%/25%/30%/35%/40%. For every Hydro Elemental Type character in the party, Max HP is increased by another 12%/15%/18%/21%/24%, and the maximum increase that can be achieved in this way is 24%/30%/36%/42%/48%. Can be triggered once every 15s.", "location": "Event Wish Exclusive", "baseDamage": { "attack": 41, "subStat": 133 }, - "description": "A boomerang made from the fangs of a giant sea serpent. It was a rare weapon indeed that the giant Tupac would call \"trusty.\"" + "description": "A boomerang made from the fangs of a giant sea serpent. It was a rare weapon indeed that the giant Tupac would call \"trusty.\"", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/waveriding-whirl/pt.json b/assets/data/weapons/waveriding-whirl/pt.json index 21db423a2..5b49048ba 100644 --- a/assets/data/weapons/waveriding-whirl/pt.json +++ b/assets/data/weapons/waveriding-whirl/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Diminui o consumo de Stamina ao Nadar em 15%. Além disso, por 10s após usar uma Habilidade Elemental, a Vida Máxima é aumentada em 20%/25%/30%/35%/40%. Para cada personagem Hydro na equipe, a Vida Máxima é aumentada em mais 12%/15%/18%/21%/24%, e o aumento máximo que pode ser alcançado dessa forma é de 24%/30%/36%/42%/48%. Pode ser ativado uma vez a cada 15s.", "location": "Oração de Evento de Arma", "baseDamage": { "attack": 41, "subStat": 133 }, - "description": "Um bumerangue feito das presas de uma gigantesca serpente do mar. Era uma arma rara que o gigante Tupac se referia como confiável." + "description": "Um bumerangue feito das presas de uma gigantesca serpente do mar. Era uma arma rara que o gigante Tupac se referia como confiável.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/white-iron-greatsword/en.json b/assets/data/weapons/white-iron-greatsword/en.json index 6a155125a..16fdeb5ff 100755 --- a/assets/data/weapons/white-iron-greatsword/en.json +++ b/assets/data/weapons/white-iron-greatsword/en.json @@ -7,5 +7,6 @@ "passiveName": "Cull the Weak", "passiveDesc": "Defeating an opponent restores 8/10/12/14/16% HP.", "location": "Chests", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/white-iron-greatsword/jp.json b/assets/data/weapons/white-iron-greatsword/jp.json index ef883830f..d520df73e 100644 --- a/assets/data/weapons/white-iron-greatsword/jp.json +++ b/assets/data/weapons/white-iron-greatsword/jp.json @@ -6,5 +6,6 @@ "subStat": "防御力", "passiveName": "刈り取る", "passiveDesc": "敵を倒したとき、HPを8%回復する。", - "location": "宝箱等" + "location": "宝箱等", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/white-iron-greatsword/pt.json b/assets/data/weapons/white-iron-greatsword/pt.json index c0f8cb14f..841a5568c 100644 --- a/assets/data/weapons/white-iron-greatsword/pt.json +++ b/assets/data/weapons/white-iron-greatsword/pt.json @@ -6,5 +6,6 @@ "subStat": "Porcentagem de DEF", "location": "Mondstadt", "baseDamage": { "attack": 39, "subStat": 96 }, - "description": "Um espadão feito com ferro branco que aumenta o poder durante o corte. Adequado até mesmo para as pessoas com forças normais, mas seu poder pode aumentar exponencialmente com a força do seu manejador." + "description": "Um espadão feito com ferro branco que aumenta o poder durante o corte. Adequado até mesmo para as pessoas com forças normais, mas seu poder pode aumentar exponencialmente com a força do seu manejador.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/white-tassel/en.json b/assets/data/weapons/white-tassel/en.json index fbb4b6213..f116c8728 100755 --- a/assets/data/weapons/white-tassel/en.json +++ b/assets/data/weapons/white-tassel/en.json @@ -7,5 +7,6 @@ "passiveName": "Sharp", "passiveDesc": "Increases Normal Attack DMG by 24/30/36/42/48%.", "location": "Chest", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/white-tassel/jp.json b/assets/data/weapons/white-tassel/jp.json index 0b538b1e8..f1b958b22 100644 --- a/assets/data/weapons/white-tassel/jp.json +++ b/assets/data/weapons/white-tassel/jp.json @@ -6,5 +6,6 @@ "subStat": "会心率", "passiveName": "鋭利", "passiveDesc": "通常攻撃のダメージ+24%。", - "location": "宝箱" + "location": "宝箱", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/white-tassel/pt.json b/assets/data/weapons/white-tassel/pt.json index 0879fc5a5..90f703333 100644 --- a/assets/data/weapons/white-tassel/pt.json +++ b/assets/data/weapons/white-tassel/pt.json @@ -6,5 +6,6 @@ "subStat": "Taxa Crítica", "location": "Liyue", "baseDamage": { "attack": 39, "subStat": 51 }, - "description": "Uma arma padrão dos soldados de Millelith. Tem uma ponta bastante afida e resistente. É uma arma confiável." + "description": "Uma arma padrão dos soldados de Millelith. Tem uma ponta bastante afida e resistente. É uma arma confiável.", + "weapon_type": "POLEARM" } diff --git a/assets/data/weapons/whiteblind/en.json b/assets/data/weapons/whiteblind/en.json index c4e94fbcd..13fadf9d4 100755 --- a/assets/data/weapons/whiteblind/en.json +++ b/assets/data/weapons/whiteblind/en.json @@ -7,5 +7,6 @@ "passiveName": "Infusion Blade", "passiveDesc": "On hit, Normal or Charged Attacks increase Base ATK and DEF by 6/7.5/9/10.5/12% for 6s. Max 4 stacks. Can only occur once every 0.5s.", "location": "Crafting", - "ascensionMaterial": "guyun" + "ascensionMaterial": "guyun", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/whiteblind/jp.json b/assets/data/weapons/whiteblind/jp.json index c05f98ac4..9312d1d7d 100644 --- a/assets/data/weapons/whiteblind/jp.json +++ b/assets/data/weapons/whiteblind/jp.json @@ -6,5 +6,6 @@ "subStat": "防御力", "passiveName": "注入の刃", "passiveDesc": "通常攻撃と重撃が命中すると、攻撃力と防御力+6%、継続時間6秒、最大4重まで。0.5秒毎に1回のみ発動可能。", - "location": "鍛造" + "location": "鍛造", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/whiteblind/pt.json b/assets/data/weapons/whiteblind/pt.json index bdc1c15b7..57314e45a 100644 --- a/assets/data/weapons/whiteblind/pt.json +++ b/assets/data/weapons/whiteblind/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Após acertar um Ataque Normal e um Ataque Carregado, o ATQ e a DEF aumentam 6%/7.5%/9%/10.5%/12% por 6s, podendo ser acumulado até 4 vezes. Este efeito pode ser ativado uma vez a cada 0.5s.", "location": "Liyue", "baseDamage": { "attack": 42, "subStat": 113 }, - "description": "Uma espada exótica com uma lâmina que ficou sem corte. Chegou a Liyue pelas mãos de comerciantes estrangeiros. Incrivelmente poderosa nas mãos de alguém que sabe usá-la." + "description": "Uma espada exótica com uma lâmina que ficou sem corte. Chegou a Liyue pelas mãos de comerciantes estrangeiros. Incrivelmente poderosa nas mãos de alguém que sabe usá-la.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/windblume-ode/en.json b/assets/data/weapons/windblume-ode/en.json index 3fbd187b2..a3111bebc 100644 --- a/assets/data/weapons/windblume-ode/en.json +++ b/assets/data/weapons/windblume-ode/en.json @@ -7,5 +7,6 @@ "passiveName": "Windblume Wish", "passiveDesc": "After using an Elemental Skill, receive a boon from the ancient wish of the Windblume, increasing ATK by 16/20/24/28/32% for 6s.", "location": "Invitation to Windblume (v1.4) Event Shop", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/windblume-ode/jp.json b/assets/data/weapons/windblume-ode/jp.json index d82ae8074..244df7f6e 100644 --- a/assets/data/weapons/windblume-ode/jp.json +++ b/assets/data/weapons/windblume-ode/jp.json @@ -6,5 +6,6 @@ "subStat": "元素熟知", "passiveName": "風花の願い", "passiveDesc": "元素スキルを発動した後、風の花の悠久なる願いの加護を獲得し、攻撃力+16%、持続時間6秒。", - "location": "イベント「風花の招待」" + "location": "イベント「風花の招待」", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/windblume-ode/pt.json b/assets/data/weapons/windblume-ode/pt.json index 25aae47df..95fb10a71 100644 --- a/assets/data/weapons/windblume-ode/pt.json +++ b/assets/data/weapons/windblume-ode/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Ao lançar uma Habilidade Elemental, se obtém o desejo antigo da Flor do Vento, e o Ataque aumenta 16%/20%/24%/28%/32% por 6s.", "location": "Mondstadt", "baseDamage": { "attack": 42, "subStat": 36 }, - "description": "Um arco adornado com flores desconhecidas que carrega as esperanças de uma pessoa também desconhecida." + "description": "Um arco adornado com flores desconhecidas que carrega as esperanças de uma pessoa também desconhecida.", + "weapon_type": "BOW" } diff --git a/assets/data/weapons/wine-and-song/en.json b/assets/data/weapons/wine-and-song/en.json index 6433ea237..d9a0de832 100755 --- a/assets/data/weapons/wine-and-song/en.json +++ b/assets/data/weapons/wine-and-song/en.json @@ -7,5 +7,6 @@ "passiveName": "Wind in the Square", "passiveDesc": "For every character in the party who hails from Mondstadt, the character who equips this weapon gains 8/10/12/14/16% ATK increase and 3/3.5/4/4.5/5% Movement SPD increase.", "location": "Gacha", - "ascensionMaterial": "boreal" + "ascensionMaterial": "boreal", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/wine-and-song/jp.json b/assets/data/weapons/wine-and-song/jp.json index c6fc8f4c5..24dbc2d8b 100644 --- a/assets/data/weapons/wine-and-song/jp.json +++ b/assets/data/weapons/wine-and-song/jp.json @@ -6,5 +6,6 @@ "subStat": "元素チャージ効率", "passiveName": "千変万化", "passiveDesc": "通常攻撃が敵に命中すると、ダッシュまたはダッシュを代替する能力のスタミナ消費-14%、持続時間5秒。また、ダッシュまたはダッシュを代替する能力を使用すると、攻撃力+20%、持続時間5秒。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/wine-and-song/pt.json b/assets/data/weapons/wine-and-song/pt.json index d29f7194e..f024d06f4 100644 --- a/assets/data/weapons/wine-and-song/pt.json +++ b/assets/data/weapons/wine-and-song/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Quando um Ataque Normal atingir um inimigo, o consumo de Stamina ao Correr ou utilizar uma habilidade que substitua Correr reduz em 14%/16%/18%/20%/22% por 5s. Além disso, depois de Correr ou utilizar uma habilidade que substitua Correr aumenta o Ataque em 20%/25%/30%/35%/40% durante 5s.", "location": "Mondstadt", "baseDamage": { "attack": 44, "subStat": 67 }, - "description": "Um livro de canções da época aristocrática passada, cujo compositor foi esquecido. Ele narra a história de um certo fora-da-lei heroico." + "description": "Um livro de canções da época aristocrática passada, cujo compositor foi esquecido. Ele narra a história de um certo fora-da-lei heroico.", + "weapon_type": "CATALYST" } diff --git a/assets/data/weapons/wolf-fang/en.json b/assets/data/weapons/wolf-fang/en.json index 7d02da01f..049b268e7 100644 --- a/assets/data/weapons/wolf-fang/en.json +++ b/assets/data/weapons/wolf-fang/en.json @@ -7,5 +7,6 @@ "passiveName": "Northwind Wolf", "passiveDesc": "DMG dealt by Elemental Skill and Elemental Burst is increased by 16%. When an Elemental Skill hits an opponent, its CRIT Rate will be increased by 2%. When an Elemental Burst hits an opponent, its CRIT Rate will be increased by 2%. Both of these effects last 10s separately, have 4 max stacks, and can be triggered once every 0.1s.", "location": "BP Bounty", - "ascensionMaterial": "ancient-chord" + "ascensionMaterial": "ancient-chord", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/wolf-fang/pt.json b/assets/data/weapons/wolf-fang/pt.json index ccf0db441..6edda7d47 100644 --- a/assets/data/weapons/wolf-fang/pt.json +++ b/assets/data/weapons/wolf-fang/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o Dano causado pela Habilidade Elemental e Supremo em 16/20/24/28/32%. Quando a Habilidade Elemental atingir um inimigo, aumenta a Taxa CRIT dela em 2/2.5/3/3.5/4%. Quando o Supremo atingir um inimigo, aumenta a Taxa CRIT dele em 2/2.5/3/3.5/4%. Esses dois efeitos duram 10s cada e podem ser acumulados até 4 vezes, podendo serem desencadeados uma vez a cada 0.1s.", "location": "Passe de Batalha do Gnóstico", "baseDamage": { "attack": 42, "subStat": 60 }, - "description": "Lendas dizem que essa lâmina foi usada por um cavaleiro andarilho num passado distante." + "description": "Lendas dizem que essa lâmina foi usada por um cavaleiro andarilho num passado distante.", + "weapon_type": "SWORD" } diff --git a/assets/data/weapons/wolf-s-gravestone/en.json b/assets/data/weapons/wolf-s-gravestone/en.json index 0ad58168d..f567eea86 100755 --- a/assets/data/weapons/wolf-s-gravestone/en.json +++ b/assets/data/weapons/wolf-s-gravestone/en.json @@ -7,5 +7,6 @@ "passiveName": "Wolfish Tracker", "passiveDesc": "Increases Base ATK by 20/25/30/35/40%. On hit, attacks against enemies with less than 30% HP increase all party members' Base ATK by 40/50/60/70/80% for 12s. Can only occur once every 30s.", "location": "Gacha", - "ascensionMaterial": "dandelion" + "ascensionMaterial": "dandelion", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/wolf-s-gravestone/jp.json b/assets/data/weapons/wolf-s-gravestone/jp.json index 4542eef2d..c6a15fded 100644 --- a/assets/data/weapons/wolf-s-gravestone/jp.json +++ b/assets/data/weapons/wolf-s-gravestone/jp.json @@ -6,5 +6,6 @@ "subStat": "攻撃力", "passiveName": "狼のような狩人", "passiveDesc": "攻撃力+20%。HPが30%以下の敵に命中すると、チーム全員の攻撃力+40%、継続時間12秒。30秒に1回のみ発動可能。", - "location": "祈願" + "location": "祈願", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/wolf-s-gravestone/pt.json b/assets/data/weapons/wolf-s-gravestone/pt.json index 4ae2fa07a..c5a49cf74 100644 --- a/assets/data/weapons/wolf-s-gravestone/pt.json +++ b/assets/data/weapons/wolf-s-gravestone/pt.json @@ -8,5 +8,6 @@ "passiveDesc": "Aumenta o ATQ em 20%/25%/30%/35%/40%. Ao acertar o ataque em oponentes com Vida inferior a 30%, aumenta o ATQ de todos os companheiros em 40%/50%/60%/70%/80% por 12s. Este efeito pode ser ativado uma vez a cada 30s.", "location": "Mondstadt", "baseDamage": { "attack": 46, "subStat": 108 }, - "description": "Uma grande espada que foi usada pelo Cavaleiro Lobo. Originalmente era apenas uma lâmina de ferro pesada que foi dado por um ferreiro da cidade. No entanto, recebeu poderes lendários por sua amizade com os lobos." + "description": "Uma grande espada que foi usada pelo Cavaleiro Lobo. Originalmente era apenas uma lâmina de ferro pesada que foi dado por um ferreiro da cidade. No entanto, recebeu poderes lendários por sua amizade com os lobos.", + "weapon_type": "CLAYMORE" } diff --git a/assets/data/weapons/xiphos-moonlight/en.json b/assets/data/weapons/xiphos-moonlight/en.json index 5835824ca..10d16136f 100644 --- a/assets/data/weapons/xiphos-moonlight/en.json +++ b/assets/data/weapons/xiphos-moonlight/en.json @@ -1,12 +1,12 @@ { - "name": "Xiphos' Moonlight", - "type": "Sword", - "rarity": 4, - "baseAttack": 42, - "subStat": "Elemental Mastery", - "passiveName": "Jinni's Whisper", - "passiveDesc": "The following effect will trigger every 10s: The equipping character will gain 0.036% Energy Recharge for each point of Elemental Mastery they possess for 12s, with nearby party members gaining 30% of this buff for the same duration. Multiple instances of this weapon can allow this buff to stack. This effect will still trigger even if the character is not on the field.", - "location": "Gacha", - "ascensionMaterial": "talisman" + "name": "Xiphos' Moonlight", + "type": "Sword", + "rarity": 4, + "baseAttack": 42, + "subStat": "Elemental Mastery", + "passiveName": "Jinni's Whisper", + "passiveDesc": "The following effect will trigger every 10s: The equipping character will gain 0.036% Energy Recharge for each point of Elemental Mastery they possess for 12s, with nearby party members gaining 30% of this buff for the same duration. Multiple instances of this weapon can allow this buff to stack. This effect will still trigger even if the character is not on the field.", + "location": "Gacha", + "ascensionMaterial": "talisman", + "weapon_type": "SWORD" } - diff --git a/assets/data/weapons/xiphos-moonlight/pt.json b/assets/data/weapons/xiphos-moonlight/pt.json index a2a6dd5f5..b28b5cb3a 100644 --- a/assets/data/weapons/xiphos-moonlight/pt.json +++ b/assets/data/weapons/xiphos-moonlight/pt.json @@ -7,5 +7,6 @@ "passiveName": "Sussurros do Jinni", "passiveDesc": "Os seguintes efeitos serão desencadeados a cada 10s: o personagem com esta arma equipada terá sua Recarga de Energia aumentada em 0.036%/0.045%/0.054%/0.063%/0.072% para cada ponto de Proficiência Elemental que ele possuir, com os membros da equipe próximos ganhando 30% desse bônus, esses efeitos duram 12s. É possível acumular esse efeito ao equipar vários exemplares desta arma. Esse efeito será desencadeado mesmo que o personagem não esteja ativo no campo de batalha.", "baseDamage": { "attack": 42, "subStat": 36 }, - "description": "Uma espada de dois gumes que emite um brilho semelhante ao da lua. Segundo as lendas, nela reside um Jinni que aguarda em silêncio." + "description": "Uma espada de dois gumes que emite um brilho semelhante ao da lua. Segundo as lendas, nela reside um Jinni que aguarda em silêncio.", + "weapon_type": "SWORD" }