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

Rebase commit.

Browse Source
This commit is contained in:
Sam 2021-10-27 18:44:52 -04:00
parent 4f466d0523
commit b7aa0a7a9f
20 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/common/items/armor/cultist/necklace.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Cultist Amulet",
name: Direct("Cultist Amulet"),
description: "You can still feel the Mindflayer's presence within this amulet...",
kind: Armor((
kind: Neck("Cultist"),
@ -10,6 +10,6 @@ ItemDef(
crit_power: Some(0.03),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [],
)

4
assets/common/items/armor/cultist/ring.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Cultist Signet Ring ",
name: Direct("Cultist Signet Ring"),
description: "Once belonged to a cultist.",
kind: Armor((
kind: Ring("Cultist"),
@ -10,6 +10,6 @@ ItemDef(
crit_power: Some(0.02),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [],
)

4
assets/common/items/armor/misc/neck/amethyst.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Amethyst Necklace",
name: Direct("Amethyst Necklace"),
description: "A tin necklace lined with amethyst gems.",
kind: Armor((
kind: Neck("Amethyst"),
@ -8,6 +8,6 @@ ItemDef(
energy_reward: Some(0.1),
),
)),
quality: Moderate,
quality: Direct(Moderate),
tags: [],
)

4
assets/common/items/armor/misc/neck/ankh_of_life.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Ankh of Life",
name: Direct("Ankh of Life"),
description: "A unique necklace of unkown origin... You can feel the power flowing through it.",
kind: Armor((
kind: Neck("Ankh"),
@ -9,6 +9,6 @@ ItemDef(
energy_reward: Some(0.1),
),
)),
quality: Legendary,
quality: Direct(Legendary),
tags: [],
)

4
assets/common/items/armor/misc/neck/carcanet_of_wrath.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Carcanet of Wrath",
name: Direct("Carcanet of Wrath"),
description: "A necklace that gives even the most feeble beings immense amounts of power.",
kind: Armor((
kind: Neck("Carcanet"),
@ -8,6 +8,6 @@ ItemDef(
crit_power: Some(0.2),
),
)),
quality: Legendary,
quality: Direct(Legendary),
tags: [],
)

4
assets/common/items/armor/misc/neck/diamond.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Diamond Necklace",
name: Direct("Diamond Necklace"),
description: "An expensive gold necklace, ornate with exquisite diamonds.",
kind: Armor((
kind: Neck("Diamond"),
@ -9,6 +9,6 @@ ItemDef(
crit_power: Some(0.1),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [],
)

4
assets/common/items/armor/misc/neck/emerald.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Emerald Necklace",
name: Direct("Emerald Necklace"),
description: "A cobalt necklace, bearing beautiful emerald gems.",
kind: Armor((
kind: Neck("Emerald"),
@ -9,6 +9,6 @@ ItemDef(
energy_reward: Some(-0.2),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [],
)

4
assets/common/items/armor/misc/neck/fang.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Fang Necklace",
name: Direct("Fang Necklace"),
description: "Only the most savage beings can handle the power of this necklace...",
kind: Armor((
kind: Neck("Fang"),
@ -8,6 +8,6 @@ ItemDef(
crit_power: Some(0.07),
),
)),
quality: High,
quality: Direct(High),
tags: [],
)

2
assets/common/items/armor/misc/neck/gem_of_resilience.ron
View File

@ -8,6 +8,6 @@ ItemDef(
poise_resilience: Some(Normal(1.0)),
),
)),
quality: Moderate,
quality: Direct(Moderate),
tags: [],
)

4
assets/common/items/armor/misc/neck/gold.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Gold Necklace",
name: Direct("Gold Necklace"),
description: "An expensive gold necklace... looks stolen.",
kind: Armor((
kind: Neck("Gold"),
@ -9,6 +9,6 @@ ItemDef(
crit_power: Some(0.02),
),
)),
quality: Moderate,
quality: Direct(Moderate),
tags: [],
)

4
assets/common/items/armor/misc/neck/honeycomb_pendant.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Honeycomb Pendant",
name: Direct("Honeycomb Pendant"),
description: "This necklace is always spewing out honey...",
kind: Armor((
kind: Neck("Honeycomb"),
@ -9,6 +9,6 @@ ItemDef(
energy_reward: Some(0.05),
),
)),
quality: High,
quality: Direct(High),
tags: [],
)

2
assets/common/items/armor/misc/neck/pendant_of_protection.ron
View File

@ -7,6 +7,6 @@ ItemDef(
protection: Some(Normal(1.0)),
),
)),
quality: Common,
quality: Direct(Common),
tags: [],
)

4
assets/common/items/armor/misc/neck/ruby.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Ruby Necklace",
name: Direct("Ruby Necklace"),
description: "An ornate silver necklace, embedded with beautiful rubies.",
kind: Armor((
kind: Neck("Ruby"),
@ -9,6 +9,6 @@ ItemDef(
crit_power: Some(-0.06),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [],
)

4
assets/common/items/armor/misc/neck/sapphire.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Sapphire Necklace",
name: Direct("Sapphire Necklace"),
description: "A sturdy iron necklace, with polished sapphire gems embedded into it.",
kind: Armor((
kind: Neck("Sapphire"),
@ -8,6 +8,6 @@ ItemDef(
crit_power: Some(0.05),
),
)),
quality: Moderate,
quality: Direct(Moderate),
tags: [],
)

4
assets/common/items/armor/misc/neck/scratched.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Scratched Necklace",
name: Direct("Scratched Necklace"),
description: "The string is about to snap...",
kind: Armor((
kind: Neck("Scratched"),
@ -7,6 +7,6 @@ ItemDef(
protection: Some(Normal(0.5)),
),
)),
quality: Low,
quality: Direct(Low),
tags: [],
)

