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

Added correct names to every bow, staff, and sceptre component.

Browse Source
This commit is contained in:
Sam 2021-08-08 11:40:17 -04:00
parent 0a44874e88
commit c10fa35fa4
55 changed files with 183 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/common/items/armor/pirate/belt.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Pirate Belt",
name: Direct("Pirate Belt"),
description: "",
kind: Armor((
kind: Belt("Pirate"),
@ -11,7 +11,7 @@ ItemDef(
crit_power: Some(0.02),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

4
assets/common/items/armor/pirate/chest.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Pirate Jacket",
name: Direct("Pirate Jacket"),
description: "",
kind: Armor((
kind: Chest("Pirate"),
@ -11,7 +11,7 @@ ItemDef(
crit_power: Some(0.125),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

4
assets/common/items/armor/pirate/foot.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Pirate Boots",
name: Direct("Pirate Boots"),
description: "",
kind: Armor((
kind: Foot("Pirate"),
@ -11,7 +11,7 @@ ItemDef(
crit_power: Some(0.04),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

4
assets/common/items/armor/pirate/hand.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Pirate Gloves",
name: Direct("Pirate Gloves"),
description: "",
kind: Armor((
kind: Hand("Pirate"),
@ -11,7 +11,7 @@ ItemDef(
crit_power: Some(0.04),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

2
assets/common/items/armor/pirate/hat.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Pirate Hat",
name: Direct("Pirate Hat"),
description: "It seems like a parrot was perched up here.",
kind: Armor((
kind: Head("Pirate"),

4
assets/common/items/armor/pirate/pants.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Pirate Pants",
name: Direct("Pirate Pants"),
description: "",
kind: Armor((
kind: Pants("Pirate"),
@ -11,7 +11,7 @@ ItemDef(
crit_power: Some(0.08),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

4
assets/common/items/armor/pirate/shoulder.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Pirate Mantle",
name: Direct("Pirate Mantle"),
description: "",
kind: Armor((
kind: Shoulder("Pirate"),
@ -11,7 +11,7 @@ ItemDef(
crit_power: Some(0.08),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

4
assets/common/items/armor/witch/back.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Witch Cape",
name: Direct("Witch Cape"),
description: "",
kind: Armor((
kind: Back("Witch"),
@ -11,7 +11,7 @@ ItemDef(
crit_power: Some(0.08),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

4
assets/common/items/armor/witch/belt.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Witch Belt",
name: Direct("Witch Belt"),
description: "",
kind: Armor((
kind: Belt("Witch"),
@ -11,7 +11,7 @@ ItemDef(
crit_power: Some(0.02),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

4
assets/common/items/armor/witch/chest.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Witch Robe",
name: Direct("Witch Robe"),
description: "",
kind: Armor((
kind: Chest("Witch"),
@ -11,7 +11,7 @@ ItemDef(
crit_power: Some(0.125),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

4
assets/common/items/armor/witch/foot.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Witch Boots",
name: Direct("Witch Boots"),
description: "",
kind: Armor((
kind: Foot("Witch"),
@ -11,7 +11,7 @@ ItemDef(
crit_power: Some(0.04),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

4
assets/common/items/armor/witch/hand.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Witch Handwarmers",
name: Direct("Witch Handwarmers"),
description: "",
kind: Armor((
kind: Hand("Witch"),
@ -11,7 +11,7 @@ ItemDef(
crit_power: Some(0.04),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

4
assets/common/items/armor/witch/hat.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Witch Hat",
name: Direct("Witch Hat"),
description: "Draws strength from dark arts.",
kind: Armor((
kind: Head("Witch"),
@ -10,7 +10,7 @@ ItemDef(
energy_reward: Some(0.084),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

4
assets/common/items/armor/witch/pants.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Witch Skirt",
name: Direct("Witch Skirt"),
description: "",
kind: Armor((
kind: Pants("Witch"),
@ -11,7 +11,7 @@ ItemDef(
crit_power: Some(0.08),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

4
assets/common/items/armor/witch/shoulder.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Witch Mantle",
name: Direct("Witch Mantle"),
description: "",
kind: Armor((
kind: Shoulder("Witch"),
@ -11,7 +11,7 @@ ItemDef(
crit_power: Some(0.08),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [
],
)

5
assets/common/items/crafting_ing/modular/held/bow/balanced_comp.ron.ron → assets/common/items/crafting_ing/modular/damage/bow/medium.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: Component("Balanced Bow Held"),
name: Component("Medium Bow Limbs"),
description: "",
kind: ModularComponent((
toolkind: Bow,
@ -21,5 +21,4 @@ ItemDef(
tags: [
ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
],
)
)

6
assets/common/items/crafting_ing/modular/held/bow/light_comp.ron.ron → assets/common/items/crafting_ing/modular/damage/bow/narrow.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Light Bow Held"),
name: Component("Narrow Bow Limbs"),
description: "",
kind: ModularComponent((
toolkind: Bow,
modkind: Held,
modkind: Damage,
stats: (
equip_time_secs: 1.0,
power: 0.7,
@ -19,7 +19,7 @@ ItemDef(
)),
quality: Direct(Common),
tags: [
ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
],
)

6
assets/common/items/crafting_ing/modular/held/bow/heavy_comp.ron → assets/common/items/crafting_ing/modular/damage/bow/wide.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Heavy Bow Held"),
name: Component("Wide Bow Limbs"),
description: "",
kind: ModularComponent((
toolkind: Bow,
modkind: Held,
modkind: Damage,
stats: (
equip_time_secs: 1.0,
power: 1.5,
@ -19,7 +19,7 @@ ItemDef(
)),
quality: Direct(Common),
tags: [
ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
],
)

6
assets/common/items/crafting_ing/modular/held/sceptre/heavy_comp.ron → assets/common/items/crafting_ing/modular/damage/sceptre/large.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Heavy Sceptre Held"),
name: Component("Large Nature Core"),
description: "",
kind: ModularComponent((
toolkind: Sceptre,
modkind: Held,
modkind: Damage,
stats: (
equip_time_secs: 1.0,
power: 1.5,
@ -19,7 +19,7 @@ ItemDef(
)),
quality: Direct(Common),
tags: [
ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)),
ModularComponent((toolkind: Sceptre, modkind: Damage, hands: Two)),
],
)

6
assets/common/items/crafting_ing/modular/held/sceptre/balanced_comp.ron.ron → assets/common/items/crafting_ing/modular/damage/sceptre/medium.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Balanced Sceptre Held"),
name: Component("Medium Nature Core"),
description: "",
kind: ModularComponent((
toolkind: Sceptre,
modkind: Held,
modkind: Damage,
stats: (
equip_time_secs: 1.0,
power: 1.0,
@ -19,7 +19,7 @@ ItemDef(
)),
quality: Direct(Common),
tags: [
ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)),
ModularComponent((toolkind: Sceptre, modkind: Damage, hands: Two)),
],
)

6
assets/common/items/crafting_ing/modular/held/sceptre/light_comp.ron.ron → assets/common/items/crafting_ing/modular/damage/sceptre/small.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Light Sceptre Held"),
name: Component("Small Nature Core"),
description: "",
kind: ModularComponent((
toolkind: Sceptre,
modkind: Held,
modkind: Damage,
stats: (
equip_time_secs: 1.0,
power: 0.7,
@ -19,7 +19,7 @@ ItemDef(
)),
quality: Direct(Common),
tags: [
ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)),
ModularComponent((toolkind: Sceptre, modkind: Damage, hands: Two)),
],
)

6
assets/common/items/crafting_ing/modular/held/staff/heavy_comp.ron → assets/common/items/crafting_ing/modular/damage/staff/large.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Heavy Staff Held"),
name: Component("Large Fire Core"),
description: "",
kind: ModularComponent((
toolkind: Staff,
modkind: Held,
modkind: Damage,
stats: (
equip_time_secs: 1.0,
power: 1.5,
@ -19,7 +19,7 @@ ItemDef(
)),
quality: Direct(Common),
tags: [
ModularComponent((toolkind: Staff, modkind: Held, hands: Two)),
ModularComponent((toolkind: Staff, modkind: Damage, hands: Two)),
],
)

7
assets/common/items/crafting_ing/modular/held/staff/balanced_comp.ron.ron → assets/common/items/crafting_ing/modular/damage/staff/medium.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Balanced Staff Held"),
name: Component("Medium Fire Core"),
description: "",
kind: ModularComponent((
toolkind: Staff,
modkind: Held,
modkind: Damage,
stats: (
equip_time_secs: 1.0,
power: 1.0,
@ -19,7 +19,6 @@ ItemDef(
)),
quality: Direct(Common),
tags: [
ModularComponent((toolkind: Staff, modkind: Held, hands: Two)),
ModularComponent((toolkind: Staff, modkind: Damage, hands: Two)),
],
)

6
assets/common/items/crafting_ing/modular/held/staff/light_comp.ron.ron → assets/common/items/crafting_ing/modular/damage/staff/small.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Light Staff Held"),
name: Component("Samll Fire Core"),
description: "",
kind: ModularComponent((
toolkind: Staff,
modkind: Held,
modkind: Damage,
stats: (
equip_time_secs: 1.0,
power: 0.7,
@ -19,7 +19,7 @@ ItemDef(
)),
quality: Direct(Common),
tags: [
ModularComponent((toolkind: Staff, modkind: Held, hands: Two)),
ModularComponent((toolkind: Staff, modkind: Damage, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/bow/balanced_comp.ron → assets/common/items/crafting_ing/modular/held/bow/bow.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Balanced Bow Piece"),
name: Component("Bow Grip"),
description: "",
kind: ModularComponent((
toolkind: Bow,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 1.0,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 1.0,
),
hand_restriction: Some(Two),
weapon_name: "Balanced Bow",
weapon_name: "Bow",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/bow/buff_comp.ron → assets/common/items/crafting_ing/modular/held/bow/composite.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Buff Bow Piece"),
name: Component("Composite Bow Grip"),
description: "",
kind: ModularComponent((
toolkind: Bow,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 0.9,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 2.0,
),
hand_restriction: Some(Two),
weapon_name: "Buff Bow",
weapon_name: "Composite Bow",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/bow/effect_comp.ron → assets/common/items/crafting_ing/modular/held/bow/greatbow.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Speed Bow Piece"),
name: Component("Greatbow Grip"),
description: "",
kind: ModularComponent((
toolkind: Bow,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 0.9,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.8,
),
hand_restriction: Some(Two),
weapon_name: "Speed Bow",
weapon_name: "Greatbow",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/bow/range_comp.ron → assets/common/items/crafting_ing/modular/held/bow/longbow.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Ranged Bow Piece"),
name: Component("Longbow Grip"),
description: "",
kind: ModularComponent((
toolkind: Bow,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 1.0,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.9,
),
hand_restriction: Some(Two),
weapon_name: "Ranged Bow",
weapon_name: "Longbow",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/bow/crit_comp.ron → assets/common/items/crafting_ing/modular/held/bow/ornate.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Crit Bow Piece"),
name: Component("Ornate Bow Grip"),
description: "",
kind: ModularComponent((
toolkind: Bow,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 0.9,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.8,
),
hand_restriction: Some(Two),
weapon_name: "Crit Bow",
weapon_name: "Ornate Bow",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/bow/speed_comp.ron → assets/common/items/crafting_ing/modular/held/bow/shortbow.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Speed Bow Piece"),
name: Component("Shortbow Grip"),
description: "",
kind: ModularComponent((
toolkind: Bow,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 0.9,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.8,
),
hand_restriction: Some(Two),
weapon_name: "Speed Bow",
weapon_name: "Shortbow",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/bow/power_comp.ron → assets/common/items/crafting_ing/modular/held/bow/warbow.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Power Bow Piece"),
name: Component("Warbow Grip"),
description: "",
kind: ModularComponent((
toolkind: Bow,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 1.5,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.8,
),
hand_restriction: Some(Two),
weapon_name: "Power Bow",
weapon_name: "Warbow",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/sceptre/range_comp.ron → assets/common/items/crafting_ing/modular/held/sceptre/arbor.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Ranged Sceptre Piece"),
name: Component("Arbor Grip"),
description: "",
kind: ModularComponent((
toolkind: Sceptre,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 1.0,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.9,
),
hand_restriction: Some(Two),
weapon_name: "Ranged Sceptre",
weapon_name: "Arbor",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Sceptre, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/sceptre/power_comp.ron → assets/common/items/crafting_ing/modular/held/sceptre/cane.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Power Sceptre Piece"),
name: Component("Cane Grip"),
description: "",
kind: ModularComponent((
toolkind: Sceptre,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 1.5,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.8,
),
hand_restriction: Some(Two),
weapon_name: "Power Sceptre",
weapon_name: "Cane",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Sceptre, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/sceptre/buff_comp.ron → assets/common/items/crafting_ing/modular/held/sceptre/crook.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Buff Sceptre Piece"),
name: Component("Crook Grip"),
description: "",
kind: ModularComponent((
toolkind: Sceptre,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 0.9,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 2.0,
),
hand_restriction: Some(Two),
weapon_name: "Buff Sceptre",
weapon_name: "Crook",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Sceptre, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/sceptre/speed_comp.ron → assets/common/items/crafting_ing/modular/held/sceptre/crozier.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Speed Sceptre Piece"),
name: Component("Crozier Grip"),
description: "",
kind: ModularComponent((
toolkind: Sceptre,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 0.9,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.8,
),
hand_restriction: Some(Two),
weapon_name: "Speed Sceptre",
weapon_name: "Crozier",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Sceptre, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/sceptre/effect_comp.ron → assets/common/items/crafting_ing/modular/held/sceptre/grandsceptre.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Speed Sceptre Piece"),
name: Component("Grandsceptre Grip"),
description: "",
kind: ModularComponent((
toolkind: Sceptre,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 0.9,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.8,
),
hand_restriction: Some(Two),
weapon_name: "Speed Sceptre",
weapon_name: "Grandsceptre",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Sceptre, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/sceptre/crit_comp.ron → assets/common/items/crafting_ing/modular/held/sceptre/ornate.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Crit Sceptre Piece"),
name: Component("Ornate Sceptre Grip"),
description: "",
kind: ModularComponent((
toolkind: Sceptre,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 0.9,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.8,
),
hand_restriction: Some(Two),
weapon_name: "Crit Sceptre",
weapon_name: "Ornate Sceptre",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Sceptre, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/sceptre/balanced_comp.ron → assets/common/items/crafting_ing/modular/held/sceptre/sceptre.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Balanced Sceptre Piece"),
name: Component("Sceptre Grip"),
description: "",
kind: ModularComponent((
toolkind: Sceptre,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 1.0,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 1.0,
),
hand_restriction: Some(Two),
weapon_name: "Balanced Sceptre",
weapon_name: "Sceptre",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Sceptre, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Sceptre, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/staff/speed_comp.ron → assets/common/items/crafting_ing/modular/held/staff/brand.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Speed Staff Piece"),
name: Component("Brand Grip"),
description: "",
kind: ModularComponent((
toolkind: Staff,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 0.9,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.8,
),
hand_restriction: Some(Two),
weapon_name: "Speed Staff",
weapon_name: "Brand",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Staff, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Staff, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/staff/effect_comp.ron → assets/common/items/crafting_ing/modular/held/staff/greatstaff.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Speed Staff Piece"),
name: Component("Greatstaff Grip"),
description: "",
kind: ModularComponent((
toolkind: Staff,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 0.9,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.8,
),
hand_restriction: Some(Two),
weapon_name: "Speed Staff",
weapon_name: "Greatstaff",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Staff, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Staff, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/staff/range_comp.ron → assets/common/items/crafting_ing/modular/held/staff/longstaff.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Ranged Staff Piece"),
name: Component("Long Staff Piece"),
description: "",
kind: ModularComponent((
toolkind: Staff,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 1.0,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.9,
),
hand_restriction: Some(Two),
weapon_name: "Ranged Staff",
weapon_name: "Long Staff",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Staff, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Staff, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/staff/crit_comp.ron → assets/common/items/crafting_ing/modular/held/staff/orante.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Crit Staff Piece"),
name: Component("Orante Staff Grip"),
description: "",
kind: ModularComponent((
toolkind: Staff,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 0.9,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.8,
),
hand_restriction: Some(Two),
weapon_name: "Crit Staff",
weapon_name: "Ornate Staff",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Staff, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Staff, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/staff/buff_comp.ron → assets/common/items/crafting_ing/modular/held/staff/pole.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Buff Staff Piece"),
name: Component("Pole Grip"),
description: "",
kind: ModularComponent((
toolkind: Staff,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 0.9,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 2.0,
),
hand_restriction: Some(Two),
weapon_name: "Buff Staff",
weapon_name: "Pole",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Staff, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Staff, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/staff/power_comp.ron → assets/common/items/crafting_ing/modular/held/staff/rod.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Power Staff Piece"),
name: Component("Rod Grip"),
description: "",
kind: ModularComponent((
toolkind: Staff,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 1.5,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 0.8,
),
hand_restriction: Some(Two),
weapon_name: "Power Staff",
weapon_name: "Rod",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Staff, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Staff, modkind: Held, hands: Two)),
],
)

8
assets/common/items/crafting_ing/modular/damage/staff/balanced_comp.ron → assets/common/items/crafting_ing/modular/held/staff/staff.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: Component("Balanced Staff Piece"),
name: Component("Staff Grip"),
description: "",
kind: ModularComponent((
toolkind: Staff,
modkind: Damage,
modkind: Held,
stats: (
equip_time_secs: 0.25,
power: 1.0,
@ -15,11 +15,11 @@ ItemDef(
buff_strength: 1.0,
),
hand_restriction: Some(Two),
weapon_name: "Balanced Staff",
weapon_name: "Staff",
)),
quality: Modular,
tags: [
ModularComponent((toolkind: Staff, modkind: Damage, hands: Two)),
ModularComponent((toolkind: Staff, modkind: Held, hands: Two)),
],
)

2
assets/common/items/lantern/pumpkin.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Eerie Pumpkin",
name: Direct("Eerie Pumpkin"),
description: "Did it just blink?!",
kind: Lantern(
(

4
assets/common/items/npc_armor/biped_small/gnome/chest/gnome.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Gnome",
name: Direct("Gnome"),
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Chest("Gnome"),
@ -8,6 +8,6 @@ ItemDef(
poise_resilience: Some(Normal(1.0)),
),
)),
quality: Low,
quality: Direct(Low),
tags: [],
)

4
assets/common/items/npc_armor/biped_small/gnome/foot/gnome.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Gnome",
name: Direct("Gnome"),
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Foot("Gnome"),
@ -8,6 +8,6 @@ ItemDef(
poise_resilience: Some(Normal(1.0)),
),
)),
quality: Low,
quality: Direct(Low),
tags: [],
)

4
assets/common/items/npc_armor/biped_small/gnome/hand/gnome.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Gnome",
name: Direct("Gnome"),
description: "Ceremonial attire used by members..",
kind: Armor((
kind: Hand("Gnome"),
@ -8,6 +8,6 @@ ItemDef(
poise_resilience: Some(Normal(1.0)),
),
)),
quality: Low,
quality: Direct(Low),
tags: [],
)

4
assets/common/items/npc_armor/biped_small/gnome/head/gnome.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Gnome",
name: Direct("Gnome"),
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Head("Gnome"),
@ -8,6 +8,6 @@ ItemDef(
poise_resilience: Some(Normal(1.0)),
),
)),
quality: Low,
quality: Direct(Low),
tags: [],
)

4
assets/common/items/npc_armor/biped_small/gnome/pants/gnome.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Gnome",
name: Direct("Gnome"),
description: "Ceremonial attire used by members..",
kind: Armor((
kind: Pants("Gnome"),
@ -8,6 +8,6 @@ ItemDef(
poise_resilience: Some(Normal(1.0)),
),
)),
quality: Low,
quality: Direct(Low),
tags: [],
)

6
assets/common/items/weapons/sceptre/belzeshrub.ron
View File

@ -1,9 +1,9 @@
ItemDef(
name: "Belzeshrub the Broom God",
name: Direct("Belzeshrub the Broom God"),
description: "'Is it... alive?'",
kind: Tool((
kind: Sceptre,
hands: Two,
hands: Direct(Two),
stats: Direct((
equip_time_secs: 0.4,
power: 2.5,
@ -15,7 +15,7 @@ ItemDef(
buff_strength: 1.0,
)),
)),
quality: Artifact,
quality: Direct(Artifact),
tags: [],
ability_spec: None,
)

34
common/src/bin/csv_export/main.rs
View File

@ -13,7 +13,7 @@ use veloren_common::{
self,
item::{
armor::{ArmorKind, Protection},
tool::{Hands, MaterialStatManifest, Tool, ToolKind},
tool::{Hands, HandsKind, MaterialStatManifest, Tool, ToolKind},
Item, ItemKind,
},
},
@ -74,7 +74,7 @@ fn armor_stats() -> Result<(), Box<dyn Error>> {
wtr.write_record(&[
item.item_definition_id(),
&kind,
item.name(),
&item.name(),
&format!("{:?}", item.quality()),
&protection,
&poise_resilience,
@ -135,7 +135,7 @@ fn weapon_stats() -> Result<(), Box<dyn Error>> {
wtr.write_record(&[
item.item_definition_id(),
&kind,
item.name(),
&item.name(),
&hands,
&format!("{:?}", item.quality()),
&power,
@ -177,8 +177,9 @@ fn get_tool_kind(kind: &ToolKind) -> String {
fn get_tool_hands(tool: &Tool) -> String {
match tool.hands {
Hands::One => "One".to_string(),
Hands::Two => "Two".to_string(),
HandsKind::Direct(Hands::One) => "One".to_string(),
HandsKind::Direct(Hands::Two) => "Two".to_string(),
HandsKind::Modular => "Modular".to_string(),
}
}
@ -229,7 +230,7 @@ fn all_items() -> Result<(), Box<dyn Error>> {
_ => "".to_owned(),
};
wtr.write_record(&[item.item_definition_id(), item.name(), &kind])?;
wtr.write_record(&[item.item_definition_id(), &item.name(), &kind])?;
}
wtr.flush()?;
@ -242,8 +243,8 @@ fn loot_table(loot_table: &str) -> Result<(), Box<dyn Error>> {
"Relative Chance",
"Kind",
"Item",
"Lower Amount",
"Upper Amount",
"Lower Amount or Material",
"Upper Amount or Hands",
])?;
let loot_table = "common.loot_tables.".to_owned() + loot_table;
@ -261,6 +262,12 @@ fn loot_table(loot_table: &str) -> Result<(), Box<dyn Error>> {
.div(10_f32.powi(5))
.to_string();
let get_hands = |hands| match hands {
Some(Hands::One) => "One",
Some(Hands::Two) => "Two",
None => "",
};
match item {
LootSpec::Item(item) => wtr.write_record(&[&chance, "Item", item, "", ""])?,
LootSpec::ItemQuantity(item, lower, upper) => wtr.write_record(&[
@ -274,6 +281,17 @@ fn loot_table(loot_table: &str) -> Result<(), Box<dyn Error>> {
wtr.write_record(&[&chance, "LootTable", table, "", ""])?
},
LootSpec::Nothing => wtr.write_record(&[&chance, "Nothing", "", ""])?,
LootSpec::ModularWeapon {
tool,
material,
hands,
} => wtr.write_record(&[
&chance,
"Modular Weapon",
&get_tool_kind(tool),
material.into(),
get_hands(*hands),
])?,
}
}

4
common/src/comp/inventory/item/mod.rs
View File

@ -539,7 +539,7 @@ impl ItemDef {
name: ItemName::Direct("test item name".to_owned()),
description: "test item description".to_owned(),
kind,
quality,
quality: QualityKind::Direct(quality),
tags,
slots,
ability_spec: None,
@ -553,7 +553,7 @@ impl ItemDef {
name: ItemName::Direct("test item name".to_owned()),
description: "test item description".to_owned(),
kind,
quality: Quality::Common,
quality: QualityKind::Direct(Quality::Common),
tags: vec![],
slots: 0,
ability_spec: None,

2
common/src/lottery.rs
View File

@ -183,6 +183,8 @@ pub mod tests {
validate_table_contents(loot_table);
},
LootSpec::Nothing => {},
// TODO: Figure out later
LootSpec::ModularWeapon { .. } => {},
}
}