From 9b078c3383fbaae1add13254bda529ebf35230d5 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 7 May 2022 23:28:13 -0400 Subject: [PATCH] Addressed playtest feedback (assets). --- .../crafting_ing/modular/primary/axe/axe.ron | 2 +- .../modular/primary/axe/battleaxe.ron | 6 +- .../modular/primary/axe/greataxe.ron | 6 +- .../modular/primary/axe/jagged.ron | 8 +-- .../modular/primary/axe/labrys.ron | 6 +- .../modular/primary/axe/ornate.ron | 8 +-- .../modular/primary/axe/poleaxe.ron | 6 +- .../crafting_ing/modular/primary/bow/bow.ron | 2 +- .../modular/primary/bow/composite.ron | 8 +-- .../modular/primary/bow/greatbow.ron | 6 +- .../modular/primary/bow/longbow.ron | 6 +- .../modular/primary/bow/ornate.ron | 8 +-- .../modular/primary/bow/shortbow.ron | 6 +- .../modular/primary/bow/warbow.ron | 6 +- .../modular/primary/hammer/greathammer.ron | 6 +- .../modular/primary/hammer/greatmace.ron | 6 +- .../modular/primary/hammer/hammer.ron | 2 +- .../modular/primary/hammer/maul.ron | 6 +- .../modular/primary/hammer/ornate.ron | 8 +-- .../modular/primary/hammer/spikedmace.ron | 8 +-- .../modular/primary/hammer/warhammer.ron | 6 +- .../modular/primary/sceptre/arbor.ron | 6 +- .../modular/primary/sceptre/cane.ron | 6 +- .../modular/primary/sceptre/crook.ron | 8 +-- .../modular/primary/sceptre/crozier.ron | 6 +- .../modular/primary/sceptre/grandsceptre.ron | 6 +- .../modular/primary/sceptre/ornate.ron | 8 +-- .../modular/primary/sceptre/sceptre.ron | 2 +- .../modular/primary/staff/brand.ron | 6 +- .../modular/primary/staff/grandstaff.ron | 6 +- .../modular/primary/staff/longpole.ron | 6 +- .../modular/primary/staff/ornate.ron | 8 +-- .../modular/primary/staff/pole.ron | 8 +-- .../modular/primary/staff/rod.ron | 6 +- .../modular/primary/staff/staff.ron | 2 +- .../modular/primary/sword/greatsword.ron | 6 +- .../modular/primary/sword/katana.ron | 6 +- .../modular/primary/sword/longsword.ron | 2 +- .../modular/primary/sword/ornate.ron | 8 +-- .../modular/primary/sword/sabre.ron | 6 +- .../modular/primary/sword/sawblade.ron | 8 +-- .../modular/primary/sword/zweihander.ron | 6 +- .../secondary/bow/{large.ron => long.ron} | 2 +- .../secondary/bow/{small.ron => short.ron} | 2 +- .../sceptre/{large.ron => heavy.ron} | 2 +- .../sceptre/{small.ron => light.ron} | 2 +- .../modular/secondary/sceptre/medium.ron | 2 +- .../secondary/staff/{large.ron => heavy.ron} | 2 +- .../secondary/staff/{small.ron => light.ron} | 2 +- .../modular/secondary/staff/medium.ron | 2 +- .../sword/{two-handed.ron => long.ron} | 2 +- .../sword/{hand-and-half.ron => medium.ron} | 2 +- .../sword/{one-handed.ron => short.ron} | 2 +- assets/common/items/log/eldwood.ron | 2 +- assets/common/items/log/frostwood.ron | 2 +- assets/common/items/log/hardwood.ron | 2 +- assets/common/items/log/wood.ron | 2 +- assets/common/items/weapons/axe/parashu.ron | 6 +- assets/common/items/weapons/bow/sagitta.ron | 6 +- .../common/items/weapons/hammer/mjolnir.ron | 4 +- .../common/items/weapons/sceptre/caduceus.ron | 8 +-- .../items/weapons/sceptre/root_evil.ron | 8 +-- .../common/items/weapons/staff/laevateinn.ron | 4 +- .../common/items/weapons/sword/caladbolg.ron | 4 +- assets/common/loot_tables/cave_large.ron | 6 +- .../creature/biped_large/troll.ron | 2 +- .../creature/biped_large/wendigo.ron | 2 +- assets/common/loot_tables/creature/dragon.ron | 2 +- assets/common/loot_tables/creature/golem.ron | 6 +- .../common/loot_tables/creature/humanoid.ron | 2 +- .../creature/quad_low/deadwood.ron | 5 +- .../loot_tables/dungeon/tier-0/chest.ron | 2 +- .../loot_tables/dungeon/tier-1/chest.ron | 2 +- .../loot_tables/dungeon/tier-2/chest.ron | 2 +- .../loot_tables/dungeon/tier-3/chest.ron | 2 +- .../loot_tables/dungeon/tier-4/chest.ron | 2 +- .../loot_tables/dungeon/tier-5/chest.ron | 2 +- assets/common/loot_tables/spots/witch.ron | 10 ++-- .../loot_tables/sprite/chest-buried.ron | 2 +- assets/common/loot_tables/sprite/chest.ron | 4 +- assets/common/loot_tables/sprite/mud.ron | 2 +- .../loot_tables/weapons/components/tier-0.ron | 8 +++ .../loot_tables/weapons/components/tier-1.ron | 8 +++ .../loot_tables/weapons/components/tier-2.ron | 8 +++ .../loot_tables/weapons/components/tier-3.ron | 8 +++ .../loot_tables/weapons/components/tier-4.ron | 8 +++ .../loot_tables/weapons/components/tier-5.ron | 8 +++ assets/common/loot_tables/weapons/cultist.ron | 1 + .../loot_tables/weapons/legendary_ranged.ron | 3 +- assets/common/recipe_book.ron | 58 +++++++++---------- assets/common/trading/sellable_materials.ron | 4 ++ .../common/trading/unsellable_materials.ron | 6 ++ assets/voxygen/i18n/en/hud/crafting.ron | 10 ++++ assets/voxygen/item_image_manifest.ron | 30 +++++----- assets/voxygen/voxel/item_drop_manifest.ron | 18 +++--- .../bow/grip/{large.vox => long.vox} | 0 .../bow/grip/{small.vox => short.vox} | 0 97 files changed, 312 insertions(+), 243 deletions(-) rename assets/common/items/crafting_ing/modular/secondary/bow/{large.ron => long.ron} (94%) rename assets/common/items/crafting_ing/modular/secondary/bow/{small.ron => short.ron} (94%) rename assets/common/items/crafting_ing/modular/secondary/sceptre/{large.ron => heavy.ron} (94%) rename assets/common/items/crafting_ing/modular/secondary/sceptre/{small.ron => light.ron} (94%) rename assets/common/items/crafting_ing/modular/secondary/staff/{large.ron => heavy.ron} (94%) rename assets/common/items/crafting_ing/modular/secondary/staff/{small.ron => light.ron} (94%) rename assets/common/items/crafting_ing/modular/secondary/sword/{two-handed.ron => long.ron} (93%) rename assets/common/items/crafting_ing/modular/secondary/sword/{hand-and-half.ron => medium.ron} (92%) rename assets/common/items/crafting_ing/modular/secondary/sword/{one-handed.ron => short.ron} (93%) create mode 100644 assets/common/loot_tables/weapons/components/tier-0.ron create mode 100644 assets/common/loot_tables/weapons/components/tier-1.ron create mode 100644 assets/common/loot_tables/weapons/components/tier-2.ron create mode 100644 assets/common/loot_tables/weapons/components/tier-3.ron create mode 100644 assets/common/loot_tables/weapons/components/tier-4.ron create mode 100644 assets/common/loot_tables/weapons/components/tier-5.ron rename assets/voxygen/voxel/weapon/component/bow/grip/{large.vox => long.vox} (100%) rename assets/voxygen/voxel/weapon/component/bow/grip/{small.vox => short.vox} (100%) diff --git a/assets/common/items/crafting_ing/modular/primary/axe/axe.ron b/assets/common/items/crafting_ing/modular/primary/axe/axe.ron index d578540380..cb2c05f4c9 100644 --- a/assets/common/items/crafting_ing/modular/primary/axe/axe.ron +++ b/assets/common/items/crafting_ing/modular/primary/axe/axe.ron @@ -9,7 +9,7 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.2, + crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/crafting_ing/modular/primary/axe/battleaxe.ron b/assets/common/items/crafting_ing/modular/primary/axe/battleaxe.ron index d8e9be7eb5..87da1749f1 100644 --- a/assets/common/items/crafting_ing/modular/primary/axe/battleaxe.ron +++ b/assets/common/items/crafting_ing/modular/primary/axe/battleaxe.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 1.5, - crit_chance: 0.15, + speed: 1.25, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/axe/greataxe.ron b/assets/common/items/crafting_ing/modular/primary/axe/greataxe.ron index 9f273631d0..a36b051b4a 100644 --- a/assets/common/items/crafting_ing/modular/primary/axe/greataxe.ron +++ b/assets/common/items/crafting_ing/modular/primary/axe/greataxe.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 0.25, - power: 0.9, - effect_power: 2.0, + power: 0.8, + effect_power: 1.5, speed: 0.8, - crit_chance: 0.15, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/axe/jagged.ron b/assets/common/items/crafting_ing/modular/primary/axe/jagged.ron index df9e104d21..dcd29bbabe 100644 --- a/assets/common/items/crafting_ing/modular/primary/axe/jagged.ron +++ b/assets/common/items/crafting_ing/modular/primary/axe/jagged.ron @@ -6,13 +6,13 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.15, + speed: 0.8, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, - buff_strength: 2.0, + buff_strength: 1.5, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/crafting_ing/modular/primary/axe/labrys.ron b/assets/common/items/crafting_ing/modular/primary/axe/labrys.ron index d0758895c0..207b1565e5 100644 --- a/assets/common/items/crafting_ing/modular/primary/axe/labrys.ron +++ b/assets/common/items/crafting_ing/modular/primary/axe/labrys.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 0.25, - power: 1.5, + power: 1.25, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.15, + speed: 0.8, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/axe/ornate.ron b/assets/common/items/crafting_ing/modular/primary/axe/ornate.ron index 96f7997ef4..b708a957ea 100644 --- a/assets/common/items/crafting_ing/modular/primary/axe/ornate.ron +++ b/assets/common/items/crafting_ing/modular/primary/axe/ornate.ron @@ -6,12 +6,12 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.2, + speed: 0.8, + crit_chance: 0.1, range: 1.0, - energy_efficiency: 2.0, + energy_efficiency: 1.5, buff_strength: 0.8, ), hand_restriction: None, diff --git a/assets/common/items/crafting_ing/modular/primary/axe/poleaxe.ron b/assets/common/items/crafting_ing/modular/primary/axe/poleaxe.ron index 4156540f6c..5ced4c6fc4 100644 --- a/assets/common/items/crafting_ing/modular/primary/axe/poleaxe.ron +++ b/assets/common/items/crafting_ing/modular/primary/axe/poleaxe.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.4, + speed: 0.8, + crit_chance: 0.2, range: 1.5, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/bow/bow.ron b/assets/common/items/crafting_ing/modular/primary/bow/bow.ron index 097edb9189..9413fa01c7 100644 --- a/assets/common/items/crafting_ing/modular/primary/bow/bow.ron +++ b/assets/common/items/crafting_ing/modular/primary/bow/bow.ron @@ -9,7 +9,7 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.2, + crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/crafting_ing/modular/primary/bow/composite.ron b/assets/common/items/crafting_ing/modular/primary/bow/composite.ron index 6066908f75..ac8d6b8923 100644 --- a/assets/common/items/crafting_ing/modular/primary/bow/composite.ron +++ b/assets/common/items/crafting_ing/modular/primary/bow/composite.ron @@ -6,13 +6,13 @@ ItemDef( toolkind: Bow, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.15, + speed: 0.8, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, - buff_strength: 2.0, + buff_strength: 1.5, ), hand_restriction: Some(Two), weapon_name: Universal("Composite Bow"), diff --git a/assets/common/items/crafting_ing/modular/primary/bow/greatbow.ron b/assets/common/items/crafting_ing/modular/primary/bow/greatbow.ron index b7cde21045..cee7a0e02f 100644 --- a/assets/common/items/crafting_ing/modular/primary/bow/greatbow.ron +++ b/assets/common/items/crafting_ing/modular/primary/bow/greatbow.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Bow, stats: ( equip_time_secs: 0.25, - power: 0.9, - effect_power: 2.0, + power: 0.8, + effect_power: 1.5, speed: 0.8, - crit_chance: 0.15, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/bow/longbow.ron b/assets/common/items/crafting_ing/modular/primary/bow/longbow.ron index dc46d0d4c5..2c4e251f84 100644 --- a/assets/common/items/crafting_ing/modular/primary/bow/longbow.ron +++ b/assets/common/items/crafting_ing/modular/primary/bow/longbow.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Bow, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.4, + speed: 0.8, + crit_chance: 0.2, range: 1.5, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/bow/ornate.ron b/assets/common/items/crafting_ing/modular/primary/bow/ornate.ron index 50e701cb18..7c94ce8c13 100644 --- a/assets/common/items/crafting_ing/modular/primary/bow/ornate.ron +++ b/assets/common/items/crafting_ing/modular/primary/bow/ornate.ron @@ -6,12 +6,12 @@ ItemDef( toolkind: Bow, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.2, + speed: 0.8, + crit_chance: 0.1, range: 1.0, - energy_efficiency: 2.0, + energy_efficiency: 1.5, buff_strength: 0.8, ), hand_restriction: Some(Two), diff --git a/assets/common/items/crafting_ing/modular/primary/bow/shortbow.ron b/assets/common/items/crafting_ing/modular/primary/bow/shortbow.ron index a3aee74cec..05a2bc50d2 100644 --- a/assets/common/items/crafting_ing/modular/primary/bow/shortbow.ron +++ b/assets/common/items/crafting_ing/modular/primary/bow/shortbow.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Bow, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 1.5, - crit_chance: 0.15, + speed: 1.25, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/bow/warbow.ron b/assets/common/items/crafting_ing/modular/primary/bow/warbow.ron index 57c3238309..78364dde54 100644 --- a/assets/common/items/crafting_ing/modular/primary/bow/warbow.ron +++ b/assets/common/items/crafting_ing/modular/primary/bow/warbow.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Bow, stats: ( equip_time_secs: 0.25, - power: 1.5, + power: 1.25, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.15, + speed: 0.8, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/hammer/greathammer.ron b/assets/common/items/crafting_ing/modular/primary/hammer/greathammer.ron index 2716bee036..f61ada9a30 100644 --- a/assets/common/items/crafting_ing/modular/primary/hammer/greathammer.ron +++ b/assets/common/items/crafting_ing/modular/primary/hammer/greathammer.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Hammer, stats: ( equip_time_secs: 0.25, - power: 0.9, - effect_power: 2.0, + power: 0.8, + effect_power: 1.5, speed: 0.8, - crit_chance: 0.15, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/hammer/greatmace.ron b/assets/common/items/crafting_ing/modular/primary/hammer/greatmace.ron index e43be36b3c..136704cd10 100644 --- a/assets/common/items/crafting_ing/modular/primary/hammer/greatmace.ron +++ b/assets/common/items/crafting_ing/modular/primary/hammer/greatmace.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Hammer, stats: ( equip_time_secs: 0.25, - power: 1.5, + power: 1.25, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.15, + speed: 0.8, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/hammer/hammer.ron b/assets/common/items/crafting_ing/modular/primary/hammer/hammer.ron index 96ea00561a..e36f841c51 100644 --- a/assets/common/items/crafting_ing/modular/primary/hammer/hammer.ron +++ b/assets/common/items/crafting_ing/modular/primary/hammer/hammer.ron @@ -9,7 +9,7 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.2, + crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/crafting_ing/modular/primary/hammer/maul.ron b/assets/common/items/crafting_ing/modular/primary/hammer/maul.ron index 32eeb361e0..81e224b140 100644 --- a/assets/common/items/crafting_ing/modular/primary/hammer/maul.ron +++ b/assets/common/items/crafting_ing/modular/primary/hammer/maul.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Hammer, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.4, + speed: 0.8, + crit_chance: 0.2, range: 1.5, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/hammer/ornate.ron b/assets/common/items/crafting_ing/modular/primary/hammer/ornate.ron index fc86207a7f..eaf1f366ec 100644 --- a/assets/common/items/crafting_ing/modular/primary/hammer/ornate.ron +++ b/assets/common/items/crafting_ing/modular/primary/hammer/ornate.ron @@ -6,12 +6,12 @@ ItemDef( toolkind: Hammer, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.2, + speed: 0.8, + crit_chance: 0.1, range: 1.0, - energy_efficiency: 2.0, + energy_efficiency: 1.5, buff_strength: 0.8, ), hand_restriction: None, diff --git a/assets/common/items/crafting_ing/modular/primary/hammer/spikedmace.ron b/assets/common/items/crafting_ing/modular/primary/hammer/spikedmace.ron index 2e413dfef7..c842be357a 100644 --- a/assets/common/items/crafting_ing/modular/primary/hammer/spikedmace.ron +++ b/assets/common/items/crafting_ing/modular/primary/hammer/spikedmace.ron @@ -6,13 +6,13 @@ ItemDef( toolkind: Hammer, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.15, + speed: 0.8, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, - buff_strength: 2.0, + buff_strength: 1.5, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/crafting_ing/modular/primary/hammer/warhammer.ron b/assets/common/items/crafting_ing/modular/primary/hammer/warhammer.ron index 0bdccb93b8..096c5c2301 100644 --- a/assets/common/items/crafting_ing/modular/primary/hammer/warhammer.ron +++ b/assets/common/items/crafting_ing/modular/primary/hammer/warhammer.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Hammer, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 1.5, - crit_chance: 0.15, + speed: 1.25, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/sceptre/arbor.ron b/assets/common/items/crafting_ing/modular/primary/sceptre/arbor.ron index 2ea6504fa2..ccb6027875 100644 --- a/assets/common/items/crafting_ing/modular/primary/sceptre/arbor.ron +++ b/assets/common/items/crafting_ing/modular/primary/sceptre/arbor.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Sceptre, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.4, + speed: 0.8, + crit_chance: 0.2, range: 1.5, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/sceptre/cane.ron b/assets/common/items/crafting_ing/modular/primary/sceptre/cane.ron index 5a22312783..7e742ca44a 100644 --- a/assets/common/items/crafting_ing/modular/primary/sceptre/cane.ron +++ b/assets/common/items/crafting_ing/modular/primary/sceptre/cane.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Sceptre, stats: ( equip_time_secs: 0.25, - power: 1.5, + power: 1.25, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.15, + speed: 0.8, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/sceptre/crook.ron b/assets/common/items/crafting_ing/modular/primary/sceptre/crook.ron index e939812aa3..6285fba433 100644 --- a/assets/common/items/crafting_ing/modular/primary/sceptre/crook.ron +++ b/assets/common/items/crafting_ing/modular/primary/sceptre/crook.ron @@ -6,13 +6,13 @@ ItemDef( toolkind: Sceptre, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.15, + speed: 0.8, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, - buff_strength: 2.0, + buff_strength: 1.5, ), hand_restriction: Some(Two), weapon_name: Universal("Crook"), diff --git a/assets/common/items/crafting_ing/modular/primary/sceptre/crozier.ron b/assets/common/items/crafting_ing/modular/primary/sceptre/crozier.ron index 725a681215..361f2541cd 100644 --- a/assets/common/items/crafting_ing/modular/primary/sceptre/crozier.ron +++ b/assets/common/items/crafting_ing/modular/primary/sceptre/crozier.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Sceptre, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 1.5, - crit_chance: 0.15, + speed: 1.25, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/sceptre/grandsceptre.ron b/assets/common/items/crafting_ing/modular/primary/sceptre/grandsceptre.ron index f1fb0b01c9..8148d992ad 100644 --- a/assets/common/items/crafting_ing/modular/primary/sceptre/grandsceptre.ron +++ b/assets/common/items/crafting_ing/modular/primary/sceptre/grandsceptre.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Sceptre, stats: ( equip_time_secs: 0.25, - power: 0.9, - effect_power: 2.0, + power: 0.8, + effect_power: 1.5, speed: 0.8, - crit_chance: 0.15, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/sceptre/ornate.ron b/assets/common/items/crafting_ing/modular/primary/sceptre/ornate.ron index 6ee06cf5b1..03b2957a0e 100644 --- a/assets/common/items/crafting_ing/modular/primary/sceptre/ornate.ron +++ b/assets/common/items/crafting_ing/modular/primary/sceptre/ornate.ron @@ -6,12 +6,12 @@ ItemDef( toolkind: Sceptre, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.2, + speed: 0.8, + crit_chance: 0.1, range: 1.0, - energy_efficiency: 2.0, + energy_efficiency: 1.5, buff_strength: 0.8, ), hand_restriction: Some(Two), diff --git a/assets/common/items/crafting_ing/modular/primary/sceptre/sceptre.ron b/assets/common/items/crafting_ing/modular/primary/sceptre/sceptre.ron index d19558a13f..f009746810 100644 --- a/assets/common/items/crafting_ing/modular/primary/sceptre/sceptre.ron +++ b/assets/common/items/crafting_ing/modular/primary/sceptre/sceptre.ron @@ -9,7 +9,7 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.2, + crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/crafting_ing/modular/primary/staff/brand.ron b/assets/common/items/crafting_ing/modular/primary/staff/brand.ron index 3af7288715..fd46199e98 100644 --- a/assets/common/items/crafting_ing/modular/primary/staff/brand.ron +++ b/assets/common/items/crafting_ing/modular/primary/staff/brand.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Staff, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 1.5, - crit_chance: 0.15, + speed: 1.25, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/staff/grandstaff.ron b/assets/common/items/crafting_ing/modular/primary/staff/grandstaff.ron index 84be7f6872..0fe90b72a9 100644 --- a/assets/common/items/crafting_ing/modular/primary/staff/grandstaff.ron +++ b/assets/common/items/crafting_ing/modular/primary/staff/grandstaff.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Staff, stats: ( equip_time_secs: 0.25, - power: 0.9, - effect_power: 2.0, + power: 0.8, + effect_power: 1.5, speed: 0.8, - crit_chance: 0.15, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/staff/longpole.ron b/assets/common/items/crafting_ing/modular/primary/staff/longpole.ron index 3b065810d3..e3ac3d38bf 100644 --- a/assets/common/items/crafting_ing/modular/primary/staff/longpole.ron +++ b/assets/common/items/crafting_ing/modular/primary/staff/longpole.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Staff, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.4, + speed: 0.8, + crit_chance: 0.2, range: 1.5, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/staff/ornate.ron b/assets/common/items/crafting_ing/modular/primary/staff/ornate.ron index 0eebad5990..2368aacbf0 100644 --- a/assets/common/items/crafting_ing/modular/primary/staff/ornate.ron +++ b/assets/common/items/crafting_ing/modular/primary/staff/ornate.ron @@ -6,12 +6,12 @@ ItemDef( toolkind: Staff, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.2, + speed: 0.8, + crit_chance: 0.1, range: 1.0, - energy_efficiency: 2.0, + energy_efficiency: 1.5, buff_strength: 0.8, ), hand_restriction: Some(Two), diff --git a/assets/common/items/crafting_ing/modular/primary/staff/pole.ron b/assets/common/items/crafting_ing/modular/primary/staff/pole.ron index 4b2ab9d1cb..7febaaee49 100644 --- a/assets/common/items/crafting_ing/modular/primary/staff/pole.ron +++ b/assets/common/items/crafting_ing/modular/primary/staff/pole.ron @@ -6,13 +6,13 @@ ItemDef( toolkind: Staff, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.15, + speed: 0.8, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, - buff_strength: 2.0, + buff_strength: 1.5, ), hand_restriction: Some(Two), weapon_name: Universal("Pole"), diff --git a/assets/common/items/crafting_ing/modular/primary/staff/rod.ron b/assets/common/items/crafting_ing/modular/primary/staff/rod.ron index 68730c8466..16c6e5935c 100644 --- a/assets/common/items/crafting_ing/modular/primary/staff/rod.ron +++ b/assets/common/items/crafting_ing/modular/primary/staff/rod.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Staff, stats: ( equip_time_secs: 0.25, - power: 1.5, + power: 1.25, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.15, + speed: 0.8, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/staff/staff.ron b/assets/common/items/crafting_ing/modular/primary/staff/staff.ron index 86020ee113..9addf0b8dd 100644 --- a/assets/common/items/crafting_ing/modular/primary/staff/staff.ron +++ b/assets/common/items/crafting_ing/modular/primary/staff/staff.ron @@ -9,7 +9,7 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.2, + crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/crafting_ing/modular/primary/sword/greatsword.ron b/assets/common/items/crafting_ing/modular/primary/sword/greatsword.ron index 62fd108011..d4e20f5654 100644 --- a/assets/common/items/crafting_ing/modular/primary/sword/greatsword.ron +++ b/assets/common/items/crafting_ing/modular/primary/sword/greatsword.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Sword, stats: ( equip_time_secs: 0.25, - power: 0.9, - effect_power: 2.0, + power: 0.8, + effect_power: 1.5, speed: 0.8, - crit_chance: 0.15, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/sword/katana.ron b/assets/common/items/crafting_ing/modular/primary/sword/katana.ron index d9e18ebf9c..794bbb625e 100644 --- a/assets/common/items/crafting_ing/modular/primary/sword/katana.ron +++ b/assets/common/items/crafting_ing/modular/primary/sword/katana.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Sword, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 1.5, - crit_chance: 0.15, + speed: 1.25, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/sword/longsword.ron b/assets/common/items/crafting_ing/modular/primary/sword/longsword.ron index ccbb8cf3ec..8d653fab3c 100644 --- a/assets/common/items/crafting_ing/modular/primary/sword/longsword.ron +++ b/assets/common/items/crafting_ing/modular/primary/sword/longsword.ron @@ -9,7 +9,7 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.2, + crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/crafting_ing/modular/primary/sword/ornate.ron b/assets/common/items/crafting_ing/modular/primary/sword/ornate.ron index f19224e4b3..2ec79684d3 100644 --- a/assets/common/items/crafting_ing/modular/primary/sword/ornate.ron +++ b/assets/common/items/crafting_ing/modular/primary/sword/ornate.ron @@ -6,12 +6,12 @@ ItemDef( toolkind: Sword, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.2, + speed: 0.8, + crit_chance: 0.1, range: 1.0, - energy_efficiency: 2.0, + energy_efficiency: 1.5, buff_strength: 0.8, ), hand_restriction: None, diff --git a/assets/common/items/crafting_ing/modular/primary/sword/sabre.ron b/assets/common/items/crafting_ing/modular/primary/sword/sabre.ron index 09db81adb5..e6ba10bdd9 100644 --- a/assets/common/items/crafting_ing/modular/primary/sword/sabre.ron +++ b/assets/common/items/crafting_ing/modular/primary/sword/sabre.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Sword, stats: ( equip_time_secs: 0.25, - power: 1.5, + power: 1.25, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.15, + speed: 0.8, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/primary/sword/sawblade.ron b/assets/common/items/crafting_ing/modular/primary/sword/sawblade.ron index 1cecea662c..7a5e4dae29 100644 --- a/assets/common/items/crafting_ing/modular/primary/sword/sawblade.ron +++ b/assets/common/items/crafting_ing/modular/primary/sword/sawblade.ron @@ -6,13 +6,13 @@ ItemDef( toolkind: Sword, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.15, + speed: 0.8, + crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, - buff_strength: 2.0, + buff_strength: 1.5, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/crafting_ing/modular/primary/sword/zweihander.ron b/assets/common/items/crafting_ing/modular/primary/sword/zweihander.ron index bb9d8a9e2e..364a937ba2 100644 --- a/assets/common/items/crafting_ing/modular/primary/sword/zweihander.ron +++ b/assets/common/items/crafting_ing/modular/primary/sword/zweihander.ron @@ -6,10 +6,10 @@ ItemDef( toolkind: Sword, stats: ( equip_time_secs: 0.25, - power: 0.9, + power: 0.8, effect_power: 0.8, - speed: 0.9, - crit_chance: 0.4, + speed: 0.8, + crit_chance: 0.2, range: 1.5, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/crafting_ing/modular/secondary/bow/large.ron b/assets/common/items/crafting_ing/modular/secondary/bow/long.ron similarity index 94% rename from assets/common/items/crafting_ing/modular/secondary/bow/large.ron rename to assets/common/items/crafting_ing/modular/secondary/bow/long.ron index 7cd5df65fb..dd2b51cfda 100644 --- a/assets/common/items/crafting_ing/modular/secondary/bow/large.ron +++ b/assets/common/items/crafting_ing/modular/secondary/bow/long.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Large Bow Grip", + name: "Long Bow Grip", description: "", kind: ModularComponent( ToolSecondaryComponent( diff --git a/assets/common/items/crafting_ing/modular/secondary/bow/small.ron b/assets/common/items/crafting_ing/modular/secondary/bow/short.ron similarity index 94% rename from assets/common/items/crafting_ing/modular/secondary/bow/small.ron rename to assets/common/items/crafting_ing/modular/secondary/bow/short.ron index 7ebdda8315..e52dc423fa 100644 --- a/assets/common/items/crafting_ing/modular/secondary/bow/small.ron +++ b/assets/common/items/crafting_ing/modular/secondary/bow/short.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Small Bow Grip", + name: "Short Bow Grip", description: "", kind: ModularComponent( ToolSecondaryComponent( diff --git a/assets/common/items/crafting_ing/modular/secondary/sceptre/large.ron b/assets/common/items/crafting_ing/modular/secondary/sceptre/heavy.ron similarity index 94% rename from assets/common/items/crafting_ing/modular/secondary/sceptre/large.ron rename to assets/common/items/crafting_ing/modular/secondary/sceptre/heavy.ron index 350dfcd5e2..593f83c882 100644 --- a/assets/common/items/crafting_ing/modular/secondary/sceptre/large.ron +++ b/assets/common/items/crafting_ing/modular/secondary/sceptre/heavy.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Large Nature Core", + name: "Heavy Biocore", description: "", kind: ModularComponent( ToolSecondaryComponent( diff --git a/assets/common/items/crafting_ing/modular/secondary/sceptre/small.ron b/assets/common/items/crafting_ing/modular/secondary/sceptre/light.ron similarity index 94% rename from assets/common/items/crafting_ing/modular/secondary/sceptre/small.ron rename to assets/common/items/crafting_ing/modular/secondary/sceptre/light.ron index a862220d0c..6241b94754 100644 --- a/assets/common/items/crafting_ing/modular/secondary/sceptre/small.ron +++ b/assets/common/items/crafting_ing/modular/secondary/sceptre/light.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Small Nature Core", + name: "Light Biocore", description: "", kind: ModularComponent( ToolSecondaryComponent( diff --git a/assets/common/items/crafting_ing/modular/secondary/sceptre/medium.ron b/assets/common/items/crafting_ing/modular/secondary/sceptre/medium.ron index 123da60d9d..103a5a971b 100644 --- a/assets/common/items/crafting_ing/modular/secondary/sceptre/medium.ron +++ b/assets/common/items/crafting_ing/modular/secondary/sceptre/medium.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Medium Nature Core", + name: "Biocore", description: "", kind: ModularComponent( ToolSecondaryComponent( diff --git a/assets/common/items/crafting_ing/modular/secondary/staff/large.ron b/assets/common/items/crafting_ing/modular/secondary/staff/heavy.ron similarity index 94% rename from assets/common/items/crafting_ing/modular/secondary/staff/large.ron rename to assets/common/items/crafting_ing/modular/secondary/staff/heavy.ron index 0e4dfdd5c5..4f2c2ed207 100644 --- a/assets/common/items/crafting_ing/modular/secondary/staff/large.ron +++ b/assets/common/items/crafting_ing/modular/secondary/staff/heavy.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Large Fire Core", + name: "Heavy Pyrocore", description: "", kind: ModularComponent( ToolSecondaryComponent( diff --git a/assets/common/items/crafting_ing/modular/secondary/staff/small.ron b/assets/common/items/crafting_ing/modular/secondary/staff/light.ron similarity index 94% rename from assets/common/items/crafting_ing/modular/secondary/staff/small.ron rename to assets/common/items/crafting_ing/modular/secondary/staff/light.ron index 6f154a801a..1495d0d0c4 100644 --- a/assets/common/items/crafting_ing/modular/secondary/staff/small.ron +++ b/assets/common/items/crafting_ing/modular/secondary/staff/light.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Small Fire Core", + name: "Light Pyrocore", description: "", kind: ModularComponent( ToolSecondaryComponent( diff --git a/assets/common/items/crafting_ing/modular/secondary/staff/medium.ron b/assets/common/items/crafting_ing/modular/secondary/staff/medium.ron index 3a2505deff..c66f8e8ec0 100644 --- a/assets/common/items/crafting_ing/modular/secondary/staff/medium.ron +++ b/assets/common/items/crafting_ing/modular/secondary/staff/medium.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Medium Fire Core", + name: "Pyrocore", description: "", kind: ModularComponent( ToolSecondaryComponent( diff --git a/assets/common/items/crafting_ing/modular/secondary/sword/two-handed.ron b/assets/common/items/crafting_ing/modular/secondary/sword/long.ron similarity index 93% rename from assets/common/items/crafting_ing/modular/secondary/sword/two-handed.ron rename to assets/common/items/crafting_ing/modular/secondary/sword/long.ron index 6155073bba..eaaaba67e5 100644 --- a/assets/common/items/crafting_ing/modular/secondary/sword/two-handed.ron +++ b/assets/common/items/crafting_ing/modular/secondary/sword/long.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Two-Handed Sword Hilt", + name: "Long Sword Hilt", description: "", kind: ModularComponent( ToolSecondaryComponent( diff --git a/assets/common/items/crafting_ing/modular/secondary/sword/hand-and-half.ron b/assets/common/items/crafting_ing/modular/secondary/sword/medium.ron similarity index 92% rename from assets/common/items/crafting_ing/modular/secondary/sword/hand-and-half.ron rename to assets/common/items/crafting_ing/modular/secondary/sword/medium.ron index 28793ddb16..5c61b1a53d 100644 --- a/assets/common/items/crafting_ing/modular/secondary/sword/hand-and-half.ron +++ b/assets/common/items/crafting_ing/modular/secondary/sword/medium.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Hand-and-a-Half Sword Hilt", + name: "Medium Sword Hilt", description: "", kind: ModularComponent( ToolSecondaryComponent( diff --git a/assets/common/items/crafting_ing/modular/secondary/sword/one-handed.ron b/assets/common/items/crafting_ing/modular/secondary/sword/short.ron similarity index 93% rename from assets/common/items/crafting_ing/modular/secondary/sword/one-handed.ron rename to assets/common/items/crafting_ing/modular/secondary/sword/short.ron index 2db087472a..ab6e7be3cb 100644 --- a/assets/common/items/crafting_ing/modular/secondary/sword/one-handed.ron +++ b/assets/common/items/crafting_ing/modular/secondary/sword/short.ron @@ -1,5 +1,5 @@ ItemDef( - name: "One-Handed Sword Hilt", + name: "Short Sword Hilt", description: "", kind: ModularComponent( ToolSecondaryComponent( diff --git a/assets/common/items/log/eldwood.ron b/assets/common/items/log/eldwood.ron index 1c688bf32c..e2d049eb4d 100644 --- a/assets/common/items/log/eldwood.ron +++ b/assets/common/items/log/eldwood.ron @@ -5,6 +5,6 @@ ItemDef( kind: "EldwoodLogs", descriptor: "Eldwood", ), - quality: Common, + quality: Legendary, tags: [MaterialKind(Wood), Material(Eldwood)], ) \ No newline at end of file diff --git a/assets/common/items/log/frostwood.ron b/assets/common/items/log/frostwood.ron index 4632930596..a68f113681 100644 --- a/assets/common/items/log/frostwood.ron +++ b/assets/common/items/log/frostwood.ron @@ -5,6 +5,6 @@ ItemDef( kind: "FrostwoodLogs", descriptor: "Frostwood", ), - quality: Common, + quality: Epic, tags: [MaterialKind(Wood), Material(Frostwood)], ) \ No newline at end of file diff --git a/assets/common/items/log/hardwood.ron b/assets/common/items/log/hardwood.ron index e565c3a0ad..b3e4896b75 100644 --- a/assets/common/items/log/hardwood.ron +++ b/assets/common/items/log/hardwood.ron @@ -5,6 +5,6 @@ ItemDef( kind: "HardwoodLogs", descriptor: "Hardwood", ), - quality: Common, + quality: Moderate, tags: [MaterialKind(Wood), Material(Hardwood)], ) \ No newline at end of file diff --git a/assets/common/items/log/wood.ron b/assets/common/items/log/wood.ron index 28c0756f30..25e49e4210 100644 --- a/assets/common/items/log/wood.ron +++ b/assets/common/items/log/wood.ron @@ -5,6 +5,6 @@ ItemDef( kind: "WoodLogs", descriptor: "Wooden", ), - quality: Common, + quality: Low, tags: [MaterialKind(Wood), Material(Wood)], ) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/parashu.ron b/assets/common/items/weapons/axe/parashu.ron index 99926b12f5..6222b81798 100644 --- a/assets/common/items/weapons/axe/parashu.ron +++ b/assets/common/items/weapons/axe/parashu.ron @@ -5,10 +5,10 @@ ItemDef( kind: Axe, hands: Two, stats: ( - equip_time_secs: 0.4, - power: 2.5, + equip_time_secs: 0.3, + power: 4.0, effect_power: 1.0, - speed: 0.8, + speed: 0.6, crit_chance: 0.2, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/weapons/bow/sagitta.ron b/assets/common/items/weapons/bow/sagitta.ron index ee5a535e99..ab1f824722 100644 --- a/assets/common/items/weapons/bow/sagitta.ron +++ b/assets/common/items/weapons/bow/sagitta.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.4, - power: 2.5, - effect_power: 0.8, - speed: 0.8, + power: 4.0, + effect_power: 1.0, + speed: 0.6, crit_chance: 0.2, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index ae7f6e3386..935f096488 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.5, - power: 2.5, + power: 4.0, effect_power: 1.0, - speed: 0.8, + speed: 0.6, crit_chance: 0.2, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/weapons/sceptre/caduceus.ron b/assets/common/items/weapons/sceptre/caduceus.ron index f62b95e1c7..53b22ecd83 100644 --- a/assets/common/items/weapons/sceptre/caduceus.ron +++ b/assets/common/items/weapons/sceptre/caduceus.ron @@ -6,10 +6,10 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.4, - power: 1.67, - effect_power: 1.5, - speed: 1.2, - crit_chance: 0.1, + power: 4.0, + effect_power: 1.0, + speed: 0.6, + crit_chance: 0.2, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron index bc71d416d6..d58af7a7de 100644 --- a/assets/common/items/weapons/sceptre/root_evil.ron +++ b/assets/common/items/weapons/sceptre/root_evil.ron @@ -6,16 +6,16 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.4, - power: 2.5, + power: 2.0, effect_power: 1.0, - speed: 0.8, - crit_chance: 0.2, + speed: 1.0, + crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, ), )), - quality: Legendary, + quality: Epic, tags: [], ability_spec: None, ) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/laevateinn.ron b/assets/common/items/weapons/staff/laevateinn.ron index 225354f9fb..6fbabd180f 100644 --- a/assets/common/items/weapons/staff/laevateinn.ron +++ b/assets/common/items/weapons/staff/laevateinn.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.6, - power: 2.5, + power: 4.0, effect_power: 1.0, - speed: 0.8, + speed: 0.6, crit_chance: 0.2, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron index 6b04ff59e3..219dcc6c36 100644 --- a/assets/common/items/weapons/sword/caladbolg.ron +++ b/assets/common/items/weapons/sword/caladbolg.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.3, - power: 2.5, + power: 4.0, effect_power: 1.0, - speed: 0.8, + speed: 0.6, crit_chance: 0.2, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/loot_tables/cave_large.ron b/assets/common/loot_tables/cave_large.ron index e831d6b429..bd2f01ef6e 100644 --- a/assets/common/loot_tables/cave_large.ron +++ b/assets/common/loot_tables/cave_large.ron @@ -15,8 +15,8 @@ // Lantern (0.1, Item("common.items.lantern.geode_purp")), // Weapons - (2.0, LootTable("common.loot_tables.weapons.tier-3")), - (1.5, LootTable("common.loot_tables.weapons.tier-4")), - (1.0, LootTable("common.loot_tables.weapons.tier-5")), + (2.0, LootTable("common.loot_tables.weapons.components.tier-3")), + (1.5, LootTable("common.loot_tables.weapons.components.tier-4")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-5")), (0.05, LootTable("common.loot_tables.weapons.cave")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/biped_large/troll.ron b/assets/common/loot_tables/creature/biped_large/troll.ron index a5a670a39f..d7a91ec43a 100644 --- a/assets/common/loot_tables/creature/biped_large/troll.ron +++ b/assets/common/loot_tables/creature/biped_large/troll.ron @@ -1,6 +1,6 @@ [ (1.0, LootTable("common.loot_tables.food.prepared")), (1.0, LootTable("common.loot_tables.cave_large")), - (1.0, LootTable("common.loot_tables.weapons.tier-2")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-2")), (5.0, Item("common.items.crafting_ing.hide.leather_troll")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/biped_large/wendigo.ron b/assets/common/loot_tables/creature/biped_large/wendigo.ron index aa83360486..e39133663d 100644 --- a/assets/common/loot_tables/creature/biped_large/wendigo.ron +++ b/assets/common/loot_tables/creature/biped_large/wendigo.ron @@ -1,6 +1,6 @@ [ (1.0, LootTable("common.loot_tables.food.prepared")), (1.0, Item("common.items.crafting_ing.animal_misc.icy_fang")), - (1.0, LootTable("common.loot_tables.weapons.tier-2")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-2")), (4.0, LootTable("common.loot_tables.cave_large")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/dragon.ron b/assets/common/loot_tables/creature/dragon.ron index 674c7b3822..fb89d822a4 100644 --- a/assets/common/loot_tables/creature/dragon.ron +++ b/assets/common/loot_tables/creature/dragon.ron @@ -1,3 +1,3 @@ [ - (1.0, LootTable("common.loot_tables.weapons.tier-5")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-5")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/golem.ron b/assets/common/loot_tables/creature/golem.ron index a20e4a076c..88cac8d727 100644 --- a/assets/common/loot_tables/creature/golem.ron +++ b/assets/common/loot_tables/creature/golem.ron @@ -1,6 +1,6 @@ [ (1.0, LootTable("common.loot_tables.food.prepared")), - (1.0, LootTable("common.loot_tables.weapons.tier-1")), - (1.0, LootTable("common.loot_tables.weapons.tier-2")), - (1.0, LootTable("common.loot_tables.weapons.tier-3")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-1")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-2")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-3")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/humanoid.ron b/assets/common/loot_tables/creature/humanoid.ron index c8f0885a94..59486f5698 100644 --- a/assets/common/loot_tables/creature/humanoid.ron +++ b/assets/common/loot_tables/creature/humanoid.ron @@ -16,5 +16,5 @@ (0.25, LootTable("common.loot_tables.food.prepared")), // Weapons (1.0, LootTable("common.loot_tables.weapons.starter")), - (1.0, LootTable("common.loot_tables.weapons.tier-0")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-0")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/deadwood.ron b/assets/common/loot_tables/creature/quad_low/deadwood.ron index 718cb96b97..3ae06fcc0b 100644 --- a/assets/common/loot_tables/creature/quad_low/deadwood.ron +++ b/assets/common/loot_tables/creature/quad_low/deadwood.ron @@ -1,5 +1,6 @@ [ - (9.0, Item("common.items.crafting_ing.animal_misc.lively_vine")), - (9.0, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), + (12.0, Item("common.items.log.wood")), + (12.0, Item("common.items.flowers.plant_fiber")), + (5.0, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), (1.0, Item("common.items.armor.misc.head.bamboo_twig")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron index b19cde34a4..e5819298be 100644 --- a/assets/common/loot_tables/dungeon/tier-0/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron @@ -1,6 +1,6 @@ [ // Gear - (1.0, LootTable("common.loot_tables.weapons.tier-0")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-0")), (1.0, LootTable("common.loot_tables.armor.tier-0")), // Currency (3.0, ItemQuantity("common.items.utility.coins", 10, 20)), diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron index 73815f2e96..bfb943eb9b 100644 --- a/assets/common/loot_tables/dungeon/tier-1/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron @@ -1,6 +1,6 @@ [ // Gear - (1.0, LootTable("common.loot_tables.weapons.tier-1")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-1")), (1.0, LootTable("common.loot_tables.armor.tier-1")), (0.5, Item("common.items.armor.misc.head.hog_hood")), // Currency diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron index 339854f8be..d0215cd694 100644 --- a/assets/common/loot_tables/dungeon/tier-2/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron @@ -1,6 +1,6 @@ [ // Gear - (1.0, LootTable("common.loot_tables.weapons.tier-2")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-2")), (1.0, LootTable("common.loot_tables.armor.tier-2")), // Currency (3.0, ItemQuantity("common.items.utility.coins", 50, 100)), diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron index 2422b42d67..a644f1b905 100644 --- a/assets/common/loot_tables/dungeon/tier-3/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron @@ -1,6 +1,6 @@ [ // Gear - (1.0, LootTable("common.loot_tables.weapons.tier-3")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-3")), (1.0, LootTable("common.loot_tables.armor.tier-3")), // Currency (3.0, ItemQuantity("common.items.utility.coins", 100, 200)), diff --git a/assets/common/loot_tables/dungeon/tier-4/chest.ron b/assets/common/loot_tables/dungeon/tier-4/chest.ron index f58bb7cfc0..48598fc661 100644 --- a/assets/common/loot_tables/dungeon/tier-4/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-4/chest.ron @@ -1,6 +1,6 @@ [ // Gear - (1.0, LootTable("common.loot_tables.weapons.tier-4")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-4")), (1.0, LootTable("common.loot_tables.armor.tier-4")), (1.0, Item("common.items.armor.misc.head.spikeguard")), // Currency diff --git a/assets/common/loot_tables/dungeon/tier-5/chest.ron b/assets/common/loot_tables/dungeon/tier-5/chest.ron index 05f2563553..47beb33b7d 100644 --- a/assets/common/loot_tables/dungeon/tier-5/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-5/chest.ron @@ -1,6 +1,6 @@ [ // Gear - (1.0, LootTable("common.loot_tables.weapons.tier-4")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-4")), (1.0, LootTable("common.loot_tables.armor.tier-4")), (0.1, Item("common.items.armor.cultist.bandana")), // Currency diff --git a/assets/common/loot_tables/spots/witch.ron b/assets/common/loot_tables/spots/witch.ron index 549f1346bf..aae625fd9d 100644 --- a/assets/common/loot_tables/spots/witch.ron +++ b/assets/common/loot_tables/spots/witch.ron @@ -1,9 +1,9 @@ -[ +[ (0.004, Item("common.items.lantern.pumpkin")), - (2.0, LootTable("common.loot_tables.materials.common")), - (0.1, Item("common.items.armor.misc.ring.gold")), - (1.0, LootTable("common.loot_tables.weapons.tier-3")), - (0.1, LootTable("common.loot_tables.weapons.tier-4")), + (2.0, LootTable("common.loot_tables.materials.common")), + (0.1, Item("common.items.armor.misc.ring.gold")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-3")), + (0.1, LootTable("common.loot_tables.weapons.components.tier-4")), (1.5, LootTable("common.loot_tables.food.prepared")), (0.05, Item("common.items.armor.witch.hat")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/chest-buried.ron b/assets/common/loot_tables/sprite/chest-buried.ron index 91979faf46..d5b7a55c25 100644 --- a/assets/common/loot_tables/sprite/chest-buried.ron +++ b/assets/common/loot_tables/sprite/chest-buried.ron @@ -1,4 +1,4 @@ [ - (1.0, LootTable("common.loot_tables.weapons.tier-1")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-1")), (1.0, LootTable("common.loot_tables.armor.cloth")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/chest.ron b/assets/common/loot_tables/sprite/chest.ron index 3fadca566d..f44e90a59f 100644 --- a/assets/common/loot_tables/sprite/chest.ron +++ b/assets/common/loot_tables/sprite/chest.ron @@ -1,5 +1,5 @@ [ - (1.0, LootTable("common.loot_tables.weapons.tier-0")), - (1.0, LootTable("common.loot_tables.weapons.tier-1")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-0")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-1")), (1.0, LootTable("common.loot_tables.armor.cloth")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/mud.ron b/assets/common/loot_tables/sprite/mud.ron index 73389a2671..579801bb30 100644 --- a/assets/common/loot_tables/sprite/mud.ron +++ b/assets/common/loot_tables/sprite/mud.ron @@ -1,5 +1,5 @@ [ (1.0, LootTable("common.loot_tables.materials.common")), - (1.0, LootTable("common.loot_tables.weapons.tier-0")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-0")), (1.0, LootTable("common.loot_tables.materials.underground")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/components/tier-0.ron b/assets/common/loot_tables/weapons/components/tier-0.ron new file mode 100644 index 0000000000..3ab12f691c --- /dev/null +++ b/assets/common/loot_tables/weapons/components/tier-0.ron @@ -0,0 +1,8 @@ +[ + (1.0, ModularWeaponPrimaryComponent(tool: Sword, material: Bronze, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Axe, material: Bronze, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Hammer, material: Bronze, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Bow, material: Wood, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Staff, material: Wood, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Sceptre, material: Wood, hands: None)), +] diff --git a/assets/common/loot_tables/weapons/components/tier-1.ron b/assets/common/loot_tables/weapons/components/tier-1.ron new file mode 100644 index 0000000000..c76ef34546 --- /dev/null +++ b/assets/common/loot_tables/weapons/components/tier-1.ron @@ -0,0 +1,8 @@ +[ + (1.0, ModularWeaponPrimaryComponent(tool: Sword, material: Iron, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Axe, material: Iron, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Hammer, material: Iron, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Bow, material: Bamboo, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Staff, material: Bamboo, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Sceptre, material: Bamboo, hands: None)), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/components/tier-2.ron b/assets/common/loot_tables/weapons/components/tier-2.ron new file mode 100644 index 0000000000..46ed03f1ad --- /dev/null +++ b/assets/common/loot_tables/weapons/components/tier-2.ron @@ -0,0 +1,8 @@ +[ + (1.0, ModularWeaponPrimaryComponent(tool: Sword, material: Steel, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Axe, material: Steel, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Hammer, material: Steel, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Bow, material: Hardwood, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Staff, material: Hardwood, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Sceptre, material: Hardwood, hands: None)), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/components/tier-3.ron b/assets/common/loot_tables/weapons/components/tier-3.ron new file mode 100644 index 0000000000..e2369a2766 --- /dev/null +++ b/assets/common/loot_tables/weapons/components/tier-3.ron @@ -0,0 +1,8 @@ +[ + (1.0, ModularWeaponPrimaryComponent(tool: Sword, material: Cobalt, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Axe, material: Cobalt, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Hammer, material: Cobalt, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Bow, material: Ironwood, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Staff, material: Ironwood, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Sceptre, material: Ironwood, hands: None)), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/components/tier-4.ron b/assets/common/loot_tables/weapons/components/tier-4.ron new file mode 100644 index 0000000000..e655284e0b --- /dev/null +++ b/assets/common/loot_tables/weapons/components/tier-4.ron @@ -0,0 +1,8 @@ +[ + (1.0, ModularWeaponPrimaryComponent(tool: Sword, material: Bloodsteel, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Axe, material: Bloodsteel, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Hammer, material: Bloodsteel, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Bow, material: Frostwood, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Staff, material: Frostwood, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Sceptre, material: Frostwood, hands: None)), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/components/tier-5.ron b/assets/common/loot_tables/weapons/components/tier-5.ron new file mode 100644 index 0000000000..c477cf33db --- /dev/null +++ b/assets/common/loot_tables/weapons/components/tier-5.ron @@ -0,0 +1,8 @@ +[ + (1.0, ModularWeaponPrimaryComponent(tool: Sword, material: Orichalcum, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Axe, material: Orichalcum, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Hammer, material: Orichalcum, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Bow, material: Eldwood, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Staff, material: Eldwood, hands: None)), + (1.0, ModularWeaponPrimaryComponent(tool: Sceptre, material: Eldwood, hands: None)), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/cultist.ron b/assets/common/loot_tables/weapons/cultist.ron index dbb9d9b2bd..5ad8302fa1 100644 --- a/assets/common/loot_tables/weapons/cultist.ron +++ b/assets/common/loot_tables/weapons/cultist.ron @@ -2,4 +2,5 @@ (1.0, Item("common.items.weapons.sword.cultist")), (1.0, Item("common.items.weapons.hammer.cultist_purp_2h-0")), (1.0, Item("common.items.weapons.staff.cultist_staff")), + (1.0, Item("common.items.weapons.sceptre.root_evil")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/legendary_ranged.ron b/assets/common/loot_tables/weapons/legendary_ranged.ron index 0494383721..9c66464911 100644 --- a/assets/common/loot_tables/weapons/legendary_ranged.ron +++ b/assets/common/loot_tables/weapons/legendary_ranged.ron @@ -1,6 +1,5 @@ [ (1.0, Item("common.items.weapons.bow.sagitta")), (1.0, Item("common.items.weapons.staff.laevateinn")), - (0.5, Item("common.items.weapons.sceptre.root_evil")), - (0.5, Item("common.items.weapons.sceptre.caduceus")), + (1.0, Item("common.items.weapons.sceptre.caduceus")), ] \ No newline at end of file diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index edc9f85aa8..fae6d408e1 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -2,10 +2,10 @@ "crafting_hammer": ( output: ("common.items.tool.craftsman_hammer", 1), inputs: [ - (Item("common.items.crafting_ing.twigs"), 6, false), - (Item("common.items.crafting_ing.stones"), 6, false), + (Item("common.items.crafting_ing.twigs"), 3, false), + (Item("common.items.crafting_ing.stones"), 3, false), ], - craft_sprite: Some(Anvil), + craft_sprite: None, ), "mortar_pestle": ( output: ("common.items.crafting_tools.mortar_pestle", 1), @@ -1881,8 +1881,8 @@ craft_sprite: Some(CraftingBench), ), /// MODULAR WEAPONS/SWORDS/SECONDARY COMPONENTS - "one-handed hilt": ( - output: ("common.items.crafting_ing.modular.secondary.sword.one-handed", 1), + "short hilt": ( + output: ("common.items.crafting_ing.modular.secondary.sword.short", 1), inputs: [ (Item("common.items.log.wood"), 1, false), (Item("common.items.crafting_ing.leather.leather_strips"), 1, false), @@ -1890,8 +1890,8 @@ craft_sprite: Some(CraftingBench), is_recycling: false, ), - "two-handed hilt": ( - output: ("common.items.crafting_ing.modular.secondary.sword.two-handed", 1), + "medium hilt": ( + output: ("common.items.crafting_ing.modular.secondary.sword.medium", 1), inputs: [ (Item("common.items.log.wood"), 1, false), (Item("common.items.crafting_ing.leather.leather_strips"), 1, false), @@ -1899,8 +1899,8 @@ craft_sprite: Some(CraftingBench), is_recycling: false, ), - "hand-and-a-half hilt": ( - output: ("common.items.crafting_ing.modular.secondary.sword.hand-and-half", 1), + "long hilt": ( + output: ("common.items.crafting_ing.modular.secondary.sword.long", 1), inputs: [ (Item("common.items.log.wood"), 1, false), (Item("common.items.crafting_ing.leather.leather_strips"), 1, false), @@ -1968,33 +1968,33 @@ "medium bow grip": ( output: ("common.items.crafting_ing.modular.secondary.bow.medium", 1), inputs: [ - (Item("common.items.log.wood"), 1, false), - (Item("common.items.crafting_ing.leather.leather_strips"), 1, false), + (Item("common.items.flowers.plant_fiber"), 3, false), + (Item("common.items.crafting_ing.leather.leather_strips"), 2, false), ], craft_sprite: Some(CraftingBench), is_recycling: false, ), - "small bow grip": ( - output: ("common.items.crafting_ing.modular.secondary.bow.small", 1), + "short bow grip": ( + output: ("common.items.crafting_ing.modular.secondary.bow.short", 1), inputs: [ - (Item("common.items.log.wood"), 1, false), - (Item("common.items.crafting_ing.leather.leather_strips"), 1, false), + (Item("common.items.flowers.plant_fiber"), 3, false), + (Item("common.items.crafting_ing.leather.leather_strips"), 2, false), ], craft_sprite: Some(CraftingBench), is_recycling: false, ), - "large bow grip": ( - output: ("common.items.crafting_ing.modular.secondary.bow.large", 1), + "long bow grip": ( + output: ("common.items.crafting_ing.modular.secondary.bow.long", 1), inputs: [ - (Item("common.items.log.wood"), 1, false), - (Item("common.items.crafting_ing.leather.leather_strips"), 1, false), + (Item("common.items.flowers.plant_fiber"), 3, false), + (Item("common.items.crafting_ing.leather.leather_strips"), 2, false), ], craft_sprite: Some(CraftingBench), is_recycling: false, ), /// MODULAR WEAPONS/FIRE STAFFS/SECONDARY COMPONENTS - "large fire core": ( - output: ("common.items.crafting_ing.modular.secondary.staff.large", 1), + "heavy pyrocore": ( + output: ("common.items.crafting_ing.modular.secondary.staff.heavy", 1), inputs: [ (Item("common.items.mineral.gem.ruby"), 1, false), (Item("common.items.mineral.ore.veloritefrag"), 3, false), @@ -2002,7 +2002,7 @@ craft_sprite: Some(CraftingBench), is_recycling: false, ), - "medium fire core": ( + "pyrocore": ( output: ("common.items.crafting_ing.modular.secondary.staff.medium", 1), inputs: [ (Item("common.items.mineral.gem.ruby"), 1, false), @@ -2011,8 +2011,8 @@ craft_sprite: Some(CraftingBench), is_recycling: false, ), - "small fire core": ( - output: ("common.items.crafting_ing.modular.secondary.staff.small", 1), + "light pyrocore": ( + output: ("common.items.crafting_ing.modular.secondary.staff.light", 1), inputs: [ (Item("common.items.mineral.gem.ruby"), 1, false), (Item("common.items.mineral.ore.veloritefrag"), 3, false), @@ -2021,8 +2021,8 @@ is_recycling: false, ), /// MODULAR WEAPONS/NATURE SCEPTRES/SECONDARY COMPONENTS - "large nature core": ( - output: ("common.items.crafting_ing.modular.secondary.sceptre.large", 1), + "heavy biocore": ( + output: ("common.items.crafting_ing.modular.secondary.sceptre.heavy", 1), inputs: [ (Item("common.items.mineral.gem.emerald"), 1, false), (Item("common.items.mineral.ore.veloritefrag"), 3, false), @@ -2030,7 +2030,7 @@ craft_sprite: Some(CraftingBench), is_recycling: false, ), - "medium nature core": ( + "biocore": ( output: ("common.items.crafting_ing.modular.secondary.sceptre.medium", 1), inputs: [ (Item("common.items.mineral.gem.emerald"), 1, false), @@ -2039,8 +2039,8 @@ craft_sprite: Some(CraftingBench), is_recycling: false, ), - "small nature core": ( - output: ("common.items.crafting_ing.modular.secondary.sceptre.small", 1), + "light biocore": ( + output: ("common.items.crafting_ing.modular.secondary.sceptre.light", 1), inputs: [ (Item("common.items.mineral.gem.emerald"), 1, false), (Item("common.items.mineral.ore.veloritefrag"), 3, false), diff --git a/assets/common/trading/sellable_materials.ron b/assets/common/trading/sellable_materials.ron index 0736ccaaf9..e0cd359683 100644 --- a/assets/common/trading/sellable_materials.ron +++ b/assets/common/trading/sellable_materials.ron @@ -24,6 +24,10 @@ (2.5, Item("common.items.mineral.ore.iron")), (2.5, Item("common.items.mineral.ore.tin")), + // Logs + (5.0, Item("common.items.log.wood")), + (2.5, Item("common.items.log.bamboo")), + // Animal Hide (2.5, Item("common.items.crafting_ing.hide.tough_hide")), (4.0, Item("common.items.crafting_ing.hide.animal_hide")), diff --git a/assets/common/trading/unsellable_materials.ron b/assets/common/trading/unsellable_materials.ron index 5c333cc8b2..c3b774d288 100644 --- a/assets/common/trading/unsellable_materials.ron +++ b/assets/common/trading/unsellable_materials.ron @@ -13,6 +13,12 @@ (0.2, Item("common.items.mineral.ore.cobalt")), (0.25, Item("common.items.mineral.ore.coal")), + // High tier woods + (0.05, Item("common.items.log.eldwood")), + (0.1, Item("common.items.log.frostwood")), + (0.2, Item("common.items.log.ironwood")), + (0.5, Item("common.items.log.hardwood")), + // High tier Animal Hide (0.025, Item("common.items.crafting_ing.hide.dragon_scale")), (0.05, Item("common.items.crafting_ing.hide.plate")), diff --git a/assets/voxygen/i18n/en/hud/crafting.ron b/assets/voxygen/i18n/en/hud/crafting.ron index 3145ebcc20..98112b0827 100644 --- a/assets/voxygen/i18n/en/hud/crafting.ron +++ b/assets/voxygen/i18n/en/hud/crafting.ron @@ -35,6 +35,16 @@ "hud.crafting.dismantle_title": "Dismantling", "hud.crafting.dismantle_explanation" : "Hover items in your bag to see what\nyou can salvage.\n\nDouble-Click them to start dismantling.", "hud.crafting.modular_desc": "Drag Item-Parts here to craft a weapon", + "hud.crafting.mod_weap_prim_slot_title": "Primary Weapon Component", + "hud.crafting.mod_weap_prim_slot_desc": "Place a primary weapon component here (e.g. a sword blade, axe head, or bow limbs).", + "hud.crafting.mod_weap_sec_slot_title": "Secondary Weapon Component", + "hud.crafting.mod_weap_sec_slot_desc": "Place a secondary weapon component here (e.g. a sword hilt, bow grip, or staff core).", + "hud.crafting.mod_comp_metal_prim_slot_title": "Metal Ingot", + "hud.crafting.mod_comp_metal_prim_slot_desc": "Place a metal ingot here, only certain metals can be used to make weapons.", + "hud.crafting.mod_comp_wood_prim_slot_title": "Wood", + "hud.crafting.mod_comp_wood_prim_slot_desc": "Place a kind of wood here, only certain woods can be used to make weapons.", + "hud.crafting.mod_comp_sec_slot_title": "Animal Material", + "hud.crafting.mod_comp_sec_slot_desc": "Place an animal crafting ingredient, only certain ingredients can be used to augment weapons.", }, diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 68d7507717..ac4fae9478 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -54,7 +54,7 @@ (0.0, 0.0, 0.0), (-90.0, 70.0, 0.0), 1.0, ), Tool("example_hammer"): VoxTrans( - "voxel.weapon.hammer.2hhammer_ramshead", + "voxel.weapon.hammer.greatmace.bloodsteel-2h", (-1.0, 0.0, 0.0), (-70.0, 55.0, 0.0), 1.0, ), Tool("example_bow"): VoxTrans( @@ -3755,16 +3755,16 @@ "voxel.weapon.component.sword.zweihander.orichalcum", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool("common.items.crafting_ing.modular.secondary.sword.two-handed"): VoxTrans( - "voxel.weapon.component.sword.hilt.twohand", + Tool("common.items.crafting_ing.modular.secondary.sword.long"): VoxTrans( + "voxel.weapon.component.sword.hilt.long", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool("common.items.crafting_ing.modular.secondary.sword.one-handed"): VoxTrans( - "voxel.weapon.component.sword.hilt.onehand", + Tool("common.items.crafting_ing.modular.secondary.sword.medium"): VoxTrans( + "voxel.weapon.component.sword.hilt.medium", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool("common.items.crafting_ing.modular.secondary.sword.hand-and-half"): VoxTrans( - "voxel.weapon.component.sword.hilt.handandhalf", + Tool("common.items.crafting_ing.modular.secondary.sword.short"): VoxTrans( + "voxel.weapon.component.sword.hilt.short", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), // Axes @@ -4298,16 +4298,16 @@ "voxel.weapon.component.bow.warbow.eldwood", (0.0, 0.0, 0.0), (0.0, 90.0, 0.0), 1.0, ), - Tool("common.items.crafting_ing.modular.secondary.bow.large"): VoxTrans( - "voxel.weapon.component.bow.grip.large", + Tool("common.items.crafting_ing.modular.secondary.bow.long"): VoxTrans( + "voxel.weapon.component.bow.grip.long", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.crafting_ing.modular.secondary.bow.medium"): VoxTrans( "voxel.weapon.component.bow.grip.medium", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool("common.items.crafting_ing.modular.secondary.bow.small"): VoxTrans( - "voxel.weapon.component.bow.grip.small", + Tool("common.items.crafting_ing.modular.secondary.bow.short"): VoxTrans( + "voxel.weapon.component.bow.grip.short", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), // Staffs @@ -4479,7 +4479,7 @@ "voxel.weapon.component.staff.staff.eldwood", (0.0, 0.0, 0.0), (-130.0, 90.0, 0.0), 1.0, ), - Tool("common.items.crafting_ing.modular.secondary.staff.large"): VoxTrans( + Tool("common.items.crafting_ing.modular.secondary.staff.heavy"): VoxTrans( "voxel.weapon.component.staff.core.heavy", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), @@ -4487,7 +4487,7 @@ "voxel.weapon.component.staff.core.medium", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool("common.items.crafting_ing.modular.secondary.staff.small"): VoxTrans( + Tool("common.items.crafting_ing.modular.secondary.staff.light"): VoxTrans( "voxel.weapon.component.staff.core.light", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), @@ -4660,7 +4660,7 @@ "voxel.weapon.component.sceptre.sceptre.eldwood", (0.0, 0.0, 0.0), (-130.0, 90.0, 0.0), 1.0, ), - Tool("common.items.crafting_ing.modular.secondary.sceptre.large"): VoxTrans( + Tool("common.items.crafting_ing.modular.secondary.sceptre.heavy"): VoxTrans( "voxel.weapon.component.sceptre.core.heavy", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), @@ -4668,7 +4668,7 @@ "voxel.weapon.component.sceptre.core.medium", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool("common.items.crafting_ing.modular.secondary.sceptre.small"): VoxTrans( + Tool("common.items.crafting_ing.modular.secondary.sceptre.light"): VoxTrans( "voxel.weapon.component.sceptre.core.light", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index ccc34ecf6b..b61fcb14ef 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/assets/voxygen/voxel/item_drop_manifest.ron @@ -965,9 +965,9 @@ ModularWeaponComponent(("common.items.crafting_ing.modular.primary.sword.sabre", "common.items.mineral.ingot.orichalcum")): "voxel.weapon.component.sword.sabre.orichalcum", ModularWeaponComponent(("common.items.crafting_ing.modular.primary.sword.sawblade", "common.items.mineral.ingot.orichalcum")): "voxel.weapon.component.sword.sawblade.orichalcum", ModularWeaponComponent(("common.items.crafting_ing.modular.primary.sword.zweihander", "common.items.mineral.ingot.orichalcum")): "voxel.weapon.component.sword.zweihander.orichalcum", - Tool("common.items.crafting_ing.modular.secondary.sword.two-handed"): "voxel.weapon.component.sword.hilt.twohand", - Tool("common.items.crafting_ing.modular.secondary.sword.one-handed"): "voxel.weapon.component.sword.hilt.onehand", - Tool("common.items.crafting_ing.modular.secondary.sword.hand-and-half"): "voxel.weapon.component.sword.hilt.handandhalf", + Tool("common.items.crafting_ing.modular.secondary.sword.long"): "voxel.weapon.component.sword.hilt.long", + Tool("common.items.crafting_ing.modular.secondary.sword.medium"): "voxel.weapon.component.sword.hilt.medium", + Tool("common.items.crafting_ing.modular.secondary.sword.short"): "voxel.weapon.component.sword.hilt.short", // Axes ModularWeaponComponent(("common.items.crafting_ing.modular.primary.axe.axe", "common.items.mineral.ingot.bronze")): "voxel.weapon.component.axe.axe.bronze", ModularWeaponComponent(("common.items.crafting_ing.modular.primary.axe.battleaxe", "common.items.mineral.ingot.bronze")): "voxel.weapon.component.axe.battleaxe.bronze", @@ -1103,9 +1103,9 @@ ModularWeaponComponent(("common.items.crafting_ing.modular.primary.bow.ornate", "common.items.log.eldwood")): "voxel.weapon.component.bow.ornate.eldwood", ModularWeaponComponent(("common.items.crafting_ing.modular.primary.bow.shortbow", "common.items.log.eldwood")): "voxel.weapon.component.bow.shortbow.eldwood", ModularWeaponComponent(("common.items.crafting_ing.modular.primary.bow.warbow", "common.items.log.eldwood")): "voxel.weapon.component.bow.warbow.eldwood", - Tool("common.items.crafting_ing.modular.secondary.bow.large"): "voxel.weapon.component.bow.grip.large", + Tool("common.items.crafting_ing.modular.secondary.bow.long"): "voxel.weapon.component.bow.grip.long", Tool("common.items.crafting_ing.modular.secondary.bow.medium"): "voxel.weapon.component.bow.grip.medium", - Tool("common.items.crafting_ing.modular.secondary.bow.small"): "voxel.weapon.component.bow.grip.small", + Tool("common.items.crafting_ing.modular.secondary.bow.short"): "voxel.weapon.component.bow.grip.short", // Staffs ModularWeaponComponent(("common.items.crafting_ing.modular.primary.staff.brand", "common.items.log.wood")): "voxel.weapon.component.staff.brand.wood", ModularWeaponComponent(("common.items.crafting_ing.modular.primary.staff.grandstaff", "common.items.log.wood")): "voxel.weapon.component.staff.grandstaff.wood", @@ -1149,9 +1149,9 @@ ModularWeaponComponent(("common.items.crafting_ing.modular.primary.staff.pole", "common.items.log.eldwood")): "voxel.weapon.component.staff.pole.eldwood", ModularWeaponComponent(("common.items.crafting_ing.modular.primary.staff.rod", "common.items.log.eldwood")): "voxel.weapon.component.staff.rod.eldwood", ModularWeaponComponent(("common.items.crafting_ing.modular.primary.staff.staff", "common.items.log.eldwood")): "voxel.weapon.component.staff.staff.eldwood", - Tool("common.items.crafting_ing.modular.secondary.staff.large"): "voxel.weapon.component.staff.core.heavy", + Tool("common.items.crafting_ing.modular.secondary.staff.heavy"): "voxel.weapon.component.staff.core.heavy", Tool("common.items.crafting_ing.modular.secondary.staff.medium"): "voxel.weapon.component.staff.core.medium", - Tool("common.items.crafting_ing.modular.secondary.staff.small"): "voxel.weapon.component.staff.core.light", + Tool("common.items.crafting_ing.modular.secondary.staff.light"): "voxel.weapon.component.staff.core.light", // Sceptres ModularWeaponComponent(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.wood")): "voxel.weapon.component.sceptre.arbor.wood", ModularWeaponComponent(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.wood")): "voxel.weapon.component.sceptre.cane.wood", @@ -1195,7 +1195,7 @@ ModularWeaponComponent(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.eldwood")): "voxel.weapon.component.sceptre.grandsceptre.eldwood", ModularWeaponComponent(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.eldwood")): "voxel.weapon.component.sceptre.ornate.eldwood", ModularWeaponComponent(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.eldwood")): "voxel.weapon.component.sceptre.sceptre.eldwood", - Tool("common.items.crafting_ing.modular.secondary.sceptre.large"): "voxel.weapon.component.sceptre.core.heavy", + Tool("common.items.crafting_ing.modular.secondary.sceptre.heavy"): "voxel.weapon.component.sceptre.core.heavy", Tool("common.items.crafting_ing.modular.secondary.sceptre.medium"): "voxel.weapon.component.sceptre.core.medium", - Tool("common.items.crafting_ing.modular.secondary.sceptre.small"): "voxel.weapon.component.sceptre.core.light", + Tool("common.items.crafting_ing.modular.secondary.sceptre.light"): "voxel.weapon.component.sceptre.core.light", }) diff --git a/assets/voxygen/voxel/weapon/component/bow/grip/large.vox b/assets/voxygen/voxel/weapon/component/bow/grip/long.vox similarity index 100% rename from assets/voxygen/voxel/weapon/component/bow/grip/large.vox rename to assets/voxygen/voxel/weapon/component/bow/grip/long.vox diff --git a/assets/voxygen/voxel/weapon/component/bow/grip/small.vox b/assets/voxygen/voxel/weapon/component/bow/grip/short.vox similarity index 100% rename from assets/voxygen/voxel/weapon/component/bow/grip/small.vox rename to assets/voxygen/voxel/weapon/component/bow/grip/short.vox