From e8f26e12ce00b0adc096c41f4c0561bb1c254d6c Mon Sep 17 00:00:00 2001 From: LightLeaves001 <156404640+LightLeaves001@users.noreply.github.com> Date: Thu, 2 Jan 2025 22:42:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=BB=E9=80=A0=E5=B8=88=E4=B9=8B=E6=9D=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E4=BF=AE=E8=A1=A5=E8=A1=A5=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=9A=84=E6=AD=A6=E5=99=A8=20(#85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quests/chapters/02AAD4264B2C55AAB.snbt | 21 +++++---- kubejs/assets/art_of_forging/lang/zh_cn.json | 43 +++++++++++-------- kubejs/assets/tetra/lang/zh_cn.json | 10 +++-- .../sword/crucible_blade/vengeance_tier.json | 2 +- .../thousand_cold_nights_imprv.json | 2 +- .../tetra/materials/fibre/shadow_silk.json | 2 +- .../data/tetra/materials/metal/diabolium.json | 30 ------------- .../metal/dragonsteel_fire_ingot.json | 2 +- .../metal/dragonsteel_ice_ingot.json | 2 +- .../metal/dragonsteel_lightning_ingot.json | 2 +- .../materials/metal/dreadsteel_ingot.json | 3 ++ .../tetra/materials/metal/endsteel_ingot.json | 2 +- .../tetra/materials/metal/mine_ingot.json | 2 +- .../materials/metal/vobrivium_ingot.json | 2 +- .../tetra/materials/socket/cyclops_eye.json | 8 +++- .../tetra/materials/socket/cyclops_skull.json | 33 ++++++++++++++ .../materials/socket/precision_mechanism.json | 3 -- .../tetra/materials/socket/sigil_of_eden.json | 2 + .../tetra/materials/socket/singularity.json | 2 +- .../tetra/materials/socket/void_worm_eye.json | 3 +- .../tetra/modules/double/annihilator_axe.json | 8 +--- .../sword/crucible/hone_esoteric_1.json | 2 +- .../sword/crucible/hone_esoteric_2.json | 2 +- .../sword/crucible/hone_esoteric_3.json | 2 +- .../sword/crucible/hone_goliath_2.json | 4 +- .../sword/crucible/hone_goliath_3.json | 2 +- .../sword/crucible/hone_vengeance_1.json | 9 +++- .../sword/crucible/hone_vengeance_2.json | 9 +++- .../sword/crucible/hone_vengeance_3.json | 9 +++- .../sword/katana/bloodthirster.json | 4 +- .../sword/katana/infinity_edge.json | 2 +- .../{ => architect_imprv}/cyclops_eye.json | 4 +- .../sword/architect_imprv/cyclops_skull.json | 11 +++++ 33 files changed, 146 insertions(+), 98 deletions(-) delete mode 100644 kubejs/data/tetra/materials/metal/diabolium.json create mode 100644 kubejs/data/tetra/materials/socket/cyclops_skull.json rename kubejs/data/tetra/synergies/sword/{ => architect_imprv}/cyclops_eye.json (72%) create mode 100644 kubejs/data/tetra/synergies/sword/architect_imprv/cyclops_skull.json diff --git a/config/ftbquests/quests/chapters/02AAD4264B2C55AAB.snbt b/config/ftbquests/quests/chapters/02AAD4264B2C55AAB.snbt index 66838232..497efd49 100644 --- a/config/ftbquests/quests/chapters/02AAD4264B2C55AAB.snbt +++ b/config/ftbquests/quests/chapters/02AAD4264B2C55AAB.snbt @@ -23,6 +23,7 @@ quest_links: [ ] quests: [ { + description: [""] icon: { Count: 1 id: "tetra:scroll_rolled" @@ -57,6 +58,7 @@ id: "6EDC35C7A5A0FC86" type: "advancement" }] + title: "&e锻造之艺&r" x: 0.0d y: 0.0d } @@ -563,7 +565,10 @@ } { dependencies: ["07FC717035C3584B"] - description: [""] + description: [ + "按照古籍中记载的仪式，我将击杀&4遗弃者&r后掉落的&4恶魔之眼&r献祭给夜之恶魔。" + "最终，这一恐怖的杀戮武器——&b千夜寒&r，得以重现世间，重新散发它令人颤栗的威能。" + ] icon: { Count: 1 id: "tetra:modular_sword" @@ -684,7 +689,7 @@ title: "发现远古城市" type: "structure" }] - title: "远古城市" + title: "&0远古城市&r" x: 6.0d y: 0.0d } @@ -1106,8 +1111,8 @@ type: "item" }] title: "&c远古恶意&r" - x: 8.0d - y: 1.5d + x: 5.5d + y: 3.5d } { dependencies: ["137C9220F86DD557"] @@ -1121,8 +1126,8 @@ type: "item" }] title: "&c远古恶意&r" - x: 8.0d - y: 2.5d + x: 6.5d + y: 3.5d } { dependencies: ["7259774FF36EFCA6"] @@ -1415,8 +1420,8 @@ } ] title: "收集不到三件套？" - x: 6.0d - y: 3.5d + x: 8.0d + y: 2.0d } ] subtitle: ["暂属于未完成章节"] diff --git a/kubejs/assets/art_of_forging/lang/zh_cn.json b/kubejs/assets/art_of_forging/lang/zh_cn.json index e20f13df..18ee507d 100644 --- a/kubejs/assets/art_of_forging/lang/zh_cn.json +++ b/kubejs/assets/art_of_forging/lang/zh_cn.json @@ -74,12 +74,12 @@ "tetra.stats.art_of_forging:infernal_rebuke.tooltip_short": "有一定几率将敌人点燃并击退", "art_of_forging.effect.hubris.name": "傲慢诅咒", - "art_of_forging.effect.hubris.tooltip": "当你的生命值在百分之90或以上时，你会造成§e%s额外伤害§r。当你失去生命值时，手持武器造成伤害会减少，当生命值降至百分之30或更低时，你的伤害会减少到原伤害的一半以上。", + "art_of_forging.effect.hubris.tooltip": "当你的生命值在90%%或以上时，你会造成§e%s额外伤害§r。当你失去生命值时，手持武器造成伤害会减少，当生命值降至30%%或更低时，你的伤害会减少到原伤害的一半以上。", "tetra.stats.art_of_forging:hubris": "傲慢诅咒", "tetra.stats.art_of_forging:hubris.tooltip_short": "生命值高于90%时造成额外伤害，生命值越低，伤害越少", "art_of_forging.effect.slaughtering.name": "屠戮", - "art_of_forging.effect.slaughtering.tooltip": "你会造成§e百分之%s额外伤害§r（当你的目标生命值高于§e百分之%s§r时）。", + "art_of_forging.effect.slaughtering.tooltip": "你会造成§e%%s额外伤害§r（当你的目标生命值高于§e%%s§r时）。", "tetra.stats.art_of_forging:slaughtering": "屠戮", "tetra.stats.art_of_forging:slaughtering.tooltip_short": "当目标生命值高于某个百分比时，造成额外伤害", @@ -167,9 +167,9 @@ "tetra.stats.art_of_forging:subjugation.tooltip_short": "连续攻击目标允许你释放一次定向攻击，造成负面效果并吸取目标生命", "art_of_forging.effect.goliath_slayer.name": "巨人杀手", - "art_of_forging.effect.goliath_slayer.tooltip": "对Boss或类似Boss的实体造成额外§e%s§r伤害。", + "art_of_forging.effect.goliath_slayer.tooltip": "对高血量目标造成额外§e%s§r伤害。", "tetra.stats.art_of_forging:goliath_slayer": "巨人杀手", - "tetra.stats.art_of_forging:goliath_slayer.tooltip_short": "对Boss或类似Boss的实体造成更多伤害", + "tetra.stats.art_of_forging:goliath_slayer.tooltip_short": "对高血量目标造成更多伤害", @@ -769,16 +769,19 @@ "tetra/schematic/double/basic_hammer/hone_radius_5.name": "打磨：深掘 V", "tetra/schematic/double/basic_hammer/hone_radius_5.description": "进一步打磨，提升挖掘深度。效果增加至54个方块。", - "tetra.improvement.blade/vengeance_tier.name": "愤怒之刃", - "tetra.improvement.blade/vengeance_tier.prefix": "愤怒之刃", - "tetra.improvement.blade/vengeance_tier.description": "增加复仇伤害。", + "tetra.improvement.blade/vengeance_tier.name": "无畏", + "tetra.improvement.blade/vengeance_tier.prefix": "无畏", + "tetra.improvement.blade/vengeance_tier.description": "勇者抽刃向强者。", - "tetra/schematic/sword/crucible/hone_vengeance_1.name": "路径：愤怒", - "tetra/schematic/sword/crucible/hone_vengeance_1.description": "在生命值低时增加5%的复仇伤害。", - "tetra/schematic/sword/crucible/hone_vengeance_2.name": "打磨：愤怒之刃II", - "tetra/schematic/sword/crucible/hone_vengeance_2.description": "提升复仇伤害。在生命值较低时的伤害提高到15%。", - "tetra/schematic/sword/crucible/hone_vengeance_3.name": "打磨：愤怒之刃III", - "tetra/schematic/sword/crucible/hone_vengeance_3.description": "进一步提升复仇伤害。在生命值较低时的伤害提高到20%。", + "tetra/schematic/sword/crucible/hone_vengeance_1.name": "无畏I", + "tetra/schematic/sword/crucible/hone_vengeance_1.description": "击杀令人生畏的巨型恐龙，磨炼胆识，你将对80%%生命值以上的敌人额外造成10%%伤害。", + "tetra/schematic/sword/crucible/hone_vengeance_1.slot1": "沉重骨头", + "tetra/schematic/sword/crucible/hone_vengeance_2.name": "无畏II", + "tetra/schematic/sword/crucible/hone_vengeance_2.description": "击杀更多巨型恐龙，进一步提升胆识，你将对70%%生命值以上的敌人额外造成20%%伤害。", + "tetra/schematic/sword/crucible/hone_vengeance_2.slot1": "沉重骨头", + "tetra/schematic/sword/crucible/hone_vengeance_3.name": "无畏III", + "tetra/schematic/sword/crucible/hone_vengeance_3.description": "击杀传说中的瞑煌龙，无畏的你将对50%%生命值以上的敌人额外造成30%%伤害。", + "tetra/schematic/sword/crucible/hone_vengeance_3.slot1": "板块碎片", "tetra.improvement.blade/infernal.name": "炼狱之刃", "tetra.improvement.blade/infernal.prefix": "炼狱之刃", @@ -816,10 +819,13 @@ "tetra/schematic/sword/crucible/hone_esoteric_1.name": "路线：秘刃", "tetra/schematic/sword/crucible/hone_esoteric_1.description": "为剑刃注入魔力，无视敌人10%护甲效力。", + "tetra/schematic/sword/crucible/hone_esoteric_1.slot1": "灵魂余烬", "tetra/schematic/sword/crucible/hone_esoteric_2.name": "线路：秘刃II", "tetra/schematic/sword/crucible/hone_esoteric_2.description": "将更多的魔力注入剑刃，无视敌人20%效力。", + "tetra/schematic/sword/crucible/hone_esoteric_2.slot1": "龙之灵魂", "tetra/schematic/sword/crucible/hone_esoteric_3.name": "线路：秘刃III", "tetra/schematic/sword/crucible/hone_esoteric_3.description": "将剑刃彻底神化，从此敌人护甲将形同虚设。", + "tetra/schematic/sword/crucible/hone_esoteric_3.slot1": "神秘构件", "tetra.improvement.nano_fused.name": "纳米融合", "tetra.improvement.nano_fused.description": "用纳米昆虫注入武器，改变特定生物的掉落物品。", @@ -918,16 +924,19 @@ "tetra.improvement.shockwave_head_hone/damage.description": "增加造成的伤害", "tetra.improvement.blade/goliath_tier.name": "巨人杀手", - "tetra.improvement.blade/goliath_tier.description": "对Boss造成更多伤害", + "tetra.improvement.blade/goliath_tier.description": "对高血量目标造成更多伤害", "tetra/schematic/sword/crucible/hone_goliath_1.name": "路径：巨人杀手I", - "tetra/schematic/sword/crucible/hone_goliath_1.description": "对Boss造成的伤害提高25%。", + "tetra/schematic/sword/crucible/hone_goliath_1.description": "碾碎巨人独眼用于强化剑刃，对高血量目标额外造成25%%伤害。", + "tetra/schematic/sword/crucible/hone_goliath_1.slot1": "巨人独眼", "tetra/schematic/sword/crucible/hone_goliath_2.name": "打磨：巨人杀手II", - "tetra/schematic/sword/crucible/hone_goliath_2.description": "进一步改进部件。对Boss造成的伤害提高至50%。", + "tetra/schematic/sword/crucible/hone_goliath_2.description": "碾碎巨人独眼用于强化剑刃，对高血量目标额外造成50%%伤害。", + "tetra/schematic/sword/crucible/hone_goliath_2.slot1": "巨人独眼", "tetra/schematic/sword/crucible/hone_goliath_3.name": "打磨：巨人杀手III", - "tetra/schematic/sword/crucible/hone_goliath_3.description": "进一步改进部件。对Boss造成的伤害提高至75%。", + "tetra/schematic/sword/crucible/hone_goliath_3.description": "碾碎巨人颅骨用于强化剑刃，对高血量目标额外造成100%%伤害。", + "tetra/schematic/sword/crucible/hone_goliath_3.slot1": "独眼巨人颅骨", diff --git a/kubejs/assets/tetra/lang/zh_cn.json b/kubejs/assets/tetra/lang/zh_cn.json index c0d9ce16..bbd6d533 100644 --- a/kubejs/assets/tetra/lang/zh_cn.json +++ b/kubejs/assets/tetra/lang/zh_cn.json @@ -2670,7 +2670,7 @@ "tetra/schematic/sword/katana/hone_benight_2.description": "献祭更多的纯粹黑暗,化身夜幕,对敌人造成的伤害将无视30%%护甲。", "tetra/schematic/sword/katana/hone_benight_2.slot1": "纯粹黑暗", "tetra/schematic/sword/katana/hone_benight_3.name": "入夜III", - "tetra/schematic/sword/katana/hone_benight_3.description": "为夜之恶魔献上荒芜匕首,此刻你将成为黑暗本身,对敌人造成的伤害将无视50%护甲。", + "tetra/schematic/sword/katana/hone_benight_3.description": "为夜之恶魔献上荒芜匕首,此刻你将成为黑暗本身,对敌人造成的伤害将无视50%%护甲。", "tetra/schematic/sword/katana/hone_benight_3.slot1": "荒芜匕首", "tetra.variant.evernight_dagger/evernight_dagger": "§4永夜匕首§r", @@ -2690,6 +2690,8 @@ "tetra.material.cyclops_eye.prefix":"§5巨人独眼§r", "tetra.material.cyclops_eye": "§5巨人独眼§r", "tetra.variant.sword_socket/cyclops_eye": "§5巨人独眼§r", + "tetra.material.cyclops_skull": "§5独眼巨人颅骨§r", + "tetra.variant.sword_socket/cyclops_skull": "§5独眼巨人颅骨§r", "tetra.material.dragonscales_fire.prefix":"§4火龙鳞§r", "tetra.material.dragonscales_fire": "§4火龙鳞§r", "tetra.material.dragonscales_ice.prefix":"§b冰龙鳞§r", @@ -2716,7 +2718,7 @@ "tetra.material.totem_of_undying": "不死图腾", "tetra.material.shadow_silk.prefix": "黑暗丝绸", "tetra.material.shadow_silk": "黑暗丝绸", - "tetra.material.singularity.prefix": "§11奇点§r", - "tetra.material.singularity": "§11奇点§r", - "tetra.variant.sword_socket/singularity":"§11奇点§r" + "tetra.material.singularity.prefix": "§1奇点§r", + "tetra.material.singularity": "§1奇点§r", + "tetra.variant.sword_socket/singularity":"§1奇点§r" } diff --git a/kubejs/data/tetra/improvements/sword/crucible_blade/vengeance_tier.json b/kubejs/data/tetra/improvements/sword/crucible_blade/vengeance_tier.json index cab5d990..66bf68f5 100644 --- a/kubejs/data/tetra/improvements/sword/crucible_blade/vengeance_tier.json +++ b/kubejs/data/tetra/improvements/sword/crucible_blade/vengeance_tier.json @@ -27,7 +27,7 @@ "honed": 3 }, "effects": { - "art_of_forging:slaughtering": [ 30, 40 ] + "art_of_forging:slaughtering": [ 30, 50 ] } } ] \ No newline at end of file diff --git a/kubejs/data/tetra/improvements/sword/katana_blade/thousand_cold_nights_imprv.json b/kubejs/data/tetra/improvements/sword/katana_blade/thousand_cold_nights_imprv.json index 7a9ac73b..e40f4d81 100644 --- a/kubejs/data/tetra/improvements/sword/katana_blade/thousand_cold_nights_imprv.json +++ b/kubejs/data/tetra/improvements/sword/katana_blade/thousand_cold_nights_imprv.json @@ -4,7 +4,7 @@ "integrity": -2, "effects": { "severing": [ 10, 3 ], - "art_of_forging:devouring": [ 2, 5 ], + "art_of_forging:devouring": [ 4, 5 ], "art_of_forging:life_steal": [ 1, 20 ] }, "attributes": { diff --git a/kubejs/data/tetra/materials/fibre/shadow_silk.json b/kubejs/data/tetra/materials/fibre/shadow_silk.json index bc23dc92..ea9ef45c 100644 --- a/kubejs/data/tetra/materials/fibre/shadow_silk.json +++ b/kubejs/data/tetra/materials/fibre/shadow_silk.json @@ -27,6 +27,6 @@ "cut": "minecraft:iron" }, "effects": { - "art_of_forging:devouring": [ 1, 5 ] + "art_of_forging:devouring": [ -2, 5 ] } } \ No newline at end of file diff --git a/kubejs/data/tetra/materials/metal/diabolium.json b/kubejs/data/tetra/materials/metal/diabolium.json deleted file mode 100644 index 19a55805..00000000 --- a/kubejs/data/tetra/materials/metal/diabolium.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "key": "diabolium_ingot", - "category": "metal", - "primary": 8.5, - "secondary": 2.8, - "tertiary": 2, - "durability": 2550, - "integrityCost": 2, - "integrityGain": 8, - "magicCapacity": 96, - "toolLevel": "minecraft:netherite", - "toolEfficiency": 10, - "tints": { - "glyph": "42070e", - "texture": "42070e" - }, - "textures": [ - "heavy", - "metal" - ], - "material": { - "items": [ "fromtheshadows:diabolium_ingot" ] - }, - "requiredTools": { - "hammer_dig": "minecraft:iron" - }, - "effects": { - "unbreaking": 3 - } -} \ No newline at end of file diff --git a/kubejs/data/tetra/materials/metal/dragonsteel_fire_ingot.json b/kubejs/data/tetra/materials/metal/dragonsteel_fire_ingot.json index bc3846fe..58701c46 100644 --- a/kubejs/data/tetra/materials/metal/dragonsteel_fire_ingot.json +++ b/kubejs/data/tetra/materials/metal/dragonsteel_fire_ingot.json @@ -10,7 +10,7 @@ "integrityGain": 8, "magicCapacity": 120, "toolLevel": 7, - "toolEfficiency": 11, + "toolEfficiency": 10, "tints": { "glyph": "910d13", "texture": "910d13" diff --git a/kubejs/data/tetra/materials/metal/dragonsteel_ice_ingot.json b/kubejs/data/tetra/materials/metal/dragonsteel_ice_ingot.json index 45033439..3357004f 100644 --- a/kubejs/data/tetra/materials/metal/dragonsteel_ice_ingot.json +++ b/kubejs/data/tetra/materials/metal/dragonsteel_ice_ingot.json @@ -9,7 +9,7 @@ "integrityGain": 8, "magicCapacity": 120, "toolLevel": "minecraft:netherite", - "toolEfficiency": 11, + "toolEfficiency": 10, "effects": { "art_of_forging:disorienting":[20,2] }, diff --git a/kubejs/data/tetra/materials/metal/dragonsteel_lightning_ingot.json b/kubejs/data/tetra/materials/metal/dragonsteel_lightning_ingot.json index 3593856d..529c64b3 100644 --- a/kubejs/data/tetra/materials/metal/dragonsteel_lightning_ingot.json +++ b/kubejs/data/tetra/materials/metal/dragonsteel_lightning_ingot.json @@ -9,7 +9,7 @@ "integrityGain": 8, "magicCapacity": 120, "toolLevel": "minecraft:netherite", - "toolEfficiency": 11, + "toolEfficiency": 10, "effects": { "art_of_forging:stormcaller": [ 3, 20 ] }, diff --git a/kubejs/data/tetra/materials/metal/dreadsteel_ingot.json b/kubejs/data/tetra/materials/metal/dreadsteel_ingot.json index 20447340..51c6edf5 100644 --- a/kubejs/data/tetra/materials/metal/dreadsteel_ingot.json +++ b/kubejs/data/tetra/materials/metal/dreadsteel_ingot.json @@ -10,6 +10,9 @@ "magicCapacity": 150, "toolLevel": "minecraft:netherite", "toolEfficiency": 11, + "effects": { + "art_of_forging:devouring": [ -2, 5 ] + }, "tints": { "glyph": "910d13", "texture": "910d13" diff --git a/kubejs/data/tetra/materials/metal/endsteel_ingot.json b/kubejs/data/tetra/materials/metal/endsteel_ingot.json index 07322ffa..02c28152 100644 --- a/kubejs/data/tetra/materials/metal/endsteel_ingot.json +++ b/kubejs/data/tetra/materials/metal/endsteel_ingot.json @@ -10,7 +10,7 @@ "integrityGain": 10, "magicCapacity": 80, "toolLevel": "minecraft:netherite", - "toolEfficiency": 14, + "toolEfficiency": 12, "effects": { "unbreaking":3, "workable":10 diff --git a/kubejs/data/tetra/materials/metal/mine_ingot.json b/kubejs/data/tetra/materials/metal/mine_ingot.json index 64d73183..e4e37f4b 100644 --- a/kubejs/data/tetra/materials/metal/mine_ingot.json +++ b/kubejs/data/tetra/materials/metal/mine_ingot.json @@ -9,7 +9,7 @@ "integrityGain": 9, "magicCapacity": 100, "toolLevel": "minecraft:netherite", - "toolEfficiency": 9, + "toolEfficiency": 8, "improvements":{ "vvaddon/charge": 1 }, diff --git a/kubejs/data/tetra/materials/metal/vobrivium_ingot.json b/kubejs/data/tetra/materials/metal/vobrivium_ingot.json index 85d5a156..0c7c1b78 100644 --- a/kubejs/data/tetra/materials/metal/vobrivium_ingot.json +++ b/kubejs/data/tetra/materials/metal/vobrivium_ingot.json @@ -9,7 +9,7 @@ "integrityGain": 9, "magicCapacity": 200, "toolLevel": "minecraft:netherite", - "toolEfficiency": 10, + "toolEfficiency": 8, "effects": { "art_of_forging:stormcaller": [ 1, 10 ] }, diff --git a/kubejs/data/tetra/materials/socket/cyclops_eye.json b/kubejs/data/tetra/materials/socket/cyclops_eye.json index 2b257f65..d083f056 100644 --- a/kubejs/data/tetra/materials/socket/cyclops_eye.json +++ b/kubejs/data/tetra/materials/socket/cyclops_eye.json @@ -12,8 +12,12 @@ "magicCapacity": 200, "toolLevel": 0, "toolEfficiency": 0, + "attributes": { + "generic.attack_damage": 1 + }, "effects": { - "art_of_forging:goliath_slayer": 50 + "art_of_forging:goliath_slayer": 25, + "intuit": 3 }, "tints": { "glyph": "b74545", @@ -22,7 +26,7 @@ "textures": [ "default" ], - "experienceCost": 20, + "experienceCost": 15, "material":{ "items":["iceandfire:cyclops_eye"] } diff --git a/kubejs/data/tetra/materials/socket/cyclops_skull.json b/kubejs/data/tetra/materials/socket/cyclops_skull.json new file mode 100644 index 00000000..8758b157 --- /dev/null +++ b/kubejs/data/tetra/materials/socket/cyclops_skull.json @@ -0,0 +1,33 @@ +{ + "replace": true, + "key": "cyclops_skull", + "hidden": true, + "category": "socket", + "primary": 0, + "secondary": 0, + "tertiary": 0, + "durability": 60, + "integrityCost": 1, + "integrityGain": 0, + "magicCapacity": 200, + "toolLevel": 0, + "toolEfficiency": 0, + "attributes": { + "generic.attack_damage": 2 + }, + "effects": { + "art_of_forging:goliath_slayer": 50, + "intuit": 5 + }, + "tints": { + "glyph": "b74545", + "texture": "b74545" + }, + "textures": [ + "default" + ], + "experienceCost": 30, + "material":{ + "items":["iceandfire:cyclops_skull"] + } +} \ No newline at end of file diff --git a/kubejs/data/tetra/materials/socket/precision_mechanism.json b/kubejs/data/tetra/materials/socket/precision_mechanism.json index 73d65b72..82d9167c 100644 --- a/kubejs/data/tetra/materials/socket/precision_mechanism.json +++ b/kubejs/data/tetra/materials/socket/precision_mechanism.json @@ -11,9 +11,6 @@ "magicCapacity": 0, "toolLevel": 0, "toolEfficiency": 2, - "attributes": { - "**generic.attack_damage": 0 - }, "effects": { "intuit": 5 }, diff --git a/kubejs/data/tetra/materials/socket/sigil_of_eden.json b/kubejs/data/tetra/materials/socket/sigil_of_eden.json index e0236843..98f136f7 100644 --- a/kubejs/data/tetra/materials/socket/sigil_of_eden.json +++ b/kubejs/data/tetra/materials/socket/sigil_of_eden.json @@ -17,6 +17,8 @@ }, "effects": { "criticalStrike": [ 20, 2 ], + "art_of_forging:life_steal": [ 2, 20 ], + "intuit": 5 "art_of_forging:life_steal": [ 2, 20 ] }, "tints": { diff --git a/kubejs/data/tetra/materials/socket/singularity.json b/kubejs/data/tetra/materials/socket/singularity.json index f7203e12..86593d06 100644 --- a/kubejs/data/tetra/materials/socket/singularity.json +++ b/kubejs/data/tetra/materials/socket/singularity.json @@ -16,7 +16,7 @@ "forge:attack_range":1 }, "effects": { - "intuit": 10, + "intuit": 5, "janking":[10,0] }, "tints": { diff --git a/kubejs/data/tetra/materials/socket/void_worm_eye.json b/kubejs/data/tetra/materials/socket/void_worm_eye.json index 2f7287ff..7a49ec90 100644 --- a/kubejs/data/tetra/materials/socket/void_worm_eye.json +++ b/kubejs/data/tetra/materials/socket/void_worm_eye.json @@ -19,7 +19,8 @@ }, "effects": { "criticalStrike": [ 25, 1.5 ], - "art_of_forging:resolve": [ 60, 4 ] + "art_of_forging:resolve": [ 60, 4 ], + "intuit": 5 }, "tints": { "glyph": "4a42ab" diff --git a/kubejs/data/tetra/modules/double/annihilator_axe.json b/kubejs/data/tetra/modules/double/annihilator_axe.json index 430a14b4..4592df6e 100644 --- a/kubejs/data/tetra/modules/double/annihilator_axe.json +++ b/kubejs/data/tetra/modules/double/annihilator_axe.json @@ -29,19 +29,15 @@ "effects": { "shieldbreaker": 1, "art_of_forging:devouring": [ 2, 5 ], - "art_of_forging:life_steal": [ 1.5, 25 ], - "art_of_forging:knockback": [ 0.5, 0 ], "art_of_forging:hubris": 30, - "crushing": 2, - "armorPenetration": 5, "art_of_forging:carnage": [ 1, 10 ] }, "tools": { - "axe_dig": [ 5, 2 ], + "axe_dig": [ 4, 12 ], "axe_strip": [ 1, 1 ], "axe_scrape": [ 1, 1 ], "axe_wax_off": [ 1, 1 ], - "shovel_dig": [5, 2] + "shovel_dig": [4, 12] }, "durability": 100, "magicCapacity": 800, diff --git a/kubejs/data/tetra/schematics/sword/crucible/hone_esoteric_1.json b/kubejs/data/tetra/schematics/sword/crucible/hone_esoteric_1.json index 9bd84af1..6bd90704 100644 --- a/kubejs/data/tetra/schematics/sword/crucible/hone_esoteric_1.json +++ b/kubejs/data/tetra/schematics/sword/crucible/hone_esoteric_1.json @@ -37,7 +37,7 @@ "outcomes": [ { "material": { - "items":[ "alexsmobs:shark_tooth" ,"iceandfire:troll_tusk","iceandfire:hydra_fang","iceandfire:sea_serpent_fang","alexsmobs:bone_serpent_tooth"], + "items":[ "art_of_forging:soul_ember"], "count": 1 }, "experienceCost": 10, diff --git a/kubejs/data/tetra/schematics/sword/crucible/hone_esoteric_2.json b/kubejs/data/tetra/schematics/sword/crucible/hone_esoteric_2.json index f1f6e740..72a301db 100644 --- a/kubejs/data/tetra/schematics/sword/crucible/hone_esoteric_2.json +++ b/kubejs/data/tetra/schematics/sword/crucible/hone_esoteric_2.json @@ -17,7 +17,7 @@ "outcomes": [ { "material": { - "items":[ "iceandfire:cyclops_eye"], + "items":[ "art_of_forging:dragon_soul"], "count": 1 }, "experienceCost": 10, diff --git a/kubejs/data/tetra/schematics/sword/crucible/hone_esoteric_3.json b/kubejs/data/tetra/schematics/sword/crucible/hone_esoteric_3.json index 8f4691fc..d02b6dfa 100644 --- a/kubejs/data/tetra/schematics/sword/crucible/hone_esoteric_3.json +++ b/kubejs/data/tetra/schematics/sword/crucible/hone_esoteric_3.json @@ -17,7 +17,7 @@ "outcomes": [ { "material": { - "items":[ "iceandfire:cyclops_skull"], + "items":[ "art_of_forging:enigmatic_construct"], "count": 1 }, "experienceCost": 30, diff --git a/kubejs/data/tetra/schematics/sword/crucible/hone_goliath_2.json b/kubejs/data/tetra/schematics/sword/crucible/hone_goliath_2.json index 93bb3ca1..4ae9843b 100644 --- a/kubejs/data/tetra/schematics/sword/crucible/hone_goliath_2.json +++ b/kubejs/data/tetra/schematics/sword/crucible/hone_goliath_2.json @@ -1,7 +1,7 @@ { "replace": true, "slots": [ "sword/blade" ], - "materialSlotCount": 0, + "materialSlotCount": 1, "hone": true, "rarity": "hone", "displayType": "major", @@ -20,7 +20,7 @@ "items":[ "iceandfire:cyclops_eye"], "count": 1 }, - "experienceCost": 10, + "experienceCost": 15, "requiredTools": { "hammer_dig": 9 }, diff --git a/kubejs/data/tetra/schematics/sword/crucible/hone_goliath_3.json b/kubejs/data/tetra/schematics/sword/crucible/hone_goliath_3.json index cfc32d81..31bfeb4a 100644 --- a/kubejs/data/tetra/schematics/sword/crucible/hone_goliath_3.json +++ b/kubejs/data/tetra/schematics/sword/crucible/hone_goliath_3.json @@ -20,7 +20,7 @@ "items":[ "iceandfire:cyclops_skull"], "count": 1 }, - "experienceCost": 15, + "experienceCost": 20, "requiredTools": { "hammer_dig": 9 }, diff --git a/kubejs/data/tetra/schematics/sword/crucible/hone_vengeance_1.json b/kubejs/data/tetra/schematics/sword/crucible/hone_vengeance_1.json index f1706e3c..2fe58faa 100644 --- a/kubejs/data/tetra/schematics/sword/crucible/hone_vengeance_1.json +++ b/kubejs/data/tetra/schematics/sword/crucible/hone_vengeance_1.json @@ -1,7 +1,7 @@ { "replace": true, "slots": [ "sword/blade" ], - "materialSlotCount": 0, + "materialSlotCount": 1, "hone": true, "rarity": "hone", "displayType": "major", @@ -27,8 +27,13 @@ }, "outcomes": [ { + "material": { + "items":[ "alexscaves:heavy_bone"], + "count": 1 + }, + "experienceCost": 10, "requiredTools": { - "hammer_dig": "minecraft:gold" + "hammer_dig": 9 }, "improvements": { "blade/vengeance_tier": 1 diff --git a/kubejs/data/tetra/schematics/sword/crucible/hone_vengeance_2.json b/kubejs/data/tetra/schematics/sword/crucible/hone_vengeance_2.json index 80d9f96c..fd4e82f1 100644 --- a/kubejs/data/tetra/schematics/sword/crucible/hone_vengeance_2.json +++ b/kubejs/data/tetra/schematics/sword/crucible/hone_vengeance_2.json @@ -1,7 +1,7 @@ { "replace": true, "slots": [ "sword/blade" ], - "materialSlotCount": 0, + "materialSlotCount": 1, "hone": true, "rarity": "hone", "displayType": "major", @@ -16,8 +16,13 @@ }, "outcomes": [ { + "material": { + "items":[ "alexscaves:heavy_bone"], + "count": 2 + }, + "experienceCost": 15, "requiredTools": { - "hammer_dig": "minecraft:gold" + "hammer_dig": 9 }, "improvements": { "blade/vengeance_tier": 2 diff --git a/kubejs/data/tetra/schematics/sword/crucible/hone_vengeance_3.json b/kubejs/data/tetra/schematics/sword/crucible/hone_vengeance_3.json index 3ae9cda2..933e6a2c 100644 --- a/kubejs/data/tetra/schematics/sword/crucible/hone_vengeance_3.json +++ b/kubejs/data/tetra/schematics/sword/crucible/hone_vengeance_3.json @@ -1,7 +1,7 @@ { "replace": true, "slots": [ "sword/blade" ], - "materialSlotCount": 0, + "materialSlotCount": 1, "hone": true, "rarity": "hone", "displayType": "major", @@ -16,8 +16,13 @@ }, "outcomes": [ { + "material": { + "items":[ "alexscaves:tectonic_shard"], + "count": 2 + }, + "experienceCost": 20, "requiredTools": { - "hammer_dig": "minecraft:stone" + "hammer_dig": 9 }, "improvements": { "blade/vengeance_tier": 3 diff --git a/kubejs/data/tetra/schematics/sword/katana/bloodthirster.json b/kubejs/data/tetra/schematics/sword/katana/bloodthirster.json index 2c3063bd..f30122ef 100644 --- a/kubejs/data/tetra/schematics/sword/katana/bloodthirster.json +++ b/kubejs/data/tetra/schematics/sword/katana/bloodthirster.json @@ -30,14 +30,14 @@ "type": "tetra:not", "requirement": { "type": "tetra:improvement", - "improvement": "blade/infinity_edge" + "improvement": "blade/bloodthirster" } }, { "type": "tetra:not", "requirement": { "type": "tetra:improvement", - "improvement": "blade/booldthirster" + "improvement": "blade/infinity_edge" } } ] diff --git a/kubejs/data/tetra/schematics/sword/katana/infinity_edge.json b/kubejs/data/tetra/schematics/sword/katana/infinity_edge.json index 01704599..2584c6ed 100644 --- a/kubejs/data/tetra/schematics/sword/katana/infinity_edge.json +++ b/kubejs/data/tetra/schematics/sword/katana/infinity_edge.json @@ -37,7 +37,7 @@ "type": "tetra:not", "requirement": { "type": "tetra:improvement", - "improvement": "blade/booldthirster" + "improvement": "blade/bloodthirster" } } ] diff --git a/kubejs/data/tetra/synergies/sword/cyclops_eye.json b/kubejs/data/tetra/synergies/sword/architect_imprv/cyclops_eye.json similarity index 72% rename from kubejs/data/tetra/synergies/sword/cyclops_eye.json rename to kubejs/data/tetra/synergies/sword/architect_imprv/cyclops_eye.json index a7ccba48..decae5e3 100644 --- a/kubejs/data/tetra/synergies/sword/cyclops_eye.json +++ b/kubejs/data/tetra/synergies/sword/architect_imprv/cyclops_eye.json @@ -3,9 +3,9 @@ "moduleVariants": ["sword_socket/cyclops_eye"], "visibilityKey": "sword_socket/cyclops_eye", "effects": { - "art_of_forging:goliath_slayer": 50 + "art_of_forging:goliath_slayer": 25 }, "attributes": { - "generic.attack_damage": 10 + "generic.attack_damage": 3 } }] \ No newline at end of file diff --git a/kubejs/data/tetra/synergies/sword/architect_imprv/cyclops_skull.json b/kubejs/data/tetra/synergies/sword/architect_imprv/cyclops_skull.json new file mode 100644 index 00000000..2068780c --- /dev/null +++ b/kubejs/data/tetra/synergies/sword/architect_imprv/cyclops_skull.json @@ -0,0 +1,11 @@ +[ { + "modules": ["sword/crucible_blade"], + "moduleVariants": ["sword_socket/cyclops_skull"], + "visibilityKey": "sword_socket/cyclops_skull", + "effects": { + "art_of_forging:goliath_slayer": 50 + }, + "attributes": { + "generic.attack_damage": 6 + } +}] \ No newline at end of file