fix: remove type on potions, ingredients, baits, fish, fishing_rods

scripts/generate.js

@@ -4,43 +4,10 @@ const path = require('path');
 const GENERATED_PATH = path.join(__dirname, '..', 'src', 'data');
 const MIN_PATH = path.join(__dirname, '..', 'src', 'min');
 
-const languages = [
-  'english',
-  'spanish',
-  'japanese',
-  'chinese-simplified',
-  'chinese-traditional',
-  'french',
-  'german',
-  'indonesian',
-  'korean',
-  'portuguese',
-  'russian',
-  'thai',
-  'vietnamese',
-];
-
-const folders = [
-  'artifacts',
-  'bait',
-  'characters',
-  'common_materials',
-  'elemental_stone_materials',
-  'fish',
-  'fishing_rod',
-  'food',
-  'ingredients',
-  'jewels_materials',
-  'local_materials',
-  'potions',
-  'talent_lvl_up_materials',
-  'weapon_primary_materials',
-  'weapon_secondary_materials',
-  'weapons',
-];
-
 function combineData() {
+  const languages = fs.readdirSync(GENERATED_PATH);
   for (const lang of languages) {
+    const folders = fs.readdirSync(path.join(GENERATED_PATH, lang));
     let data = {};
     for (const folder of folders) {
       if (!fs.existsSync(path.join(GENERATED_PATH, lang, folder))) continue;

src/data/chinese-simplified/artifacts/adventurer.json

@@ -3,8 +3,8 @@
   "name": "冒险家",
   "min_rarity": 1,
   "max_rarity": 3,
-  "2pc": "生命值上限提高1000点。",
-  "4pc": "开启各类宝箱后的5秒内，持续恢复30%生命值。",
+  "two_pc": "生命值上限提高1000点。",
+  "four_pc": "开启各类宝箱后的5秒内，持续恢复30%生命值。",
   "goblet": {
     "id": "adventurers_golden_goblet",
     "name": "冒险家金杯",

src/data/chinese-simplified/artifacts/archaic_petra.json

@@ -3,8 +3,8 @@
   "name": "悠古的磐岩",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "获得15%岩元素伤害加成。",
-  "4pc": "获得结晶反应形成的晶片时，队伍中所有角色获得35%对应元素伤害加成，持续10秒。同时只能通过该效果获得一种元素伤害加成。",
+  "two_pc": "获得15%岩元素伤害加成。",
+  "four_pc": "获得结晶反应形成的晶片时，队伍中所有角色获得35%对应元素伤害加成，持续10秒。同时只能通过该效果获得一种元素伤害加成。",
   "goblet": {
     "id": "goblet_of_chiseled_crag",
     "name": "巉岩琢塑之樽",

src/data/chinese-simplified/artifacts/berserker.json

@@ -3,8 +3,8 @@
   "name": "战狂",
   "min_rarity": 3,
   "max_rarity": 4,
-  "2pc": "暴击率提高12%。",
-  "4pc": "生命值低于70%时，暴击率额外提升24%。",
+  "two_pc": "暴击率提高12%。",
+  "four_pc": "生命值低于70%时，暴击率额外提升24%。",
   "goblet": {
     "id": "berserkers_bone_goblet",
     "name": "战狂的骨杯",

src/data/chinese-simplified/artifacts/blizzard_strayer.json

@@ -3,8 +3,8 @@
   "name": "冰风迷途的勇士",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "获得15%冰元素伤害加成。",
-  "4pc": "攻击处于冰元素影响下的敌人时，暴击率提高20%；若敌人处于冻结状态下，则暴击率额外提高20%。",
+  "two_pc": "获得15%冰元素伤害加成。",
+  "four_pc": "攻击处于冰元素影响下的敌人时，暴击率提高20%；若敌人处于冻结状态下，则暴击率额外提高20%。",
   "goblet": {
     "id": "frostweaved_dignity",
     "name": "遍结寒霜的傲骨",

src/data/chinese-simplified/artifacts/bloodstained_chivalry.json

@@ -3,8 +3,8 @@
   "name": "染血的骑士道",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "造成的物理伤害提高25%。",
-  "4pc": "击败敌人后的10秒内，施放重击时不消耗体力，且重击造成的伤害提升50%。",
+  "two_pc": "造成的物理伤害提高25%。",
+  "four_pc": "击败敌人后的10秒内，施放重击时不消耗体力，且重击造成的伤害提升50%。",
   "goblet": {
     "id": "bloodstained_chevaliers_goblet",
     "name": "染血骑士之杯",

src/data/chinese-simplified/artifacts/brave_heart.json

@@ -3,8 +3,8 @@
   "name": "勇士之心",
   "min_rarity": 3,
   "max_rarity": 4,
-  "2pc": "攻击力提高18%。",
-  "4pc": "对生命值高于50%的敌人，造成的伤害增加30%。",
+  "two_pc": "攻击力提高18%。",
+  "four_pc": "对生命值高于50%的敌人，造成的伤害增加30%。",
   "goblet": {
     "id": "outset_of_the_brave",
     "name": "勇士的壮行",

src/data/chinese-simplified/artifacts/crimson_witch_of_flames.json

@@ -3,8 +3,8 @@
   "name": "炽烈的炎之魔女",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "获得15%火元素伤害加成。",
-  "4pc": "超载、燃烧反应造成的伤害提升40%，蒸发、融化反应的加成系数提高15%。施放元素战技后的10秒内，2件套的效果提高50%，该效果最多叠加3次。",
+  "two_pc": "获得15%火元素伤害加成。",
+  "four_pc": "超载、燃烧反应造成的伤害提升40%，蒸发、融化反应的加成系数提高15%。施放元素战技后的10秒内，2件套的效果提高50%，该效果最多叠加3次。",
   "goblet": {
     "id": "witchs_heart_flames",
     "name": "魔女的心之火",

src/data/chinese-simplified/artifacts/defenders_will.json

@@ -3,8 +3,8 @@
   "name": "守护之心",
   "min_rarity": 3,
   "max_rarity": 4,
-  "2pc": "防御力提高30%。",
-  "4pc": "队伍里每有不同一种元素类型的自己的角色，自身获得30%相应的元素抗性。",
+  "two_pc": "防御力提高30%。",
+  "four_pc": "队伍里每有不同一种元素类型的自己的角色，自身获得30%相应的元素抗性。",
   "goblet": {
     "id": "guardians_vessel",
     "name": "守护之皿",

src/data/chinese-simplified/artifacts/emblem_of_severed_fate.json

@@ -3,8 +3,8 @@
   "name": "绝缘之旗印",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "元素充能效率提高20%。",
-  "4pc": "基于元素充能效率的25%，提高元素爆发造成的伤害。至多通过这种方式获得75%提升。",
+  "two_pc": "元素充能效率提高20%。",
+  "four_pc": "基于元素充能效率的25%，提高元素爆发造成的伤害。至多通过这种方式获得75%提升。",
   "goblet": {
     "id": "scarlet_vessel",
     "name": "绯花之壶",

src/data/chinese-simplified/artifacts/gambler.json

@@ -3,8 +3,8 @@
   "name": "赌徒",
   "min_rarity": 3,
   "max_rarity": 4,
-  "2pc": "元素战技造成的伤害提升20%。",
-  "4pc": "击败敌人时，有100%概率清除元素战技的冷却时间。该效果每15秒至多触发一次。",
+  "two_pc": "元素战技造成的伤害提升20%。",
+  "four_pc": "击败敌人时，有100%概率清除元素战技的冷却时间。该效果每15秒至多触发一次。",
   "goblet": {
     "id": "gamblers_dice_cup",
     "name": "赌徒的骰盅",

src/data/chinese-simplified/artifacts/gladiators_finale.json

@@ -3,8 +3,8 @@
   "name": "角斗士的终幕礼",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "攻击力提高18%。",
-  "4pc": "装备该圣遗物套装的角色为单手剑、双手剑、长柄武器角色时，角色普通攻击造成的伤害提高35%。",
+  "two_pc": "攻击力提高18%。",
+  "four_pc": "装备该圣遗物套装的角色为单手剑、双手剑、长柄武器角色时，角色普通攻击造成的伤害提高35%。",
   "goblet": {
     "id": "gladiators_intoxication",
     "name": "角斗士的酣醉",

src/data/chinese-simplified/artifacts/heart_of_depth.json

@@ -3,8 +3,8 @@
   "name": "沉沦之心",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "获得15%水元素伤害加成。",
-  "4pc": "施放元素战技后的15秒内，普通攻击与重击造成的伤害提高30%。",
+  "two_pc": "获得15%水元素伤害加成。",
+  "four_pc": "施放元素战技后的15秒内，普通攻击与重击造成的伤害提高30%。",
   "goblet": {
     "id": "goblet_of_thundering_deep",
     "name": "沉波之盏",

src/data/chinese-simplified/artifacts/instructor.json

@@ -3,8 +3,8 @@
   "name": "教官",
   "min_rarity": 3,
   "max_rarity": 4,
-  "2pc": "元素精通提高80点。",
-  "4pc": "触发元素反应后，队伍中所有角色的元素精通提高120点，持续8秒。",
+  "two_pc": "元素精通提高80点。",
+  "four_pc": "触发元素反应后，队伍中所有角色的元素精通提高120点，持续8秒。",
   "goblet": {
     "id": "instructors_tea_cup",
     "name": "教官的茶杯",

src/data/chinese-simplified/artifacts/lavawalker.json

@@ -3,8 +3,8 @@
   "name": "渡过烈火的贤人",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "火元素抗性提高40%。",
-  "4pc": "对处于火元素影响下的敌人造成的伤害提升35%。",
+  "two_pc": "火元素抗性提高40%。",
+  "four_pc": "对处于火元素影响下的敌人造成的伤害提升35%。",
   "goblet": {
     "id": "lavawalkers_epiphany",
     "name": "渡火者的醒悟",

src/data/chinese-simplified/artifacts/lucky_dog.json

@@ -3,8 +3,8 @@
   "name": "幸运儿",
   "min_rarity": 1,
   "max_rarity": 3,
-  "2pc": "防御力提高100点。",
-  "4pc": "拾取摩拉时，恢复300点生命值。",
+  "two_pc": "防御力提高100点。",
+  "four_pc": "拾取摩拉时，恢复300点生命值。",
   "goblet": {
     "id": "lucky_dogs_goblet",
     "name": "幸运儿之杯",

src/data/chinese-simplified/artifacts/maiden_beloved.json

@@ -3,8 +3,8 @@
   "name": "被怜爱的少女",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "角色造成的治疗效果提升15%。",
-  "4pc": "施放元素战技或元素爆发后的10秒内，队伍中所有角色受治疗效果加成提高20%。",
+  "two_pc": "角色造成的治疗效果提升15%。",
+  "four_pc": "施放元素战技或元素爆发后的10秒内，队伍中所有角色受治疗效果加成提高20%。",
   "goblet": {
     "id": "maidens_fleeting_leisure",
     "name": "少女片刻的闲暇",

src/data/chinese-simplified/artifacts/martial_artist.json

@@ -3,8 +3,8 @@
   "name": "武人",
   "min_rarity": 3,
   "max_rarity": 4,
-  "2pc": "普通攻击与重击造成的伤害提高15%；",
-  "4pc": "施放元素战技后的8秒内，普通攻击和重击造成的伤害提升25%。",
+  "two_pc": "普通攻击与重击造成的伤害提高15%；",
+  "four_pc": "施放元素战技后的8秒内，普通攻击和重击造成的伤害提升25%。",
   "goblet": {
     "id": "martial_artists_wine_cup",
     "name": "武人的酒杯",

src/data/chinese-simplified/artifacts/noblesse_oblige.json

@@ -3,8 +3,8 @@
   "name": "昔日宗室之仪",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "元素爆发造成的伤害提升20%。",
-  "4pc": "施放元素爆发后，队伍中所有角色攻击力提升20%，持续12秒。该效果不可叠加。",
+  "two_pc": "元素爆发造成的伤害提升20%。",
+  "four_pc": "施放元素爆发后，队伍中所有角色攻击力提升20%，持续12秒。该效果不可叠加。",
   "goblet": {
     "id": "royal_silver_urn",
     "name": "宗室银瓮",

src/data/chinese-simplified/artifacts/pale_flame.json

@@ -3,8 +3,8 @@
   "name": "苍白之火",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "造成的物理伤害提高25%。",
-  "4pc": "元素战技命中敌人后，攻击力提升9%。该效果持续7秒，至多叠加2层，每0.3秒至多触发一次。叠满2层时，2件套的效果提升100%。",
+  "two_pc": "造成的物理伤害提高25%。",
+  "four_pc": "元素战技命中敌人后，攻击力提升9%。该效果持续7秒，至多叠加2层，每0.3秒至多触发一次。叠满2层时，2件套的效果提升100%。",
   "goblet": {
     "id": "surpassing_cup",
     "name": "超越之盏",

src/data/chinese-simplified/artifacts/prayers_for_destiny.json

@@ -3,7 +3,7 @@
   "name": "祭水之人",
   "min_rarity": 3,
   "max_rarity": 4,
-  "1pc": "受到的水元素附着效果的持续时间减少40%。",
+  "one_pc": "受到的水元素附着效果的持续时间减少40%。",
   "circlet": {
     "id": "tiara_of_torrents",
     "name": "祭水礼冠",

src/data/chinese-simplified/artifacts/prayers_for_illumination.json

@@ -3,7 +3,7 @@
   "name": "祭火之人",
   "min_rarity": 3,
   "max_rarity": 4,
-  "1pc": "受到的火元素附着效果的持续时间减少40%。",
+  "one_pc": "受到的火元素附着效果的持续时间减少40%。",
   "circlet": {
     "id": "tiara_of_flame",
     "name": "祭火礼冠",

src/data/chinese-simplified/artifacts/prayers_for_wisdom.json

@@ -3,7 +3,7 @@
   "name": "祭雷之人",
   "min_rarity": 3,
   "max_rarity": 4,
-  "1pc": "受到的雷元素附着效果的持续时间减少40%。",
+  "one_pc": "受到的雷元素附着效果的持续时间减少40%。",
   "circlet": {
     "id": "tiara_of_thunder",
     "name": "祭雷礼冠",

src/data/chinese-simplified/artifacts/prayers_to_springtime.json

@@ -3,7 +3,7 @@
   "name": "祭冰之人",
   "min_rarity": 3,
   "max_rarity": 4,
-  "1pc": "受到的冰元素附着效果的持续时间减少40%。",
+  "one_pc": "受到的冰元素附着效果的持续时间减少40%。",
   "circlet": {
     "id": "tiara_of_frost",
     "name": "祭冰礼冠",

src/data/chinese-simplified/artifacts/resolution_of_sojourner.json

@@ -3,8 +3,8 @@
   "name": "行者之心",
   "min_rarity": 3,
   "max_rarity": 4,
-  "2pc": "攻击力提高18%。",
-  "4pc": "重击的暴击率提升30%。",
+  "two_pc": "攻击力提高18%。",
+  "four_pc": "重击的暴击率提升30%。",
   "goblet": {
     "id": "goblet_of_the_sojourner",
     "name": "异国之盏",

src/data/chinese-simplified/artifacts/retracing_bolide.json

@@ -3,8 +3,8 @@
   "name": "逆飞的流星",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "护盾强效提高35%。",
-  "4pc": "处于护盾庇护下时，额外获得40%普通攻击和重击伤害加成。",
+  "two_pc": "护盾强效提高35%。",
+  "four_pc": "处于护盾庇护下时，额外获得40%普通攻击和重击伤害加成。",
   "goblet": {
     "id": "summer_nights_waterballoon",
     "name": "夏祭水玉",

src/data/chinese-simplified/artifacts/scholar.json

@@ -3,8 +3,8 @@
   "name": "学士",
   "min_rarity": 3,
   "max_rarity": 4,
-  "2pc": "元素充能效率提高20%。",
-  "4pc": "获得元素微粒或元素晶球时，队伍中所有弓箭和法器角色额外恢复3点元素能量。该效果每3秒只能触发一次。",
+  "two_pc": "元素充能效率提高20%。",
+  "four_pc": "获得元素微粒或元素晶球时，队伍中所有弓箭和法器角色额外恢复3点元素能量。该效果每3秒只能触发一次。",
   "goblet": {
     "id": "scholars_ink_cup",
     "name": "学士的墨杯",

src/data/chinese-simplified/artifacts/shimenawas_reminiscence.json

@@ -3,8 +3,8 @@
   "name": "追忆之注连",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "攻击力提高18%。",
-  "4pc": "施放元素战技时，如果角色的元素能量高于或等于15点，则会流失15点元素能量，使接下来的10秒内，普通攻击、重击、下落攻击造成的伤害提高50%，持续期间内该效果不会再次触发。",
+  "two_pc": "攻击力提高18%。",
+  "four_pc": "施放元素战技时，如果角色的元素能量高于或等于15点，则会流失15点元素能量，使接下来的10秒内，普通攻击、重击、下落攻击造成的伤害提高50%，持续期间内该效果不会再次触发。",
   "goblet": {
     "id": "hopeful_heart",
     "name": "祈望之心",

src/data/chinese-simplified/artifacts/tenacity_of_the_millelith.json

@@ -3,8 +3,8 @@
   "name": "千岩牢固",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "生命值提升20%",
-  "4pc": "元素战技命中敌人后，使队伍中附近的所有角色攻击力提升20%，护盾强效提升30%，持续3秒。该效果每0.5秒至多触发一次。装备此圣遗物套装的角色处于队伍后台时，依然能触发该效果。",
+  "two_pc": "生命值提升20%",
+  "four_pc": "元素战技命中敌人后，使队伍中附近的所有角色攻击力提升20%，护盾强效提升30%，持续3秒。该效果每0.5秒至多触发一次。装备此圣遗物套装的角色处于队伍后台时，依然能触发该效果。",
   "goblet": {
     "id": "nobles_pledging_vessel",
     "name": "盟誓金爵",

src/data/chinese-simplified/artifacts/the_exile.json

@@ -3,8 +3,8 @@
   "name": "流放者",
   "min_rarity": 3,
   "max_rarity": 4,
-  "2pc": "元素充能效率提高20%。",
-  "4pc": "施放元素爆发后，每2秒为队伍中所有角色（不包括自己）恢复2点元素能量。该效果持续6秒，无法叠加。",
+  "two_pc": "元素充能效率提高20%。",
+  "four_pc": "施放元素爆发后，每2秒为队伍中所有角色（不包括自己）恢复2点元素能量。该效果持续6秒，无法叠加。",
   "goblet": {
     "id": "exiles_goblet",
     "name": "流放者之杯",

src/data/chinese-simplified/artifacts/thundering_fury.json

@@ -3,8 +3,8 @@
   "name": "如雷的盛怒",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "获得15%雷元素伤害加成。",
-  "4pc": "超载、感电、超导反应造成的伤害提升40%。触发这些元素反应时，元素战技冷却时间减少1秒。该效果每0.8秒最多触发一次。",
+  "two_pc": "获得15%雷元素伤害加成。",
+  "four_pc": "超载、感电、超导反应造成的伤害提升40%。触发这些元素反应时，元素战技冷却时间减少1秒。该效果每0.8秒最多触发一次。",
   "goblet": {
     "id": "omen_of_thunderstorm",
     "name": "降雷的凶兆",

src/data/chinese-simplified/artifacts/thundersoother.json

@@ -3,8 +3,8 @@
   "name": "平息鸣雷的尊者",
   "min_rarity": 4,
   "max_rarity": 5,
-  "2pc": "雷元素抗性提高40%。",
-  "4pc": "对处于雷元素影响下的敌人造成的伤害提升35%。",
+  "two_pc": "雷元素抗性提高40%。",
+  "four_pc": "对处于雷元素影响下的敌人造成的伤害提升35%。",
   "goblet": {
     "id": "thundersoothers_goblet",
     "name": "平雷之器",

src/data/chinese-simplified/artifacts/tiny_miracle.json

@@ -3,8 +3,8 @@
   "name": "奇迹",
   "min_rarity": 3,
   "max_rarity": 4,
-  "2pc": "所有元素抗性提高20%。",
-  "4pc": "受到某个元素类型的伤害后，相应的抗性提升30%，持续10秒。该效果每10秒只能触发一次。",
+  "two_pc": "所有元素抗性提高20%。",
+  "four_pc": "受到某个元素类型的伤害后，相应的抗性提升30%，持续10秒。该效果每10秒只能触发一次。",
   "goblet": {
     "id": "tiny_miracles_goblet",
     "name": "奇迹之杯",