Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addressed playtest feedback (assets).

Browse Source
This commit is contained in:
Sam 2022-05-07 23:28:13 -04:00
parent f47cbeb022
commit 9b078c3383
97 changed files with 312 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/items/crafting_ing/modular/primary/axe/axe.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/axe/battleaxe.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/axe/greataxe.ron
View File

@ -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,

8
assets/common/items/crafting_ing/modular/primary/axe/jagged.ron
View File

@ -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(

6
assets/common/items/crafting_ing/modular/primary/axe/labrys.ron
View File

@ -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,

8
assets/common/items/crafting_ing/modular/primary/axe/ornate.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/axe/poleaxe.ron
View File

@ -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,

2
assets/common/items/crafting_ing/modular/primary/bow/bow.ron
View File

@ -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,

8
assets/common/items/crafting_ing/modular/primary/bow/composite.ron
View File

@ -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"),

6
assets/common/items/crafting_ing/modular/primary/bow/greatbow.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/bow/longbow.ron
View File

@ -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,

8
assets/common/items/crafting_ing/modular/primary/bow/ornate.ron
View File

@ -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),

6
assets/common/items/crafting_ing/modular/primary/bow/shortbow.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/bow/warbow.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/hammer/greathammer.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/hammer/greatmace.ron
View File

@ -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,

2
assets/common/items/crafting_ing/modular/primary/hammer/hammer.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/hammer/maul.ron
View File

@ -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,

8
assets/common/items/crafting_ing/modular/primary/hammer/ornate.ron
View File

@ -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,

8
assets/common/items/crafting_ing/modular/primary/hammer/spikedmace.ron
View File

@ -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(

6
assets/common/items/crafting_ing/modular/primary/hammer/warhammer.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/sceptre/arbor.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/sceptre/cane.ron
View File

@ -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,

8
assets/common/items/crafting_ing/modular/primary/sceptre/crook.ron
View File

@ -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"),

6
assets/common/items/crafting_ing/modular/primary/sceptre/crozier.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/sceptre/grandsceptre.ron
View File

@ -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,

8
assets/common/items/crafting_ing/modular/primary/sceptre/ornate.ron
View File

@ -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),

2
assets/common/items/crafting_ing/modular/primary/sceptre/sceptre.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/staff/brand.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/staff/grandstaff.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/staff/longpole.ron
View File

@ -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,

8
assets/common/items/crafting_ing/modular/primary/staff/ornate.ron
View File

@ -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),

8
assets/common/items/crafting_ing/modular/primary/staff/pole.ron
View File

@ -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"),

6
assets/common/items/crafting_ing/modular/primary/staff/rod.ron
View File

@ -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,

2
assets/common/items/crafting_ing/modular/primary/staff/staff.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/sword/greatsword.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/sword/katana.ron
View File

@ -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,

2
assets/common/items/crafting_ing/modular/primary/sword/longsword.ron
View File

@ -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,

8
assets/common/items/crafting_ing/modular/primary/sword/ornate.ron
View File

@ -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,

6
assets/common/items/crafting_ing/modular/primary/sword/sabre.ron
View File

@ -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,

8
assets/common/items/crafting_ing/modular/primary/sword/sawblade.ron
View File

