Reimplement the changes after fixing merge conflicts

This commit is contained in:
Marcx committed 2022-01-16 10:50:13 +01:00
1 parent 9df1a37c05
commit f19c7da502
4 files changed
+1073 -1076

No files matched your search

+1 -1
View File
@@ -180,7 +180,7 @@ local repCollectibles={
[462] = {"462", "彼列之眼", "↑ +1.5射程#穿透眼泪#眼泪击中第1个敌人后,造成双倍伤害并获得跟踪效果"}, -- Eye of Belial
[464] = {"464", "平衡符号", "+2魂心#精英怪掉落掉落物更频繁#生成掉落物的优先级取决于角色最缺少的掉落物"}, -- Glyph of Balance
[472] = {"472", "国王宝宝", "其他跟班都会跟着他并自动射击敌人#角色发射时停止移动#停止发射后传送回角色位置"}, -- King Baby
[474] = {"474", "损坏的玻璃大炮", "使用时变成玻璃大炮"}, -- broken Glass Canon
[474] = {"474", "损坏的玻璃大炮", "使用时变成玻璃大炮"}, -- Broken Glass Canon
[476] = {"476", "一面骰", "复制房间中随机1个掉落物#复制的掉落物可能与原来的不同"},
[489] = {"489", "无限面骰", "可作为任何骰子, {{Collectible723}} 计数二十面骰除外#按丢弃键改变当前骰子#根据骰子改变充能,且使用时更新"}, -- D Infinity
[491] = {"491", "毒瘾宝宝", "每7个房间掉落1随机胶囊#使用胶囊会使房间内所有敌人中毒"}, -- Acid Baby