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

weapon/manifest tweaks

Browse Source
This commit is contained in:
jshipsey 2021-02-27 01:41:14 -05:00
parent 238fcaf5f1
commit 16720a6826
14 changed files with 496 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -36,6 +36,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Support for modular weapons. - Support for modular weapons.
- Saturation buff (healing from food) now queues - Saturation buff (healing from food) now queues
- Coral reefs, kelp forests, and seagrass - Coral reefs, kelp forests, and seagrass
- Talk animation
- New bosses in 5 lower dungeons
= New enemies in 5 lower dungeons
### Changed ### Changed

13
assets/common/items/debug/lantern.ron
View File

@ -1,13 +0,0 @@
ItemDef(
name: "Magic Lantern",
description: "Illuminates even the darkest dungeon\nA great monster was slain for this item",
kind: Lantern(
(
kind: "Blue0",
color: (r: 128, g: 26, b: 255),
strength_thousandths: 8500,
flicker_thousandths: 300,
),
),
quality: High,
)

8
assets/common/items/npc_weapons/hammer/harvester_scythe.ron
View File

@ -5,12 +5,12 @@ ItemDef(
( (
kind: HammerSimple, kind: HammerSimple,
hands: Two, hands: Two,
stats: ( stats: Direct((
equip_time_millis: 500, equip_time_millis: 1,
power: 1.00, power: 1.6,
poise_strength: 1.00, poise_strength: 1.00,
speed: 1.0 speed: 1.0
), )),
) )
), ),
quality: Low, quality: Low,

4
assets/common/items/npc_weapons/unique/quadlowbeam.ron
View File

@ -5,12 +5,12 @@ ItemDef(
( (
kind: Unique(QuadLowBeam), kind: Unique(QuadLowBeam),
hands: Two, hands: Two,
stats: ( stats: Direct((
equip_time_millis: 10, equip_time_millis: 10,
power: 1.00, power: 1.00,
poise_strength: 1.00, poise_strength: 1.00,
speed: 1.00, speed: 1.00,
), )),
) )
), ),
quality: Low, quality: Low,

4
assets/common/loot_tables/loot_table_mindflayer.ron
View File

@ -12,8 +12,8 @@
(1, "common.items.weapons.hammer.cultist_purp_2h-0"), (1, "common.items.weapons.hammer.cultist_purp_2h-0"),
(1, "common.items.weapons.sword.cultist"), (1, "common.items.weapons.sword.cultist"),
(0.25, "common.items.crafting_ing.mindflayer_bag_damaged"), (0.25, "common.items.crafting_ing.mindflayer_bag_damaged"),
(0.01, "common.items.weapons.sceptre.root_evil"), (0.2, "common.items.weapons.sceptre.root_evil"),
// misc // misc
(1, "common.items.boss_drops.lantern"), (1, "common.items.boss_drops.lantern"),
(0.1, "common.items.glider.glider_purp"), (0.25, "common.items.glider.glider_purp"),
] ]

25
assets/voxygen/item_image_manifest.ron
View File

