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 branch 'increasing_witch_lantern_droprate_' into 'master'

Browse Source 
Minor edits

See merge request veloren/veloren!2979
This commit is contained in:
Samuel Keiffer 2021-11-03 21:27:47 +00:00
commit 7438252560
12 changed files with 53 additions and 49 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")),
]

34
assets/common/recipe_book.ron
View File

@ -522,7 +522,7 @@
],
craft_sprite: Some(CookingPot),
),
//ARMOR/HIDE/RAWHIDE
//ARMOR/HIDE/RAWHIDE
"rawhide back": (
output: ("common.items.armor.hide.rawhide.back", 1),
inputs: [
@ -579,7 +579,7 @@
],
craft_sprite: Some(CraftingBench),
),
//ARMOR/HIDE/LEATHER
//ARMOR/HIDE/LEATHER
"leather back": (
output: ("common.items.armor.hide.leather.back", 1),
inputs: [
@ -636,7 +636,7 @@
],
craft_sprite: Some(CraftingBench),
),
//ARMOR/HIDE/SCALE
//ARMOR/HIDE/SCALE
"scale back": (
output: ("common.items.armor.hide.scale.back", 1),
inputs: [
@ -693,7 +693,7 @@
],
craft_sprite: Some(CraftingBench),
),
//ARMOR/HIDE/CARAPACE
//ARMOR/HIDE/CARAPACE
"carapace back": (
output: ("common.items.armor.hide.carapace.back", 1),
inputs: [
@ -757,7 +757,7 @@
],
craft_sprite: Some(CraftingBench),
),
//ARMOR/HIDE/PRIMAL
//ARMOR/HIDE/PRIMAL
"primal back": (
output: ("common.items.armor.hide.primal.back", 1),
inputs: [
@ -825,7 +825,7 @@
],
craft_sprite: Some(CraftingBench),
),
//ARMOR/HIDE/DRAGONSCALE
//ARMOR/HIDE/DRAGONSCALE
"dragonscale back": (
output: ("common.items.armor.hide.dragonscale.back", 1),
inputs: [
@ -893,7 +893,7 @@
],
craft_sprite: Some(CraftingBench),
),
//ARMOR/CLOTH/LINEN
//ARMOR/CLOTH/LINEN
"linen back": (
output: ("common.items.armor.cloth.linen.back", 1),
inputs: [
@ -943,7 +943,7 @@
],
craft_sprite: Some(Loom),
),
//ARMOR/CLOTH/WOOLEN
//ARMOR/CLOTH/WOOLEN
"woolen back": (
output: ("common.items.armor.cloth.woolen.back", 1),
inputs: [
@ -1014,7 +1014,7 @@
],
craft_sprite: Some(Loom),
),
//ARMOR/CLOTH/SILKEN
//ARMOR/CLOTH/SILKEN
"silken back": (
output: ("common.items.armor.cloth.silken.back", 1),
inputs: [
@ -1074,7 +1074,7 @@
],
craft_sprite: Some(Loom),
),
//ARMOR/CLOTH/DRUID
//ARMOR/CLOTH/DRUID
"druid back": (
output: ("common.items.armor.cloth.druid.back", 1),
inputs: [
@ -1138,7 +1138,7 @@
],
craft_sprite: Some(Loom),
),
//ARMOR/CLOTH/MOONWEAVE
//ARMOR/CLOTH/MOONWEAVE
"moonweave back": (
output: ("common.items.armor.cloth.moonweave.back", 1),
inputs: [
@ -1211,7 +1211,7 @@
],
craft_sprite: Some(Loom),
),
//ARMOR/CLOTH/SUNSILK
//ARMOR/CLOTH/SUNSILK
"sunsilk back": (
output: ("common.items.armor.cloth.sunsilk.back", 1),
inputs: [
@ -1277,7 +1277,7 @@
],
craft_sprite: Some(Loom),
),
//ARMOR/MAIL/BRONZE
//ARMOR/MAIL/BRONZE
"bronze back": (
output: ("common.items.armor.mail.bronze.back", 1),
inputs: [
@ -1391,7 +1391,7 @@
],
craft_sprite: Some(Anvil),
),
//ARMOR/MAIL/STEEL
//ARMOR/MAIL/STEEL
"steel back": (
output: ("common.items.armor.mail.steel.back", 1),
inputs: [
@ -1448,7 +1448,7 @@
],
craft_sprite: Some(Anvil),
),
//ARMOR/MAIL/COBALT
//ARMOR/MAIL/COBALT
"cobalt back": (
output: ("common.items.armor.mail.cobalt.back", 1),
inputs: [
@ -1510,7 +1510,7 @@
],
craft_sprite: Some(Anvil),
),
//ARMOR/MAIL/BLOODSTEEL
//ARMOR/MAIL/BLOODSTEEL
"bloodsteel back": (
output: ("common.items.armor.mail.bloodsteel.back", 1),
inputs: [
@ -1573,7 +1573,7 @@
],
craft_sprite: Some(Anvil),
),
//ARMOR/MAIL/ORICHALCUM
//ARMOR/MAIL/ORICHALCUM
"orichalcum back": (
output: ("common.items.armor.mail.orichalcum.back", 1),
inputs: [

23
assets/voxygen/item_image_manifest.ron
View File

@ -17,27 +17,27 @@
),
Tool("CraftingBench"): VoxTrans(
"voxel.sprite.crafting_bench.crafting_bench-0",
(0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0,
(0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0,
),
Tool("Forge"): VoxTrans(
"voxel.object.forge",
(0.0, 0.0, 0.0), (-80.0, 20.0, 0.0), 1.0,
(0.0, 0.0, 0.0), (-80.0, 20.0, 0.0), 1.0,
),
Tool("Loom"): VoxTrans(
"voxel.object.loom",
(0.0, 0.0, 0.0), (-100.0, 00.0, 0.0), 1.0,
(0.0, 0.0, 0.0), (-100.0, 00.0, 0.0), 1.0,
),
Tool("SpinningWheel"): VoxTrans(
"voxel.object.spinning_wheel",
(0.0, 0.0, 0.0), (-70.0, 10.0, 0.0), 1.0,
(0.0, 0.0, 0.0), (-70.0, 10.0, 0.0), 1.0,
),
Tool("TanningRack"): VoxTrans(
"voxel.object.tanning_rack",
(0.0, 0.0, 0.0), (-90.0, 20.0, 0.0), 1.0,
(0.0, 0.0, 0.0), (-90.0, 20.0, 0.0), 1.0,
),
Tool("DismantlingBench"): VoxTrans(
"voxel.sprite.salvaging_station.salvaging_station-0",
(0.0, 0.0, 0.0), (-50.0, 40.0, 30.0), 0.9,
(0.0, 0.0, 0.0), (-50.0, 40.0, 30.0), 0.9,
),
// Weapons
// Diary Example Images
@ -51,7 +51,7 @@
),
Tool("example_axe"): VoxTrans(
"voxel.weapon.axe.2haxe_bloodsteel-0",
(0.0, 0.0, 0.0), (-90.0, 70.0, 0.0), 1.0,
(0.0, 0.0, 0.0), (-90.0, 70.0, 0.0), 1.0,
),
Tool("example_hammer"): VoxTrans(
"voxel.weapon.hammer.2hhammer_ramshead",
@ -999,7 +999,7 @@
"voxel.weapon.sceptre.root_evil",
(1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
),
Tool("common.items.weapons.sceptre.sceptre_velorite_0"): VoxTrans(
Tool("common.items.weapons.sceptre.sceptre_velorite_0"): VoxTrans(
"voxel.weapon.sceptre.ore-nature",
(1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.15,
),
@ -1086,7 +1086,7 @@
"voxel.weapon.tool.shovel_gold",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
),
// Picks
// Picks
Tool("common.items.tool.pickaxe_stone"): VoxTrans(
"voxel.weapon.tool.pickaxe_green-0",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
@ -1463,7 +1463,7 @@
Armor(Shoulder("Twigs")): VoxTrans(
"voxel.armor.twigs.shoulder",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
),
),
//TwigsLeaves Set
Armor(Chest("TwigsLeaves")): VoxTrans(
"voxel.armor.twigsleaves.chest",
@ -2116,7 +2116,7 @@
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
//misc
Armor(Pants("Hunting")): VoxTrans(
Armor(Pants("Hunting")): VoxTrans(
"voxel.armor.misc.pants.grayscale",
(0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
@ -2223,7 +2223,6 @@
"voxel.armor.cultist.ring",
(0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
),
// Necks
Armor(Neck("Ankh")): VoxTrans(
"voxel.armor.misc.neck.ankh_of_life",