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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	assets/voxygen/item_image_manifest.ron
This commit is contained in:
UncomfySilence 2021-11-03 22:40:32 +01:00
commit efa43e0394
12 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assets/common/items/armor/cultist/bandana.ron
View File

@ -4,16 +4,16 @@ ItemDef(
kind: Armor((
kind: Head("Cultist"),
stats: (
protection: Normal(18.0),
poise_resilience: Normal(3.0),
energy_max: 7.0,
energy_reward: 0.1,
crit_power: 0.06,
stealth: 0.0,
protection: Normal(12.0),
poise_resilience: Normal(2.0),
energy_max: 5.0,
energy_reward: 0.03,
crit_power: 0.04,
stealth: 0.04,
),
)),
quality: Epic,
tags: [
Cultist
Cultist,
],
)

4
assets/common/items/armor/misc/head/hood.ron
View File

@ -4,8 +4,8 @@ ItemDef(
kind: Armor((
kind: Head("Hood"),
stats: (
protection: Normal(20.0),
poise_resilience: Normal(0.0),
protection: Normal(8.0),
poise_resilience: Normal(1.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,

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

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

8
assets/common/loadout/dungeon/tier-5/cultist.ron
View File

@ -5,10 +5,12 @@
Armor(Hands): Item("common.items.armor.cultist.hand"),
Armor(Legs): Item("common.items.armor.cultist.pants"),
Armor(Feet): Item("common.items.armor.cultist.foot"),
Armor(Back): Item("common.items.armor.misc.back.dungeon_purple"),
Armor(Head): Item("common.items.armor.cultist.bandana"),
//Little easter egg, lost their mask in a chest
Armor(Head): Choice([
(1.0, Some(Item("common.items.armor.cultist.bandana"))),
(0.009, None),
]),
Lantern: Choice([
(1.0, Some(Item("common.items.lantern.black_0"))),

4
assets/common/loadout/village/villager.ron
View File

@ -20,7 +20,7 @@
(1.0, Some(Item("common.items.armor.cloth_blue.foot"))),
]),
Armor(Head): Choice([
(1.0, Some(Item("common.items.armor.misc.head.spikeguard"))),
(1.0, Some(Item("common.items.armor.misc.head.straw"))),
(1.0, None),
]),
})

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

@ -5,5 +5,6 @@
(1.0, Item("common.items.armor.cultist.hand")),
(1.0, Item("common.items.armor.cultist.pants")),
(1.0, Item("common.items.armor.cultist.shoulder")),
(1.0, Item("common.items.armor.cultist.bandana")),
(1.0, Item("common.items.armor.misc.back.dungeon_purple")),
]

5
assets/common/loot_tables/dungeon/tier-0/boss.ron
View File

@ -1,7 +1,8 @@
[
// Weapons
(1.0, LootTable("common.loot_tables.weapons.tier-0")),
(2.0, LootTable("common.loot_tables.weapons.tier-0")),
// Armor
(1.0, LootTable("common.loot_tables.armor.tier-0")),
(2.0, LootTable("common.loot_tables.armor.tier-0")),
(1.0, Item("common.items.armor.misc.neck.scratched")),
(0.5, Item("common.items.armor.misc.head.straw")),
]

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

@ -2,7 +2,7 @@
// Gear
(1.0, LootTable("common.loot_tables.weapons.tier-4")),
(1.0, LootTable("common.loot_tables.armor.tier-4")),
(0.3, Item("common.items.armor.cultist.bandana")),
(0.1, Item("common.items.armor.cultist.bandana")),
// Currency
(3.0, ItemQuantity("common.items.utility.coins", 200, 500)),
// Materials

1
assets/common/loot_tables/spots/bandit.ron
View File

@ -12,6 +12,7 @@
// Armor
(0.01, Item("common.items.armor.misc.head.bandana.thief")),
(0.01, Item("common.items.armor.misc.head.bandana.red")),
(0.005, Item("common.items.armor.misc.head.hood")),
// Food
(1.0, LootTable("common.loot_tables.food.wild_ingredients")),
(0.25, LootTable("common.loot_tables.food.prepared")),

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

@ -1,9 +1,9 @@
[
(0.001, Item("common.items.lantern.pumpkin")),
(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")),
(1.5, LootTable("common.loot_tables.food.prepared")),
(0.01, Item("common.items.armor.witch.hat")),
(0.05, Item("common.items.armor.witch.hat")),
]