@ -1207,6 +1207,31 @@
"voxel.armor.shoulder.steel_right-0", "voxel.armor.shoulder.steel_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
), ),
//PlateLeather0 Armor
Armor(Chest("PlateLeather")): VoxTrans(
"voxel.armor.chest.plate_leather",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Pants("PlateLeather")): VoxTrans(
"voxel.armor.pants.plate_leather-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Belt("PlateLeather")): VoxTrans(
"voxel.armor.belt.plate_leather-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
),
Armor(Foot("PlateLeather")): VoxTrans(
"voxel.armor.foot.plate_leather",
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
Armor(Hand("PlateLeather")): VoxTrans(
"voxel.armor.hand.plate_leather_right-0",
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
Armor(Shoulder("PlateLeather")): VoxTrans(
"voxel.armor.shoulder.plate_leather_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//Leather0 Armor //Leather0 Armor
Armor(Chest("Leather0")): VoxTrans( Armor(Chest("Leather0")): VoxTrans(
"voxel.armor.chest.leather-0", "voxel.armor.chest.leather-0",

70
assets/voxygen/voxel/biped_large_weapon_manifest.ron
View File

@ -1,70 +0,0 @@
({
"common.items.npc_weapons.hammer.ogre_hammer": (
vox_spec: ("weapon.hammer.2hhammer_ogre", (-5.0, -5.5, -7.0)),
color: None
),
"common.items.npc_weapons.staff.ogre_staff": (
vox_spec: ("weapon.staff.firestaff_ogre", (-2.5, -5.5, -6.0)),
color: None
),
"common.items.npc_weapons.hammer.cyclops_hammer": (
vox_spec: ("weapon.hammer.2hhammer_cyclops-0", (-5.0, -6.5, -7.0)),
color: None
),
"common.items.npc_weapons.hammer.troll_hammer": (
vox_spec: ("weapon.hammer.2hhammer_troll", (-4.0, -6.0, -7.0)),
color: None
),
"common.items.npc_weapons.sword.dullahan_sword": (
vox_spec: ("weapon.sword.greatsword_2h_dullahan", (-1.5, -9.0, -10.0)),
color: None
),
"common.items.npc_weapons.staff.saurok_staff": (
vox_spec: ("weapon.staff.firestaff_saurok", (-3.0, -3.0, -6.0)),
color: None
),
"common.items.npc_weapons.sword.saurok_sword": (
vox_spec: ("weapon.sword.long_2h_saurok", (-1.5, -4.0, -5.0)),
color: None
),
"common.items.npc_weapons.bow.saurok_bow": (
vox_spec: ("weapon.bow.longbow_saurok", (-1.5, -4.0, -16.5)),
color: None
),
"common.items.npc_weapons.staff.mindflayer_staff": (
vox_spec: ("weapon.staff.firestaff_mindflayer", (-5.5, -3.5, -8.0)),
color: None
),
"common.items.npc_weapons.unique.beast_claws": (
vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
color: None
),
"common.items.npc_weapons.unique.wendigo_magic": (
vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
color: None
),
"common.items.npc_weapons.unique.tidal_claws": (
vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
color: None
),
"common.items.npc_weapons.spear.wooden_spear": (
vox_spec: ("weapon.spear.sahagin", (-1.5, -3.0, -5.0)),
color: None
),
"common.items.weapon.spear.adlet": (
vox_spec: ("weapon.spear.adlet", (-0.5, -3.0, -5.0)),
color: None
),
"common.items.npc_weapons.bow.adlet": (
vox_spec: ("weapon.bow.adlet", (-0.5, -5.5, -9.5)),
color: None
),
"common.items.npc_weapons.staff.gnoll": (
vox_spec: ("weapon.staff.gnoll", (-2.5, -3.0, -4.0)),
color: None
),
"common.items.npc_weapons.hammer.yeti_hammer": (
vox_spec: ("weapon.hammer.2hhammer_yeti", (-7.5, -7.0, -7.0)),
color: None
),
})

62
assets/voxygen/voxel/biped_small_weapon_manifest.ron
View File

@ -1,62 +0,0 @@
({
"common.items.npc_weapons.biped_small.adlet.adlet_bow": (
vox_spec: ("weapon.biped_small.bow.adlet", (-1.5, -3.0, -5.0)),
color: None
),
"common.items.npc_weapons.biped_small.adlet.gnoll_staff": (
vox_spec: ("weapon.biped_small.staff.sahagin", (-0.5, -4.0, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.adlet.wooden_spear": (
vox_spec: ("weapon.biped_small.spear.adlet", (-0.5, -3.0, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.gnarling.adlet_bow": (
vox_spec: ("weapon.biped_small.bow.adlet", (-1.5, -3.0, -5.0)),
color: None
),
"common.items.npc_weapons.biped_small.gnarling.gnoll_staff": (
vox_spec: ("weapon.biped_small.staff.sahagin", (-0.5, -4.0, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.gnarling.wooden_spear": (
vox_spec: ("weapon.biped_small.spear.adlet", (-0.5, -3.0, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.sahagin.adlet_bow": (
vox_spec: ("weapon.biped_small.bow.sahagin", (-0.5, -5.5, -9.5)),
color: None
),
"common.items.npc_weapons.biped_small.sahagin.gnoll_staff": (
vox_spec: ("weapon.biped_small.staff.sahagin", (-0.5, -4.0, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.sahagin.wooden_spear": (
vox_spec: ("weapon.biped_small.spear.sahagin", (-0.5, -3.0, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.haniwa.adlet_bow": (
vox_spec: ("weapon.biped_small.bow.haniwa", (-0.5, -4.5, -10.5)),
color: None
),
"common.items.npc_weapons.biped_small.haniwa.gnoll_staff": (
vox_spec: ("weapon.biped_small.staff.sahagin", (-0.5, -4.0, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.haniwa.wooden_spear": (
vox_spec: ("weapon.biped_small.spear.haniwa", (-0.5, -3.0, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.myrmidon.adlet_bow": (
vox_spec: ("weapon.biped_small.bow.myrmidon", (-0.5, -5.0, -10.5)),
color: None
),
"common.items.npc_weapons.biped_small.myrmidon.gnoll_staff": (
vox_spec: ("weapon.biped_small.staff.sahagin", (-0.5, -4.0, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.myrmidon.wooden_spear": (
vox_spec: ("weapon.biped_small.spear.myrmidon", (-0.5, -2.0, -4.0)),
color: None
),
})

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

@ -1,203 +1,260 @@
({ //Swords ({ //Swords
"common.items.weapons.sword.starter_sword": ( "common.items.weapons.sword.bloodsteel-0": (
vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)), vox_spec: ("weapon.sword.bloodsteel-0", (-1.5, -4.5, -4.0)),
color: None color: None
), ),
"common.items.npc_weapons.sword.starter_sword": ( "common.items.weapons.sword.bloodsteel-1": (
vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)), vox_spec: ("weapon.sword.bloodsteel-1", (-2.5, -3.0, -5.5)),
color: None color: None
), ),
"common.items.weapons.sword.wood_sword": ( "common.items.weapons.sword.bloodsteel-2": (
vox_spec: ("weapon.sword.wood_ore_2h", (-1.5, -6.5, -4.0)), vox_spec: ("weapon.sword.bloodsteel-2", (-1.5, -3.5, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.zweihander_sword_0": ( "common.items.weapons.sword.bronze-0": (
vox_spec: ("weapon.sword.zweihander_2h-0", (-1.5, -6.5, -4.0)), vox_spec: ("weapon.sword.bronze-0", (-1.5, -3.0, -4.0)),
color: None color: None
), ),
"common.items.npc_weapons.sword.zweihander_sword_0": ( "common.items.weapons.sword.bronze-1": (
vox_spec: ("weapon.sword.zweihander_2h-0", (-1.5, -6.5, -4.0)), vox_spec: ("weapon.sword.bronze-1", (-1.5, -3.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.short_sword_0": ( "common.items.weapons.sword.bronze-2": (
vox_spec: ("weapon.sword.short_2h-0", (-1.5, -6.5, -1.0)), vox_spec: ("weapon.sword.bronze-2", (-1.5, -3.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.greatsword_2h_dam-0": ( "common.items.weapons.sword.caladbolg": (
vox_spec: ("weapon.sword.greatsword_2h_dam-0", (-1.0, -4.5, -6.5)), vox_spec: ("weapon.sword.caladbolg", (-1.5, -5.5, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.greatsword_2h_dam-1": ( "common.items.weapons.sword.cobalt-0": (
vox_spec: ("weapon.sword.greatsword_2h_dam-1", (-1.0, -4.5, -6.5)), vox_spec: ("weapon.sword.cobalt-0", (-1.5, -5.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.greatsword_2h_dam-2": ( "common.items.weapons.sword.cobalt-1": (
vox_spec: ("weapon.sword.greatsword_2h_dam-2", (-1.0, -4.5, -6.5)), vox_spec: ("weapon.sword.cobalt-1", (-1.5, -6.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.sword.greatsword_2h_simple-0": ( "common.items.weapons.sword.cobalt-2": (
vox_spec: ("weapon.sword.greatsword_2h_simple-0", (-1.0, -4.5, -6.5)), vox_spec: ("weapon.sword.cobalt-2", (-1.5, -5.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.greatsword_2h_simple-1": ( "common.items.weapons.sword.cobalt-3": (
vox_spec: ("weapon.sword.greatsword_2h_simple-1", (-1.0, -4.5, -6.5)), vox_spec: ("weapon.sword.cobalt-3", (-1.5, -4.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.greatsword_2h_simple-2": ( "common.items.weapons.sword.cultist": (
vox_spec: ("weapon.sword.greatsword_2h_simple-2", (-1.0, -4.5, -6.5)), vox_spec: ("weapon.sword.cultist", (-1.5, -4.0, -6.0)),
color: None color: None
), ),
"common.items.weapons.sword.greatsword_2h_orn-0": ( "common.items.weapons.sword.frost-0": (
vox_spec: ("weapon.sword.greatsword_2h_orn-0", (-1.0, -4.5, -7.5)), vox_spec: ("weapon.sword.frost-0", (-1.5, -5.5, -5.0)),
color: None color: None
), ),
"common.items.weapons.sword.greatsword_2h_orn-1": ( "common.items.weapons.sword.frost-1": (
vox_spec: ("weapon.sword.greatsword_2h_orn-1", (-1.0, -4.5, -7.5)), vox_spec: ("weapon.sword.frost-1", (-1.5, -5.5, -5.0)),
color: None color: None
), ),
"common.items.weapons.sword.greatsword_2h_orn-2": ( "common.items.weapons.sword.iron-0": (
vox_spec: ("weapon.sword.greatsword_2h_orn-2", (-1.0, -4.5, -7.5)), vox_spec: ("weapon.sword.iron-0", (-1.5, -3.5, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.greatsword_2h_fine-0": ( "common.items.weapons.sword.iron-1": (
vox_spec: ("weapon.sword.greatsword_2h_fine-0", (-2.0, -6.5, -8.0)), vox_spec: ("weapon.sword.iron-1", (-1.5, -5.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.sword.greatsword_2h_fine-1": ( "common.items.weapons.sword.iron-2": (
vox_spec: ("weapon.sword.greatsword_2h_fine-1", (-2.0, -6.5, -8.0)), vox_spec: ("weapon.sword.iron-2", (-1.5, -5.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.greatsword_2h_fine-2": ( "common.items.weapons.sword.iron-3": (
vox_spec: ("weapon.sword.greatsword_2h_fine-2", (-2.0, -6.5, -8.0)), vox_spec: ("weapon.sword.iron-3", (-1.5, -4.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_dam-0": ( "common.items.weapons.sword.iron-4": (
vox_spec: ("weapon.sword.long_2h_dam-0", (-1.0, -3.5, -5.0)), vox_spec: ("weapon.sword.iron-4", (-1.5, -4.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_dam-1": ( "common.items.weapons.sword.iron-5": (
vox_spec: ("weapon.sword.long_2h_dam-1", (-1.0, -3.5, -5.0)), vox_spec: ("weapon.sword.iron-5", (-1.5, -4.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_dam-2": ( "common.items.weapons.sword.iron-6": (
vox_spec: ("weapon.sword.long_2h_dam-2", (-1.0, -3.5, -5.0)), vox_spec: ("weapon.sword.iron-6", (-1.5, -5.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_dam-3": ( "common.items.weapons.sword.iron-7": (
vox_spec: ("weapon.sword.long_2h_dam-3", (-1.0, -3.5, -5.0)), vox_spec: ("weapon.sword.iron-7", (-2.0, -6.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_dam-4": ( "common.items.weapons.sword.iron-8": (
vox_spec: ("weapon.sword.long_2h_dam-4", (-1.0, -3.5, -5.0)), vox_spec: ("weapon.sword.iron-8", (-2.0, -5.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_dam-5": ( "common.items.weapons.sword.iron-9": (
vox_spec: ("weapon.sword.long_2h_dam-5", (-1.0, -3.5, -5.0)), vox_spec: ("weapon.sword.iron-9", (-1.5, -2.5, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_simple-0": ( "common.items.weapons.sword.iron-10": (
vox_spec: ("weapon.sword.long_2h_simple-0", (-1.0, -3.5, -5.0)), vox_spec: ("weapon.sword.iron-10", (-1.5, -4.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_simple-1": ( "common.items.weapons.sword.starter": (
vox_spec: ("weapon.sword.long_2h_simple-1", (-1.0, -3.5, -5.0)), vox_spec: ("weapon.sword.starter", (-1.5, -4.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_simple-2": ( "common.items.weapons.sword.steel-0": (
vox_spec: ("weapon.sword.long_2h_simple-2", (-1.0, -3.5, -5.0)), vox_spec: ("weapon.sword.steel-0", (-1.5, -5.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_simple-3": ( "common.items.weapons.sword.steel-1": (
vox_spec: ("weapon.sword.long_2h_simple-3", (-1.0, -3.5, -5.0)), vox_spec: ("weapon.sword.steel-1", (-1.5, -4.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_simple-4": ( "common.items.weapons.sword.steel-2": (
vox_spec: ("weapon.sword.long_2h_simple-4", (-1.0, -3.5, -5.0)), vox_spec: ("weapon.sword.steel-2", (-1.5, -6.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_simple-5": ( "common.items.weapons.sword.steel-3": (
vox_spec: ("weapon.sword.long_2h_simple-5", (-1.0, -3.5, -5.0)), vox_spec: ("weapon.sword.steel-3", (-1.5, -4.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_orn-0": ( "common.items.weapons.sword.steel-4": (
vox_spec: ("weapon.sword.long_2h_orn-0", (-1.0, -3.5, -6.0)), vox_spec: ("weapon.sword.steel-4", (-1.5, -5.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_orn-1": ( "common.items.weapons.sword.steel-5": (
vox_spec: ("weapon.sword.long_2h_orn-1", (-1.0, -3.5, -6.0)), vox_spec: ("weapon.sword.steel-5", (-1.5, -2.5, -5.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_orn-2": ( "common.items.weapons.sword.steel-6": (
vox_spec: ("weapon.sword.long_2h_orn-2", (-1.0, -3.5, -6.0)), vox_spec: ("weapon.sword.steel-6", (-1.5, -5.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_orn-3": ( "common.items.weapons.sword.steel-7": (
vox_spec: ("weapon.sword.long_2h_orn-3", (-1.0, -3.5, -6.0)), vox_spec: ("weapon.sword.steel-7", (-1.5, -5.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_orn-4": ( "common.items.weapons.sword.steel-8": (
vox_spec: ("weapon.sword.long_2h_orn-4", (-1.0, -3.5, -6.0)), vox_spec: ("weapon.sword.steel-8", (-1.5, -5.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_orn-5": ( "common.items.weapons.sword.stone-0": (
vox_spec: ("weapon.sword.long_2h_orn-5", (-1.0, -3.5, -6.0)), vox_spec: ("weapon.sword.stone-0", (-2.5, -4.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_fine-0": ( "common.items.weapons.sword.stone-1": (
vox_spec: ("weapon.sword.long_2h_fine-0", (-2.0, -4.5, -6.0)), vox_spec: ("weapon.sword.stone-1", (-1.5, -4.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_fine-1": ( "common.items.weapons.sword.stone-2": (
vox_spec: ("weapon.sword.long_2h_fine-1", (-2.0, -4.5, -6.0)), vox_spec: ("weapon.sword.stone-2", (-1.5, -4.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_fine-2": ( "common.items.weapons.sword.wood-0": (
vox_spec: ("weapon.sword.long_2h_fine-2", (-2.0, -4.5, -6.0)), vox_spec: ("weapon.sword.wood-0", (-1.5, -3.5, -4.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_fine-3": ( "common.items.weapons.sword.wood-1": (
vox_spec: ("weapon.sword.long_2h_fine-3", (-2.0, -4.5, -6.0)), vox_spec: ("weapon.sword.wood-1", (-1.5, -5.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_fine-4": ( "common.items.weapons.sword.wood-2": (
vox_spec: ("weapon.sword.long_2h_fine-4", (-2.0, -4.5, -6.0)), vox_spec: ("weapon.sword.wood-2", (-1.5, -6.5, -3.0)),
color: None color: None
), ),
"common.items.weapons.sword.long_2h_fine-5": ( // 1h Swords
vox_spec: ("weapon.sword.long_2h_fine-5", (-2.0, -4.5, -6.0)), "common.items.weapons.sword_1h.bloodsteel-0": (
vox_spec: ("weapon.sword_1h.bloodsteel-0", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword.cultist_purp_2h-0": ( "common.items.weapons.sword_1h.bloodsteel-1": (
vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.bloodsteel-1", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.npc_weapons.sword.cultist_purp_2h-0": ( "common.items.weapons.sword_1h.bloodsteel-2": (
vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.bloodsteel-2", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.debug.cultist_purp_2h_boss-0": ( "common.items.weapons.sword_1h.bronze-0": (
vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.bronze-0", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.npc_weapons.sword.cultist_purp_2h_boss-0": ( "common.items.weapons.sword_1h.bronze-1": (
vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.bronze-1", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword.frost_cleaver_2h-0": ( "common.items.weapons.sword_1h.bronze-2": (
vox_spec: ("weapon.sword.frost_cleaver-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.bronze-2", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword.frost_cleaver_2h-1": ( "common.items.weapons.sword_1h.cobalt-0": (
vox_spec: ("weapon.sword.frost_cleaver-1", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.cobalt-0", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.cobalt-1": (
vox_spec: ("weapon.sword_1h.cobalt-1", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.cobalt-2": (
vox_spec: ("weapon.sword_1h.cobalt-2", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.cobalt-3": (
vox_spec: ("weapon.sword_1h.cobalt-3", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.iron-0": (
vox_spec: ("weapon.sword_1h.iron-0", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.iron-1": (
vox_spec: ("weapon.sword_1h.iron-1", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.iron-2": (
vox_spec: ("weapon.sword_1h.iron-2", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.iron-3": (
vox_spec: ("weapon.sword_1h.iron-3", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.iron-4": (
vox_spec: ("weapon.sword_1h.iron-4", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.obsidian-0": (
vox_spec: ("weapon.sword_1h.obsidian-0", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.orichalcum-0": (
vox_spec: ("weapon.sword_1h.orichalcum-0", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.orichalcum-1": (
vox_spec: ("weapon.sword_1h.orichalcum-1", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.steel-0": (
vox_spec: ("weapon.sword_1h.steel-0", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.steel-1": (
vox_spec: ("weapon.sword_1h.steel-1", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.steel-2": (
vox_spec: ("weapon.sword_1h.steel-2", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.weapons.sword_1h.steel-3": (
vox_spec: ("weapon.sword_1h.steel-3", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
// Axes // Axes
"common.items.npc_weapons.axe.starter_axe": (
vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -5.0, -4.0)),
color: None
),
"common.items.weapons.axe.starter_axe": ( "common.items.weapons.axe.starter_axe": (
vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -5.0, -4.0)), vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -7.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.axe.orc_axe-0": ( "common.items.weapons.axe.orc_axe-0": (
@ -205,7 +262,7 @@
color: None color: None
), ),
"common.items.weapons.axe.worn_iron_axe-0": ( "common.items.weapons.axe.worn_iron_axe-0": (
vox_spec: ("weapon.axe.2haxe_worn_iron-0", (-1.5, -3.0, -4.0)), vox_spec: ("weapon.axe.2haxe_worn_iron-0", (-1.5, -5.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.axe.worn_iron_axe-1": ( "common.items.weapons.axe.worn_iron_axe-1": (
@ -221,55 +278,59 @@
color: None color: None
), ),
"common.items.weapons.axe.worn_iron_axe-4": ( "common.items.weapons.axe.worn_iron_axe-4": (
vox_spec: ("weapon.axe.2haxe_worn_iron-4", (-1.5, -4.0, -5.5)), vox_spec: ("weapon.axe.2haxe_worn_iron-4", (-1.5, -6.0, -5.5)),
color: None color: None
), ),
"common.items.weapons.axe.bronze_axe-0": ( "common.items.weapons.axe.bronze_axe-0": (
vox_spec: ("weapon.axe.2haxe_bronze-0", (-1.5, -4.0, -4.5)), vox_spec: ("weapon.axe.2haxe_bronze-0", (-1.5, -7.0, -4.5)),
color: None color: None
), ),
"common.items.weapons.axe.bronze_axe-1": ( "common.items.weapons.axe.bronze_axe-1": (
vox_spec: ("weapon.axe.2haxe_bronze-1", (-1.5, -3.0, -5.5)), vox_spec: ("weapon.axe.2haxe_bronze-1", (-1.5, -5.0, -4.0)),
color: None
),
"common.items.weapons.axe.bronze_axe-2": (
vox_spec: ("weapon.axe.2haxe_bronze-2", (-1.5, -8.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.axe.iron_axe-0": ( "common.items.weapons.axe.iron_axe-0": (
vox_spec: ("weapon.axe.2haxe_iron-0", (-1.5, -5.0, -5.5)), vox_spec: ("weapon.axe.2haxe_iron-0", (-1.5, -7.0, -5.5)),
color: None color: None
), ),
"common.items.weapons.axe.iron_axe-1": ( "common.items.weapons.axe.iron_axe-1": (
vox_spec: ("weapon.axe.2haxe_iron-1", (-1.5, -5.0, -5.5)), vox_spec: ("weapon.axe.2haxe_iron-1", (-1.5, -7.0, -5.5)),
color: None color: None
), ),
"common.items.weapons.axe.iron_axe-2": ( "common.items.weapons.axe.iron_axe-2": (
vox_spec: ("weapon.axe.2haxe_iron-2", (-1.5, -5.0, -5.5)), vox_spec: ("weapon.axe.2haxe_iron-2", (-1.5, -7.0, -5.5)),
color: None color: None
), ),
"common.items.weapons.axe.iron_axe-3": ( "common.items.weapons.axe.iron_axe-3": (
vox_spec: ("weapon.axe.2haxe_iron-3", (-1.5, -6.0, -6.5)), vox_spec: ("weapon.axe.2haxe_iron-3", (-1.5, -8.0, -6.5)),
color: None color: None
), ),
"common.items.weapons.axe.iron_axe-4": ( "common.items.weapons.axe.iron_axe-4": (
vox_spec: ("weapon.axe.2haxe_iron-4", (-1.5, -6.0, -5.5)), vox_spec: ("weapon.axe.2haxe_iron-4", (-1.5, -7.0, -5.5)),
color: None color: None
), ),
"common.items.weapons.axe.iron_axe-5": ( "common.items.weapons.axe.iron_axe-5": (
vox_spec: ("weapon.axe.2haxe_iron-5", (-1.5, -6.0, -5.0)), vox_spec: ("weapon.axe.2haxe_iron-5", (-1.5, -7.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.axe.iron_axe-6": ( "common.items.weapons.axe.iron_axe-6": (
vox_spec: ("weapon.axe.2haxe_iron-6", (-1.5, -5.0, -6.0)), vox_spec: ("weapon.axe.2haxe_iron-6", (-1.5, -7.0, -6.0)),
color: None color: None
), ),
"common.items.weapons.axe.iron_axe-7": ( "common.items.weapons.axe.iron_axe-7": (
vox_spec: ("weapon.axe.2haxe_iron-7", (-1.5, -5.0, -5.0)), vox_spec: ("weapon.axe.2haxe_iron-7", (-1.5, -7.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.axe.iron_axe-8": ( "common.items.weapons.axe.iron_axe-8": (
vox_spec: ("weapon.axe.2haxe_iron-8", (-1.5, -5.0, -5.0)), vox_spec: ("weapon.axe.2haxe_iron-8", (-1.5, -7.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.axe.iron_axe-9": ( "common.items.weapons.axe.iron_axe-9": (
vox_spec: ("weapon.axe.2haxe_iron-9", (-1.5, -4.0, -5.0)), vox_spec: ("weapon.axe.2haxe_iron-9", (-1.5, -6.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.axe.steel_axe-0": ( "common.items.weapons.axe.steel_axe-0": (
@ -277,27 +338,27 @@
color: None color: None
), ),
"common.items.weapons.axe.steel_axe-1": ( "common.items.weapons.axe.steel_axe-1": (
vox_spec: ("weapon.axe.2haxe_steel-1", (-1.5, -7.0, -5.5)), vox_spec: ("weapon.axe.2haxe_steel-1", (-1.5, -8.0, -5.5)),
color: None color: None
), ),
"common.items.weapons.axe.steel_axe-2": ( "common.items.weapons.axe.steel_axe-2": (
vox_spec: ("weapon.axe.2haxe_steel-2", (-1.5, -3.5, -3.5)), vox_spec: ("weapon.axe.2haxe_steel-2", (-1.5, -9.0, -3.5)),
color: None color: None
), ),
"common.items.weapons.axe.steel_axe-3": ( "common.items.weapons.axe.steel_axe-3": (
vox_spec: ("weapon.axe.2haxe_steel-3", (-1.5, -4.0, -6.0)), vox_spec: ("weapon.axe.2haxe_steel-3", (-1.5, -5.5, -6.0)),
color: None color: None
), ),
"common.items.weapons.axe.steel_axe-4": ( "common.items.weapons.axe.steel_axe-4": (
vox_spec: ("weapon.axe.2haxe_steel-4", (-1.5, -4.0, -5.5)), vox_spec: ("weapon.axe.2haxe_steel-4", (-1.5, -6.0, -5.5)),
color: None color: None
), ),
"common.items.weapons.axe.steel_axe-5": ( "common.items.weapons.axe.steel_axe-5": (
vox_spec: ("weapon.axe.2haxe_steel-5", (-1.5, -5.5, -5.5)), vox_spec: ("weapon.axe.2haxe_steel-5", (-1.5, -8.0, -5.5)),
color: None color: None
), ),
"common.items.weapons.axe.steel_axe-6": ( "common.items.weapons.axe.steel_axe-6": (
vox_spec: ("weapon.axe.2haxe_steel-6", (-1.5, -4.0, -4.0)), vox_spec: ("weapon.axe.2haxe_steel-6", (-1.5, -6.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.axe.bloodsteel_axe-0": ( "common.items.weapons.axe.bloodsteel_axe-0": (
@ -305,23 +366,100 @@
color: None color: None
), ),
"common.items.weapons.axe.bloodsteel_axe-1": ( "common.items.weapons.axe.bloodsteel_axe-1": (
vox_spec: ("weapon.axe.2haxe_bloodsteel-1", (-1.5, -5.5, -5.0)), vox_spec: ("weapon.axe.2haxe_bloodsteel-1", (-1.5, -7.0, -5.0)),
color: None color: None
), ),
"common.items.weapons.axe.bloodsteel_axe-2": ( "common.items.weapons.axe.bloodsteel_axe-2": (
vox_spec: ("weapon.axe.2haxe_bloodsteel-2", (-1.5, -5.0, -4.0)), vox_spec: ("weapon.axe.2haxe_bloodsteel-2", (-1.5, -8.0, -4.0)),
color: None color: None
), ),
"common.items.weapons.axe.cobalt_axe-0": ( "common.items.weapons.axe.cobalt_axe-0": (
vox_spec: ("weapon.axe.2haxe_cobalt-0", (-1.5, -5.0, -5.5)), vox_spec: ("weapon.axe.2haxe_cobalt-0", (-1.5, -7.0, -5.5)),
color: None color: None
), ),
"common.items.npc_weapons.axe.malachite_axe-0": ( "common.items.weapons.axe.cobalt_axe-1": (
vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -5.0, -6.0)), vox_spec: ("weapon.axe.2haxe_cobalt-1", (-1.5, -8.0, -5.5)),
color: None color: None
), ),
"common.items.weapons.axe.malachite_axe-0": ( "common.items.weapons.axe.malachite_axe-0": (
vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -5.0, -6.0)), vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -7.0, -5.0)),
color: None
),
"common.items.weapons.axe.parashu": (
vox_spec: ("weapon.axe.parashu", (-1.5, -12.0, -6.0)),
color: None
),
// 1h Axes
"common.items.weapons.axe_1h.bloodsteel-0": (
vox_spec: ("weapon.axe_1h.bloodsteel-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.bloodsteel-1": (
vox_spec: ("weapon.axe_1h.bloodsteel-1", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.bronze-0": (
vox_spec: ("weapon.axe_1h.bronze-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.bronze-1": (
vox_spec: ("weapon.axe_1h.bronze-1", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.cobalt-0": (
vox_spec: ("weapon.axe_1h.cobalt-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.cobalt-1": (
vox_spec: ("weapon.axe_1h.cobalt-1", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.iron-0": (
vox_spec: ("weapon.axe_1h.iron-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.iron-1": (
vox_spec: ("weapon.axe_1h.iron-1", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.iron-2": (
vox_spec: ("weapon.axe_1h.iron-2", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.iron-3": (
vox_spec: ("weapon.axe_1h.iron-3", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.orichalcum-0": (
vox_spec: ("weapon.axe_1h.orichalcum-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.steel-0": (
vox_spec: ("weapon.axe_1h.steel-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.steel-1": (
vox_spec: ("weapon.axe_1h.steel-1", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.steel-2": (
vox_spec: ("weapon.axe_1h.steel-2", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.stone-0": (
vox_spec: ("weapon.axe_1h.stone-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.stone-1": (
vox_spec: ("weapon.axe_1h.stone-1", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.wood-0": (
vox_spec: ("weapon.axe_1h.wood-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.axe_1h.wood-1": (
vox_spec: ("weapon.axe_1h.wood-1", (-1.5, -5.0, -6.0)),
color: None color: None
), ),
// Hammers // Hammers
@ -333,10 +471,6 @@
vox_spec: ("weapon.hammer.2hhammer_rusty", (-2.5, -5.5, -4.5)), vox_spec: ("weapon.hammer.2hhammer_rusty", (-2.5, -5.5, -4.5)),
color: None color: None
), ),
"common.items.npc_weapons.hammer.starter_hammer": (
vox_spec: ("weapon.hammer.2hhammer_rusty", (-2.5, -5.5, -4.5)),
color: None
),
"common.items.weapons.hammer.wood_hammer-0": ( "common.items.weapons.hammer.wood_hammer-0": (
vox_spec: ("weapon.hammer.2hhammer_wood-0", (-3.5, -5.5, -4.5)), vox_spec: ("weapon.hammer.2hhammer_wood-0", (-3.5, -5.5, -4.5)),
color: None color: None
@ -469,20 +603,81 @@
vox_spec: ("weapon.hammer.cult_purp-0", (-3.5, -4.5, -5.0)), vox_spec: ("weapon.hammer.cult_purp-0", (-3.5, -4.5, -5.0)),
color: None color: None
), ),
"common.items.npc_weapons.hammer.cultist_purp_2h-0": (
vox_spec: ("weapon.hammer.cult_purp-0", (-3.5, -4.5, -5.0)),
color: None
),
/*"Craftsman": ( //TODO This should be a 1h hammer! /*"Craftsman": ( //TODO This should be a 1h hammer!
vox_spec: ("weapon.hammer.craftsman", (-2.0, -5.0, -5.5)), vox_spec: ("weapon.hammer.craftsman", (-2.0, -5.0, -5.5)),
color: None color: None
),*/ ),*/
// Daggers // 1h Hammers
"common.items.weapons.dagger.starter_dagger": ( "common.items.weapons.hammer_1h.bloodsteel-0": (
vox_spec: ("weapon.dagger.dagger_rusty", (-1.5, -3.0, -3.0)), vox_spec: ("weapon.hammer_1h.bloodsteel-0", (-1.5, -5.0, -6.0)),
color: None color: None
), ),
"common.items.npc_weapons.dagger.starter_dagger": ( "common.items.weapons.hammer_1h.bloodsteel-1": (
vox_spec: ("weapon.hammer_1h.bloodsteel-1", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.bronze-0": (
vox_spec: ("weapon.hammer_1h.bronze-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.bronze-1": (
vox_spec: ("weapon.hammer_1h.bronze-1", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.cobalt-0": (
vox_spec: ("weapon.hammer_1h.cobalt-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.cobalt-1": (
vox_spec: ("weapon.hammer_1h.cobalt-1", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.iron-0": (
vox_spec: ("weapon.hammer_1h.iron-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.iron-1": (
vox_spec: ("weapon.hammer_1h.iron-1", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.iron-2": (
vox_spec: ("weapon.hammer_1h.iron-2", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.orichalcum-0": (
vox_spec: ("weapon.hammer_1h.orichalcum-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.steel-0": (
vox_spec: ("weapon.hammer_1h.steel-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.steel-1": (
vox_spec: ("weapon.hammer_1h.steel-1", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.steel-2": (
vox_spec: ("weapon.hammer_1h.steel-2", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.stone-0": (
vox_spec: ("weapon.hammer_1h.stone-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.stone-1": (
vox_spec: ("weapon.hammer_1h.stone-1", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.wood-0": (
vox_spec: ("weapon.hammer_1h.wood-0", (-1.5, -5.0, -6.0)),
color: None
),
"common.items.weapons.hammer_1h.wood-1": (
vox_spec: ("weapon.hammer_1h.wood-1", (-1.5, -5.0, -6.0)),
color: None
),
// Daggers
"common.items.weapons.dagger.starter_dagger": (
vox_spec: ("weapon.dagger.dagger_rusty", (-1.5, -3.0, -3.0)), vox_spec: ("weapon.dagger.dagger_rusty", (-1.5, -3.0, -3.0)),
color: None color: None
), ),
@ -499,57 +694,129 @@
vox_spec: ("weapon.shield.wood-0", (-2.5, -5.5, -5.5)), vox_spec: ("weapon.shield.wood-0", (-2.5, -5.5, -5.5)),
color: None color: None
), ),
"common.items.npc_weapons.shield.shield_1": (
vox_spec: ("weapon.shield.wood-0", (-2.5, -5.5, -5.5)),
color: None
),
// Bows // Bows
"common.items.weapons.bow.starter_bow": ( "common.items.weapons.bow.bone-0": (
vox_spec: ("weapon.bow.shortbow_starter", (-0.5, -3.0, -8.5)), vox_spec: ("weapon.bow.bone-0", (-0.5, -5.5, -12.5)),
color: None color: None
), ),
"common.items.weapons.bow.wood_shortbow-0": ( "common.items.weapons.bow.bone-1": (
vox_spec: ("weapon.bow.shortbow_wood-0", (-0.5, -3.0, -9.5)), vox_spec: ("weapon.bow.bone-1", (-1.5, -4.5, -15.5)),
color: None color: None
), ),
"common.items.weapons.bow.wood_shortbow-1": ( "common.items.weapons.bow.bone-2": (
vox_spec: ("weapon.bow.shortbow_wood-1", (-0.5, -3.5, -9.5)), vox_spec: ("weapon.bow.bone-2", (-1.5, -5.5, -13.0)),
color: None color: None
), ),
"common.items.weapons.bow.leafy_shortbow-0": ( "common.items.weapons.bow.bone-3": (
vox_spec: ("weapon.bow.shortbow_leafy-0", (-0.5, -4.5, -9.0)), vox_spec: ("weapon.bow.bone-3", (-1.5, -5.0, -12.5)),
color: None color: None
), ),
"common.items.weapons.bow.wood_longbow-0": ( "common.items.weapons.bow.eldwood-0": (
vox_spec: ("weapon.bow.longbow_wood-0", (-0.5, -3.5, -12.5)), vox_spec: ("weapon.bow.eldwood-0", (-1.5, -4.0, -12.5)),
color: None color: None
), ),
"common.items.weapons.bow.wood_longbow-1": ( "common.items.weapons.bow.eldwood-1": (
vox_spec: ("weapon.bow.longbow_wood-1", (-1.5, -3.5, -12.5)), vox_spec: ("weapon.bow.eldwood-1", (-1.5, -5.5, -12.5)),
color: None color: None
), ),
"common.items.weapons.bow.leafy_longbow-0": ( "common.items.weapons.bow.eldwood-2": (
vox_spec: ("weapon.bow.longbow_leafy-0", (-1.5, -4.5, -12.5)), vox_spec: ("weapon.bow.eldwood-2", (-1.5, -4.5, -12.5)),
color: None color: None
), ),
"common.items.weapons.bow.horn_longbow-0": ( "common.items.weapons.bow.frostwood-0": (
vox_spec: ("weapon.bow.longbow_horn-0", (-1.5, -4.5, -17.5)), vox_spec: ("weapon.bow.frostwood-0", (-1.5, -6.0, -13.5)),
color: None color: None
), ),
"common.items.npc_weapons.bow.horn_longbow-0": ( "common.items.weapons.bow.frostwood-1": (
vox_spec: ("weapon.bow.longbow_horn-0", (-1.5, -4.5, -17.5)), vox_spec: ("weapon.bow.frostwood-1", (-1.5, -5.0, -12.5)),
color: None color: None
), ),
"common.items.weapons.bow.iron_longbow-0": ( "common.items.weapons.bow.frostwood-2": (
vox_spec: ("weapon.bow.longbow_iron-0", (-1.5, -4.0, -16.0)), vox_spec: ("weapon.bow.frostwood-2", (-1.5, -4.5, -12.5)),
color: None color: None
), ),
"common.items.weapons.bow.rare_longbow": ( "common.items.weapons.bow.hardwood-0": (
vox_spec: ("weapon.bow.longbow_rare", (-1.5, -5.0, -13.5)), vox_spec: ("weapon.bow.hardwood-0", (-1.5, -4.0, -12.0)),
color: None color: None
), ),
"common.items.weapons.bow.nature_ore_longbow-0": ( "common.items.weapons.bow.hardwood-1": (
vox_spec: ("weapon.bow.longbow_ore_nature-0", (-1.5, -4.0, -15.0)), vox_spec: ("weapon.bow.hardwood-1", (-1.5, -4.5, -12.5)),
color: None
),
"common.items.weapons.bow.hardwood-2": (
vox_spec: ("weapon.bow.hardwood-2", (-1.5, -6.0, -12.5)),
color: None
),
"common.items.weapons.bow.hardwood-3": (
vox_spec: ("weapon.bow.hardwood-3", (-0.5, -4.0, -11.0)),
color: None
),
"common.items.weapons.bow.hardwood-4": (
vox_spec: ("weapon.bow.hardwood-4", (-0.5, -3.5, -12.5)),
color: None
),
"common.items.weapons.bow.hardwood-5": (
vox_spec: ("weapon.bow.hardwood-5", (-1.5, -5.0, -13.5)),
color: None
),
"common.items.weapons.bow.metal-0": (
vox_spec: ("weapon.bow.metal-0", (-0.5, -6.0, -13.5)),
color: None
),
"common.items.weapons.bow.metal-1": (
vox_spec: ("weapon.bow.metal-1", (-1.5, -5.0, -13.5)),
color: None
),
"common.items.weapons.bow.metal-2": (
vox_spec: ("weapon.bow.metal-2", (-1.5, -4.0, -11.5)),
color: None
),
"common.items.weapons.bow.metal-3": (
vox_spec: ("weapon.bow.metal-3", (-1.5, -5.5, -15.0)),
color: None
),
"common.items.weapons.bow.metal-4": (
vox_spec: ("weapon.bow.metal-4", (-1.5, -4.0, -15.0)),
color: None
),
"common.items.weapons.bow.rawwood-0": (
vox_spec: ("weapon.bow.rawwood-0", (-1.5, -4.0, -12.5)),
color: None
),
"common.items.weapons.bow.rawwood-1": (
vox_spec: ("weapon.bow.rawwood-1", (-1.5, -4.0, -12.5)),
color: None
),
"common.items.weapons.bow.sagitta": (
vox_spec: ("weapon.bow.sagitta", (-1.5, -7.0, -12.5)),
color: None
),
"common.items.weapons.bow.starter": (
vox_spec: ("weapon.bow.starter", (-0.5, -3.0, -8.5)),
color: None
),
"common.items.weapons.bow.velorite": (
vox_spec: ("weapon.bow.velorite", (-1.5, -4.0, -15.0)),
color: None
),
"common.items.weapons.bow.wood-0": (
vox_spec: ("weapon.bow.wood-0", (-0.5, -5.0, -11.0)),
color: None
),
"common.items.weapons.bow.wood-1": (
vox_spec: ("weapon.bow.wood-1", (-0.5, -4.5, -12.5)),
color: None
),
"common.items.weapons.bow.wood-2": (
vox_spec: ("weapon.bow.wood-2", (-0.5, -3.5, -11.0)),
color: None
),
"common.items.weapons.bow.wood-3": (
vox_spec: ("weapon.bow.wood-3", (-0.5, -3.5, -12.5)),
color: None
),
"common.items.weapons.bow.wood-4": (
vox_spec: ("weapon.bow.wood-4", (-0.5, -4.5, -11.5)),
color: None color: None
), ),
// Farming Equipment // Farming Equipment
@ -585,38 +852,6 @@
vox_spec: ("weapon.tool.shovel_gold", (-1.0, -2.5, -4.0)), vox_spec: ("weapon.tool.shovel_gold", (-1.0, -2.5, -4.0)),
color: None color: None
), ),
"common.items.npc_weapons.tool.broom": (
vox_spec: ("weapon.tool.broom-0", (-1.5, -4.0, -4.0)),
color: None
),
"common.items.npc_weapons.tool.hoe": (
vox_spec: ("weapon.tool.hoe_green", (-2.5, -4.5, -4.0)),
color: None
),
"common.items.npc_weapons.tool.pitchfork": (
vox_spec: ("weapon.tool.pitchfork-0", (-1.0, -3.5, -4.0)),
color: None
),
"common.items.npc_weapons.tool.fishing_rod": (
vox_spec: ("weapon.tool.fishing_rod_blue-0", (-2.5, -4.5, -4.0)),
color: None
),
"common.items.npc_weapons.tool.rake": (
vox_spec: ("weapon.tool.rake-0", (-1.0, -5.5, -4.0)),
color: None
),
"common.items.npc_weapons.tool.pickaxe": (
vox_spec: ("weapon.tool.pickaxe_green-0", (-1.5, -7.5, -4.0)),
color: None
),
"common.items.npc_weapons.tool.shovel-0": (
vox_spec: ("weapon.tool.shovel_green", (-1.0, -2.5, -4.0)),
color: None
),
"common.items.npc_weapons.tool.shovel-1": (
vox_spec: ("weapon.tool.shovel_gold", (-1.0, -2.5, -4.0)),
color: None
),
// Staves // Staves
"common.items.weapons.staff.staff_1": ( "common.items.weapons.staff.staff_1": (
vox_spec: ("weapon.staff.firestaff_starter", (-1.5, -3.0, -3.0)), vox_spec: ("weapon.staff.firestaff_starter", (-1.5, -3.0, -3.0)),
@ -630,10 +865,6 @@
vox_spec: ("weapon.staff.firestaff_bone", (-1.5, -2.5, -3.0)), vox_spec: ("weapon.staff.firestaff_bone", (-1.5, -2.5, -3.0)),
color: None color: None
), ),
"common.items.npc_weapons.staff.bone_staff": (
vox_spec: ("weapon.staff.firestaff_bone", (-1.5, -2.5, -3.0)),
color: None
),
"common.items.weapons.staff.amethyst_staff": ( "common.items.weapons.staff.amethyst_staff": (
vox_spec: ("weapon.staff.firestaff_amethyst", (-1.5, -4.0, -4.0)), vox_spec: ("weapon.staff.firestaff_amethyst", (-1.5, -4.0, -4.0)),
color: None color: None
@ -642,10 +873,6 @@
vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)), vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)),
color: None color: None
), ),
"common.items.npc_weapons.staff.cultist_staff": (
vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)),
color: None
),
// Healing sceptre // Healing sceptre
"common.items.weapons.sceptre.starter_sceptre": ( "common.items.weapons.sceptre.starter_sceptre": (
vox_spec: ("weapon.sceptre.wood-simple", (-1.5, -2.5, -6.0)), vox_spec: ("weapon.sceptre.wood-simple", (-1.5, -2.5, -6.0)),
@ -684,16 +911,12 @@
color: None color: None
), ),
// Misc // Misc
"common.items.debug.boost": ( "common.items.debug.admin_stick": (
vox_spec: ("weapon.tool.broom_belzeshrub_purple", (-3.0, -4.0, -4.0)), vox_spec: ("weapon.tool.broom_belzeshrub_purple", (-3.0, -4.0, -4.0)),
color: None color: None
), ),
"common.items.debug.possess": ( "common.items.debug.admin_sword": (
vox_spec: ("weapon.tool.broom_belzeshrub_purple", (-3.0, -4.0, -4.0)), vox_spec: ("weapon.sword.frost-1", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.debug.cultist_purp_2h_boss-0": (
vox_spec: ("weapon.sword.frost_cleaver-1", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
// Misc // Misc

2
voxygen/anim/src/biped_small/run.rs
View File

@ -27,7 +27,7 @@ impl Animation for RunAnimation {
let mut next = (*skeleton).clone(); let mut next = (*skeleton).clone();
let speed = Vec2::<f32>::from(velocity).magnitude(); let speed = Vec2::<f32>::from(velocity).magnitude();
*rate = 1.0; *rate = 1.0;
let speednorm = speed / 9.4; let speednorm = (speed / 9.4).powf(0.4);
let lab = 1.0; let lab = 1.0;

8
voxygen/anim/src/character/run.rs
View File

@ -50,7 +50,7 @@ impl Animation for RunAnimation {
let speed = Vec2::<f32>::from(velocity).magnitude(); let speed = Vec2::<f32>::from(velocity).magnitude();
*rate = 1.0; *rate = 1.0;
let impact = (avg_vel.z).max(-8.0); let impact = (avg_vel.z).max(-8.0);
let speednorm = (speed / 9.4).min(1.5); let speednorm = (speed / 9.4).powf(0.6);
let lab = 1.0; let lab = 1.0;
@ -159,7 +159,11 @@ impl Animation for RunAnimation {
Quaternion::rotation_x(0.6 * speednorm + (footrotr * -1.2) * speednorm) Quaternion::rotation_x(0.6 * speednorm + (footrotr * -1.2) * speednorm)
* Quaternion::rotation_y(footrotr * 0.4 * speednorm); * Quaternion::rotation_y(footrotr * 0.4 * speednorm);
next.hand_r.position = -next.hand_l.position; next.hand_r.position = Vec3::new(
s_a.hand.0 + foothoril * 1.3 * speednorm,
3.0 * speednorm + s_a.hand.1 + foothoril * -7.0 * speednorm,
1.5 * speednorm + s_a.hand.2 - foothoril * 5.5 * speednorm,
);
next.hand_r.orientation = next.hand_r.orientation =
Quaternion::rotation_x(0.6 * speednorm + (footrotl * -1.2) * speednorm) Quaternion::rotation_x(0.6 * speednorm + (footrotl * -1.2) * speednorm)
* Quaternion::rotation_y(footrotl * -0.4 * speednorm); * Quaternion::rotation_y(footrotl * -0.4 * speednorm);

2
voxygen/anim/src/character/spin.rs
View File

@ -65,7 +65,7 @@ impl Animation for SpinAnimation {
* Quaternion::rotation_y( * Quaternion::rotation_y(
s_a.sc.4 - 0.6 + movement1 * 0.0 + movement2 * -1.7, s_a.sc.4 - 0.6 + movement1 * 0.0 + movement2 * -1.7,
) )
* Quaternion::rotation_z(s_a.sc.5 + 0.1 + movement1 * -1.57); * Quaternion::rotation_z(s_a.sc.5 + 0.1 + movement1 * 1.57);
next.head.position = Vec3::new( next.head.position = Vec3::new(
0.0 + 2.0 + movement2 * -2.0, 0.0 + 2.0 + movement2 * -2.0,
2.0 + movement2 * -2.0 + s_a.head.0, 2.0 + movement2 * -2.0 + s_a.head.0,

21
voxygen/anim/src/quadruped_medium/mod.rs
View File

@ -434,8 +434,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Kelpie, _) => (-0.5, 0.5, -4.5), (Kelpie, _) => (-0.5, 0.5, -4.5),
(Horse, _) => (-0.5, 0.5, -5.0), (Horse, _) => (-0.5, 0.5, -5.0),
(Barghest, _) => (2.0, 2.5, -6.0), (Barghest, _) => (2.0, 2.5, -6.0),
(Cattle, Male) => (-2.5, 1.0, -5.0), (Cattle, Male) => (-0.5, 1.0, -5.0),
(Cattle, Female) => (-1.5, 0.5, -5.5), (Cattle, Female) => (-0.5, 0.5, -5.5),
(Darkhound, _) => (0.0, 0.5, -4.0), (Darkhound, _) => (0.0, 0.5, -4.0),
(Highland, _) => (-0.5, 0.5, -4.5), (Highland, _) => (-0.5, 0.5, -4.5),
(Yak, _) => (-0.5, 0.0, -5.0), (Yak, _) => (-0.5, 0.0, -5.0),
@ -481,11 +481,17 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Tiger, _) => (1.2), (Tiger, _) => (1.2),
(Catoblepas, _) => (1.3), (Catoblepas, _) => (1.3),
(Roshwalr, _) => (1.2), (Roshwalr, _) => (1.2),
(Barghest, _) => (1.3), (Barghest, _) => (1.5),
(Cattle, _) => (1.9), (Antelope, _) => (1.2),
(Highland, _) => (1.9), (Kelpie, _) => (1.3),
(Bear, _) => (1.9), (Donkey, _) => (1.2),
(Yak, _) => (1.9), (Horse, _) => (1.4),
(Zebra, _) => (1.3),
(Cattle, _) => (1.7),
(Highland, _) => (1.7),
(Bear, _) => (1.7),
(Yak, _) => (1.7),
(Camel, _) => (1.4),
_ => (1.0), _ => (1.0),
}, },
startangle: match (body.species, body.body_type) { startangle: match (body.species, body.body_type) {
@ -523,6 +529,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Highland, _) => (0.8), (Highland, _) => (0.8),
(Bear, _) => (0.8), (Bear, _) => (0.8),
(Yak, _) => (0.8), (Yak, _) => (0.8),
(Camel, _) => (1.8),
_ => (1.0), _ => (1.0),
}, },
spring: match (body.species, body.body_type) { spring: match (body.species, body.body_type) {

4
world/src/site/dungeon/mod.rs
View File

@ -746,9 +746,7 @@ impl Floor {
)), )),
5 => match dynamic_rng.gen_range(0..6) { 5 => match dynamic_rng.gen_range(0..6) {
0 => entity 0 => entity
.with_body(comp::Body::BipedSmall( .with_body(comp::Body::Humanoid(comp::humanoid::Body::random()))
comp::biped_small::Body::random(),
))
.with_name("Cultist Warlock") .with_name("Cultist Warlock")
.with_loadout_config(loadout_builder::LoadoutConfig::Warlock) .with_loadout_config(loadout_builder::LoadoutConfig::Warlock)
.with_skillset_config( .with_skillset_config(