mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Rebase conflcits handled.
This commit is contained in:
parent
33feee787b
commit
5acb8cf74e
@ -1,5 +1,5 @@
|
||||
ItemDef(
|
||||
name: "Cultist Bandana",
|
||||
name: Direct("Cultist Bandana"),
|
||||
description: "Ceremonial attire used by members.",
|
||||
kind: Armor((
|
||||
kind: Head("Cultist"),
|
||||
@ -12,7 +12,7 @@ ItemDef(
|
||||
stealth: Some(0.04),
|
||||
),
|
||||
)),
|
||||
quality: Epic,
|
||||
quality: Direct(Epic),
|
||||
tags: [
|
||||
Cultist,
|
||||
],
|
||||
|
@ -1,5 +1,5 @@
|
||||
ItemDef(
|
||||
name: "Red Bandana",
|
||||
name: Direct("Red Bandana"),
|
||||
description: "Very sneaky, but also, bright red.",
|
||||
kind: Armor((
|
||||
kind: Head("Red"),
|
||||
@ -8,6 +8,6 @@ ItemDef(
|
||||
stealth: Some(0.15),
|
||||
),
|
||||
)),
|
||||
quality: Common,
|
||||
quality: Direct(Common),
|
||||
tags: [],
|
||||
)
|
||||
|
@ -1,5 +1,5 @@
|
||||
ItemDef(
|
||||
name: "Thief Bandana",
|
||||
name: Direct("Thief Bandana"),
|
||||
description: "Common bandit's mask.",
|
||||
kind: Armor((
|
||||
kind: Head("Thief"),
|
||||
@ -8,6 +8,6 @@ ItemDef(
|
||||
stealth: Some(0.18),
|
||||
),
|
||||
)),
|
||||
quality: Common,
|
||||
quality: Direct(Common),
|
||||
tags: [],
|
||||
)
|
||||
|
@ -1,5 +1,5 @@
|
||||
ItemDef(
|
||||
name: "Crown",
|
||||
name: Direct("Crown"),
|
||||
description: "Fit for a king.",
|
||||
kind: Armor((
|
||||
kind: Head("Crown"),
|
||||
|
@ -1,11 +1,11 @@
|
||||
ItemDef(
|
||||
name: "Headband",
|
||||
name: Direct("Headband"),
|
||||
description: "yep.",
|
||||
kind: Armor((
|
||||
kind: Head("Headband"),
|
||||
stats: (
|
||||
),
|
||||
)),
|
||||
quality: Common,
|
||||
quality: Direct(Common),
|
||||
tags: [],
|
||||
)
|
||||
|
@ -1,5 +1,5 @@
|
||||
ItemDef(
|
||||
name: "Helmet",
|
||||
name: Direct("Helmet"),
|
||||
description: "yep.",
|
||||
kind: Armor((
|
||||
kind: Head("Helmet"),
|
||||
|
@ -1,5 +1,5 @@
|
||||
ItemDef(
|
||||
name: "Hood",
|
||||
name: Direct("Hood"),
|
||||
description: "Become one with the treetops.",
|
||||
kind: Armor((
|
||||
kind: Head("Hood"),
|
||||
|
@ -1,5 +1,5 @@
|
||||
ItemDef(
|
||||
name: "Mitre",
|
||||
name: Direct("Mitre"),
|
||||
description: "Calls strength from above.",
|
||||
kind: Armor((
|
||||
kind: Head("Mitre"),
|
||||
|
@ -1,5 +1,5 @@
|
||||
ItemDef(
|
||||
name: "Straw Hat",
|
||||
name: Direct("Straw Hat"),
|
||||
description: "Simple and stylish.",
|
||||
kind: Armor((
|
||||
kind: Head("Straw"),
|
||||
@ -8,6 +8,6 @@ ItemDef(
|
||||
energy_reward: Some(0.02),
|
||||
),
|
||||
)),
|
||||
quality: Common,
|
||||
quality: Direct(Common),
|
||||
tags: [],
|
||||
)
|
||||
|
@ -1,11 +1,11 @@
|
||||
ItemDef(
|
||||
name: "Moonlit Love",
|
||||
name: Direct("Moonlit Love"),
|
||||
description: "Love is in the air.",
|
||||
kind: Glider(
|
||||
(
|
||||
kind: "ButterflyLove",
|
||||
),
|
||||
),
|
||||
quality: Epic,
|
||||
quality: Direct(Epic),
|
||||
tags: [],
|
||||
)
|
||||
|
@ -1,11 +1,11 @@
|
||||
ItemDef(
|
||||
name: "Aquatic Night",
|
||||
name: Direct("Aquatic Night"),
|
||||
description: "The stars are beautiful tonight.",
|
||||
kind: Glider(
|
||||
(
|
||||
kind: "Moonrise",
|
||||
),
|
||||
),
|
||||
quality: Epic,
|
||||
quality: Direct(Epic),
|
||||
tags: [],
|
||||
)
|
||||
|
@ -1,11 +1,11 @@
|
||||
ItemDef(
|
||||
name: "Horizon",
|
||||
name: Direct("Horizon"),
|
||||
description: "It isn't high noon.",
|
||||
kind: Glider(
|
||||
(
|
||||
kind: "Sunset",
|
||||
),
|
||||
),
|
||||
quality: Epic,
|
||||
quality: Direct(Epic),
|
||||
tags: [],
|
||||
)
|
||||
|
@ -456,13 +456,13 @@
|
||||
"Moonlit Love": (
|
||||
output: ("common.items.glider.butterfly3", 1),
|
||||
inputs: [
|
||||
(Item("common.items.crafting_ing.cloth.moonweave"), 20),
|
||||
(Item("common.items.crafting_ing.twigs"), 5),
|
||||
(Item("common.items.flowers.red"), 6),
|
||||
(Item("common.items.crafting_ing.sticky_thread"), 8),
|
||||
(Item("common.items.mineral.gem.diamond"), 2),
|
||||
(Item("common.items.crafting_tools.sewing_set"), 0),
|
||||
(Item("common.items.tool.craftsman_hammer"), 0),
|
||||
(Item("common.items.crafting_ing.cloth.moonweave"), 20, false),
|
||||
(Item("common.items.crafting_ing.twigs"), 5, false),
|
||||
(Item("common.items.flowers.red"), 6, false),
|
||||
(Item("common.items.crafting_ing.sticky_thread"), 8, false),
|
||||
(Item("common.items.mineral.gem.diamond"), 2, false),
|
||||
(Item("common.items.crafting_tools.sewing_set"), 0, false),
|
||||
(Item("common.items.tool.craftsman_hammer"), 0, false),
|
||||
],
|
||||
craft_sprite: Some(CraftingBench),
|
||||
is_recycling: false,
|
||||
@ -470,13 +470,13 @@
|
||||
"Horizon": (
|
||||
output: ("common.items.glider.sunset", 1),
|
||||
inputs: [
|
||||
(Item("common.items.crafting_ing.cloth.sunsilk"), 20),
|
||||
(Item("common.items.crafting_ing.twigs"), 5),
|
||||
(Item("common.items.crafting_ing.cactus"), 8),
|
||||
(Item("common.items.mineral.gem.topaz"), 6),
|
||||
(Item("common.items.mineral.gem.ruby"), 2),
|
||||
(Item("common.items.crafting_tools.sewing_set"), 0),
|
||||
(Item("common.items.tool.craftsman_hammer"), 0),
|
||||
(Item("common.items.crafting_ing.cloth.sunsilk"), 20, false),
|
||||
(Item("common.items.crafting_ing.twigs"), 5, false),
|
||||
(Item("common.items.crafting_ing.cactus"), 8, false),
|
||||
(Item("common.items.mineral.gem.topaz"), 6, false),
|
||||
(Item("common.items.mineral.gem.ruby"), 2, false),
|
||||
(Item("common.items.crafting_tools.sewing_set"), 0, false),
|
||||
(Item("common.items.tool.craftsman_hammer"), 0, false),
|
||||
],
|
||||
craft_sprite: Some(CraftingBench),
|
||||
is_recycling: false,
|
||||
|
Loading…
Reference in New Issue
Block a user