Skip to content

Commit

Permalink
Weapon typos fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Wolfteam
Wolfteam committed Jan 1, 2021
1 parent 76aa026 commit 90ca018
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 47 deletions.
72 changes: 45 additions & 27 deletions assets/db/weapons.json
View file
Expand Up @@ -2183,7 +2183,7 @@
"atk": 41,
"rarity": 4,
"secondaryStat": "energyRechargePercentage",
"secondaryStatValue": 15,
"secondaryStatValue": 13.3,
"location": "gacha",
"ascentionMaterials": [
{
Expand Down Expand Up @@ -2379,10 +2379,10 @@
"name": "Prototype Crescent",
"image": "prototype_crescent.png",
"type": "bow",
"atk": 41,
"atk": 42,
"rarity": 4,
"secondaryStat": "energyRechargePercentage",
"secondaryStatValue": 15,
"secondaryStat": "atkPercentage",
"secondaryStatValue": 9,
"location": "crafting",
"ascentionMaterials": [
{
Expand Down Expand Up @@ -4076,7 +4076,7 @@
"name": "Silver Sword",
"image": "silver_sword.png",
"type": "sword",
"atk": 23,
"atk": 33,
"rarity": 2,
"secondaryStat": "none",
"secondaryStatValue": 0,
Expand Down Expand Up @@ -7446,7 +7446,15 @@
]
}
],
"refinements": []
"refinements": [
{
"level": 1,
"values": [
50,
66
]
}
]
},
{
"name": "Festering Desire",
Expand Down Expand Up @@ -7614,35 +7622,35 @@
"level": 1,
"values": [
16,
4
6
]
},
{
"level": 2,
"values": [
20,
5
7.5
]
},
{
"level": 3,
"values": [
24,
6
9
]
},
{
"level": 4,
"values": [
28,
7
10.5
]
},
{
"level": 5,
"values": [
32,
8
12
]
}
]
Expand Down Expand Up @@ -10229,7 +10237,7 @@
]
},
{
"name": "Prototype Malice",
"name": "Prototype Amber",
"image": "prototype_malice.png",
"type": "catalyst",
"atk": 42,
Expand Down Expand Up @@ -11389,7 +11397,7 @@
"level": 1,
"values": [
8,
3.5
3
]
},
{
Expand Down Expand Up @@ -11587,31 +11595,36 @@
{
"level": 1,
"values": [
240
240,
12
]
},
{
"level": 2,
"values": [
270
270,
11
]
},
{
"level": 3,
"values": [
300
300,
10
]
},
{
"level": 4,
"values": [
330
330,
9
]
},
{
"level": 5,
"values": [
360
360,
8
]
}
]
Expand Down Expand Up @@ -13233,8 +13246,8 @@
"type": "claymore",
"atk": 39,
"rarity": 3,
"secondaryStat": "physDmgPercentage",
"secondaryStatValue": 9.6,
"secondaryStat": "elementaryMaster",
"secondaryStatValue": 31,
"location": "gacha",
"ascentionMaterials": [
{
Expand Down Expand Up @@ -14168,31 +14181,36 @@
{
"level": 1,
"values": [
60
60,
12
]
},
{
"level": 2,
"values": [
70
70,
10.5
]
},
{
"level": 3,
"values": [
80
80,
9
]
},
{
"level": 4,
"values": [
90
90,
7.5
]
},
{
"level": 5,
"values": [
100
100,
6
]
}
]
Expand Down Expand Up @@ -14397,7 +14415,7 @@
]
},
{
"name": "Prototype Aminus",
"name": "Prototype Archaic",
"image": "prototype_aminus.png",
"type": "claymore",
"atk": 44,
Expand Down Expand Up @@ -18366,7 +18384,7 @@
]
},
{
"name": "Prototype Grudge",
"name": "Prototype Starglitter",
"image": "prototype_grudge.png",
"type": "polearm",
"atk": 42,
Expand Down
24 changes: 12 additions & 12 deletions assets/i18n/en.json
View file
Expand Up @@ -4081,7 +4081,7 @@
"key": "Sword of Descension",
"name": "Sword of Descension",
"description": "A sword of unique craftsmanship. It does not appear to belong to this world.",
"refinement": null
"refinement": "Hitting opponents with Normal and Charged Attacks grants a {{0}}% 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 {{1}}."
},
{
"key": "Festering Desire",
Expand Down Expand Up @@ -4171,11 +4171,11 @@
"key": "Mappa Mare",
"name": "Mappa Mare",
"description": "A nautical chart featuring nearby currents and climates that somehow found its way into Liyue via foreign traders.",
"refinement": "Triggering an Elemental reaction grants a 8% Elemental DMG Bonus for 10s. Max 2 stacks."
"refinement": "Triggering an Elemental reaction grants a {{0}}% Elemental DMG Bonus for 10s. Max 2 stacks."
},
{
"key": "Prototype Malice",
"name": "Prototype Malice",
"key": "Prototype Amber",
"name": "Prototype Amber",
"description": "A dully gilded catalyst secretly guarded in the Blackcliff Forge. It seems to glow with the very light from the sky.",
"refinement": "Using an Elemental Burst regenerates {{0}} Energy every 2s for 6s. All party members will regenerate {{1}}% HP every 2s for this duration."
},
Expand All @@ -4188,19 +4188,19 @@
{
"key": "Sacrificial Fragments",
"name": "Sacrificial Fragments",
"description": "A book that once belonged to a royal mage of Mondstadt. It contains faithful and comprehensive historical accounts as well as magic spells.",
"description": "A weathered script, the text of which is no longer legible. A cursed item eroded by the winds of time.",
"refinement": "After damaging an opponent with an Elemental Skill, the skill has a {{0}}% chance to end its own CD. Can only occur once every {{1}}s."
},
{
"key": "Solar Pearl",
"name": "Solar Pearl",
"description": "A book that once belonged to a royal mage of Mondstadt. It contains faithful and comprehensive historical accounts as well as magic spells.",
"description": "A dull, golden pearl made of an unknown substance that harbors the light of the sun and the moon, and pulses with a warm strength.",
"refinement": "Normal Attack hits increase Elemental Skill and Elemental Burst DMG by {{0}}% for 6s. Likewise, Elemental Skill or Elemental Burst hits increase Normal Attack DMG by {{1}}% for 6s."
},
{
"key": "The Widsith",
"name": "The Widsith",
"description": "A book that once belonged to a royal mage of Mondstadt. It contains faithful and comprehensive historical accounts as well as magic spells.",
"description": "A heavy notebook filled with musical scores. Though suffering from moth damage and heavy wear-and-tear, there is still much power to be found among the hand-written words within.",
"refinement": "When the character takes the field, they will gain a random theme song for 10s. This can only occur once every 30s. Recitative: ATK is increased by {{0}}%. Aria: Increases all Elemental DMG by {{1}}%. Interlude: Elemental Mastery is increased by {{2}}."
},
{
Expand Down Expand Up @@ -4297,7 +4297,7 @@
"key": "Favonius Greatsword",
"name": "Favonius Greatsword",
"description": "A heavy ceremonial sword of the Knights of Favonius. It channels elemental power easily and is highly destructive.",
"refinement": "CRIT Hits have a {{0}}% chance to generate a small amount of Elemental Particles, which will regenerate 6 Energy for the character. Can only occur once every {{1}}"
"refinement": "CRIT Hits have a {{0}}% chance to generate a small amount of Elemental Particles, which will regenerate 6 Energy for the character. Can only occur once every {{1}}s."
},
{
"key": "Lithic Blade",
Expand All @@ -4306,8 +4306,8 @@
"refinement": "For every character in the party who hails from Liyue, the character who equips this weapon gains {{0}}% ATK increase and {{1}}% CRIT Rate increase."
},
{
"key": "Prototype Aminus",
"name": "Prototype Aminus",
"key": "Prototype Archaic",
"name": "Prototype Archaic",
"description": "An ancient greatsword discovered in the Blackcliff Forge. It swings with such an immense force that one feels it could cut straight through reality itself.",
"refinement": "On hit, Normal or Charged Attacks have a 50% chance to deal an additional {{0}}% ATK DMG to enemies within a small AoE. Can only occur once every 15s."
},
Expand Down Expand Up @@ -4432,8 +4432,8 @@
"refinement": "Normal Attack hits have a {{0}}% chance of causing the next Charged Attack performed in the following 10s to deal {{1}}% increased DMG."
},
{
"key": "Prototype Grudge",
"name": "Prototype Grudge",
"key": "Prototype Starglitter",
"name": "Prototype Starglitter",
"description": "A grudge discovered in the Blackcliff Forge. The glimmers along the sharp edge are like stars in the night.",
"refinement": "After using an Elemental Skill, increases Normal and Charged Attack DMG by {{0}}% for 12s. Max 2 stacks."
},
Expand Down
2 changes: 1 addition & 1 deletion lib/generated/intl/messages_en.dart
View file
Expand Up @@ -29,7 +29,7 @@ class MessageLookup extends MessageLookupByLibrary {

static m4(value) => "${value} CRIT ATK";

static m5(value) => "${value} CRIT DMG";
static m5(value) => "${value} CRIT DMG%";

static m6(value) => "${value} CRIT Rate";

Expand Down
2 changes: 1 addition & 1 deletion lib/generated/intl/messages_es_ES.dart
View file
Expand Up @@ -29,7 +29,7 @@ class MessageLookup extends MessageLookupByLibrary {

static m4(value) => "${value} CRIT ATK";

static m5(value) => "${value} CRIT DMG";
static m5(value) => "${value} CRIT DMG%";

static m6(value) => "${value} CRIT Rate";

Expand Down
4 changes: 2 additions & 2 deletions lib/generated/l10n.dart
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/l10n/intl_en.arb
View file
Expand Up @@ -16,7 +16,7 @@
"critAtk": "{value} CRIT ATK",
"critRate": "{value} CRIT Rate",
"critRatePercentage": "{value} CRIT Rate%",
"critDmgPercentage": "{value} CRIT DMG",
"critDmgPercentage": "{value} CRIT DMG%",
"elementaryMaster": "{value} Elementary Master",
"hpPercentage": "{value} HP%",
"physDmgPercentage": "{value} PHYS DMG %",
Expand Down
2 changes: 1 addition & 1 deletion lib/l10n/intl_es_ES.arb
View file
Expand Up @@ -16,7 +16,7 @@
"critAtk": "{value} CRIT ATK",
"critRate": "{value} CRIT Rate",
"critRatePercentage": "{value} CRIT Rate%",
"critDmgPercentage": "{value} CRIT DMG",
"critDmgPercentage": "{value} CRIT DMG%",
"elementaryMaster": "{value} Maestría Elemental",
"hpPercentage": "{value} HP%",
"physDmgPercentage": "{value} PHYS DMG %",
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/pages/artifact_details_page.dart
View file
Expand Up @@ -21,7 +21,7 @@ class ArtifactDetailsPage extends StatelessWidget {
child: BlocBuilder<ArtifactDetailsBloc, ArtifactDetailsState>(
builder: (context, state) {
return state.map(
loading: (_) => const Loading(),
loading: (_) => const Loading(useScaffold: false),
loaded: (s) => Stack(
fit: StackFit.passthrough,
clipBehavior: Clip.none,
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/pages/weapon_page.dart
View file
Expand Up @@ -29,7 +29,7 @@ class WeaponPage extends StatelessWidget {
child: BlocBuilder<WeaponBloc, WeaponState>(
builder: (context, state) {
return state.map(
loading: (_) => const Loading(),
loading: (_) => const Loading(useScaffold: false),
loaded: (s) => Stack(
children: [
_buildTop(
Expand Down

0 comments on commit 90ca018

Please sign in to comment.