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

Addressed second round of balance feedback (assets).

Browse Source
This commit is contained in:
Sam 2022-05-08 23:31:08 -04:00
parent c0dd748bc7
commit 13ea6dee93
44 changed files with 145 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/abilities/sceptre/wardingaura.ron
View File

@ -6,7 +6,7 @@ BasicAura(
auras: [
(
kind: ProtectingWard,
strength: 0.20,
strength: 0.15,
duration: Some(10.0),
category: Magical,
),

2
assets/common/entity/dungeon/gnarling/mandragora.ron
View File

@ -3,7 +3,7 @@
name: Name("Mandragora"),
body: RandomWith("mandragora"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
loot: LootTable("common.loot_tables.dungeon.tier-0.mandragora"),
inventory: (
loadout: Inline((
inherit: Asset("common.loadout.dungeon.gnarling.mandragora"),

2
assets/common/entity/dungeon/gnarling/woodgolem.ron
View File

@ -3,7 +3,7 @@
name: Name("Wooden Golem"),
body: RandomWith("woodgolem"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.dungeon.tier-0.miniboss"),
loot: LootTable("common.loot_tables.dungeon.tier-0.woodgolem"),
inventory: (
loadout: FromBody,
),

2
assets/common/items/crafting_ing/animal_misc/claw.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Predator Claw",
description: "Incredibly sharp claw from a predatory animal.",
description: "Incredibly sharp claw from a predatory animal.\n\nThis can be used when crafting weapons.",
kind: Ingredient(
kind: "Claw",
// Descriptor not needed

2
assets/common/items/crafting_ing/animal_misc/elegant_crest.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Elegant Crest",
description: "A flawless crest from some majestic creature.",
description: "A flawless crest from some majestic creature.\n\nThis can be used when crafting weapons.",
kind: Ingredient(
kind: "ElegantCrest",
// Descriptor not needed

2
assets/common/items/crafting_ing/animal_misc/large_horn.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Large Horn",
description: "A huge sharp horn from an animal.",
description: "A huge sharp horn from an animal.\n\nThis can be used when crafting weapons.",
kind: Ingredient(
kind: "LargeHorn",
// Descriptor not needed

2
assets/common/items/crafting_ing/animal_misc/long_tusk.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Long Tusk",
description: "A pointy tusk from some beast.",
description: "A pointy tusk from some beast.\n\nThis can be used when crafting weapons.",
kind: Ingredient(
kind: "LongTusk",
// Descriptor not needed

2
assets/common/items/crafting_ing/animal_misc/sharp_fang.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Sharp Fang",
description: "Incredibly sharp tooth from a predatory animal.",
description: "Incredibly sharp tooth from a predatory animal.\n\nThis can be used when crafting weapons.",
kind: Ingredient(
kind: "SharpFang",
// Descriptor not needed

2
assets/common/items/crafting_ing/animal_misc/strong_pincer.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Strong Pincer",
description: "The pincer of some creature, it is very tough.",
description: "The pincer of some creature, it is very tough.\n\nThis can be used when crafting weapons.",
kind: Ingredient(
kind: "StrongPincer",
// Descriptor not needed

14
assets/common/items/crafting_ing/modular/primary/axe/axe.ron
View File

@ -6,13 +6,13 @@ ItemDef(
toolkind: Axe,
stats: (
equip_time_secs: 0.25,
power: 1.0,
effect_power: 1.0,
speed: 1.0,
crit_chance: 0.1,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
power: 0.95,
effect_power: 0.95,
speed: 0.95,
crit_chance: 0.095,
range: 0.95,
energy_efficiency: 0.95,
buff_strength: 0.95,
),
hand_restriction: None,
weapon_name: HandednessDependent(

4
assets/common/items/crafting_ing/modular/primary/axe/jagged.ron
View File

@ -6,9 +6,9 @@ ItemDef(
toolkind: Axe,
stats: (
equip_time_secs: 0.25,
power: 0.8,
power: 1.0,
effect_power: 0.8,
speed: 0.8,
speed: 0.7,
crit_chance: 0.075,
range: 1.0,
energy_efficiency: 0.8,

2
assets/common/items/crafting_ing/modular/primary/axe/poleaxe.ron
View File

@ -10,7 +10,7 @@ ItemDef(
effect_power: 0.8,
speed: 0.8,
crit_chance: 0.2,
range: 1.5,
range: 1.3,
energy_efficiency: 0.8,
buff_strength: 0.8,
),

14
assets/common/items/crafting_ing/modular/primary/bow/bow.ron
View File

@ -6,13 +6,13 @@ ItemDef(
toolkind: Bow,
stats: (
equip_time_secs: 0.25,
power: 1.0,
effect_power: 1.0,
speed: 1.0,
crit_chance: 0.1,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
power: 0.95,
effect_power: 0.95,
speed: 0.95,
crit_chance: 0.095,
range: 0.95,
energy_efficiency: 0.95,
buff_strength: 0.95,
),
hand_restriction: Some(Two),
weapon_name: Universal("Bow"),

4
assets/common/items/crafting_ing/modular/primary/bow/composite.ron
View File

@ -6,9 +6,9 @@ ItemDef(
toolkind: Bow,
stats: (
equip_time_secs: 0.25,
power: 0.8,
power: 1.0,
effect_power: 0.8,
speed: 0.8,
speed: 0.7,
crit_chance: 0.075,
range: 1.0,
energy_efficiency: 0.8,

2
assets/common/items/crafting_ing/modular/primary/bow/longbow.ron
View File

@ -10,7 +10,7 @@ ItemDef(
effect_power: 0.8,
speed: 0.8,
crit_chance: 0.2,
range: 1.5,
range: 1.3,
energy_efficiency: 0.8,
buff_strength: 0.8,
),

4
assets/common/items/crafting_ing/modular/primary/hammer/greatmace.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Great Mace Head",
name: "Greatmace Head",
description: "",
kind: ModularComponent(
ToolPrimaryComponent(
@ -15,7 +15,7 @@ ItemDef(
buff_strength: 0.8,
),
hand_restriction: Some(Two),
weapon_name: Universal("Great Mace"),
weapon_name: Universal("Greatmace"),
)
),
quality: Low,

14
assets/common/items/crafting_ing/modular/primary/hammer/hammer.ron
View File

@ -6,13 +6,13 @@ ItemDef(
toolkind: Hammer,
stats: (
equip_time_secs: 0.25,
power: 1.0,
effect_power: 1.0,
speed: 1.0,
crit_chance: 0.1,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
power: 0.95,
effect_power: 0.95,
speed: 0.95,
crit_chance: 0.095,
range: 0.95,
energy_efficiency: 0.95,
buff_strength: 0.95,
),
hand_restriction: None,
weapon_name: HandednessDependent(

2
assets/common/items/crafting_ing/modular/primary/hammer/maul.ron
View File

@ -10,7 +10,7 @@ ItemDef(
effect_power: 0.8,
speed: 0.8,
crit_chance: 0.2,
range: 1.5,
range: 1.3,
energy_efficiency: 0.8,
buff_strength: 0.8,
),

4
assets/common/items/crafting_ing/modular/primary/hammer/spikedmace.ron
View File

@ -6,9 +6,9 @@ ItemDef(
toolkind: Hammer,
stats: (
equip_time_secs: 0.25,
power: 0.8,
power: 1.0,
effect_power: 0.8,
speed: 0.8,
speed: 0.7,
crit_chance: 0.075,
range: 1.0,
energy_efficiency: 0.8,

2
assets/common/items/crafting_ing/modular/primary/sceptre/arbor.ron
View File

@ -10,7 +10,7 @@ ItemDef(
effect_power: 0.8,
speed: 0.8,
crit_chance: 0.2,
range: 1.5,
range: 1.3,
energy_efficiency: 0.8,
buff_strength: 0.8,
),

4
assets/common/items/crafting_ing/modular/primary/sceptre/crook.ron
View File

@ -6,9 +6,9 @@ ItemDef(
toolkind: Sceptre,
stats: (
equip_time_secs: 0.25,
power: 0.8,
power: 1.0,
effect_power: 0.8,
speed: 0.8,
speed: 0.7,
crit_chance: 0.075,
range: 1.0,
energy_efficiency: 0.8,

14
assets/common/items/crafting_ing/modular/primary/sceptre/sceptre.ron
View File

@ -6,13 +6,13 @@ ItemDef(
toolkind: Sceptre,
stats: (
equip_time_secs: 0.25,
power: 1.0,
effect_power: 1.0,
speed: 1.0,
crit_chance: 0.1,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
power: 0.95,
effect_power: 0.95,
speed: 0.95,
crit_chance: 0.095,
range: 0.95,
energy_efficiency: 0.95,
buff_strength: 0.95,
),
hand_restriction: Some(Two),
weapon_name: Universal("Sceptre"),

2
assets/common/items/crafting_ing/modular/primary/staff/longpole.ron
View File

@ -10,7 +10,7 @@ ItemDef(
effect_power: 0.8,
speed: 0.8,
crit_chance: 0.2,
range: 1.5,
range: 1.3,
energy_efficiency: 0.8,
buff_strength: 0.8,
),

4
assets/common/items/crafting_ing/modular/primary/staff/pole.ron
View File

@ -6,9 +6,9 @@ ItemDef(
toolkind: Staff,
stats: (
equip_time_secs: 0.25,
power: 0.8,
power: 1.0,
effect_power: 0.8,
speed: 0.8,
speed: 0.7,
crit_chance: 0.075,
range: 1.0,
energy_efficiency: 0.8,

14
assets/common/items/crafting_ing/modular/primary/staff/staff.ron
View File

@ -6,13 +6,13 @@ ItemDef(
toolkind: Staff,
stats: (
equip_time_secs: 0.25,
power: 1.0,
effect_power: 1.0,
speed: 1.0,
crit_chance: 0.1,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
power: 0.95,
effect_power: 0.95,
speed: 0.95,
crit_chance: 0.095,
range: 0.95,
energy_efficiency: 0.95,
buff_strength: 0.95,
),
hand_restriction: Some(Two),
weapon_name: Universal("Staff"),

14
assets/common/items/crafting_ing/modular/primary/sword/longsword.ron
View File

@ -6,13 +6,13 @@ ItemDef(
toolkind: Sword,
stats: (
equip_time_secs: 0.25,
power: 1.0,
effect_power: 1.0,
speed: 1.0,
crit_chance: 0.1,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
power: 0.95,
effect_power: 0.95,
speed: 0.95,
crit_chance: 0.095,
range: 0.95,
energy_efficiency: 0.95,
buff_strength: 0.95,
),
hand_restriction: None,
weapon_name: HandednessDependent(

4
assets/common/items/crafting_ing/modular/primary/sword/sawblade.ron
View File

@ -6,9 +6,9 @@ ItemDef(
toolkind: Sword,
stats: (
equip_time_secs: 0.25,
power: 0.8,
power: 1.0,
effect_power: 0.8,
speed: 0.8,
speed: 0.7,
crit_chance: 0.075,
range: 1.0,
energy_efficiency: 0.8,

2
assets/common/items/crafting_ing/modular/primary/sword/zweihander.ron
View File

@ -10,7 +10,7 @@ ItemDef(
effect_power: 0.8,
speed: 0.8,
crit_chance: 0.2,
range: 1.5,
range: 1.3,
energy_efficiency: 0.8,
buff_strength: 0.8,
),

4
assets/common/loot_tables/dungeon/tier-0/mandragora.ron Normal file
View File

@ -0,0 +1,4 @@
[
(1.0, LootTable("common.loot_tables.dungeon.tier-0.enemy")),
(1.0, ItemQuantity("common.items.flowers.plant_fiber", 2, 4)),
]

3
assets/common/loot_tables/dungeon/tier-0/miniboss.ron → assets/common/loot_tables/dungeon/tier-0/woodgolem.ron
View File

@ -5,4 +5,7 @@
(1.0, LootTable("common.loot_tables.food.wild_ingredients")),
// Consumables
(2.0, LootTable("common.loot_tables.consumable.poor")),
// Crafting ingredients
(1.0, ItemQuantity("common.items.log.wood", 5, 10)),
(0.5, LootTable("common.loot_tables.weapons.components.secondary.sceptre")),
]

5
assets/common/loot_tables/weapons/components/secondary/axe.ron Normal file
View File

@ -0,0 +1,5 @@
[
(1.0, Item("common.items.crafting_ing.modular.secondary.axe.short")),
(1.0, Item("common.items.crafting_ing.modular.secondary.axe.medium")),
(1.0, Item("common.items.crafting_ing.modular.secondary.axe.long")),
]

5
assets/common/loot_tables/weapons/components/secondary/bow.ron Normal file
View File

@ -0,0 +1,5 @@
[
(1.0, Item("common.items.crafting_ing.modular.secondary.bow.short")),
(1.0, Item("common.items.crafting_ing.modular.secondary.bow.medium")),
(1.0, Item("common.items.crafting_ing.modular.secondary.bow.long")),
]

5
assets/common/loot_tables/weapons/components/secondary/hammer.ron Normal file
View File

@ -0,0 +1,5 @@
[
(1.0, Item("common.items.crafting_ing.modular.secondary.hammer.short")),
(1.0, Item("common.items.crafting_ing.modular.secondary.hammer.medium")),
(1.0, Item("common.items.crafting_ing.modular.secondary.hammer.long")),
]

5
assets/common/loot_tables/weapons/components/secondary/sceptre.ron Normal file
View File

@ -0,0 +1,5 @@
[
(1.0, Item("common.items.crafting_ing.modular.secondary.sceptre.light")),
(1.0, Item("common.items.crafting_ing.modular.secondary.sceptre.medium")),
(1.0, Item("common.items.crafting_ing.modular.secondary.sceptre.heavy")),
]

5
assets/common/loot_tables/weapons/components/secondary/staff.ron Normal file
View File

@ -0,0 +1,5 @@
[
(1.0, Item("common.items.crafting_ing.modular.secondary.staff.light")),
(1.0, Item("common.items.crafting_ing.modular.secondary.staff.medium")),
(1.0, Item("common.items.crafting_ing.modular.secondary.staff.heavy")),
]

5
assets/common/loot_tables/weapons/components/secondary/sword.ron Normal file
View File

@ -0,0 +1,5 @@
[
(1.0, Item("common.items.crafting_ing.modular.secondary.sword.short")),
(1.0, Item("common.items.crafting_ing.modular.secondary.sword.medium")),
(1.0, Item("common.items.crafting_ing.modular.secondary.sword.long")),
]

19
assets/common/recipe_book.ron
View File

@ -1726,11 +1726,12 @@
"tin pickaxe": (
output: ("common.items.tool.pickaxe_stone", 1),
inputs: [
(Item("common.items.crafting_ing.leather.leather_strips"), 4, false),
(Item("common.items.crafting_ing.stones"), 5, false),
(Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
(Item("common.items.crafting_ing.stones"), 3, false),
(Item("common.items.log.wood"), 1, false),
(Item("common.items.tool.craftsman_hammer"), 0, false),
],
craft_sprite: Some(Anvil),
craft_sprite: None,
),
"steel pickaxe": (
output: ("common.items.tool.pickaxe_steel", 1),
@ -1999,7 +2000,7 @@
(Item("common.items.mineral.gem.ruby"), 1, false),
(Item("common.items.mineral.ore.veloritefrag"), 3, false),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Cauldron),
is_recycling: false,
),
"pyrocore": (
@ -2008,7 +2009,7 @@
(Item("common.items.mineral.gem.ruby"), 1, false),
(Item("common.items.mineral.ore.veloritefrag"), 3, false),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Cauldron),
is_recycling: false,
),
"light pyrocore": (
@ -2017,7 +2018,7 @@
(Item("common.items.mineral.gem.ruby"), 1, false),
(Item("common.items.mineral.ore.veloritefrag"), 3, false),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Cauldron),
is_recycling: false,
),
/// MODULAR WEAPONS/NATURE SCEPTRES/SECONDARY COMPONENTS
@ -2027,7 +2028,7 @@
(Item("common.items.mineral.gem.emerald"), 1, false),
(Item("common.items.mineral.ore.veloritefrag"), 3, false),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Cauldron),
is_recycling: false,
),
"biocore": (
@ -2036,7 +2037,7 @@
(Item("common.items.mineral.gem.emerald"), 1, false),
(Item("common.items.mineral.ore.veloritefrag"), 3, false),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Cauldron),
is_recycling: false,
),
"light biocore": (
@ -2045,7 +2046,7 @@
(Item("common.items.mineral.gem.emerald"), 1, false),
(Item("common.items.mineral.ore.veloritefrag"), 3, false),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Cauldron),
is_recycling: false,
),
}

10
assets/common/trading/item_price_calculation.ron
View File

@ -1,20 +1,12 @@
(
loot_tables: [
// balance the loot tables against each other (higher= more common= smaller price)
// Weapons
// Non-craftable weapons
(192.0, true, "common.loot_tables.weapons.starter"),
(0.075, false, "common.loot_tables.weapons.cultist"),
(0.075, false, "common.loot_tables.weapons.cave"),
(0.04, false, "common.loot_tables.weapons.legendary"),
// Weapons sets
(80.0, true, "common.loot_tables.weapons.tier-0"),
(48.0, true, "common.loot_tables.weapons.tier-1"),
(6.0, true, "common.loot_tables.weapons.tier-2"),
(0.75, true, "common.loot_tables.weapons.tier-3"),
(0.375, false, "common.loot_tables.weapons.tier-4"),
(0.18, false, "common.loot_tables.weapons.tier-5"),
// Non-craftable Armor
(640, true, "common.loot_tables.armor.cloth"),
(6.0, true, "common.loot_tables.armor.twigs"),

4
assets/common/trading/sellable_materials.ron
View File

@ -21,15 +21,12 @@
(0.5, Item("common.items.mineral.ore.velorite")),
(0.6, Item("common.items.mineral.ore.veloritefrag")),
(2.5, Item("common.items.mineral.ore.copper")),
(2.5, Item("common.items.mineral.ore.iron")),
(2.5, Item("common.items.mineral.ore.tin")),
// Logs
(5.0, Item("common.items.log.wood")),
(2.5, Item("common.items.log.bamboo")),
// Animal Hide
(2.5, Item("common.items.crafting_ing.hide.tough_hide")),
(4.0, Item("common.items.crafting_ing.hide.animal_hide")),
// Mob Drops
@ -42,6 +39,7 @@
(2.5, Item("common.items.crafting_ing.animal_misc.venom_sac")),
(2.5, Item("common.items.crafting_ing.animal_misc.viscous_ooze")),
(4.0, Item("common.items.crafting_ing.cloth.wool")),
(4.0, Item("common.items.flowers.plant_fiber")),
// Junk
(4.0, Item("common.items.crafting_ing.bowl")),

7
assets/common/trading/unsellable_materials.ron
View File

@ -11,13 +11,15 @@
(0.03, Item("common.items.mineral.ore.silver")),
(0.1, Item("common.items.mineral.ore.bloodstone")),
(0.2, Item("common.items.mineral.ore.cobalt")),
(0.25, Item("common.items.mineral.ore.coal")),
(0.5, Item("common.items.mineral.ore.coal")),
(1.0, Item("common.items.mineral.ore.iron")),
// High tier woods
(0.05, Item("common.items.log.eldwood")),
(0.1, Item("common.items.log.frostwood")),
(0.2, Item("common.items.log.ironwood")),
(0.5, Item("common.items.log.hardwood")),
(1.0, Item("common.items.log.bamboo")),
// High tier Animal Hide
(0.025, Item("common.items.crafting_ing.hide.dragon_scale")),
@ -25,7 +27,8 @@
(0.05, Item("common.items.crafting_ing.hide.leather_troll")),
(0.05, Item("common.items.crafting_ing.hide.rugged_hide")),
(0.2, Item("common.items.crafting_ing.hide.carapace")),
(0.2, Item("common.items.crafting_ing.hide.scales")),
(0.5, Item("common.items.crafting_ing.hide.scales")),
(1.0, Item("common.items.crafting_ing.hide.tough_hide")),
// High tier Mob drops
(0.005, Item("common.items.crafting_ing.animal_misc.phoenix_feather")),

24
assets/voxygen/item_image_manifest.ron
View File

@ -1081,10 +1081,6 @@
"voxel.weapon.hammer.hammer.bronze-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.bronze", One)): VoxTrans(
"voxel.weapon.hammer.maul.bronze-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.bronze", One)): VoxTrans(
"voxel.weapon.hammer.ornate.bronze-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
@ -1101,10 +1097,6 @@
"voxel.weapon.hammer.hammer.iron-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.iron", One)): VoxTrans(
"voxel.weapon.hammer.maul.iron-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.iron", One)): VoxTrans(
"voxel.weapon.hammer.ornate.iron-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
@ -1121,10 +1113,6 @@
"voxel.weapon.hammer.hammer.steel-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.steel", One)): VoxTrans(
"voxel.weapon.hammer.maul.steel-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.steel", One)): VoxTrans(
"voxel.weapon.hammer.ornate.steel-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
@ -1141,10 +1129,6 @@
"voxel.weapon.hammer.hammer.cobalt-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.cobalt", One)): VoxTrans(
"voxel.weapon.hammer.maul.cobalt-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.cobalt", One)): VoxTrans(
"voxel.weapon.hammer.ornate.cobalt-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
@ -1161,10 +1145,6 @@
"voxel.weapon.hammer.hammer.bloodsteel-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.bloodsteel", One)): VoxTrans(
"voxel.weapon.hammer.maul.bloodsteel-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.bloodsteel", One)): VoxTrans(
"voxel.weapon.hammer.ornate.bloodsteel-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
@ -1181,10 +1161,6 @@
"voxel.weapon.hammer.hammer.orichalcum-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.orichalcum", One)): VoxTrans(
"voxel.weapon.hammer.maul.orichalcum-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.orichalcum", One)): VoxTrans(
"voxel.weapon.hammer.ornate.orichalcum-1h",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,

24
assets/voxygen/voxel/biped_weapon_manifest.ron
View File

@ -792,10 +792,6 @@
vox_spec: ("weapon.hammer.hammer.bronze-1h", (-2.5, -2.0, -2.5)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.bronze", One)): (
vox_spec: ("weapon.hammer.maul.bronze-1h", (-2.0, -3.0, -2.5)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.bronze", One)): (
vox_spec: ("weapon.hammer.ornate.bronze-1h", (-2.5, -3.0, -2.5)),
color: None
@ -812,10 +808,6 @@
vox_spec: ("weapon.hammer.hammer.iron-1h", (-2.5, -2.0, -2.5)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.iron", One)): (
vox_spec: ("weapon.hammer.maul.iron-1h", (-2.0, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.iron", One)): (
vox_spec: ("weapon.hammer.ornate.iron-1h", (-2.5, -3.0, -3.5)),
color: None
@ -832,10 +824,6 @@
vox_spec: ("weapon.hammer.hammer.steel-1h", (-2.5, -3.0, -2.5)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.steel", One)): (
vox_spec: ("weapon.hammer.maul.steel-1h", (-2.0, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.steel", One)): (
vox_spec: ("weapon.hammer.ornate.steel-1h", (-2.5, -3.0, -2.5)),
color: None
@ -852,10 +840,6 @@
vox_spec: ("weapon.hammer.hammer.cobalt-1h", (-2.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.cobalt", One)): (
vox_spec: ("weapon.hammer.maul.cobalt-1h", (-2.0, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.cobalt", One)): (
vox_spec: ("weapon.hammer.ornate.cobalt-1h", (-2.5, -4.0, -2.5)),
color: None
@ -872,10 +856,6 @@
vox_spec: ("weapon.hammer.hammer.bloodsteel-1h", (-2.5, -3.0, -4.5)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.bloodsteel", One)): (
vox_spec: ("weapon.hammer.maul.bloodsteel-1h", (-2.0, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.bloodsteel", One)): (
vox_spec: ("weapon.hammer.ornate.bloodsteel-1h", (-1.5, -4.0, -4.5)),
color: None
@ -892,10 +872,6 @@
vox_spec: ("weapon.hammer.hammer.orichalcum-1h", (-2.5, -4.0, -2.5)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.orichalcum", One)): (
vox_spec: ("weapon.hammer.maul.orichalcum-1h", (-2.0, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.orichalcum", One)): (
vox_spec: ("weapon.hammer.ornate.orichalcum-1h", (-1.5, -4.0, -2.5)),
color: None

12
assets/voxygen/voxel/item_drop_manifest.ron
View File

@ -297,32 +297,26 @@
Tool("common.items.weapons.hammer.burnt_drumstick"): "voxel.weapon.hammer.burnt_drumstick",
// 1h Hammers
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.hammer", "common.items.mineral.ingot.bronze", One)): "voxel.weapon.hammer.hammer.bronze-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.bronze", One)): "voxel.weapon.hammer.maul.bronze-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.bronze", One)): "voxel.weapon.hammer.ornate.bronze-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.spikedmace", "common.items.mineral.ingot.bronze", One)): "voxel.weapon.hammer.spikedmace.bronze-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.warhammer", "common.items.mineral.ingot.bronze", One)): "voxel.weapon.hammer.warhammer.bronze-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.hammer", "common.items.mineral.ingot.iron", One)): "voxel.weapon.hammer.hammer.iron-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.iron", One)): "voxel.weapon.hammer.maul.iron-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.iron", One)): "voxel.weapon.hammer.ornate.iron-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.spikedmace", "common.items.mineral.ingot.iron", One)): "voxel.weapon.hammer.spikedmace.iron-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.warhammer", "common.items.mineral.ingot.iron", One)): "voxel.weapon.hammer.warhammer.iron-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.hammer", "common.items.mineral.ingot.steel", One)): "voxel.weapon.hammer.hammer.steel-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.steel", One)): "voxel.weapon.hammer.maul.steel-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.steel", One)): "voxel.weapon.hammer.ornate.steel-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.spikedmace", "common.items.mineral.ingot.steel", One)): "voxel.weapon.hammer.spikedmace.steel-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.warhammer", "common.items.mineral.ingot.steel", One)): "voxel.weapon.hammer.warhammer.steel-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.hammer", "common.items.mineral.ingot.cobalt", One)): "voxel.weapon.hammer.hammer.cobalt-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.cobalt", One)): "voxel.weapon.hammer.maul.cobalt-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.cobalt", One)): "voxel.weapon.hammer.ornate.cobalt-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.spikedmace", "common.items.mineral.ingot.cobalt", One)): "voxel.weapon.hammer.spikedmace.cobalt-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.warhammer", "common.items.mineral.ingot.cobalt", One)): "voxel.weapon.hammer.warhammer.cobalt-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.hammer", "common.items.mineral.ingot.bloodsteel", One)): "voxel.weapon.hammer.hammer.bloodsteel-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.bloodsteel", One)): "voxel.weapon.hammer.maul.bloodsteel-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.bloodsteel", One)): "voxel.weapon.hammer.ornate.bloodsteel-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.spikedmace", "common.items.mineral.ingot.bloodsteel", One)): "voxel.weapon.hammer.spikedmace.bloodsteel-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.warhammer", "common.items.mineral.ingot.bloodsteel", One)): "voxel.weapon.hammer.warhammer.bloodsteel-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.hammer", "common.items.mineral.ingot.orichalcum", One)): "voxel.weapon.hammer.hammer.orichalcum-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.maul", "common.items.mineral.ingot.orichalcum", One)): "voxel.weapon.hammer.maul.orichalcum-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.orichalcum", One)): "voxel.weapon.hammer.ornate.orichalcum-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.spikedmace", "common.items.mineral.ingot.orichalcum", One)): "voxel.weapon.hammer.spikedmace.orichalcum-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.warhammer", "common.items.mineral.ingot.orichalcum", One)): "voxel.weapon.hammer.warhammer.orichalcum-1h",
@ -893,6 +887,12 @@
Ingredient("Oil"): "voxel.sprite.crafting_ing.oil",
Ingredient("ViscousOoze"): "voxel.sprite.crafting_ing.animal_misc.viscous_ooze",
Ingredient("PhoenixFeather"): "voxel.sprite.crafting_ing.animal_misc.phoenix_feather",
Ingredient("Bamboo"): "voxel.sprite.wood.item.bamboo",
Ingredient("EldwoodLogs"): "voxel.sprite.wood.item.eldwood",
Ingredient("FrostwoodLogs"): "voxel.sprite.wood.item.frostwood",
Ingredient("HardwoodLogs"): "voxel.sprite.wood.item.hardwood",
Ingredient("IronwoodLogs"): "voxel.sprite.wood.item.ironwood",
Ingredient("WoodLogs"): "voxel.sprite.wood.item.wood",
// Gliders
Glider("Starter"): "voxel.glider.starter",
Glider("PlainCloth"): "voxel.glider.basic_white",

38
voxygen/src/session/mod.rs
View File

@ -2,23 +2,25 @@ pub mod interactable;
pub mod settings_change;
mod target;
use std::{cell::RefCell, collections::HashSet, rc::Rc, result::Result, sync::Arc, time::Duration};
use std::{cell::RefCell, collections::HashSet, rc::Rc, result::Result, time::Duration};
#[cfg(not(target_os = "macos"))]
use mumble_link::SharedLink;
use ordered_float::OrderedFloat;
use specs::{Join, WorldExt};
use tracing::{error, info, trace, warn};
use tracing::{error, info};
use vek::*;
use client::{self, Client};
use common::{
assets::AssetExt,
comp,
comp::{
inventory::slot::{EquipSlot, Slot},
invite::InviteKind,
item::{tool::ToolKind, ItemDef, ItemDefinitionId, ItemDesc},
item::{
tool::{AbilityMap, MaterialStatManifest, ToolKind},
ItemDesc,
},
ChatMsg, ChatType, InputKind, InventoryUpdateEvent, Pos, Stats, UtteranceKind, Vel,
},
consts::MAX_MOUNT_RANGE,
@ -250,25 +252,13 @@ impl SessionState {
self.hud.add_failed_entity_pickup(entity);
}
},
InventoryUpdateEvent::Collected(item) => match item.item_definition_id() {
ItemDefinitionId::Simple(id) => match Arc::<ItemDef>::load_cloned(id) {
Result::Ok(item_def) => {
self.hud.new_loot_message(LootMessage {
item: item_def,
amount: item.amount(),
});
},
Result::Err(e) => {
warn!(
?e,
"Item not present on client: {:?}",
item.item_definition_id()
);
},
},
ItemDefinitionId::Modular { .. } => {
trace!("Modular items not currently supported for loot messages.")
},
InventoryUpdateEvent::Collected(item) => {
let ability_map = AbilityMap::load().read();
let msm = MaterialStatManifest::load().read();
self.hud.new_loot_message(LootMessage {
item: item.duplicate(&ability_map, &msm),
amount: item.amount(),
});
},
_ => {},
};
@ -1449,7 +1439,7 @@ impl PlayState for SessionState {
.get(client.entity())
.and_then(|inv| inv.get(slot))
.and_then(|item| {
item.item_definition_id().raw().map(String::from)
item.item_definition_id().itemdef_id().map(String::from)
})
};
if let Some(material_id) = item_id(material) {