mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Minimap modes, Danari customizations update & bald hairstyles
This commit is contained in:
Monty Marz
Dominik Broński
parent
9333afc6f1
commit
7c8d73a0c6
@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
- Ability to toggle chat visibility
|
||||
- Added gem rings with various stat improvements.
|
||||
- Animations for using consumables.
|
||||
- New danari character customizations
|
||||
- Bald hairstyles for humans and danari
|
||||
|
||||
### Changed
|
||||
|
||||
|
||||
BIN
assets/voxygen/element/ui/map/buttons/minimap_modes.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/ui/map/buttons/minimap_modes.png
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -27,6 +27,9 @@
|
||||
"hud.map.recenter": "Recenter",
|
||||
"hud.map.marked_location": "Marked Location",
|
||||
"hud.map.marked_location_remove": "Click to remove",
|
||||
"hud.map.change_map_mode": "Change Map Mode",
|
||||
"hud.map.toggle_minimap_voxel": "Toggle Minimap Voxel View",
|
||||
"hud.map.zoom_minimap_explanation": "Zoom in the Minimap to see\nthe area around you in higher detail",
|
||||
},
|
||||
|
||||
|
||||
|
||||
@ -241,7 +241,7 @@
|
||||
// Mining
|
||||
"hud.skill.mining_title": "Mining",
|
||||
"hud.skill.pick_strike_title": "Pickaxe Strike",
|
||||
"hud.skill.pick_strike": "Hit rocks with the pickaxe to gain ore and gems and experience",
|
||||
"hud.skill.pick_strike": "Hit rocks with the pickaxe to gain ore, gems and experience",
|
||||
"hud.skill.pick_strike_speed_title": "Pickaxe Strike Speed",
|
||||
"hud.skill.pick_strike_speed": "Mine rocks faster{SP}",
|
||||
"hud.skill.pick_strike_oregain_title": "Pickaxe Strike Ore Yield",
|
||||
|
||||
@ -1,86 +1,86 @@
|
||||
({ //Swords
|
||||
"common.items.weapons.sword.bloodsteel-0": (
|
||||
vox_spec: ("weapon.sword.bloodsteel-0", (-1.5, -4.5, -4.0)),
|
||||
vox_spec: ("weapon.sword.bloodsteel-0", (-2.5, -4.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.bloodsteel-1": (
|
||||
vox_spec: ("weapon.sword.bloodsteel-1", (-2.5, -3.0, -5.5)),
|
||||
vox_spec: ("weapon.sword.bloodsteel-1", (-3.5, -3.0, -5.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.bloodsteel-2": (
|
||||
vox_spec: ("weapon.sword.bloodsteel-2", (-1.5, -3.5, -4.0)),
|
||||
vox_spec: ("weapon.sword.bloodsteel-2", (-2.5, -3.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.bronze-0": (
|
||||
vox_spec: ("weapon.sword.bronze-0", (-1.5, -3.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.bronze-0", (-2.5, -3.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.bronze-1": (
|
||||
vox_spec: ("weapon.sword.bronze-1", (-1.5, -3.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.bronze-1", (-2.5, -3.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.bronze-2": (
|
||||
vox_spec: ("weapon.sword.bronze-2", (-1.5, -3.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.bronze-2", (-2.5, -3.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.caladbolg": (
|
||||
vox_spec: ("weapon.sword.caladbolg", (-1.5, -5.5, -4.0)),
|
||||
vox_spec: ("weapon.sword.caladbolg", (-2.5, -5.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.cobalt-0": (
|
||||
vox_spec: ("weapon.sword.cobalt-0", (-1.5, -5.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.cobalt-0", (-2.5, -5.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.cobalt-1": (
|
||||
vox_spec: ("weapon.sword.cobalt-1", (-1.5, -6.0, -5.0)),
|
||||
vox_spec: ("weapon.sword.cobalt-1", (-2.5, -6.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.cobalt-2": (
|
||||
vox_spec: ("weapon.sword.cobalt-2", (-1.5, -5.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.cobalt-2", (-2.5, -5.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.cobalt-3": (
|
||||
vox_spec: ("weapon.sword.cobalt-3", (-1.5, -4.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.cobalt-3", (-2.5, -4.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.cultist": (
|
||||
vox_spec: ("weapon.sword.cultist", (-1.5, -4.0, -6.0)),
|
||||
vox_spec: ("weapon.sword.cultist", (-2.5, -4.0, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.frost-0": (
|
||||
vox_spec: ("weapon.sword.frost-0", (-1.5, -5.5, -5.0)),
|
||||
vox_spec: ("weapon.sword.frost-0", (-2.5, -5.5, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.frost-1": (
|
||||
vox_spec: ("weapon.sword.frost-1", (-1.5, -5.5, -5.0)),
|
||||
vox_spec: ("weapon.sword.frost-1", (-2.5, -5.5, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.iron-0": (
|
||||
vox_spec: ("weapon.sword.iron-0", (-1.5, -3.5, -4.0)),
|
||||
vox_spec: ("weapon.sword.iron-0", (-2.5, -3.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.iron-1": (
|
||||
vox_spec: ("weapon.sword.iron-1", (-1.5, -5.0, -5.0)),
|
||||
vox_spec: ("weapon.sword.iron-1", (-2.5, -5.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.iron-2": (
|
||||
vox_spec: ("weapon.sword.iron-2", (-1.5, -5.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.iron-2", (-2.5, -5.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.iron-3": (
|
||||
vox_spec: ("weapon.sword.iron-3", (-1.5, -4.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.iron-3", (-2.5, -4.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.iron-4": (
|
||||
vox_spec: ("weapon.sword.iron-4", (-1.5, -4.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.iron-4", (-2.5, -4.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.iron-5": (
|
||||
vox_spec: ("weapon.sword.iron-5", (-1.5, -4.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.iron-5", (-2.5, -4.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.iron-6": (
|
||||
vox_spec: ("weapon.sword.iron-6", (-1.5, -5.0, -5.0)),
|
||||
vox_spec: ("weapon.sword.iron-6", (-2.5, -5.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.iron-7": (
|
||||
@ -92,51 +92,51 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.iron-9": (
|
||||
vox_spec: ("weapon.sword.iron-9", (-1.5, -2.5, -4.0)),
|
||||
vox_spec: ("weapon.sword.iron-9", (-2.5, -2.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.iron-10": (
|
||||
vox_spec: ("weapon.sword.iron-10", (-1.5, -4.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.iron-10", (-2.5, -4.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.starter": (
|
||||
vox_spec: ("weapon.sword.starter", (-1.5, -4.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.starter", (-2.5, -4.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.steel-0": (
|
||||
vox_spec: ("weapon.sword.steel-0", (-1.5, -5.0, -5.0)),
|
||||
vox_spec: ("weapon.sword.steel-0", (-2.5, -5.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.steel-1": (
|
||||
vox_spec: ("weapon.sword.steel-1", (-1.5, -4.0, -5.0)),
|
||||
vox_spec: ("weapon.sword.steel-1", (-2.5, -4.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.steel-2": (
|
||||
vox_spec: ("weapon.sword.steel-2", (-1.5, -6.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.steel-2", (-2.5, -6.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.steel-3": (
|
||||
vox_spec: ("weapon.sword.steel-3", (-1.5, -4.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.steel-3", (-2.5, -4.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.steel-4": (
|
||||
vox_spec: ("weapon.sword.steel-4", (-1.5, -5.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.steel-4", (-2.5, -5.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.steel-5": (
|
||||
vox_spec: ("weapon.sword.steel-5", (-1.5, -2.5, -5.0)),
|
||||
vox_spec: ("weapon.sword.steel-5", (-2.5, -2.5, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.steel-6": (
|
||||
vox_spec: ("weapon.sword.steel-6", (-1.5, -5.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.steel-6", (-2.5, -5.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.steel-7": (
|
||||
vox_spec: ("weapon.sword.steel-7", (-1.5, -5.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.steel-7", (-2.5, -5.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.steel-8": (
|
||||
vox_spec: ("weapon.sword.steel-8", (-1.5, -5.0, -5.0)),
|
||||
vox_spec: ("weapon.sword.steel-8", (-2.5, -5.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.stone-0": (
|
||||
@ -144,23 +144,23 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.stone-1": (
|
||||
vox_spec: ("weapon.sword.stone-1", (-1.5, -4.0, -5.0)),
|
||||
vox_spec: ("weapon.sword.stone-1", (-2.5, -4.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.stone-2": (
|
||||
vox_spec: ("weapon.sword.stone-2", (-1.5, -4.0, -4.0)),
|
||||
vox_spec: ("weapon.sword.stone-2", (-2.5, -4.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.wood-0": (
|
||||
vox_spec: ("weapon.sword.wood-0", (-1.5, -3.5, -4.0)),
|
||||
vox_spec: ("weapon.sword.wood-0", (-2.5, -3.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.wood-1": (
|
||||
vox_spec: ("weapon.sword.wood-1", (-1.5, -5.0, -5.0)),
|
||||
vox_spec: ("weapon.sword.wood-1", (-2.5, -5.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword.wood-2": (
|
||||
vox_spec: ("weapon.sword.wood-2", (-1.5, -6.5, -3.0)),
|
||||
vox_spec: ("weapon.sword.wood-2", (-2.5, -6.5, -3.0)),
|
||||
color: None
|
||||
),
|
||||
// 1h Swords
|
||||
@ -169,11 +169,11 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword_1h.bloodsteel-1": (
|
||||
vox_spec: ("weapon.sword_1h.bloodsteel-1", (-1.5, -3.0, -3.0)),
|
||||
vox_spec: ("weapon.sword_1h.bloodsteel-1", (-2.5, -3.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword_1h.bloodsteel-2": (
|
||||
vox_spec: ("weapon.sword_1h.bloodsteel-2", (-1.5, -3.0, -3.0)),
|
||||
vox_spec: ("weapon.sword_1h.bloodsteel-2", (-2.5, -3.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sword_1h.bronze-0": (
|
||||
@ -254,192 +254,192 @@
|
||||
),
|
||||
// Axes
|
||||
"common.items.weapons.axe.starter_axe": (
|
||||
vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -7.0, -4.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_rusty", (-2.5, -7.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.orc_axe-0": (
|
||||
vox_spec: ("weapon.axe.2haxe_orc-0", (-1.5, -6.0, -4.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_orc-0", (-2.5, -6.0, -4.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.bronze_axe-0": (
|
||||
vox_spec: ("weapon.axe.2haxe_bronze-0", (-1.5, -7.0, -4.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_bronze-0", (-2.5, -7.0, -4.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.bronze_axe-1": (
|
||||
vox_spec: ("weapon.axe.2haxe_bronze-1", (-1.5, -5.0, -4.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_bronze-1", (-2.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)),
|
||||
vox_spec: ("weapon.axe.2haxe_bronze-2", (-2.5, -8.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.iron_axe-0": (
|
||||
vox_spec: ("weapon.axe.2haxe_iron-0", (-1.5, -7.0, -5.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_iron-0", (-2.5, -7.0, -5.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.iron_axe-1": (
|
||||
vox_spec: ("weapon.axe.2haxe_iron-1", (-1.5, -7.0, -5.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_iron-1", (-2.5, -7.0, -5.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.iron_axe-2": (
|
||||
vox_spec: ("weapon.axe.2haxe_iron-2", (-1.5, -7.0, -5.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_iron-2", (-2.5, -7.0, -5.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.iron_axe-3": (
|
||||
vox_spec: ("weapon.axe.2haxe_iron-3", (-1.5, -8.0, -6.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_iron-3", (-2.5, -8.0, -6.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.iron_axe-4": (
|
||||
vox_spec: ("weapon.axe.2haxe_iron-4", (-1.5, -7.0, -5.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_iron-4", (-2.5, -7.0, -5.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.iron_axe-5": (
|
||||
vox_spec: ("weapon.axe.2haxe_iron-5", (-1.5, -7.0, -5.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_iron-5", (-2.5, -7.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.iron_axe-6": (
|
||||
vox_spec: ("weapon.axe.2haxe_iron-6", (-1.5, -7.0, -6.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_iron-6", (-2.5, -7.0, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.iron_axe-7": (
|
||||
vox_spec: ("weapon.axe.2haxe_iron-7", (-1.5, -7.0, -5.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_iron-7", (-2.5, -7.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.iron_axe-8": (
|
||||
vox_spec: ("weapon.axe.2haxe_iron-8", (-1.5, -7.0, -5.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_iron-8", (-2.5, -7.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.iron_axe-9": (
|
||||
vox_spec: ("weapon.axe.2haxe_iron-9", (-1.5, -6.0, -5.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_iron-9", (-2.5, -6.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.steel_axe-0": (
|
||||
vox_spec: ("weapon.axe.2haxe_steel-0", (-1.5, -6.0, -4.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_steel-0", (-2.5, -6.0, -4.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.steel_axe-1": (
|
||||
vox_spec: ("weapon.axe.2haxe_steel-1", (-1.5, -8.0, -5.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_steel-1", (-2.5, -8.0, -5.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.steel_axe-2": (
|
||||
vox_spec: ("weapon.axe.2haxe_steel-2", (-1.5, -9.0, -3.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_steel-2", (-2.5, -9.0, -3.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.steel_axe-3": (
|
||||
vox_spec: ("weapon.axe.2haxe_steel-3", (-1.5, -5.5, -6.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_steel-3", (-2.5, -5.5, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.steel_axe-4": (
|
||||
vox_spec: ("weapon.axe.2haxe_steel-4", (-1.5, -6.0, -5.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_steel-4", (-2.5, -6.0, -5.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.steel_axe-5": (
|
||||
vox_spec: ("weapon.axe.2haxe_steel-5", (-1.5, -8.0, -5.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_steel-5", (-2.5, -8.0, -5.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.steel_axe-6": (
|
||||
vox_spec: ("weapon.axe.2haxe_steel-6", (-1.5, -6.0, -4.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_steel-6", (-2.5, -6.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.bloodsteel_axe-0": (
|
||||
vox_spec: ("weapon.axe.2haxe_bloodsteel-0", (-1.5, -7.0, -4.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_bloodsteel-0", (-2.5, -7.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.bloodsteel_axe-1": (
|
||||
vox_spec: ("weapon.axe.2haxe_bloodsteel-1", (-1.5, -7.0, -5.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_bloodsteel-1", (-2.5, -7.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.bloodsteel_axe-2": (
|
||||
vox_spec: ("weapon.axe.2haxe_bloodsteel-2", (-1.5, -8.0, -4.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_bloodsteel-2", (-2.5, -8.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.cobalt_axe-0": (
|
||||
vox_spec: ("weapon.axe.2haxe_cobalt-0", (-1.5, -7.0, -5.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_cobalt-0", (-2.5, -7.0, -5.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.cobalt_axe-1": (
|
||||
vox_spec: ("weapon.axe.2haxe_cobalt-1", (-1.5, -8.0, -5.5)),
|
||||
vox_spec: ("weapon.axe.2haxe_cobalt-1", (-2.5, -8.0, -5.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.malachite_axe-0": (
|
||||
vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -7.0, -5.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_malachite-0", (-2.5, -7.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe.parashu": (
|
||||
vox_spec: ("weapon.axe.parashu", (-1.5, -12.0, -6.0)),
|
||||
vox_spec: ("weapon.axe.parashu", (-2.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, -2.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.bloodsteel-0", (-2.5, -2.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.bloodsteel-1": (
|
||||
vox_spec: ("weapon.axe_1h.bloodsteel-1", (-1.5, -2.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.bloodsteel-1", (-2.5, -2.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.bronze-0": (
|
||||
vox_spec: ("weapon.axe_1h.bronze-0", (-1.5, -2.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.bronze-0", (-2.5, -2.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.bronze-1": (
|
||||
vox_spec: ("weapon.axe_1h.bronze-1", (-1.5, -2.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.bronze-1", (-2.5, -2.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.cobalt-0": (
|
||||
vox_spec: ("weapon.axe_1h.cobalt-0", (-1.5, -3.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.cobalt-0", (-2.5, -3.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.cobalt-1": (
|
||||
vox_spec: ("weapon.axe_1h.cobalt-1", (-1.5, -3.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.cobalt-1", (-2.5, -3.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.iron-0": (
|
||||
vox_spec: ("weapon.axe_1h.iron-0", (-1.5, -2.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.iron-0", (-2.5, -2.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.iron-1": (
|
||||
vox_spec: ("weapon.axe_1h.iron-1", (-1.5, -6.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.iron-1", (-2.5, -6.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.iron-2": (
|
||||
vox_spec: ("weapon.axe_1h.iron-2", (-1.5, -2.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.iron-2", (-2.5, -2.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.iron-3": (
|
||||
vox_spec: ("weapon.axe_1h.iron-3", (-1.5, -5.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.iron-3", (-2.5, -5.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.orichalcum-0": (
|
||||
vox_spec: ("weapon.axe_1h.orichalcum-0", (-1.5, -6.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.orichalcum-0", (-2.5, -6.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.steel-0": (
|
||||
vox_spec: ("weapon.axe_1h.steel-0", (-1.5, -2.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.steel-0", (-2.5, -2.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.steel-1": (
|
||||
vox_spec: ("weapon.axe_1h.steel-1", (-1.5, -2.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.steel-1", (-2.5, -2.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.steel-2": (
|
||||
vox_spec: ("weapon.axe_1h.steel-2", (-1.5, -2.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.steel-2", (-2.5, -2.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.stone-0": (
|
||||
vox_spec: ("weapon.axe_1h.stone-0", (-1.5, -2.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.stone-0", (-2.5, -2.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.stone-1": (
|
||||
vox_spec: ("weapon.axe_1h.stone-1", (-1.5, -2.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.stone-1", (-2.5, -2.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.wood-0": (
|
||||
vox_spec: ("weapon.axe_1h.wood-0", (-1.5, -3.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.wood-0", (-2.5, -3.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.axe_1h.wood-1": (
|
||||
vox_spec: ("weapon.axe_1h.wood-1", (-1.5, -2.0, -3.0)),
|
||||
vox_spec: ("weapon.axe_1h.wood-1", (-2.5, -2.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
// Hammers
|
||||
@ -508,7 +508,7 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.hammer.iron_hammer-5": (
|
||||
vox_spec: ("weapon.hammer.2hhammer_iron-5", (-1.5, -7.0, -5.0)),
|
||||
vox_spec: ("weapon.hammer.2hhammer_iron-5", (-2.5, -7.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.hammer.iron_hammer-6": (
|
||||
@ -520,7 +520,7 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.hammer.iron_hammer-8": (
|
||||
vox_spec: ("weapon.hammer.2hhammer_iron-8", (-1.5, -5.5, -7.0)),
|
||||
vox_spec: ("weapon.hammer.2hhammer_iron-8", (-2.5, -5.5, -7.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.hammer.steel_hammer-0": (
|
||||
@ -617,7 +617,7 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.hammer_1h.orichalcum-0": (
|
||||
vox_spec: ("weapon.hammer_1h.orichalcum-0", (-1.5, -4.0, -3.0)),
|
||||
vox_spec: ("weapon.hammer_1h.orichalcum-0", (-2.5, -4.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.hammer_1h.steel-0": (
|
||||
@ -650,15 +650,15 @@
|
||||
),
|
||||
// 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", (-2.5, -3.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.dagger.basic_0": (
|
||||
vox_spec: ("weapon.dagger.dagger_basic-0", (-1.5, -3.0, -3.0)),
|
||||
vox_spec: ("weapon.dagger.dagger_basic-0", (-2.5, -3.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.dagger.cultist_0": (
|
||||
vox_spec: ("weapon.dagger.dagger_cult-0", (-1.5, -3.0, -3.0)),
|
||||
vox_spec: ("weapon.dagger.dagger_cult-0", (-2.5, -3.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
// Shields
|
||||
@ -672,51 +672,51 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.bone-1": (
|
||||
vox_spec: ("weapon.bow.bone-1", (-1.5, -4.5, -15.5)),
|
||||
vox_spec: ("weapon.bow.bone-1", (-2.5, -4.5, -15.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.bone-2": (
|
||||
vox_spec: ("weapon.bow.bone-2", (-1.5, -5.5, -13.0)),
|
||||
vox_spec: ("weapon.bow.bone-2", (-2.5, -5.5, -13.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.bone-3": (
|
||||
vox_spec: ("weapon.bow.bone-3", (-1.5, -5.0, -12.5)),
|
||||
vox_spec: ("weapon.bow.bone-3", (-2.5, -5.0, -12.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.eldwood-0": (
|
||||
vox_spec: ("weapon.bow.eldwood-0", (-1.5, -4.0, -12.5)),
|
||||
vox_spec: ("weapon.bow.eldwood-0", (-2.5, -4.0, -12.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.eldwood-1": (
|
||||
vox_spec: ("weapon.bow.eldwood-1", (-1.5, -5.5, -12.5)),
|
||||
vox_spec: ("weapon.bow.eldwood-1", (-2.5, -5.5, -12.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.eldwood-2": (
|
||||
vox_spec: ("weapon.bow.eldwood-2", (-1.5, -4.5, -12.5)),
|
||||
vox_spec: ("weapon.bow.eldwood-2", (-2.5, -4.5, -12.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.frostwood-0": (
|
||||
vox_spec: ("weapon.bow.frostwood-0", (-1.5, -6.0, -13.5)),
|
||||
vox_spec: ("weapon.bow.frostwood-0", (-2.5, -6.0, -13.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.frostwood-1": (
|
||||
vox_spec: ("weapon.bow.frostwood-1", (-1.5, -5.0, -12.5)),
|
||||
vox_spec: ("weapon.bow.frostwood-1", (-2.5, -5.0, -12.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.frostwood-2": (
|
||||
vox_spec: ("weapon.bow.frostwood-2", (-1.5, -4.5, -12.5)),
|
||||
vox_spec: ("weapon.bow.frostwood-2", (-2.5, -4.5, -12.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.hardwood-0": (
|
||||
vox_spec: ("weapon.bow.hardwood-0", (-1.5, -4.0, -12.0)),
|
||||
vox_spec: ("weapon.bow.hardwood-0", (-2.5, -4.0, -12.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.hardwood-1": (
|
||||
vox_spec: ("weapon.bow.hardwood-1", (-1.5, -4.5, -12.5)),
|
||||
vox_spec: ("weapon.bow.hardwood-1", (-2.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)),
|
||||
vox_spec: ("weapon.bow.hardwood-2", (-2.5, -6.0, -12.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.hardwood-3": (
|
||||
@ -728,7 +728,7 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.hardwood-5": (
|
||||
vox_spec: ("weapon.bow.hardwood-5", (-1.5, -5.0, -13.5)),
|
||||
vox_spec: ("weapon.bow.hardwood-5", (-2.5, -5.0, -13.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.metal-0": (
|
||||
@ -736,31 +736,31 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.metal-1": (
|
||||
vox_spec: ("weapon.bow.metal-1", (-1.5, -5.0, -13.5)),
|
||||
vox_spec: ("weapon.bow.metal-1", (-2.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)),
|
||||
vox_spec: ("weapon.bow.metal-2", (-2.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)),
|
||||
vox_spec: ("weapon.bow.metal-3", (-2.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)),
|
||||
vox_spec: ("weapon.bow.metal-4", (-2.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)),
|
||||
vox_spec: ("weapon.bow.rawwood-0", (-2.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)),
|
||||
vox_spec: ("weapon.bow.rawwood-1", (-2.5, -4.0, -12.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.sagitta": (
|
||||
vox_spec: ("weapon.bow.sagitta", (-1.5, -7.0, -12.5)),
|
||||
vox_spec: ("weapon.bow.sagitta", (-2.5, -7.0, -12.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.starter": (
|
||||
@ -768,11 +768,11 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.bow.velorite": (
|
||||
vox_spec: ("weapon.bow.velorite", (-1.5, -4.0, -15.0)),
|
||||
vox_spec: ("weapon.bow.velorite", (-2.5, -4.0, -15.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.debug.velorite_bow_debug": (
|
||||
vox_spec: ("weapon.bow.velorite", (-1.5, -4.0, -15.0)),
|
||||
vox_spec: ("weapon.bow.velorite", (-2.5, -4.0, -15.0)),
|
||||
color: Some((73, 63, 59))
|
||||
),
|
||||
"common.items.weapons.bow.wood-0": (
|
||||
@ -797,7 +797,7 @@
|
||||
),
|
||||
// Farming Equipment
|
||||
"common.items.weapons.tool.broom": (
|
||||
vox_spec: ("weapon.tool.broom-0", (-1.5, -4.0, -4.0)),
|
||||
vox_spec: ("weapon.tool.broom-0", (-2.5, -4.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.tool.hoe": (
|
||||
@ -817,7 +817,7 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.tool.pickaxe": (
|
||||
vox_spec: ("weapon.tool.pickaxe_green-0", (-1.5, -7.5, -4.0)),
|
||||
vox_spec: ("weapon.tool.pickaxe_green-0", (-2.5, -7.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.tool.shovel-0": (
|
||||
@ -830,19 +830,19 @@
|
||||
),
|
||||
// Staves
|
||||
"common.items.weapons.staff.staff_1": (
|
||||
vox_spec: ("weapon.staff.firestaff_starter", (-1.5, -3.0, -3.0)),
|
||||
vox_spec: ("weapon.staff.firestaff_starter", (-2.5, -3.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.staff.starter_staff": (
|
||||
vox_spec: ("weapon.staff.firestaff_starter", (-1.5, -3.0, -3.0)),
|
||||
vox_spec: ("weapon.staff.firestaff_starter", (-2.5, -3.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.staff.bone_staff": (
|
||||
vox_spec: ("weapon.staff.bone_staff", (-1.5, -2.5, -3.0)),
|
||||
vox_spec: ("weapon.staff.bone_staff", (-2.5, -2.5, -3.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.staff.crimson_eye": (
|
||||
vox_spec: ("weapon.staff.crimson_eye", (-1.5, -3.5, -4.0)),
|
||||
vox_spec: ("weapon.staff.crimson_eye", (-2.5, -3.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.staff.cultist_staff": (
|
||||
@ -866,7 +866,7 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.staff.flamethrower_0": (
|
||||
vox_spec: ("weapon.staff.unstable_thrower", (-1.5, -2.5, -5.0)),
|
||||
vox_spec: ("weapon.staff.unstable_thrower", (-2.5, -2.5, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.staff.ley_seeker": (
|
||||
@ -898,11 +898,11 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.staff.laevateinn": (
|
||||
vox_spec: ("weapon.staff.laevateinn", (-1.5, -4.5, -6.0)),
|
||||
vox_spec: ("weapon.staff.laevateinn", (-2.5, -4.5, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.staff.ruby_rod": (
|
||||
vox_spec: ("weapon.staff.ruby_rod", (-1.5, -3.5, -4.0)),
|
||||
vox_spec: ("weapon.staff.ruby_rod", (-2.5, -3.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.staff.dragon_tongue": (
|
||||
@ -910,16 +910,16 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.staff.solar": (
|
||||
vox_spec: ("weapon.staff.solar", (-1.5, -4.5, -4.0)),
|
||||
vox_spec: ("weapon.staff.solar", (-2.5, -4.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
// Sceptres
|
||||
"common.items.weapons.sceptre.starter_sceptre": (
|
||||
vox_spec: ("weapon.sceptre.wood-simple", (-1.5, -2.5, -6.0)),
|
||||
vox_spec: ("weapon.sceptre.wood-simple", (-2.5, -2.5, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sceptre.moon0": (
|
||||
vox_spec: ("weapon.sceptre.moon", (-1.5, -2.5, -6.0)),
|
||||
vox_spec: ("weapon.sceptre.moon", (-2.5, -2.5, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sceptre.staff_nature": (
|
||||
@ -927,23 +927,23 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sceptre.totem_green": (
|
||||
vox_spec: ("weapon.sceptre.totem_green", (-1.5, -2.5, -6.0)),
|
||||
vox_spec: ("weapon.sceptre.totem_green", (-2.5, -2.5, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sceptre.root_green0": (
|
||||
vox_spec: ("weapon.sceptre.root_green", (-1.5, -2.5, -6.0)),
|
||||
vox_spec: ("weapon.sceptre.root_green", (-2.5, -2.5, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sceptre.fork0": (
|
||||
vox_spec: ("weapon.sceptre.fork", (-1.5, -2.5, -6.0)),
|
||||
vox_spec: ("weapon.sceptre.fork", (-2.5, -2.5, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sceptre.loops0": (
|
||||
vox_spec: ("weapon.sceptre.loops", (-1.5, -2.5, -6.0)),
|
||||
vox_spec: ("weapon.sceptre.loops", (-2.5, -2.5, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sceptre.root_evil": (
|
||||
vox_spec: ("weapon.sceptre.root_evil", (-1.5, -2.5, -6.0)),
|
||||
vox_spec: ("weapon.sceptre.root_evil", (-2.5, -2.5, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sceptre.sceptre_velorite_0": (
|
||||
@ -951,7 +951,7 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sceptre.caduceus": (
|
||||
vox_spec: ("weapon.sceptre.caduceus", (-1.5, -4.5, -6.0)),
|
||||
vox_spec: ("weapon.sceptre.caduceus", (-2.5, -4.5, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sceptre.coralline_cane": (
|
||||
@ -967,20 +967,20 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sceptre.druids_arbor": (
|
||||
vox_spec: ("weapon.sceptre.druids_arbor", (-1.5, -4.5, -4.0)),
|
||||
vox_spec: ("weapon.sceptre.druids_arbor", (-2.5, -4.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.weapons.sceptre.amethyst": (
|
||||
vox_spec: ("weapon.sceptre.amethyst", (-1.5, -4.5, -9.5)),
|
||||
vox_spec: ("weapon.sceptre.amethyst", (-2.5, -4.5, -9.5)),
|
||||
color: None
|
||||
),
|
||||
// Picks
|
||||
"common.items.tool.pickaxe_stone": (
|
||||
vox_spec: ("weapon.tool.pickaxe_green-0", (-1.5, -7.5, -4.0)),
|
||||
vox_spec: ("weapon.tool.pickaxe_green-0", (-2.5, -7.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.tool.pickaxe_steel": (
|
||||
vox_spec: ("weapon.tool.pickaxe_green-1", (-1.5, -9.5, -4.0)),
|
||||
vox_spec: ("weapon.tool.pickaxe_green-1", (-2.5, -9.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
// Misc
|
||||
@ -1019,7 +1019,7 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.sword.dullahan_sword": (
|
||||
vox_spec: ("weapon.sword.greatsword_2h_dullahan", (-1.5, -9.0, -10.0)),
|
||||
vox_spec: ("weapon.sword.greatsword_2h_dullahan", (-2.5, -9.0, -10.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.staff.saurok_staff": (
|
||||
@ -1027,11 +1027,11 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.sword.saurok_sword": (
|
||||
vox_spec: ("weapon.sword.long_2h_saurok", (-1.5, -4.0, -5.0)),
|
||||
vox_spec: ("weapon.sword.long_2h_saurok", (-2.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)),
|
||||
vox_spec: ("weapon.bow.longbow_saurok", (-2.5, -4.0, -16.5)),
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.staff.mindflayer_staff": (
|
||||
@ -1063,11 +1063,11 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.hammer.harvester_scythe": (
|
||||
vox_spec: ("weapon.hammer.2hhammer_harvester", (-1.5, -7.5, -6.0)),
|
||||
vox_spec: ("weapon.hammer.2hhammer_harvester", (-2.5, -7.5, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.axe.oni_blue_axe": (
|
||||
vox_spec: ("weapon.axe.2haxe_oni_blue", (-1.5, -2.0, -12.0)),
|
||||
vox_spec: ("weapon.axe.2haxe_oni_blue", (-2.5, -2.0, -12.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.hammer.oni_red_hammer": (
|
||||
@ -1075,7 +1075,7 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.sword.bipedlarge-cultist": (
|
||||
vox_spec: ("weapon.sword.cultist", (-1.5, -4.0, -6.0)),
|
||||
vox_spec: ("weapon.sword.cultist", (-2.5, -4.0, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.hammer.bipedlarge-cultist": (
|
||||
@ -1083,7 +1083,7 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.bow.bipedlarge-velorite": (
|
||||
vox_spec: ("weapon.bow.velorite", (-1.5, -4.0, -15.0)),
|
||||
vox_spec: ("weapon.bow.velorite", (-2.5, -4.0, -15.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.staff.bipedlarge-cultist": (
|
||||
@ -1092,7 +1092,7 @@
|
||||
),
|
||||
//BIPEDSMALL
|
||||
"common.items.npc_weapons.biped_small.adlet.adlet_bow": (
|
||||
vox_spec: ("weapon.biped_small.bow.adlet", (-1.5, -3.0, -5.0)),
|
||||
vox_spec: ("weapon.biped_small.bow.adlet", (-2.5, -3.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.biped_small.adlet.gnoll_staff": (
|
||||
@ -1104,7 +1104,7 @@
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.biped_small.gnarling.adlet_bow": (
|
||||
vox_spec: ("weapon.biped_small.bow.adlet", (-1.5, -3.0, -5.0)),
|
||||
vox_spec: ("weapon.biped_small.bow.adlet", (-2.5, -3.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
"common.items.npc_weapons.biped_small.gnarling.gnoll_staff": (
|
||||
|
||||
BIN
assets/voxygen/voxel/figure/accessory/danari/horns-1.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/accessory/danari/horns-1.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/accessory/danari/horns-2.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/accessory/danari/horns-2.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/accessory/danari/horns-3.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/accessory/danari/horns-3.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/accessory/danari/horns-4.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/accessory/danari/horns-4.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/accessory/danari/horns-5.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/accessory/danari/horns-5.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/accessory/danari/horns-6.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/accessory/danari/horns-6.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-1.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-1.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-10.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-10.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-11.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-11.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-12.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-12.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-13.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-13.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-14.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-14.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-2.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-2.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-3.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-3.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-4.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-4.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-5.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-5.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-6.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-6.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-7.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-7.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-8.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-8.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/danari/danari-9.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/danari/danari-9.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/figure/beard/dwarf/danari-11.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/figure/beard/dwarf/danari-11.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -34,6 +34,7 @@
|
||||
Some(("figure.hair.human.male-18", (1, 0, 0))),
|
||||
Some(("figure.hair.human.male-19", (2, 1, 0))),
|
||||
Some(("figure.hair.human.male-20", (-3, -4, -7))),
|
||||
None,
|
||||
],
|
||||
beard: [
|
||||
None,
|
||||
@ -347,14 +348,36 @@
|
||||
Some(("figure.hair.danari.male-0", (3, 1, 2))),
|
||||
Some(("figure.hair.danari.male-1", (3, 1, 2))),
|
||||
Some(("figure.hair.danari.male-2", (3, -2, 3))),
|
||||
Some(("figure.hair.danari.male-3", (-1, -2, 3))), // <- Modify
|
||||
Some(("figure.hair.danari.male-3", (-1, -2, 3))),
|
||||
None,
|
||||
],
|
||||
beard: [
|
||||
None,
|
||||
Some(("figure.beard.danari.danari-0", (4, 6, -1))),
|
||||
Some(("figure.beard.danari.danari-1", (4, 6, -5))),
|
||||
Some(("figure.beard.danari.danari-2", (7, 8, -1))),
|
||||
Some(("figure.beard.danari.danari-3", (3, 6, -2))),
|
||||
Some(("figure.beard.danari.danari-4", (3, 5, -2))),
|
||||
Some(("figure.beard.danari.danari-5", (4, 6, 2))),
|
||||
Some(("figure.beard.danari.danari-6", (4, 6, 1))),
|
||||
Some(("figure.beard.danari.danari-7", (4, 6, -2))),
|
||||
Some(("figure.beard.danari.danari-8", (4, 6, -5))),
|
||||
Some(("figure.beard.danari.danari-9", (4, 5, -7))),
|
||||
Some(("figure.beard.danari.danari-10", (4, 6, -2))),
|
||||
Some(("figure.beard.danari.danari-11", (4, 6, -5))),
|
||||
Some(("figure.beard.danari.danari-12", (6, 6, 0))),
|
||||
Some(("figure.beard.danari.danari-13", (7, 10, 0))),
|
||||
Some(("figure.beard.danari.danari-14", (5, 7, -1))),
|
||||
],
|
||||
accessory: [
|
||||
Some(("figure.accessory.danari.horns-0", (4, 8, 8))),]
|
||||
Some(("figure.accessory.danari.horns-0", (4, 8, 8))),
|
||||
Some(("figure.accessory.danari.horns-1", (2, 3, 8))),
|
||||
Some(("figure.accessory.danari.horns-2", (2, 1, 6))),
|
||||
Some(("figure.accessory.danari.horns-3", (4, 8, 8))),
|
||||
Some(("figure.accessory.danari.horns-4", (2, 4, 6))),
|
||||
Some(("figure.accessory.danari.horns-5", (2, 3, 8))),
|
||||
Some(("figure.accessory.danari.horns-6", (2, 3, 8))),
|
||||
]
|
||||
),
|
||||
(Danari, Female): (
|
||||
offset: (-9.0, -4.0, -2.0),
|
||||
@ -374,8 +397,15 @@
|
||||
Some(("figure.hair.danari.female-3", (1, -3, 0))),
|
||||
],
|
||||
beard: [None],
|
||||
accessory: [
|
||||
Some(("figure.accessory.danari.horns-0", (4, 9, 8))),]
|
||||
accessory: [
|
||||
Some(("figure.accessory.danari.horns-0", (4, 8, 8))),
|
||||
Some(("figure.accessory.danari.horns-1", (2, 3, 8))),
|
||||
Some(("figure.accessory.danari.horns-2", (2, 1, 6))),
|
||||
Some(("figure.accessory.danari.horns-3", (4, 8, 8))),
|
||||
Some(("figure.accessory.danari.horns-4", (2, 4, 6))),
|
||||
Some(("figure.accessory.danari.horns-5", (2, 3, 8))),
|
||||
Some(("figure.accessory.danari.horns-6", (2, 3, 8))),
|
||||
]
|
||||
),
|
||||
// More here
|
||||
})
|
||||
|
||||
@ -289,13 +289,13 @@ impl Species {
|
||||
pub fn num_hair_styles(self, body_type: BodyType) -> u8 {
|
||||
match (self, body_type) {
|
||||
(Species::Danari, BodyType::Female) => 4,
|
||||
(Species::Danari, BodyType::Male) => 4,
|
||||
(Species::Danari, BodyType::Male) => 5,
|
||||
(Species::Dwarf, BodyType::Female) => 8,
|
||||
(Species::Dwarf, BodyType::Male) => 4,
|
||||
(Species::Elf, BodyType::Female) => 21,
|
||||
(Species::Elf, BodyType::Male) => 4,
|
||||
(Species::Human, BodyType::Female) => 19,
|
||||
(Species::Human, BodyType::Male) => 17,
|
||||
(Species::Human, BodyType::Male) => 18,
|
||||
(Species::Orc, BodyType::Female) => 7,
|
||||
(Species::Orc, BodyType::Male) => 8,
|
||||
(Species::Undead, BodyType::Female) => 6,
|
||||
@ -305,8 +305,8 @@ impl Species {
|
||||
|
||||
pub fn num_accessories(self, body_type: BodyType) -> u8 {
|
||||
match (self, body_type) {
|
||||
(Species::Danari, BodyType::Female) => 1,
|
||||
(Species::Danari, BodyType::Male) => 1,
|
||||
(Species::Danari, BodyType::Female) => 7,
|
||||
(Species::Danari, BodyType::Male) => 7,
|
||||
(Species::Dwarf, BodyType::Female) => 7,
|
||||
(Species::Dwarf, BodyType::Male) => 7,
|
||||
(Species::Elf, BodyType::Female) => 2,
|
||||
@ -342,7 +342,7 @@ impl Species {
|
||||
pub fn num_beards(self, body_type: BodyType) -> u8 {
|
||||
match (self, body_type) {
|
||||
(Species::Danari, BodyType::Female) => 1,
|
||||
(Species::Danari, BodyType::Male) => 2,
|
||||
(Species::Danari, BodyType::Male) => 16,
|
||||
(Species::Dwarf, BodyType::Female) => 1,
|
||||
(Species::Dwarf, BodyType::Male) => 20,
|
||||
(Species::Elf, BodyType::Female) => 1,
|
||||
|
||||
@ -47,15 +47,12 @@ widget_ids! {
|
||||
inv_scrollbar,
|
||||
inv_slots_0,
|
||||
inv_slots[],
|
||||
//tooltip[],
|
||||
bg,
|
||||
bg_frame,
|
||||
char_ico,
|
||||
coin_ico,
|
||||
//cheese_ico,
|
||||
space_txt,
|
||||
coin_txt,
|
||||
//cheese_txt,
|
||||
inventory_title,
|
||||
inventory_title_bg,
|
||||
scrollbar_bg,
|
||||
|
||||
@ -356,6 +356,7 @@ image_ids! {
|
||||
indicator_group_down: "voxygen.element.ui.map.buttons.group_indicator_arrow_down",
|
||||
location_marker: "voxygen.element.ui.map.buttons.location_marker",
|
||||
map_mode_overlay: "voxygen.element.ui.map.buttons.map_modes",
|
||||
minimap_mode_overlay: "voxygen.element.ui.map.buttons.minimap_modes",
|
||||
|
||||
// MiniMap
|
||||
mmap_frame: "voxygen.element.ui.minimap.mmap",
|
||||
|
||||
@ -80,6 +80,9 @@ widget_ids! {
|
||||
waypoint_txt,
|
||||
map_mode_btn,
|
||||
map_mode_overlay,
|
||||
minimap_mode_btn,
|
||||
minimap_mode_overlay,
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -1193,7 +1196,7 @@ impl<'a> Widget for Map<'a> {
|
||||
.bottom_right_with_margins_on(state.ids.map_layers[0], -36.0, 0.0)
|
||||
.with_tooltip(
|
||||
self.tooltip_manager,
|
||||
"Change Map Mode",
|
||||
i18n.get("hud.map.change_map_mode"),
|
||||
"",
|
||||
&site_tooltip,
|
||||
TEXT_COLOR,
|
||||
@ -1209,6 +1212,30 @@ impl<'a> Widget for Map<'a> {
|
||||
.middle_of(state.ids.map_mode_btn)
|
||||
.set(state.ids.map_mode_overlay, ui);
|
||||
|
||||
// Render voxel view on minimap
|
||||
if Button::image(self.imgs.button)
|
||||
.w_h(92.0, icon_size.y)
|
||||
.hover_image(self.imgs.button_hover)
|
||||
.press_image(self.imgs.button_press)
|
||||
.left_from(state.ids.map_mode_btn, 5.0)
|
||||
.with_tooltip(
|
||||
self.tooltip_manager,
|
||||
i18n.get("hud.map.toggle_minimap_voxel"),
|
||||
i18n.get("hud.map.zoom_minimap_explanation"),
|
||||
&site_tooltip,
|
||||
TEXT_COLOR,
|
||||
)
|
||||
.set(state.ids.minimap_mode_btn, ui)
|
||||
.was_clicked()
|
||||
{
|
||||
events.push(Event::SettingsChange(MapShowVoxelMap(!show_voxel_map)));
|
||||
};
|
||||
Button::image(self.imgs.minimap_mode_overlay)
|
||||
.w_h(92.0, icon_size.y)
|
||||
.graphics_for(state.ids.minimap_mode_btn)
|
||||
.middle_of(state.ids.minimap_mode_btn)
|
||||
.set(state.ids.minimap_mode_overlay, ui);
|
||||
|
||||
events
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@ use crate::{
|
||||
},
|
||||
Element, IcedRenderer, IcedUi as Ui,
|
||||
},
|
||||
img_ids::ImageGraphic,
|
||||
img_ids::{BlankGraphic, ImageGraphic},
|
||||
},
|
||||
window, GlobalState,
|
||||
};
|
||||
@ -116,6 +116,9 @@ image_ids_ice! {
|
||||
// Tooltips
|
||||
tt_edge: "voxygen.element.ui.generic.frames.tooltip.edge",
|
||||
tt_corner: "voxygen.element.ui.generic.frames.tooltip.corner",
|
||||
|
||||
<BlankGraphic>
|
||||
nothing: (),
|
||||
}
|
||||
}
|
||||
|
||||
@ -437,9 +440,13 @@ impl Controls {
|
||||
Space::new(Length::Units(16), Length::Units(16)),
|
||||
)
|
||||
.style(
|
||||
style::button::Style::new(imgs.delete_button)
|
||||
.hover_image(imgs.delete_button_hover)
|
||||
.press_image(imgs.delete_button_press),
|
||||
style::button::Style::new(if Some(i) != selected {
|
||||
imgs.nothing
|
||||
} else {
|
||||
imgs.delete_button
|
||||
})
|
||||
.hover_image(imgs.delete_button_hover)
|
||||
.press_image(imgs.delete_button_press),
|
||||
)
|
||||
.on_press(Message::Delete(i))
|
||||
.with_tooltip(
|
||||
@ -470,7 +477,7 @@ impl Controls {
|
||||
style::button::Style::new(if Some(i) == selected {
|
||||
imgs.selection_hover
|
||||
} else {
|
||||
imgs.selection
|
||||
imgs.nothing
|
||||
})
|
||||
.hover_image(imgs.selection_hover)
|
||||
.press_image(imgs.selection_press),
|
||||
@ -481,7 +488,7 @@ impl Controls {
|
||||
)
|
||||
.ratio_of_image(imgs.selection),
|
||||
)
|
||||
.padding(12)
|
||||
.padding(2)
|
||||
.align_x(Align::End)
|
||||
.into()
|
||||
},
|
||||
|
||||
@ -11,7 +11,7 @@ use crate::{
|
||||
self,
|
||||
fonts::IcedFonts as Fonts,
|
||||
ice::{load_font, style, widget, Element, IcedUi as Ui},
|
||||
img_ids::{ImageGraphic, VoxelGraphic},
|
||||
img_ids::ImageGraphic,
|
||||
Graphic,
|
||||
},
|
||||
window, GlobalState,
|
||||
@ -34,10 +34,8 @@ pub const FILL_FRAC_TWO: f32 = 0.53;
|
||||
|
||||
image_ids_ice! {
|
||||
struct Imgs {
|
||||
<VoxelGraphic>
|
||||
v_logo: "voxygen.element.v_logo",
|
||||
|
||||
<ImageGraphic>
|
||||
v_logo: "voxygen.element.v_logo",
|
||||
bg: "voxygen.background.bg_main",
|
||||
banner_top: "voxygen.element.ui.generic.frames.banner_top",
|
||||
banner_gradient_bottom: "voxygen.element.ui.generic.frames.banner_gradient_bottom",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user