@ -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(

6
assets/common/items/crafting_ing/modular/primary/sword/zweihander.ron
View File

@ -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,

2
assets/common/items/crafting_ing/modular/secondary/bow/large.ron → assets/common/items/crafting_ing/modular/secondary/bow/long.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Large Bow Grip",
name: "Long Bow Grip",
description: "",
kind: ModularComponent(
ToolSecondaryComponent(

2
assets/common/items/crafting_ing/modular/secondary/bow/small.ron → assets/common/items/crafting_ing/modular/secondary/bow/short.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Small Bow Grip",
name: "Short Bow Grip",
description: "",
kind: ModularComponent(
ToolSecondaryComponent(

2
assets/common/items/crafting_ing/modular/secondary/sceptre/large.ron → assets/common/items/crafting_ing/modular/secondary/sceptre/heavy.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Large Nature Core",
name: "Heavy Biocore",
description: "",
kind: ModularComponent(
ToolSecondaryComponent(

2
assets/common/items/crafting_ing/modular/secondary/sceptre/small.ron → assets/common/items/crafting_ing/modular/secondary/sceptre/light.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Small Nature Core",
name: "Light Biocore",
description: "",
kind: ModularComponent(
ToolSecondaryComponent(

2
assets/common/items/crafting_ing/modular/secondary/sceptre/medium.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Medium Nature Core",
name: "Biocore",
description: "",
kind: ModularComponent(
ToolSecondaryComponent(

2
assets/common/items/crafting_ing/modular/secondary/staff/large.ron → assets/common/items/crafting_ing/modular/secondary/staff/heavy.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Large Fire Core",
name: "Heavy Pyrocore",
description: "",
kind: ModularComponent(
ToolSecondaryComponent(

2
assets/common/items/crafting_ing/modular/secondary/staff/small.ron → assets/common/items/crafting_ing/modular/secondary/staff/light.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Small Fire Core",
name: "Light Pyrocore",
description: "",
kind: ModularComponent(
ToolSecondaryComponent(

2
assets/common/items/crafting_ing/modular/secondary/staff/medium.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Medium Fire Core",
name: "Pyrocore",
description: "",
kind: ModularComponent(
ToolSecondaryComponent(

2
assets/common/items/crafting_ing/modular/secondary/sword/two-handed.ron → assets/common/items/crafting_ing/modular/secondary/sword/long.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Two-Handed Sword Hilt",
name: "Long Sword Hilt",
description: "",
kind: ModularComponent(
ToolSecondaryComponent(

2
assets/common/items/crafting_ing/modular/secondary/sword/hand-and-half.ron → assets/common/items/crafting_ing/modular/secondary/sword/medium.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Hand-and-a-Half Sword Hilt",
name: "Medium Sword Hilt",
description: "",
kind: ModularComponent(
ToolSecondaryComponent(

2
assets/common/items/crafting_ing/modular/secondary/sword/one-handed.ron → assets/common/items/crafting_ing/modular/secondary/sword/short.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "One-Handed Sword Hilt",
name: "Short Sword Hilt",
description: "",
kind: ModularComponent(
ToolSecondaryComponent(

2
assets/common/items/log/eldwood.ron
View File

@ -5,6 +5,6 @@ ItemDef(
kind: "EldwoodLogs",
descriptor: "Eldwood",
),
quality: Common,
quality: Legendary,
tags: [MaterialKind(Wood), Material(Eldwood)],
)

2
assets/common/items/log/frostwood.ron
View File

@ -5,6 +5,6 @@ ItemDef(
kind: "FrostwoodLogs",
descriptor: "Frostwood",
),
quality: Common,
quality: Epic,
tags: [MaterialKind(Wood), Material(Frostwood)],
)

2
assets/common/items/log/hardwood.ron
View File

@ -5,6 +5,6 @@ ItemDef(
kind: "HardwoodLogs",
descriptor: "Hardwood",
),
quality: Common,
quality: Moderate,
tags: [MaterialKind(Wood), Material(Hardwood)],
)

2
assets/common/items/log/wood.ron
View File

@ -5,6 +5,6 @@ ItemDef(
kind: "WoodLogs",
descriptor: "Wooden",
),
quality: Common,
quality: Low,
tags: [MaterialKind(Wood), Material(Wood)],
)

6
assets/common/items/weapons/axe/parashu.ron
View File

@ -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,

6
assets/common/items/weapons/bow/sagitta.ron
View File

@ -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,

4
assets/common/items/weapons/hammer/mjolnir.ron
View File

@ -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,

8
assets/common/items/weapons/sceptre/caduceus.ron
View File

@ -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,

8
assets/common/items/weapons/sceptre/root_evil.ron
View File

@ -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,
)

4
assets/common/items/weapons/staff/laevateinn.ron
View File

@ -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,

4
assets/common/items/weapons/sword/caladbolg.ron
View File

@ -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,

6
assets/common/loot_tables/cave_large.ron
View File

@ -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")),
]

2
assets/common/loot_tables/creature/biped_large/troll.ron
View File

@ -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")),
]

2
assets/common/loot_tables/creature/biped_large/wendigo.ron
View File

@ -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")),
]

2
assets/common/loot_tables/creature/dragon.ron
View File

@ -1,3 +1,3 @@
[
(1.0, LootTable("common.loot_tables.weapons.tier-5")),
(1.0, LootTable("common.loot_tables.weapons.components.tier-5")),
]

6
assets/common/loot_tables/creature/golem.ron
View File

@ -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")),
]

2
assets/common/loot_tables/creature/humanoid.ron
View File

@ -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")),
]

5
assets/common/loot_tables/creature/quad_low/deadwood.ron
View File

@ -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")),
]

2
assets/common/loot_tables/dungeon/tier-0/chest.ron
View File

@ -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)),

2
assets/common/loot_tables/dungeon/tier-1/chest.ron
View File

@ -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

2
assets/common/loot_tables/dungeon/tier-2/chest.ron
View File

@ -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)),

2
assets/common/loot_tables/dungeon/tier-3/chest.ron
View File

@ -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)),

2
assets/common/loot_tables/dungeon/tier-4/chest.ron
View File

@ -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

2
assets/common/loot_tables/dungeon/tier-5/chest.ron
View File

@ -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

10
assets/common/loot_tables/spots/witch.ron
View File

@ -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")),
]

2
assets/common/loot_tables/sprite/chest-buried.ron
View File

@ -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")),
]

4
assets/common/loot_tables/sprite/chest.ron
View File

@ -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")),
]

2
assets/common/loot_tables/sprite/mud.ron
View File

@ -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")),
]

8
assets/common/loot_tables/weapons/components/tier-0.ron Normal file
View File

@ -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)),
]

8
assets/common/loot_tables/weapons/components/tier-1.ron Normal file
View File

@ -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)),
]

8
assets/common/loot_tables/weapons/components/tier-2.ron Normal file
View File

@ -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)),
]

8
assets/common/loot_tables/weapons/components/tier-3.ron Normal file
View File

@ -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)),
]

8
assets/common/loot_tables/weapons/components/tier-4.ron Normal file
View File

@ -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)),
]

8
assets/common/loot_tables/weapons/components/tier-5.ron Normal file
View File

@ -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)),
]

1
assets/common/loot_tables/weapons/cultist.ron
View File

@ -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")),
]

3
assets/common/loot_tables/weapons/legendary_ranged.ron
View File

@ -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")),
]

58
assets/common/recipe_book.ron
View File

@ -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),

4
assets/common/trading/sellable_materials.ron
View File

@ -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")),

6
assets/common/trading/unsellable_materials.ron
View File

@ -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")),

10
assets/voxygen/i18n/en/hud/crafting.ron
View File

@ -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.",
},

30
assets/voxygen/item_image_manifest.ron
View File

@ -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,
),

18
assets/voxygen/voxel/item_drop_manifest.ron
View File

@ -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",
})

0
assets/voxygen/voxel/weapon/component/bow/grip/large.vox → assets/voxygen/voxel/weapon/component/bow/grip/long.vox
View File

0
assets/voxygen/voxel/weapon/component/bow/grip/small.vox → assets/voxygen/voxel/weapon/component/bow/grip/short.vox
View File