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

small tweaks

Browse Source 
t
This commit is contained in:
jshipsey 2021-06-08 22:13:18 -04:00
parent e6493fbb2f
commit 7cb5323eb6
18 changed files with 86 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/item_price_calculation.ron
View File

@ -14,8 +14,6 @@ loot_tables: [
(0.04, false, "common.loot_tables.weapons.legendary"),
// Armor
(20.0, true, "common.loot_tables.armor.cloth"),
(6.0, true, "common.loot_tables.armor.rawhide"),
(3.0, true, "common.loot_tables.armor.leather"),
(1.0, true, "common.loot_tables.armor.twigs"),
(1.0, true, "common.loot_tables.armor.twigsflowers"),
(1.0, true, "common.loot_tables.armor.twigsleaves"),

2
assets/common/items/armor/cloth/sunsilk/back.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Back("Sunsilk"),
stats: (
protection: Normal(0.0),
protection: Normal(5.0),
poise_resilience: Normal(0.0),
energy_max: 50,
energy_reward: 0.05,

2
assets/common/items/armor/cloth/sunsilk/belt.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Belt("Sunsilk"),
stats: (
protection: Normal(0.0),
protection: Normal(5.0),
poise_resilience: Normal(0.0),
energy_max: 50,
energy_reward: 0.05,

2
assets/common/items/armor/cloth/sunsilk/chest.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Chest("Sunsilk"),
stats: (
protection: Normal(90.0),
protection: Normal(27.0),
poise_resilience: Normal(0.0),
energy_max: 300,
energy_reward: 0.3,

2
assets/common/items/armor/cloth/sunsilk/foot.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Foot("Sunsilk"),
stats: (
protection: Normal(0.0),
protection: Normal(9.0),
poise_resilience: Normal(0.0),
energy_max: 100,
energy_reward: 0.1,

2
assets/common/items/armor/cloth/sunsilk/hand.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Hand("Sunsilk"),
stats: (
protection: Normal(0.0),
protection: Normal(9.0),
poise_resilience: Normal(0.0),
energy_max: 100,
energy_reward: 0.1,

2
assets/common/items/armor/cloth/sunsilk/pants.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Pants("Sunsilk"),
stats: (
protection: Normal(0.0),
protection: Normal(18.0),
poise_resilience: Normal(0.0),
energy_max: 200,
energy_reward: 0.2,

2
assets/common/items/armor/cloth/sunsilk/shoulder.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Shoulder("Sunsilk"),
stats: (
protection: Normal(0.0),
protection: Normal(18.0),
poise_resilience: Normal(0.0),
energy_max: 200,
energy_reward: 0.2,

21
assets/common/loot_tables/trading.ron
View File

@ -1,12 +1,27 @@
// Loot table that exists purely for price rationalisation
[
(1.0, Item("common.items.crafting_ing.honey")),
(1.5, Item("common.items.crafting_ing.leather.leather_strips")),
(0.08, Item("common.items.crafting_ing.leather.rigid_leather")),
(1.0, Item("common.items.crafting_ing.leather.simple_leather")),
(0.4, Item("common.items.crafting_ing.leather.thick_leather")),
(1.0, Item("common.items.crafting_ing.hide.animal_hide")),
(0.5, Item("common.items.crafting_ing.hide.tough_hide")),
(0.2, Item("common.items.crafting_ing.hide.scales")),
(0.08, Item("common.items.crafting_ing.animal_misc.fur")),
(0.08, Item("common.items.crafting_ing.animal_misc.grim_eyeball")),
(0.08, Item("common.items.crafting_ing.animal_misc.icy_fang")),
(0.08, Item("common.items.crafting_ing.animal_misc.large_horn")),
(0.08, Item("common.items.crafting_ing.animal_misc.lively_vine")),
(0.08, Item("common.items.crafting_ing.animal_misc.phoenix_feather")),
(0.2, Item("common.items.mineral.ore.bloodstone")),
(1.0, Item("common.items.mineral.ore.coal")),
(0.4, Item("common.items.mineral.ore.cobalt")),
(0.05, Item("common.items.mineral.ore.gold")),
(1.2, Item("common.items.mineral.ore.iron")),
(0.07, Item("common.items.mineral.ore.silver")),
(1.5, Item("common.items.mineral.ore.tin")),
(1.5, Item("common.items.mineral.ore.copper")),
(0.03, Item("common.items.mineral.ore.gold")),
(0.8, Item("common.items.mineral.ore.iron")),
(0.05, Item("common.items.mineral.ore.silver")),
(1.2, Item("common.items.mineral.ore.velorite")),
(0.6, Item("common.items.mineral.ore.veloritefrag")),
(0.8, Item("common.items.mineral.gem.amethyst")),

113
assets/common/recipe_book.ron
View File

@ -251,8 +251,8 @@
"orichalcum ingot": (
output: ("common.items.mineral.ingot.orichalcum", 2),
inputs: [
(Item("common.items.mineral.ore.gold"), 1),
(Item("common.items.mineral.ore.silver"), 1),
(Item("common.items.mineral.ingot.gold"), 1),
(Item("common.items.mineral.ingot.silver"), 1),
],
craft_sprite: Some(Forge),
),
@ -855,7 +855,6 @@
output: ("common.items.armor.cloth.linen.back", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.linen"), 3),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
),
@ -863,7 +862,6 @@
output: ("common.items.armor.cloth.linen.belt", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.linen"), 2),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
),
@ -871,7 +869,6 @@
output: ("common.items.armor.cloth.linen.chest", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.linen"), 10),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
),
@ -879,7 +876,6 @@
output: ("common.items.armor.cloth.linen.foot", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.linen"), 3),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
),
@ -887,7 +883,6 @@
output: ("common.items.armor.cloth.linen.hand", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.linen"), 3),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
),
@ -895,7 +890,6 @@
output: ("common.items.armor.cloth.linen.pants", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.linen"), 8),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
),
@ -903,7 +897,6 @@
output: ("common.items.armor.cloth.linen.shoulder", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.linen"), 8),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
),
@ -1178,7 +1171,8 @@
output: ("common.items.armor.cloth.sunsilk.back", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 3),
(Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2),
(Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 1),
(Item("common.items.mineral.ore.silver"), 1),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
@ -1187,7 +1181,7 @@
output: ("common.items.armor.cloth.sunsilk.belt", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 2),
(Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2),
(Item("common.items.mineral.ore.silver"), 1),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
@ -1196,7 +1190,8 @@
output: ("common.items.armor.cloth.sunsilk.chest", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 10),
(Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 4),
(Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2),
(Item("common.items.mineral.ore.silver"), 2),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
@ -1205,7 +1200,7 @@
output: ("common.items.armor.cloth.sunsilk.foot", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 3),
(Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2),
(Item("common.items.mineral.ore.silver"), 2),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
@ -1214,7 +1209,7 @@
output: ("common.items.armor.cloth.sunsilk.hand", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 3),
(Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2),
(Item("common.items.mineral.ore.silver"), 2),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
@ -1223,7 +1218,7 @@
output: ("common.items.armor.cloth.sunsilk.pants", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 8),
(Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 3),
(Item("common.items.mineral.ore.silver"), 3),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
@ -1232,7 +1227,7 @@
output: ("common.items.armor.cloth.sunsilk.shoulder", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 8),
(Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 3),
(Item("common.items.mineral.ore.silver"), 3),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
craft_sprite: Some(Loom),
@ -1244,7 +1239,7 @@
(Item("common.items.mineral.ingot.bronze"), 3),
(Item("common.items.crafting_ing.leather.leather_strips"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"bronze belt": (
output: ("common.items.armor.mail.bronze.belt", 1),
@ -1252,7 +1247,7 @@
(Item("common.items.mineral.ingot.bronze"), 2),
(Item("common.items.crafting_ing.leather.leather_strips"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"bronze chest": (
output: ("common.items.armor.mail.bronze.chest", 1),
@ -1260,7 +1255,7 @@
(Item("common.items.mineral.ingot.bronze"), 10),
(Item("common.items.crafting_ing.leather.leather_strips"), 4),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"bronze feet": (
output: ("common.items.armor.mail.bronze.foot", 1),
@ -1268,7 +1263,7 @@
(Item("common.items.mineral.ingot.bronze"), 3),
(Item("common.items.crafting_ing.leather.leather_strips"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"bronze hands": (
output: ("common.items.armor.mail.bronze.hand", 1),
@ -1276,7 +1271,7 @@
(Item("common.items.mineral.ingot.bronze"), 3),
(Item("common.items.crafting_ing.leather.leather_strips"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"bronze pants": (
output: ("common.items.armor.mail.bronze.pants", 1),
@ -1284,7 +1279,7 @@
(Item("common.items.mineral.ingot.bronze"), 8),
(Item("common.items.crafting_ing.leather.leather_strips"), 4),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"bronze shoulder": (
output: ("common.items.armor.mail.bronze.shoulder", 1),
@ -1292,7 +1287,7 @@
(Item("common.items.mineral.ingot.bronze"), 8),
(Item("common.items.crafting_ing.leather.leather_strips"), 6),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
//ARMOR/MAIL/IRON
"iron back": (
@ -1301,7 +1296,7 @@
(Item("common.items.mineral.ingot.iron"), 3),
(Item("common.items.crafting_ing.leather.leather_strips"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"iron belt": (
output: ("common.items.armor.mail.iron.belt", 1),
@ -1309,7 +1304,7 @@
(Item("common.items.mineral.ingot.iron"), 2),
(Item("common.items.crafting_ing.leather.leather_strips"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"iron chest": (
output: ("common.items.armor.mail.iron.chest", 1),
@ -1317,7 +1312,7 @@
(Item("common.items.mineral.ingot.iron"), 10),
(Item("common.items.crafting_ing.leather.leather_strips"), 4),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"iron feet": (
output: ("common.items.armor.mail.iron.foot", 1),
@ -1325,7 +1320,7 @@
(Item("common.items.mineral.ingot.iron"), 3),
(Item("common.items.crafting_ing.leather.leather_strips"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"iron hands": (
output: ("common.items.armor.mail.iron.hand", 1),
@ -1333,7 +1328,7 @@
(Item("common.items.mineral.ingot.iron"), 3),
(Item("common.items.crafting_ing.leather.leather_strips"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"iron pants": (
output: ("common.items.armor.mail.iron.pants", 1),
@ -1341,7 +1336,7 @@
(Item("common.items.mineral.ingot.iron"), 8),
(Item("common.items.crafting_ing.leather.leather_strips"), 4),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"iron shoulder": (
output: ("common.items.armor.mail.iron.shoulder", 1),
@ -1349,7 +1344,7 @@
(Item("common.items.mineral.ingot.iron"), 8),
(Item("common.items.crafting_ing.leather.leather_strips"), 6),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
//ARMOR/MAIL/STEEL
"steel back": (
@ -1358,7 +1353,7 @@
(Item("common.items.mineral.ingot.steel"), 3),
(Item("common.items.crafting_ing.cloth.linen"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"steel belt": (
output: ("common.items.armor.mail.steel.belt", 1),
@ -1366,7 +1361,7 @@
(Item("common.items.mineral.ingot.steel"), 2),
(Item("common.items.crafting_ing.leather.thick_leather"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"steel chest": (
output: ("common.items.armor.mail.steel.chest", 1),
@ -1374,7 +1369,7 @@
(Item("common.items.mineral.ingot.steel"), 10),
(Item("common.items.crafting_ing.leather.thick_leather"), 4),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"steel feet": (
output: ("common.items.armor.mail.steel.foot", 1),
@ -1382,7 +1377,7 @@
(Item("common.items.mineral.ingot.steel"), 3),
(Item("common.items.crafting_ing.leather.thick_leather"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"steel hands": (
output: ("common.items.armor.mail.steel.hand", 1),
@ -1390,7 +1385,7 @@
(Item("common.items.mineral.ingot.steel"), 3),
(Item("common.items.crafting_ing.leather.thick_leather"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"steel pants": (
output: ("common.items.armor.mail.steel.pants", 1),
@ -1398,7 +1393,7 @@
(Item("common.items.mineral.ingot.steel"), 8),
(Item("common.items.crafting_ing.leather.thick_leather"), 4),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"steel shoulder": (
output: ("common.items.armor.mail.steel.shoulder", 1),
@ -1406,7 +1401,7 @@
(Item("common.items.mineral.ingot.steel"), 8),
(Item("common.items.crafting_ing.leather.thick_leather"), 6),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
//ARMOR/MAIL/COBALT
"cobalt back": (
@ -1416,7 +1411,7 @@
(Item("common.items.crafting_ing.cloth.silk"), 4),
(Item("common.items.mineral.gem.sapphire"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"cobalt belt": (
output: ("common.items.armor.mail.cobalt.belt", 1),
@ -1425,7 +1420,7 @@
(Item("common.items.crafting_ing.cloth.silk"), 2),
(Item("common.items.mineral.gem.sapphire"), 1),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"cobalt chest": (
output: ("common.items.armor.mail.cobalt.chest", 1),
@ -1434,7 +1429,7 @@
(Item("common.items.crafting_ing.cloth.silk"), 3),
(Item("common.items.mineral.gem.sapphire"), 3),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"cobalt feet": (
output: ("common.items.armor.mail.cobalt.foot", 1),
@ -1442,7 +1437,7 @@
(Item("common.items.mineral.ingot.cobalt"), 3),
(Item("common.items.crafting_ing.cloth.silk"), 3),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"cobalt hands": (
output: ("common.items.armor.mail.cobalt.hand", 1),
@ -1450,7 +1445,7 @@
(Item("common.items.mineral.ingot.cobalt"), 3),
(Item("common.items.crafting_ing.cloth.silk"), 3),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"cobalt pants": (
output: ("common.items.armor.mail.cobalt.pants", 1),
@ -1459,7 +1454,7 @@
(Item("common.items.crafting_ing.cloth.silk"), 3),
(Item("common.items.mineral.gem.sapphire"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"cobalt shoulder": (
output: ("common.items.armor.mail.cobalt.shoulder", 1),
@ -1468,7 +1463,7 @@
(Item("common.items.crafting_ing.cloth.silk"), 3),
(Item("common.items.mineral.gem.sapphire"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
//ARMOR/MAIL/BLOODSTEEL
"bloodsteel back": (
@ -1479,7 +1474,7 @@
(Item("common.items.crafting_ing.cloth.lifecloth"), 3),
(Item("common.items.mineral.gem.ruby"), 1),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"bloodsteel belt": (
output: ("common.items.armor.mail.bloodsteel.belt", 1),
@ -1487,7 +1482,7 @@
(Item("common.items.mineral.ingot.bloodsteel"), 2),
(Item("common.items.crafting_ing.hide.carapace"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"bloodsteel chest": (
output: ("common.items.armor.mail.bloodsteel.chest", 1),
@ -1497,7 +1492,7 @@
(Item("common.items.mineral.gem.diamond"), 2),
(Item("common.items.mineral.gem.ruby"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"bloodsteel feet": (
output: ("common.items.armor.mail.bloodsteel.foot", 1),
@ -1505,7 +1500,7 @@
(Item("common.items.mineral.ingot.bloodsteel"), 3),
(Item("common.items.crafting_ing.hide.carapace"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"bloodsteel hands": (
output: ("common.items.armor.mail.bloodsteel.hand", 1),
@ -1513,7 +1508,7 @@
(Item("common.items.mineral.ingot.bloodsteel"), 3),
(Item("common.items.crafting_ing.hide.carapace"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"bloodsteel pants": (
output: ("common.items.armor.mail.bloodsteel.pants", 1),
@ -1522,7 +1517,7 @@
(Item("common.items.crafting_ing.hide.carapace"), 3),
(Item("common.items.mineral.gem.ruby"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"bloodsteel shoulder": (
output: ("common.items.armor.mail.bloodsteel.shoulder", 1),
@ -1531,7 +1526,7 @@
(Item("common.items.crafting_ing.hide.carapace"), 4),
(Item("common.items.mineral.gem.ruby"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
//ARMOR/MAIL/ORICHALCUM
"orichalcum back": (
@ -1542,7 +1537,7 @@
(Item("common.items.mineral.gem.diamond"), 2),
(Item("common.items.mineral.gem.sapphire"), 1),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"orichalcum belt": (
output: ("common.items.armor.mail.orichalcum.belt", 1),
@ -1552,7 +1547,7 @@
(Item("common.items.mineral.gem.diamond"), 2),
(Item("common.items.mineral.gem.sapphire"), 1),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"orichalcum chest": (
output: ("common.items.armor.mail.orichalcum.chest", 1),
@ -1563,7 +1558,7 @@
(Item("common.items.mineral.gem.diamond"), 3),
(Item("common.items.mineral.gem.sapphire"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"orichalcum feet": (
output: ("common.items.armor.mail.orichalcum.foot", 1),
@ -1573,7 +1568,7 @@
(Item("common.items.mineral.gem.diamond"), 1),
(Item("common.items.mineral.gem.sapphire"), 1),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"orichalcum hands": (
output: ("common.items.armor.mail.orichalcum.hand", 1),
@ -1583,7 +1578,7 @@
(Item("common.items.mineral.gem.diamond"), 1),
(Item("common.items.mineral.gem.sapphire"), 1),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"orichalcum pants": (
output: ("common.items.armor.mail.orichalcum.pants", 1),
@ -1593,7 +1588,7 @@
(Item("common.items.crafting_ing.hide.plate"), 3),
(Item("common.items.mineral.gem.diamond"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"orichalcum shoulder": (
output: ("common.items.armor.mail.orichalcum.shoulder", 1),
@ -1602,7 +1597,7 @@
(Item("common.items.crafting_ing.hide.plate"), 4),
(Item("common.items.mineral.gem.sapphire"), 2),
],
craft_sprite: Some(CraftingBench),
craft_sprite: Some(Anvil),
),
"Seashell Necklace": (
@ -1627,14 +1622,12 @@
output: ("common.items.armor.misc.bag.tiny_red_pouch", 1),
inputs: [
(Item("common.items.crafting_ing.cloth.linen_red"), 3),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
),
"tiny leather pouch": (
output: ("common.items.armor.misc.bag.tiny_leather_pouch", 1),
inputs: [
(Item("common.items.crafting_ing.leather.leather_strips"), 6),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
),
"knitted red pouch": (

1
voxygen/anim/src/biped_large/alpha.rs
View File

@ -294,6 +294,7 @@ impl Animation for AlphaAnimation {
next.shoulder_r.orientation = Quaternion::rotation_x(-0.3)
* Quaternion::rotation_y(move1 * -0.7 + move2 * 0.7);
next.second.scale = Vec3::one() * 1.0;
next.head.orientation =
Quaternion::rotation_x(move1 * -0.6 + move2 * 0.4)
},

1
voxygen/anim/src/biped_large/chargemelee.rs
View File

@ -123,6 +123,7 @@ impl Animation for ChargeMeleeAnimation {
-18.0 + move1 * 14.0 + move2 * -19.0,
);
next.torso.position = Vec3::new(0.0, move2 * 1.5, 0.0);
next.second.scale = Vec3::one() * 1.0;
next.weapon_l.orientation =
Quaternion::rotation_x(

1
voxygen/anim/src/biped_large/dash.rs
View File

@ -178,6 +178,7 @@ impl Animation for DashAnimation {
-6.0 + move1 * 2.0,
-18.0 + move1 * 2.0,
);
next.second.scale = Vec3::one() * 1.0;
next.weapon_l.orientation = Quaternion::rotation_x(-1.67 + move1 * 0.4)
* Quaternion::rotation_y(move1 * 0.4 + move2 * 0.2)

1
voxygen/anim/src/biped_large/idle.rs
View File

@ -63,6 +63,7 @@ impl Animation for IdleAnimation {
next.lower_torso.scale = Vec3::one() * 1.02;
next.hold.scale = Vec3::one() * 0.0;
next.torso.scale = Vec3::one() / 8.0 * s_a.scaler;
next.second.scale = Vec3::one() * 0.0;
next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1 + torso * 0.2);
next.head.orientation =

1
voxygen/anim/src/biped_large/jump.rs
View File

@ -29,6 +29,7 @@ impl Animation for JumpAnimation {
let wave_slow = (anim_time * 0.8).sin();
next.hold.scale = Vec3::one() * 0.0;
next.second.scale = Vec3::one() * 0.0;
next.head.scale = Vec3::one() * 1.02;

1
voxygen/anim/src/biped_large/run.rs
View File

@ -139,6 +139,7 @@ impl Animation for RunAnimation {
next.hand_r.scale = Vec3::one() * 1.04;
next.hold.scale = Vec3::one() * 0.0;
next.torso.scale = Vec3::one() / 8.0 * s_a.scaler;
next.second.scale = Vec3::one() * 0.0;
if s_a.beast {
next.head.position = Vec3::new(0.0, s_a.head.0, 3.0 + s_a.head.1);

1
voxygen/anim/src/biped_large/selfbuff.rs
View File

@ -128,6 +128,7 @@ impl Animation for SelfBuffAnimation {
-6.0 + move1 * 7.0 + tension * 0.3,
-18.0 + move1 * -2.0,
);
next.second.scale = Vec3::one() * 1.0;
next.weapon_l.orientation = Quaternion::rotation_x(-1.67 + move1 * 1.9)
* Quaternion::rotation_y(move1 * 0.25 + tension2 * 0.06)

1
voxygen/anim/src/biped_large/wield.rs
View File

@ -449,6 +449,7 @@ impl Animation for WieldAnimation {
next.shoulder_l.orientation = Quaternion::rotation_x(-0.3);
next.shoulder_r.orientation = Quaternion::rotation_x(-0.3);
next.second.scale = Vec3::one() * 1.0;
},
"Yeti" => {
next.second.scale = Vec3::one() * 0.0;