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

Models have been cleaned up and approved by Gemu

Browse Source
This commit is contained in:
Oolnokk 2021-11-12 18:46:01 -05:00
parent 6e57380735
commit c6383ca5a4
13 changed files with 235 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/entity/wild/peaceful/boar.ron
View File

@ -3,7 +3,7 @@ EntityConfig (
body: RandomWith("boar"),
alignment: Alignment(Wild),
loot: LootTable("common.loot_tables.creature.quad_small.generic"),
loot: LootTable("common.loot_tables.creature.quad_small.boar"),
hands: Uninit,

17
assets/common/items/armor/misc/head/bamboo_twig.ron Normal file
View File

@ -0,0 +1,17 @@
ItemDef(
name: "Bamboo Twig",
description: "A tiny stray shoot from a larger bamboo shaft.",
kind: Armor((
kind: Head("BambooTwig"),
stats: (
protection: Normal(4.0),
poise_resilience: Normal(3.0),
energy_max: 0.0,
energy_reward: 0.08,
crit_power: 0.01,
stealth: 0.0,
),
)),
quality: Common,
tags: [],
)

17
assets/common/items/armor/misc/head/hog_hood.ron Normal file
View File

@ -0,0 +1,17 @@
ItemDef(
name: "Wild Hog Hood",
description: "Wear the guise of the great swine you felled, so you may honor his sacrifice.",
kind: Armor((
kind: Head("HogHood"),
stats: (
protection: Normal(6.5),
poise_resilience: Normal(1.0),
energy_max: 0.0,
energy_reward: 0.0,
crit_power: 0.0355,
stealth: 0.0335,
),
)),
quality: Common,
tags: [],
)

17
assets/common/items/armor/misc/head/wanderers_hat.ron Normal file
View File

@ -0,0 +1,17 @@
ItemDef(
name: "Wanderer's Hat",
description: "A practical hat: light, shady and relatively easy to replace. The perfect headwear for those who feel at home on the highways and byways of Veloren.",
kind: Armor((
kind: Head("WanderersHat"),
stats: (
protection: Normal(3.0),
poise_resilience: Normal(1.0),
energy_max: 1.0,
energy_reward: 0.025,
crit_power: 0.02,
stealth: 0.025,
),
)),
quality: Common,
tags: [],
)

5
assets/common/loot_tables/creature/quad_low/deadwood.ron
View File

@ -1,4 +1,5 @@
[
(1.0, Item("common.items.crafting_ing.animal_misc.lively_vine")),
(1.0, Item("common.items.crafting_ing.animal_misc.grim_eyeball")),
(9.0, Item("common.items.crafting_ing.animal_misc.lively_vine")),
(9.0, Item("common.items.crafting_ing.animal_misc.grim_eyeball")),
(1.0, Item("common.items.armor.misc.head.bamboo_twig")),
]

5
assets/common/loot_tables/creature/quad_low/maneater.ron
View File

@ -1,4 +1,5 @@
[
(1.0, Item("common.items.crafting_ing.animal_misc.lively_vine")),
(1.0, LootTable("common.loot_tables.food.wild_ingredients")),
(9.0, Item("common.items.crafting_ing.animal_misc.lively_vine")),
(9.0, LootTable("common.loot_tables.food.wild_ingredients")),
(1.0, Item("common.items.armor.misc.head.bamboo_twig")),
]

5
assets/common/loot_tables/creature/quad_small/boar.ron Normal file
View File

@ -0,0 +1,5 @@
[
(4.0, ItemQuantity("common.items.crafting_ing.hide.animal_hide", 1, 2)),
(1.0, Item("common.items.food.meat.beast_small_raw")),
(0.25, Item("common.items.armor.misc.head.hog_hood")),
]

5
assets/common/loot_tables/sprite/crate.ron
View File

@ -1,4 +1,5 @@
[
(1.0, LootTable("common.loot_tables.materials.common")),
(2.0, LootTable("common.loot_tables.food.prepared")),
(9.0, LootTable("common.loot_tables.materials.common")),
(9.0, LootTable("common.loot_tables.food.prepared")),
(1.0, Item("common.items.armor.misc.head.wanderers_hat")),
]

12
assets/voxygen/item_image_manifest.ron
View File

@ -2154,6 +2154,14 @@
"voxel.armor.witch.hat",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
Armor(Head("HogHood")): VoxTrans(
"voxel.armor.misc.head.hog_hood",
(0.0, 2.0, -0.0), (-110.0, 210.0,15.0), 1.4,
),
Armor(Head("BambooTwig")): VoxTrans(
"voxel.armor.misc.head.bamboo_twig",
(2.5, 4.5, 0.0), (-120.0, -240.0,1.0), 2.3,
),
Armor(Head("Pirate")): VoxTrans(
"voxel.armor.pirate.hat",
(1.0, 2.0, 0.0), (-120.0, 210.0,15.0), 1.0,
@ -2161,6 +2169,10 @@
Armor(Head("Thief")): VoxTrans(
"voxel.armor.misc.head.bandana.thief",
(0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9,
),
Armor(Head("WanderersHat")): VoxTrans(
"voxel.armor.misc.head.wanderers_hat",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
Armor(Head("Red")): VoxTrans(
"voxel.armor.misc.head.bandana.red",

BIN
assets/voxygen/voxel/armor/misc/head/bamboo_twig.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/misc/head/hog_hood.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/misc/head/wanderers_Hat.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

148
assets/voxygen/voxel/humanoid_armor_head_manifest.ron
View File

@ -77,6 +77,154 @@
vox_spec: ("armor.witch.hat", (-3.0, -6.0, 5.0)),
color: None
),
//
(Human, Male, "HogHood"): (
vox_spec: ("armor.misc.head.hog_hood", (-4.0, -5, -8.0)),
color: None
),
(Human, Female, "HogHood"): (
vox_spec: ("armor.misc.head.hog_hood", (-4.0, -4, -8.0)),
color: None
),
(Elf, Male, "HogHood"): (
vox_spec: ("armor.misc.head.hog_hood", (-3.0, -5.0, -8.0)),
color: None
),
(Elf, Female, "HogHood"): (
vox_spec: ("armor.misc.head.hog_hood", (-3.0, -5.0, -8.0)),
color: None
),
(Dwarf, Male, "HogHood"): (
vox_spec: ("armor.misc.head.hog_hood", (-5.0, -4.0, -8)),
color: None
),
(Dwarf, Female, "HogHood"): (
vox_spec: ("armor.misc.head.hog_hood", (-5.0, -4.0, -8.0)),
color: None
),
(Danari, Male, "HogHood"): (
vox_spec: ("armor.misc.head.hog_hood", (-2.0, -5, -6)),
color: None
),
(Danari, Female, "HogHood"): (
vox_spec: ("armor.misc.head.hog_hood", (-2.0, -5, -6)),
color: None
),
(Undead, Male, "HogHood"): (
vox_spec: ("armor.misc.head.hog_hood", (-6.0, -5.0, -7.0)),
color: None
),
(Undead, Female, "HogHood"): (
vox_spec: ("armor.misc.head.hog_hood", (-6.0, -5.0, -8.0)),
color: None
),
(Orc, Male, "HogHood"): (
vox_spec: ("armor.misc.head.hog_hood", (-3.0, -4.0, -6.0)),
color: None
),
(Orc, Female, "HogHood"): (
vox_spec: ("armor.misc.head.hog_hood", (-3.0, -6.0, -8.0)),
color: None
),
//
(Danari, Male, "BambooTwig"): (
vox_spec: ("armor.misc.head.bamboo_twig", (1.0, 2.0, -2.0)),
color: None
),
(Danari, Female, "BambooTwig"): (
vox_spec: ("armor.misc.head.bamboo_twig", (1.0, 2.0, -2.0)),
color: None
),
(Dwarf, Male, "BambooTwig"): (
vox_spec: ("armor.misc.head.bamboo_twig", (-2.0, 3.0, -5.0)),
color: None
),
(Dwarf, Female, "BambooTwig"): (
vox_spec: ("armor.misc.head.bamboo_twig", (-2.0, 3.0, -4.0)),
color: None
),
(Human, Male, "BambooTwig"): (
vox_spec: ("armor.misc.head.bamboo_twig", (-1.0, 2.0, -4.0)),
color: None
),
(Human, Female, "BambooTwig"): (
vox_spec: ("armor.misc.head.bamboo_twig", (-1.0, 3.0, -4.0)),
color: None
),
(Undead, Male, "BambooTwig"): (
vox_spec: ("armor.misc.head.bamboo_twig", (-3.0, 1.0, -2.0)),
color: None
),
(Undead, Female, "BambooTwig"): (
vox_spec: ("armor.misc.head.bamboo_twig", (-3.0, 1.0, -3.0)),
color: None
),
(Elf, Male, "BambooTwig"): (
vox_spec: ("armor.misc.head.bamboo_twig", (-0.0, 2.0, -4.0)),
color: None
),
(Elf, Female, "BambooTwig"): (
vox_spec: ("armor.misc.head.bamboo_twig", (-0.0, 2.0, -4.0)),
color: None
),
(Orc, Male, "BambooTwig"): (
vox_spec: ("armor.misc.head.bamboo_twig", (1.0, 3.0, -1.0)),
color: None
),
(Orc, Female, "BambooTwig"): (
vox_spec: ("armor.misc.head.bamboo_twig", (0.0, 0.0, -3.0)),
color: None
),
//
(Human, Male, "WanderersHat"): (
vox_spec: ("armor.misc.head.wanderers_hat", (-4, -6.0, 4.0)),
color: None
),
(Human, Female, "WanderersHat"): (
vox_spec: ("armor.misc.head.wanderers_hat", (-4, -5.0, 4.0)),
color: None
),
(Elf, Male, "WanderersHat"): (
vox_spec: ("armor.misc.head.wanderers_hat", (-3, -6.0, 4.0)),
color: None
),
(Elf, Female, "WanderersHat"): (
vox_spec: ("armor.misc.head.wanderers_hat", (-3, -6.0, 4.0)),
color: None
),
(Dwarf, Male, "WanderersHat"): (
vox_spec: ("armor.misc.head.wanderers_hat", (-5, -5.0, 3.0)),
color: None
),
(Dwarf, Female, "WanderersHat"): (
vox_spec: ("armor.misc.head.wanderers_hat", (-4, -5.0, 4.0)),
color: None
),
(Danari, Male, "WanderersHat"): (
vox_spec: ("armor.misc.head.wanderers_hat", (-2, -6.0, 6.0)),
color: None
),
(Danari, Female, "WanderersHat"): (
vox_spec: ("armor.misc.head.wanderers_hat", (-2, -6.0, 6.0)),
color: None
),
(Undead, Male, "WanderersHat"): (
vox_spec: ("armor.misc.head.wanderers_hat", (-6, -6.0, 5.0)),
color: None
),
(Undead, Female, "WanderersHat"): (
vox_spec: ("armor.misc.head.wanderers_hat", (-6, -6.0, 5.0)),
color: None
),
(Orc, Male, "WanderersHat"): (
vox_spec: ("armor.misc.head.wanderers_hat", (-3.0, -4.0, 5.0)),
color: None
),
(Orc, Female, "WanderersHat"): (
vox_spec: ("armor.misc.head.wanderers_hat", (-3.0, -7.0, 4.0)),
color: None
),
//
(Human, Male, "Pirate"): (
vox_spec: ("armor.pirate.hat", (-4.0, -4.0, 5.0)),