4
assets/common/items/armor/misc/neck/topaz.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Topaz Necklace",
name: Direct("Topaz Necklace"),
description: "A copper necklace, with topaz embedded in the center.",
kind: Armor((
kind: Neck("Topaz"),
@ -8,6 +8,6 @@ ItemDef(
energy_max: Some(10.0),
),
)),
quality: Moderate,
quality: Direct(Moderate),
tags: [],
)

2
assets/common/items/armor/misc/ring/emerald.ron
View File

@ -9,6 +9,6 @@ ItemDef(
energy_reward: Some(-0.1),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [],
)

2
assets/common/items/armor/misc/ring/ruby.ron
View File

@ -9,6 +9,6 @@ ItemDef(
crit_power: Some(-0.03),
),
)),
quality: Epic,
quality: Direct(Epic),
tags: [],
)

32
assets/common/recipe_book.ron
View File

@ -1736,8 +1736,8 @@
"fang necklace": (
output: ("common.items.armor.misc.neck.fang", 1),
inputs: [
(Item("common.items.crafting_ing.leather.leather_strips"), 3),
(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 15),
(Item("common.items.crafting_ing.leather.leather_strips"), 3, false),
(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 15, false),
],
craft_sprite: Some(CraftingBench),
is_recycling: false,
@ -1745,8 +1745,8 @@
"honeycomb pendant": (
output: ("common.items.armor.misc.neck.honeycomb_pendant", 1),
inputs: [
(Item("common.items.crafting_ing.sticky_thread"), 3),
(Item("common.items.crafting_ing.honey"), 15),
(Item("common.items.crafting_ing.sticky_thread"), 3, false),
(Item("common.items.crafting_ing.honey"), 15, false),
],
craft_sprite: Some(CraftingBench),
is_recycling: false,
@ -1762,8 +1762,8 @@
"diamond necklace": (
output: ("common.items.armor.misc.neck.diamond", 1),
inputs: [
(Item("common.items.mineral.ingot.gold"), 4),
(Item("common.items.mineral.gem.diamond"), 6),
(Item("common.items.mineral.ingot.gold"), 4, false),
(Item("common.items.mineral.gem.diamond"), 6, false),
],
craft_sprite: Some(CraftingBench),
is_recycling: false,
@ -1779,8 +1779,8 @@
"ruby necklace": (
output: ("common.items.armor.misc.neck.ruby", 1),
inputs: [
(Item("common.items.mineral.ingot.silver"), 4),
(Item("common.items.mineral.gem.ruby"), 6),
(Item("common.items.mineral.ingot.silver"), 4, false),
(Item("common.items.mineral.gem.ruby"), 6, false),
],
craft_sprite: Some(CraftingBench),
is_recycling: false,
@ -1796,8 +1796,8 @@
"emerald necklace": (
output: ("common.items.armor.misc.neck.emerald", 1),
inputs: [
(Item("common.items.mineral.ingot.cobalt"), 4),
(Item("common.items.mineral.gem.emerald"), 6),
(Item("common.items.mineral.ingot.cobalt"), 4, false),
(Item("common.items.mineral.gem.emerald"), 6, false),
],
craft_sprite: Some(CraftingBench),
is_recycling: false,
@ -1813,8 +1813,8 @@
"sapphire necklace": (
output: ("common.items.armor.misc.neck.sapphire", 1),
inputs: [
(Item("common.items.mineral.ingot.iron"), 2),
(Item("common.items.mineral.gem.sapphire"), 3),
(Item("common.items.mineral.ingot.iron"), 2, false),
(Item("common.items.mineral.gem.sapphire"), 3, false),
],
craft_sprite: Some(CraftingBench),
is_recycling: false,
@ -1830,8 +1830,8 @@
"topaz necklace": (
output: ("common.items.armor.misc.neck.topaz", 1),
inputs: [
(Item("common.items.mineral.ingot.copper"), 2),
(Item("common.items.mineral.gem.topaz"), 3),
(Item("common.items.mineral.ingot.copper"), 2, false),
(Item("common.items.mineral.gem.topaz"), 3, false),
],
craft_sprite: Some(CraftingBench),
is_recycling: false,
@ -1847,8 +1847,8 @@
"amethyst necklace": (
output: ("common.items.armor.misc.neck.amethyst", 1),
inputs: [
(Item("common.items.mineral.ingot.tin"), 2),
(Item("common.items.mineral.gem.amethyst"), 3),
(Item("common.items.mineral.ingot.tin"), 2, false),
(Item("common.items.mineral.gem.amethyst"), 3, false),
],
craft_sprite: Some(CraftingBench),
is_recycling: false,

0
server/src/migrations/V44__modular_weapons.sql → server/src/migrations/V46__modular_weapons.sql
View File