Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sam/fix-admin-sword' into 'master'

Browse Source 
Fixed sneaky admin sword.

See merge request veloren/veloren!1495
This commit is contained in:
Samuel Keiffer 2020-11-08 21:06:08 +00:00
commit 3e96c7d211
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/items/debug/cultist_purp_2h_boss-0.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Shouldn't this be a hammer?", description: "Shouldn't this be a hammer?",
kind: Tool( kind: Tool(
( (
kind: Sword("CultPurp0"), kind: Sword,
stats: ( stats: (
equip_time_millis: 0, equip_time_millis: 0,
power: 1000.0), power: 1000.0),

4
assets/voxygen/item_image_manifest.ron
View File

@ -238,6 +238,10 @@
"voxel.weapon.sword.cultist_purp_2h-0", "voxel.weapon.sword.cultist_purp_2h-0",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
), ),
Tool("common.items.debug.cultist_purp_2h_boss-0"): VoxTrans(
"voxel.weapon.sword.cultist_purp_2h-0",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
),
Tool("common.items.npc_weapons.sword.cultist_purp_2h_boss-0"): VoxTrans( Tool("common.items.npc_weapons.sword.cultist_purp_2h_boss-0"): VoxTrans(
"voxel.weapon.sword.cultist_purp_2h-0", "voxel.weapon.sword.cultist_purp_2h-0",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,

4
assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
View File

@ -175,6 +175,10 @@
vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.debug.cultist_purp_2h_boss-0": (
vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)),
color: None
),
"common.items.npc_weapons.sword.cultist_purp_2h_boss-0": ( "common.items.npc_weapons.sword.cultist_purp_2h_boss-0": (
vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)),
color: None color: None