mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
This commit is contained in:
@ -63,6 +63,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
- Added non-uniform block heights
|
||||
- Added `/sudo` command
|
||||
- Added a Level of Detail (LoD) system for terrain sprites and entities
|
||||
- Added owl, hyena, parrot npcs
|
||||
- Added dungeon entrances
|
||||
- Villagers tools and clothing
|
||||
- Cultists clothing
|
||||
|
||||
### Changed
|
||||
|
||||
@ -78,6 +82,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
- Asset cleanup to lower client-size
|
||||
- Rewrote the humanoid skeleton to be more ideal for attack animations
|
||||
- Arrows can no longer hurt their owners
|
||||
- Increased overall character scale
|
||||
|
||||
### Removed
|
||||
|
||||
|
8
assets/common/items/armor/belt/cultist_belt.ron
Normal file
8
assets/common/items/armor/belt/cultist_belt.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Cultist Belt",
|
||||
description: "Belt\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Belt(Cultist),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/cultist_chest_blue.ron
Normal file
8
assets/common/items/armor/chest/cultist_chest_blue.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Cultist Chest",
|
||||
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Chest(CultistBlue),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/cultist_chest_purple.ron
Normal file
8
assets/common/items/armor/chest/cultist_chest_purple.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Purple Cultist Chest",
|
||||
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Chest(CultistPurple),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/worker_green_0.ron
Normal file
8
assets/common/items/armor/chest/worker_green_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Green Worker Shirt",
|
||||
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Chest(WorkerGreen0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/worker_green_1.ron
Normal file
8
assets/common/items/armor/chest/worker_green_1.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Green Worker Shirt",
|
||||
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Chest(WorkerGreen1),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/worker_orange_0.ron
Normal file
8
assets/common/items/armor/chest/worker_orange_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Orange Worker Shirt",
|
||||
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Chest(WorkerOrange0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/worker_orange_1.ron
Normal file
8
assets/common/items/armor/chest/worker_orange_1.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Orange Worker Shirt",
|
||||
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Chest(WorkerOrange1),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/worker_purple_0.ron
Normal file
8
assets/common/items/armor/chest/worker_purple_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Purple Worker Shirt",
|
||||
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Chest(WorkerPurple0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/worker_purple_1.ron
Normal file
8
assets/common/items/armor/chest/worker_purple_1.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Purple Worker Shirt",
|
||||
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Chest(WorkerPurple1),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/worker_red_0.ron
Normal file
8
assets/common/items/armor/chest/worker_red_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Red Worker Shirt",
|
||||
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Chest(WorkerRed0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/worker_red_1.ron
Normal file
8
assets/common/items/armor/chest/worker_red_1.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Red Worker Shirt",
|
||||
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Chest(WorkerRed1),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/worker_yellow_0.ron
Normal file
8
assets/common/items/armor/chest/worker_yellow_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Yellow Worker Shirt",
|
||||
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Chest(WorkerYellow0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/worker_yellow_1.ron
Normal file
8
assets/common/items/armor/chest/worker_yellow_1.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Yellow Worker Shirt",
|
||||
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Chest(WorkerYellow1),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/foot/cultist_boots.ron
Normal file
8
assets/common/items/armor/foot/cultist_boots.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Cultist Boots",
|
||||
description: "Feet\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Foot(Cultist),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/hand/cultist_hands_blue.ron
Normal file
8
assets/common/items/armor/hand/cultist_hands_blue.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Cultist Gloves",
|
||||
description: "Hands\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Hand(CultistBlue),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/hand/cultist_hands_purple.ron
Normal file
8
assets/common/items/armor/hand/cultist_hands_purple.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Purple Cultist Gloves",
|
||||
description: "Hands\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Hand(CultistPurple),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/pants/cultist_legs_blue.ron
Normal file
8
assets/common/items/armor/pants/cultist_legs_blue.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Cultist Skirt",
|
||||
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Pants(CultistBlue),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/pants/cultist_legs_purple.ron
Normal file
8
assets/common/items/armor/pants/cultist_legs_purple.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Purple Cultist Skirt",
|
||||
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Pants(CultistPurple),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/pants/worker_blue_0.ron
Normal file
8
assets/common/items/armor/pants/worker_blue_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Worker Pants",
|
||||
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Pants(WorkerBlue0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Cultist Mantle",
|
||||
description: "Shoulders\n\nArmor: 0\n\nA strong shoulder to lean on.\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Shoulder(CultistBlue),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Purple Cultist Mantle",
|
||||
description: "Shoulders\n\nArmor: 0\n\nA strong shoulder to lean on.\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Shoulder(CultistPurple),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/debug/cultist_belt.ron
Normal file
8
assets/common/items/debug/cultist_belt.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Cultist Belt",
|
||||
description: "Belt\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Belt(Cultist),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/debug/cultist_boots.ron
Normal file
8
assets/common/items/debug/cultist_boots.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Cultist Boots",
|
||||
description: "Feet\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Foot(Cultist),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/debug/cultist_chest_blue.ron
Normal file
8
assets/common/items/debug/cultist_chest_blue.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Cultist Chest",
|
||||
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Chest(CultistBlue),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/debug/cultist_hands_blue.ron
Normal file
8
assets/common/items/debug/cultist_hands_blue.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Cultist Gloves",
|
||||
description: "Hands\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Hand(CultistBlue),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/debug/cultist_legs_blue.ron
Normal file
8
assets/common/items/debug/cultist_legs_blue.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Cultist Skirt",
|
||||
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Pants(CultistBlue),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/debug/cultist_shoulder_blue.ron
Normal file
8
assets/common/items/debug/cultist_shoulder_blue.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Cultist Mantle",
|
||||
description: "Shoulders\n\nArmor: 0\n\nA strong shoulder to lean on.\n\n<Right-Click to use>",
|
||||
kind: Armor(
|
||||
kind: Shoulder(CultistBlue),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
@ -1,8 +0,0 @@
|
||||
Item(
|
||||
name: "Iron Belt",
|
||||
description: "Belt\n\nArmor: 0\n\n",
|
||||
kind: Armor(
|
||||
kind: Belt(Plate0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
@ -1,8 +0,0 @@
|
||||
Item(
|
||||
name: "Iron Feet",
|
||||
description: "Feet\n\nArmor: 0\n\n",
|
||||
kind: Armor(
|
||||
kind: Foot(Plate0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
@ -1,8 +0,0 @@
|
||||
Item(
|
||||
name: "Iron Chestplate",
|
||||
description: "Chest\n\nArmor: 0",
|
||||
kind: Armor(
|
||||
kind: Chest(PlateGreen0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
@ -1,8 +0,0 @@
|
||||
Item(
|
||||
name: "Iron Legguards",
|
||||
description: "Legs\n\nArmor: 0\n\n",
|
||||
kind: Armor(
|
||||
kind: Pants(PlateGreen0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
@ -1,8 +0,0 @@
|
||||
Item(
|
||||
name: "Iron Handguards",
|
||||
description: "Hands\n\nArmor: 0\n\n",
|
||||
kind: Armor(
|
||||
kind: Hand(Plate0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
@ -1,8 +0,0 @@
|
||||
Item(
|
||||
name: "Iron Shoulderguards",
|
||||
description: "Shoulders\n\nArmor: 0\n\A strong shoulder to lean on.",
|
||||
kind: Armor(
|
||||
kind: Shoulder(Plate0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
@ -3,7 +3,7 @@ Item(
|
||||
description: "Bow\n\nPower: 5\n\nSomeone carved his initials into it...\n\n<Right-Click to use>",
|
||||
kind: Tool(
|
||||
(
|
||||
kind: Bow(BasicBow),
|
||||
kind: Bow(ShortBow0),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
10
assets/common/items/weapons/tool/broom.ron
Normal file
10
assets/common/items/weapons/tool/broom.ron
Normal file
@ -0,0 +1,10 @@
|
||||
Item(
|
||||
name: "Broom",
|
||||
description: "",
|
||||
kind: Tool (
|
||||
(
|
||||
kind: Farming(Broom),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
10
assets/common/items/weapons/tool/fishing_rod.ron
Normal file
10
assets/common/items/weapons/tool/fishing_rod.ron
Normal file
@ -0,0 +1,10 @@
|
||||
Item(
|
||||
name: "Fishing Rod",
|
||||
description: "",
|
||||
kind: Tool (
|
||||
(
|
||||
kind: Farming(FishingRod0),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
10
assets/common/items/weapons/tool/hoe.ron
Normal file
10
assets/common/items/weapons/tool/hoe.ron
Normal file
@ -0,0 +1,10 @@
|
||||
Item(
|
||||
name: "Hoe",
|
||||
description: "",
|
||||
kind: Tool (
|
||||
(
|
||||
kind: Farming(Hoe0),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
10
assets/common/items/weapons/tool/pickaxe.ron
Normal file
10
assets/common/items/weapons/tool/pickaxe.ron
Normal file
@ -0,0 +1,10 @@
|
||||
Item(
|
||||
name: "Pickaxe",
|
||||
description: "",
|
||||
kind: Tool (
|
||||
(
|
||||
kind: Farming(Pickaxe0),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
10
assets/common/items/weapons/tool/pitchfork.ron
Normal file
10
assets/common/items/weapons/tool/pitchfork.ron
Normal file
@ -0,0 +1,10 @@
|
||||
Item(
|
||||
name: "Pitchfork",
|
||||
description: "",
|
||||
kind: Tool (
|
||||
(
|
||||
kind: Farming(Pitchfork),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
10
assets/common/items/weapons/tool/rake.ron
Normal file
10
assets/common/items/weapons/tool/rake.ron
Normal file
@ -0,0 +1,10 @@
|
||||
Item(
|
||||
name: "Rake",
|
||||
description: "",
|
||||
kind: Tool (
|
||||
(
|
||||
kind: Farming(Rake),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
10
assets/common/items/weapons/tool/shovel-0.ron
Normal file
10
assets/common/items/weapons/tool/shovel-0.ron
Normal file
@ -0,0 +1,10 @@
|
||||
Item(
|
||||
name: "Shovel",
|
||||
description: "",
|
||||
kind: Tool (
|
||||
(
|
||||
kind: Farming(Shovel0),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
10
assets/common/items/weapons/tool/shovel-1.ron
Normal file
10
assets/common/items/weapons/tool/shovel-1.ron
Normal file
@ -0,0 +1,10 @@
|
||||
Item(
|
||||
name: "Shovel",
|
||||
description: "",
|
||||
kind: Tool (
|
||||
(
|
||||
kind: Farming(Shovel1),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
@ -433,6 +433,10 @@
|
||||
"holladon": {
|
||||
"keyword": "holladon",
|
||||
"generic": "Holladon"
|
||||
},
|
||||
"hyena": {
|
||||
"keyword": "hyena",
|
||||
"generic": "Hyena"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -463,6 +467,14 @@
|
||||
"eagle": {
|
||||
"keyword": "eagle",
|
||||
"generic": "Eagle"
|
||||
},
|
||||
"snowyowl": {
|
||||
"keyword": "snowyowl",
|
||||
"generic": "Snowy Owl"
|
||||
},
|
||||
"parrot": {
|
||||
"keyword": "parrot",
|
||||
"generic": "Parrot"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
BIN
assets/voxygen/element/buttons/inv_slot.png
(Stored with Git LFS)
BIN
assets/voxygen/element/buttons/inv_slot.png
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/element/icons/bow_m2.vox
(Stored with Git LFS)
BIN
assets/voxygen/element/icons/bow_m2.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/element/icons/item_apple.vox
(Stored with Git LFS)
BIN
assets/voxygen/element/icons/item_apple.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/element/icons/item_cheese.png
(Stored with Git LFS)
BIN
assets/voxygen/element/icons/item_cheese.png
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/element/icons/item_cheese.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/icons/item_cheese.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/icons/item_flower.vox
(Stored with Git LFS)
BIN
assets/voxygen/element/icons/item_flower.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/element/icons/item_grass.vox
(Stored with Git LFS)
BIN
assets/voxygen/element/icons/item_grass.vox
(Stored with Git LFS)
Binary file not shown.
@ -4,8 +4,8 @@
|
||||
({
|
||||
// Weapons
|
||||
// Bows
|
||||
Tool(Bow(BasicBow)): VoxTrans(
|
||||
"voxel.weapon.bow.simple-bow",
|
||||
Tool(Bow(ShortBow0)): VoxTrans(
|
||||
"voxel.weapon.bow.shortbow-0",
|
||||
(0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
|
||||
),
|
||||
// Daggers
|
||||
@ -16,38 +16,38 @@
|
||||
// Swords
|
||||
Tool(Sword(Short0)): VoxTrans(
|
||||
"voxel.weapon.sword.short_2h-0",
|
||||
(0.0, 9.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
|
||||
(-3.0, 3.0, 0.0), (-135.0, 90.0, 0.0), 1.60,
|
||||
),
|
||||
Tool(Sword(BasicSword)): VoxTrans(
|
||||
"voxel.weapon.sword.rusty_2h",
|
||||
(0.0, 9.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
|
||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.3,
|
||||
),
|
||||
Tool(Sword(Zweihander0)): VoxTrans(
|
||||
"voxel.weapon.sword.zweihander_2h-0",
|
||||
(0.0, 9.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
|
||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
|
||||
),
|
||||
Tool(Sword(WoodTraining)): VoxTrans(
|
||||
"voxel.weapon.sword.wood_2h",
|
||||
(0.0, 9.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
|
||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.3,
|
||||
),
|
||||
// Axes
|
||||
Tool(Axe(BasicAxe)): VoxTrans(
|
||||
"voxel.weapon.axe.rusty_2h",
|
||||
(0.0, -8.0, 0.0), (-90.0, 90.0, 0.0), 2.0,
|
||||
(1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
|
||||
),
|
||||
// Hammers
|
||||
Tool(Hammer(BasicHammer)): VoxTrans(
|
||||
"voxel.weapon.hammer.rusty_2h",
|
||||
(0.0, -8.0, 0.0), (-90.0, 90.0, 0.0), 2.0,
|
||||
(2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
|
||||
),
|
||||
// Staffs
|
||||
Tool(Staff(BasicStaff)): VoxTrans(
|
||||
"voxel.weapon.staff.wood-fire",
|
||||
(0.0, -9.0, 0.0), (90.0, 90.0, 0.0), 2.5,
|
||||
(1.0, 0.0, 0.0), (-310., 90.0, 0.0), 1.2,
|
||||
),
|
||||
Tool(Staff(Sceptre)): VoxTrans(
|
||||
"voxel.weapon.staff.wood-nature",
|
||||
(0.0, -9.0, 0.0), (90.0, 90.0, 0.0), 2.5,
|
||||
(1.0, -1.0, 0.0), (-310., 90.0, 0.0), 1.2,
|
||||
),
|
||||
// Shields
|
||||
Tool(Shield(BasicShield)): VoxTrans(
|
||||
@ -61,6 +61,48 @@
|
||||
Lantern(Green0): Png(
|
||||
"element.icons.lantern_green-0",
|
||||
),
|
||||
// Farming Equipment
|
||||
Tool(Farming(Broom)): VoxTrans(
|
||||
"voxel.weapon.tool.broom-0",
|
||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
|
||||
),
|
||||
Tool(Farming(Hoe0)): VoxTrans(
|
||||
"voxel.weapon.tool.hoe_green",
|
||||
(0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0,
|
||||
),
|
||||
Tool(Farming(Hoe1)): VoxTrans(
|
||||
"voxel.weapon.tool.hoe_blue",
|
||||
(0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0,
|
||||
),
|
||||
Tool(Farming(Pitchfork)): VoxTrans(
|
||||
"voxel.weapon.tool.pitchfork-0",
|
||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
|
||||
),
|
||||
Tool(Farming(Rake)): VoxTrans(
|
||||
"voxel.weapon.tool.rake-0",
|
||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
|
||||
),
|
||||
Tool(Farming(FishingRod0)): VoxTrans(
|
||||
"voxel.weapon.tool.fishing_rod_blue-0",
|
||||
(0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.5,
|
||||
),
|
||||
Tool(Farming(FishingRod0)): VoxTrans(
|
||||
"voxel.weapon.tool.fishing_rod_orange-0",
|
||||
(0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
|
||||
),
|
||||
Tool(Farming(Pickaxe0)): VoxTrans(
|
||||
"voxel.weapon.tool.pickaxe_green-0",
|
||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
|
||||
),
|
||||
Tool(Farming(Shovel0)): VoxTrans(
|
||||
"voxel.weapon.tool.shovel_green",
|
||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
|
||||
),
|
||||
Tool(Farming(Shovel1)): VoxTrans(
|
||||
"voxel.weapon.tool.shovel_gold",
|
||||
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
|
||||
),
|
||||
|
||||
// Other
|
||||
Utility(Collar): Png(
|
||||
"element.icons.collar",
|
||||
@ -79,6 +121,92 @@
|
||||
"voxel.armor.chest.rugged-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
// Cultist Clothing
|
||||
Armor(Chest(CultistPurple)): VoxTrans(
|
||||
"voxel.armor.chest.cultist",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Pants(CultistPurple)): VoxTrans(
|
||||
"voxel.armor.pants.cultist",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Belt(Cultist)): VoxTrans(
|
||||
"voxel.armor.belt.cultist",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
|
||||
),
|
||||
Armor(Foot(Cultist)): VoxTrans(
|
||||
"voxel.armor.foot.cultist",
|
||||
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
|
||||
),
|
||||
Armor(Hand(CultistPurple)): VoxTrans(
|
||||
"voxel.armor.hand.cultist_right",
|
||||
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
|
||||
),
|
||||
Armor(Shoulder(CultistPurple)): VoxTrans(
|
||||
"voxel.armor.shoulder.cultist_right",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Chest(CultistBlue)): VoxTrans(
|
||||
"voxel.armor.chest.cultist",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Pants(CultistBlue)): VoxTrans(
|
||||
"voxel.armor.pants.cultist",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Hand(CultistBlue)): VoxTrans(
|
||||
"voxel.armor.hand.cultist_right",
|
||||
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
|
||||
),
|
||||
Armor(Shoulder(CultistBlue)): VoxTrans(
|
||||
"voxel.armor.shoulder.cultist_right",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
// Villager Clothing
|
||||
Armor(Pants(WorkerBlue0)): VoxTrans(
|
||||
"voxel.armor.pants.worker_blue-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Chest(WorkerGreen0)): VoxTrans(
|
||||
"voxel.armor.chest.worker_green-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Chest(WorkerGreen1)): VoxTrans(
|
||||
"voxel.armor.chest.shirt_white-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Chest(WorkerRed0)): VoxTrans(
|
||||
"voxel.armor.chest.worker_green-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Chest(WorkerRed1)): VoxTrans(
|
||||
"voxel.armor.chest.shirt_white-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Chest(WorkerPurple0)): VoxTrans(
|
||||
"voxel.armor.chest.worker_green-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Chest(WorkerPurple1)): VoxTrans(
|
||||
"voxel.armor.chest.shirt_white-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Chest(WorkerYellow0)): VoxTrans(
|
||||
"voxel.armor.chest.worker_green-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Chest(WorkerYellow1)): VoxTrans(
|
||||
"voxel.armor.chest.shirt_white-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Chest(WorkerOrange0)): VoxTrans(
|
||||
"voxel.armor.chest.worker_green-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Chest(WorkerOrange1)): VoxTrans(
|
||||
"voxel.armor.chest.shirt_white-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
|
||||
),
|
||||
// Assassin Set
|
||||
Armor(Chest(Assassin)): VoxTrans(
|
||||
"voxel.armor.chest.assa",
|
||||
@ -284,9 +412,10 @@
|
||||
"voxel.object.potion_red",
|
||||
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
|
||||
),
|
||||
Consumable(Cheese): Png(
|
||||
Consumable(Cheese): VoxTrans(
|
||||
"element.icons.item_cheese",
|
||||
),
|
||||
(0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 0.9,
|
||||
),
|
||||
Consumable(Potion): VoxTrans(
|
||||
"voxel.object.potion_red",
|
||||
(0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
|
||||
|
@ -39,7 +39,7 @@ void main() {
|
||||
uint bone_idx = (v_ao_bone >> 2) & 0x3Fu;
|
||||
mat4 combined_mat = model_mat * bones[bone_idx].bone_mat;
|
||||
|
||||
vec3 pos = vec3((uvec3(v_pos_norm) >> uvec3(0, 8, 16)) & uvec3(0xFFu)) - 128.0;
|
||||
vec3 pos = (vec3((uvec3(v_pos_norm) >> uvec3(0, 9, 18)) & uvec3(0x1FFu)) - 256.0) / 2.0;
|
||||
|
||||
f_pos = (
|
||||
combined_mat *
|
||||
@ -51,7 +51,7 @@ void main() {
|
||||
|
||||
// First 3 normals are negative, next 3 are positive
|
||||
vec3 normals[6] = vec3[](vec3(-1,0,0), vec3(1,0,0), vec3(0,-1,0), vec3(0,1,0), vec3(0,0,-1), vec3(0,0,1));
|
||||
vec3 norm = normals[(v_pos_norm >> 24) & 0x7u];
|
||||
vec3 norm = normals[(v_pos_norm >> 29) & 0x7u];
|
||||
|
||||
// Calculate normal here rather than for each pixel in the fragment shader
|
||||
f_norm = normalize((
|
||||
|
BIN
assets/voxygen/voxel/armor/belt/cultist.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/belt/cultist.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/belt/cultist_right.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/belt/cultist_right.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/chest/chest_none.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/armor/chest/chest_none.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/armor/chest/cultist.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/chest/cultist.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/chest/shirt_white-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/chest/shirt_white-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/chest/worker_green-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/chest/worker_green-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/chest/worker_red-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/chest/worker_red-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/chest/worker_white-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/chest/worker_white-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/foot/cultist.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/foot/cultist.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/hand/cultist_right.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/hand/cultist_right.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/pants/cultist.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/pants/cultist.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/pants/worker_blue-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/pants/worker_blue-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/cultist_right.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/cultist_right.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -114,15 +114,15 @@
|
||||
(Eagle, Male): (
|
||||
head: (
|
||||
offset: (-2.0, -2.0, -3.5),
|
||||
center: ("npc.eagle.female.head"),
|
||||
center: ("npc.eagle.male.head"),
|
||||
),
|
||||
torso: (
|
||||
offset: (-3.0, -4.5, -4.5),
|
||||
center: ("npc.eagle.female.torso"),
|
||||
center: ("npc.eagle.male.torso"),
|
||||
),
|
||||
tail: (
|
||||
offset: (-2.0, -3.5, -3.5),
|
||||
center: ("npc.eagle.female.tail"),
|
||||
center: ("npc.eagle.male.tail"),
|
||||
)
|
||||
),
|
||||
(Eagle, Female): (
|
||||
@ -139,5 +139,60 @@
|
||||
center: ("npc.eagle.female.tail"),
|
||||
)
|
||||
),
|
||||
})
|
||||
|
||||
(Snowyowl, Male): (
|
||||
head: (
|
||||
offset: (-3.5, -4.5, -4.0),
|
||||
center: ("npc.snowyowl.male.head"),
|
||||
),
|
||||
torso: (
|
||||
offset: (-3.5, -5.0, -3.0),
|
||||
center: ("npc.snowyowl.male.torso"),
|
||||
),
|
||||
tail: (
|
||||
offset: (-2.5, -3.0, -2.0),
|
||||
center: ("npc.snowyowl.male.tail"),
|
||||
)
|
||||
),
|
||||
(Snowyowl, Female): (
|
||||
head: (
|
||||
offset: (-3.5, -4.5, -4.0),
|
||||
center: ("npc.snowyowl.female.head"),
|
||||
),
|
||||
torso: (
|
||||
offset: (-3.5, -5.0, -3.0),
|
||||
center: ("npc.snowyowl.female.torso"),
|
||||
),
|
||||
tail: (
|
||||
offset: (-2.5, -3.0, -2.0),
|
||||
center: ("npc.snowyowl.female.tail"),
|
||||
)
|
||||
),
|
||||
(Parrot, Male): (
|
||||
head: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
center: ("npc.parrot.male.head"),
|
||||
),
|
||||
torso: (
|
||||
offset: (-1.5, -3.5, -3.5),
|
||||
center: ("npc.parrot.male.torso"),
|
||||
),
|
||||
tail: (
|
||||
offset: (-1.5, -4.5, -1.5),
|
||||
center: ("npc.parrot.male.tail"),
|
||||
)
|
||||
),
|
||||
(Parrot, Female): (
|
||||
head: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
center: ("npc.parrot.female.head"),
|
||||
),
|
||||
torso: (
|
||||
offset: (-1.5, -3.5, -3.5),
|
||||
center: ("npc.parrot.female.torso"),
|
||||
),
|
||||
tail: (
|
||||
offset: (-1.5, -4.5, -1.5),
|
||||
center: ("npc.parrot.female.tail"),
|
||||
)
|
||||
),
|
||||
})
|
@ -179,4 +179,76 @@
|
||||
lateral: ("npc.eagle.female.leg_r"),
|
||||
)
|
||||
),
|
||||
})
|
||||
(Snowyowl, Male): (
|
||||
wing_l: (
|
||||
offset: (-1.0, -2.5, -8.0),
|
||||
lateral: ("npc.snowyowl.male.wing_l"),
|
||||
),
|
||||
wing_r: (
|
||||
offset: (-1.0, -2.5, -8.0),
|
||||
lateral: ("npc.snowyowl.male.wing_r"),
|
||||
),
|
||||
foot_l: (
|
||||
offset: (-1.0, 0.0, -6.5),
|
||||
lateral: ("npc.snowyowl.male.leg_l"),
|
||||
),
|
||||
foot_r: (
|
||||
offset: (-1.0, 0.0, -6.5),
|
||||
lateral: ("npc.snowyowl.male.leg_r"),
|
||||
)
|
||||
),
|
||||
(Snowyowl, Female): (
|
||||
wing_l: (
|
||||
offset: (-1.0, -2.5, -8.0),
|
||||
lateral: ("npc.snowyowl.female.wing_l"),
|
||||
),
|
||||
wing_r: (
|
||||
offset: (-1.0, -2.5, -8.0),
|
||||
lateral: ("npc.snowyowl.female.wing_r"),
|
||||
),
|
||||
foot_l: (
|
||||
offset: (-1.0, 0.0, -6.5),
|
||||
lateral: ("npc.snowyowl.female.leg_l"),
|
||||
),
|
||||
foot_r: (
|
||||
offset: (-1.0, 0.0, -6.5),
|
||||
lateral: ("npc.snowyowl.female.leg_r"),
|
||||
)
|
||||
),
|
||||
(Parrot, Male): (
|
||||
wing_l: (
|
||||
offset: (-0.5, -2.5, -8.0),
|
||||
lateral: ("npc.parrot.female.wing"),
|
||||
),
|
||||
wing_r: (
|
||||
offset: (-0.5, -2.5, -8.0),
|
||||
lateral: ("npc.parrot.female.wing"),
|
||||
),
|
||||
foot_l: (
|
||||
offset: (-1.0, 0.0, -3.0),
|
||||
lateral: ("npc.parrot.female.leg_l"),
|
||||
),
|
||||
foot_r: (
|
||||
offset: (-1.0, 0.0, -3.0),
|
||||
lateral: ("npc.parrot.female.leg_r"),
|
||||
)
|
||||
),
|
||||
(Parrot, Female): (
|
||||
wing_l: (
|
||||
offset: (-0.5, -2.5, -8.0),
|
||||
lateral: ("npc.parrot.female.wing"),
|
||||
),
|
||||
wing_r: (
|
||||
offset: (-0.5, -2.5, -8.0),
|
||||
lateral: ("npc.parrot.female.wing"),
|
||||
),
|
||||
foot_l: (
|
||||
offset: (-1.0, 0.0, -3.0),
|
||||
lateral: ("npc.parrot.female.leg_l"),
|
||||
),
|
||||
foot_r: (
|
||||
offset: (-1.0, 0.0, -3.0),
|
||||
lateral: ("npc.parrot.female.leg_r"),
|
||||
)
|
||||
),
|
||||
})
|
@ -48,5 +48,9 @@
|
||||
vox_spec: ("armor.belt.cloth_green-0", (-5.0, -3.5, 2.0)),
|
||||
color: None
|
||||
),
|
||||
Cultist: (
|
||||
vox_spec: ("armor.belt.cultist", (-5.0, -3.5, 1.0)),
|
||||
color: None
|
||||
),
|
||||
},
|
||||
))
|
||||
|
@ -60,5 +60,55 @@
|
||||
vox_spec: ("armor.chest.rugged-0", (-7.0, -3.5, 2.0)),
|
||||
color: None
|
||||
),
|
||||
// Villagers
|
||||
WorkerGreen0:(
|
||||
vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
|
||||
color: Some((88, 108, 65))
|
||||
),
|
||||
WorkerGreen1:(
|
||||
vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
|
||||
color: Some((88, 108, 65))
|
||||
),
|
||||
WorkerRed0:(
|
||||
vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
|
||||
color: Some((124, 38, 46))
|
||||
),
|
||||
WorkerRed1:(
|
||||
vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
|
||||
color: Some((124, 38, 46))
|
||||
),
|
||||
WorkerPurple0:(
|
||||
vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
|
||||
color: Some((64, 47, 56))
|
||||
),
|
||||
WorkerPurple1:(
|
||||
vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
|
||||
color: Some((64, 47, 56))
|
||||
),
|
||||
WorkerYellow0:(
|
||||
vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
|
||||
color: Some((184, 132, 40))
|
||||
),
|
||||
WorkerYellow1:(
|
||||
vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
|
||||
color: Some((184, 132, 40))
|
||||
),
|
||||
WorkerOrange0:(
|
||||
vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
|
||||
color: Some((135, 82, 67))
|
||||
),
|
||||
WorkerOrange1:(
|
||||
vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
|
||||
color: Some((135, 82, 67))
|
||||
),
|
||||
// Cultists
|
||||
CultistPurple: (
|
||||
vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)),
|
||||
color: Some((30, 0, 64))
|
||||
),
|
||||
CultistBlue: (
|
||||
vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)),
|
||||
color: Some((57, 81, 132))
|
||||
),
|
||||
},
|
||||
))
|
||||
|
@ -40,5 +40,9 @@
|
||||
vox_spec: ("armor.foot.cloth_sandals", (-2.5, -3.5, -9.0)),
|
||||
color: None
|
||||
),
|
||||
Cultist: (
|
||||
vox_spec: ("armor.foot.cultist", (-2.5, -3.5, -9.0)),
|
||||
color: None
|
||||
),
|
||||
},
|
||||
))
|
||||
|
@ -80,5 +80,26 @@
|
||||
color: None
|
||||
)
|
||||
),
|
||||
CultistPurple: (
|
||||
left: (
|
||||
vox_spec: ("armor.hand.cultist_right", (-3.0, -1.5, -7.0)),
|
||||
color: Some((30, 0, 64))
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.hand.cultist_right", (-2.0, -1.5, -7.0)),
|
||||
color: Some((30, 0, 64))
|
||||
)
|
||||
),
|
||||
CultistBlue: (
|
||||
left: (
|
||||
vox_spec: ("armor.hand.cultist_right", (-3.0, -1.5, -7.0)),
|
||||
color: Some((57, 81, 132))
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.hand.cultist_right", (-2.0, -1.5, -7.0)),
|
||||
color: Some((57, 81, 132))
|
||||
)
|
||||
),
|
||||
|
||||
},
|
||||
))
|
||||
|
@ -56,5 +56,17 @@
|
||||
vox_spec: ("armor.pants.rugged-0", (-5.0, -3.5, 1.0)),
|
||||
color: None
|
||||
),
|
||||
WorkerBlue0:(
|
||||
vox_spec: ("armor.pants.worker_blue-0", (-5.0, -3.5, 1.0)),
|
||||
color: None
|
||||
),
|
||||
CultistPurple: (
|
||||
vox_spec: ("armor.pants.cultist", (-5.0, -3.5, 1.0)),
|
||||
color: Some((30, 0, 64))
|
||||
),
|
||||
CultistBlue : (
|
||||
vox_spec: ("armor.pants.cultist", (-5.0, -3.5, 1.0)),
|
||||
color: Some((57, 81, 132))
|
||||
),
|
||||
},
|
||||
))
|
||||
|
@ -111,5 +111,25 @@
|
||||
color: None
|
||||
)
|
||||
),
|
||||
CultistPurple: (
|
||||
left: (
|
||||
vox_spec: ("armor.shoulder.cultist_right", (-2.0, -3.5, 0.0)),
|
||||
color: Some((30, 0, 64))
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.shoulder.cultist_right", (-2.9, -3.5, 0.0)),
|
||||
color: Some((30, 0, 64))
|
||||
)
|
||||
),
|
||||
CultistBlue: (
|
||||
left: (
|
||||
vox_spec: ("armor.shoulder.cultist_right", (-2.0, -3.5, 0.0)),
|
||||
color: Some((57, 81, 132))
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.shoulder.cultist_right", (-2.9, -3.5, 0.0)),
|
||||
color: Some((57, 81, 132))
|
||||
)
|
||||
),
|
||||
},
|
||||
))
|
||||
|
@ -1,4 +1,4 @@
|
||||
({
|
||||
({ //Swords
|
||||
Sword(BasicSword): (
|
||||
vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)),
|
||||
color: None
|
||||
@ -19,34 +19,99 @@
|
||||
vox_spec: ("weapon.sword.short_2h-0", (-1.5, -6.5, -1.0)),
|
||||
color: None
|
||||
),
|
||||
// Axes
|
||||
Axe(BasicAxe): (
|
||||
vox_spec: ("weapon.axe.rusty_2h", (-1.5, -5.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
// Hammers
|
||||
Hammer(BasicHammer): (
|
||||
vox_spec: ("weapon.hammer.rusty_2h", (-2.5, -5.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
// Daggers
|
||||
Dagger(BasicDagger): (
|
||||
vox_spec: ("weapon.hammer.rusty_2h", (-2.5, -5.5, -4.0)), // TODO
|
||||
color: None
|
||||
),
|
||||
// Shields
|
||||
Shield(BasicShield): (
|
||||
vox_spec: ("weapon.shield.wood-0", (-2.5, -6.5, -2.0)),
|
||||
color: None
|
||||
),
|
||||
Bow(BasicBow): (
|
||||
vox_spec: ("weapon.bow.simple-bow", (-1.0, -6.0, -2.0)),
|
||||
// Bows
|
||||
Bow(ShortBow0): (
|
||||
vox_spec: ("weapon.bow.shortbow-0", (-1.0, -6.0, 2.5)),
|
||||
color: None
|
||||
),
|
||||
Bow(ShortBow1): (
|
||||
vox_spec: ("weapon.bow.shortbow-1", (-1.0, -6.0, 2.5)),
|
||||
color: None
|
||||
),
|
||||
Bow(LongBow0): (
|
||||
vox_spec: ("weapon.bow.longbow-0", (-1.0, -6.0, 2.5)),
|
||||
color: None
|
||||
),
|
||||
Bow(LongBow1): (
|
||||
vox_spec: ("weapon.bow.longbow-1", (-1.0, -6.0, 2.5)),
|
||||
color: None
|
||||
),
|
||||
Bow(RareBow0): (
|
||||
vox_spec: ("weapon.bow.rare_bow-0", (-1.0, -6.0, 2.5)),
|
||||
color: None
|
||||
),
|
||||
// Farming Equipment
|
||||
Farming(Broom): (
|
||||
vox_spec: ("weapon.tool.broom-0", (-1.5, -4.0, -4.0)),
|
||||
color: None
|
||||
),
|
||||
Farming(Hoe0): (
|
||||
vox_spec: ("weapon.tool.hoe_green", (-2.5, -4.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
Farming(Hoe1): (
|
||||
vox_spec: ("weapon.tool.hoe_blue", (-2.5, -4.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
Farming(Pitchfork): (
|
||||
vox_spec: ("weapon.tool.pitchfork-0", (-1.0, -3.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
Farming(FishingRod0): (
|
||||
vox_spec: ("weapon.tool.fishing_rod_blue-0", (-2.5, -4.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
Farming(Rake): (
|
||||
vox_spec: ("weapon.tool.rake-0", (-1.0, -5.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
Farming(FishingRod1): (
|
||||
vox_spec: ("weapon.tool.fishing_rod_orange-0", (-2.5, -4.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
Farming(Pickaxe0): (
|
||||
vox_spec: ("weapon.tool.pickaxe_green-0", (-1.5, -7.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
Farming(Shovel0): (
|
||||
vox_spec: ("weapon.tool.shovel_green", (-1.0, -2.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
Farming(Shovel1): (
|
||||
vox_spec: ("weapon.tool.shovel_gold", (-1.0, -2.5, -4.0)),
|
||||
color: None
|
||||
),
|
||||
// Staves
|
||||
Staff(BasicStaff): (
|
||||
vox_spec: ("weapon.staff.wood-fire", (-1.0, -6.0, -3.0)),
|
||||
color: None
|
||||
),
|
||||
// Sceptres
|
||||
Staff(Sceptre): (
|
||||
vox_spec: ("weapon.staff.wood-nature", (-1.0, -6.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
// Misc
|
||||
Debug(Boost): (
|
||||
vox_spec: ("weapon.debug_wand", (-1.5, -9.5, -4.0)),
|
||||
color: None
|
||||
|
BIN
assets/voxygen/voxel/npc/eagle/female/head.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/eagle/female/head.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/eagle/female/leg_l.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/eagle/female/leg_l.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/eagle/female/leg_r.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/eagle/female/leg_r.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/eagle/female/tail.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/eagle/female/tail.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/eagle/female/torso.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/eagle/female/torso.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/eagle/female/wing_l.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/eagle/female/wing_l.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/eagle/female/wing_r.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/eagle/female/wing_r.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/eagle/male/head.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/eagle/male/head.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/eagle/male/leg_l.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/eagle/male/leg_l.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/eagle/male/leg_r.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/eagle/male/leg_r.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/eagle/male/tail.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/eagle/male/tail.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/eagle/male/torso.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/eagle/male/torso.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/npc/eagle/male/wing_l.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/npc/eagle/male/wing_l.vox
(Stored with Git LFS)
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user