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

more hats

Browse Source
This commit is contained in:
jshipsey 2021-10-27 02:42:12 -04:00
parent c2b7d3bb44
commit f69e3c9fbc
38 changed files with 572 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/entity/spot/dwarf_grave_robber.ron
View File

@ -3,7 +3,7 @@ EntityConfig (
body: RandomWith("dwarf"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.creature.humanoid"),
loot: LootTable("common.loot_tables.spots.bandit"),
hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-3")),

2
assets/common/entity/spot/grim_salvager.ron
View File

@ -3,7 +3,7 @@ EntityConfig (
body: RandomWith("humanoid"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.creature.humanoid"),
loot: LootTable("common.loot_tables.spots.bandit"),
hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-0")),

19
assets/common/items/armor/cultist/bandana.ron Normal file
View File

@ -0,0 +1,19 @@
ItemDef(
name: "Cultist Bandana",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Head("Cultist"),
stats: (
protection: Normal(18.0),
poise_resilience: Normal(3.0),
energy_max: 7.0,
energy_reward: 0.1,
crit_power: 0.06,
stealth: 0.0,
),
)),
quality: Epic,
tags: [
Cultist
],
)

4
assets/common/items/armor/misc/head/bandana/red.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Red Bandana",
description: "yep.",
description: "Very sneaky, but also, bright red.",
kind: Armor((
kind: Head("Red"),
stats: (
@ -9,7 +9,7 @@ ItemDef(
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
stealth: 0.15,
),
)),
quality: Common,

4
assets/common/items/armor/misc/head/bandana/thief.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Thief Bandana",
description: "yep.",
description: "Common bandit's mask.",
kind: Armor((
kind: Head("Thief"),
stats: (
@ -9,7 +9,7 @@ ItemDef(
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
stealth: 0.18,
),
)),
quality: Common,

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

@ -0,0 +1,17 @@
ItemDef(
name: "Crown",
description: "Fit for a king.",
kind: Armor((
kind: Head("Crown"),
stats: (
protection: Normal(12.0),
poise_resilience: Normal(0.0),
energy_max: 9.0,
energy_reward: 0.1,
crit_power: 0.12,
stealth: 0.0,
),
)),
quality: Common,
tags: [],
)

6
assets/common/items/armor/misc/head/hood.ron
View File

@ -1,15 +1,15 @@
ItemDef(
name: "Hood",
description: "yep.",
description: "Become one with the treetops.",
kind: Armor((
kind: Head("Hood"),
stats: (
protection: Normal(0.0),
protection: Normal(20.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
stealth: 0.12,
),
)),
quality: Common,

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

@ -0,0 +1,17 @@
ItemDef(
name: "Dark Hood",
description: "yep.",
kind: Armor((
kind: Head("DarkHood"),
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Common,
tags: [],
)

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

@ -0,0 +1,17 @@
ItemDef(
name: "Mitre",
description: "Calls strength from above.",
kind: Armor((
kind: Head("Mitre"),
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
energy_max: 11.0,
energy_reward: 0.12,
crit_power: 0.1,
stealth: 0.0,
),
)),
quality: Common,
tags: [],
)

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

@ -0,0 +1,17 @@
ItemDef(
name: "Spiked Faceguard",
description: "Introvert headgear.",
kind: Armor((
kind: Head("Spikeguard"),
stats: (
protection: Normal(0.0),
poise_resilience: Normal(10.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Common,
tags: [],
)

2
assets/common/items/armor/misc/head/straw.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Straw Hat",
description: "yep.",
description: "Simple and stylish.",
kind: Armor((
kind: Head("Straw"),
stats: (

12
assets/common/items/armor/pirate/hat.ron
View File

@ -1,14 +1,14 @@
ItemDef(
name: "Pirate Hat",
description: "",
description: "It seems like a parrot was perched up here.",
kind: Armor((
kind: Head("Pirate"),
stats: (
protection: Normal(32.0),
poise_resilience: Normal(5.0),
energy_max: 9.0,
energy_reward: 0.1,
crit_power: 0.08,
protection: Normal(4.0),
poise_resilience: Normal(1.0),
energy_max: 1.0,
energy_reward: 0.025,
crit_power: 0.02,
stealth: 0.0,
),
)),

14
assets/common/items/armor/witch/hat.ron
View File

@ -1,14 +1,14 @@
ItemDef(
name: "Witch hat",
description: "",
name: "Witch Hat",
description: "Draws strength from dark arts.",
kind: Armor((
kind: Head("Witch"),
stats: (
protection: Normal(32.0),
poise_resilience: Normal(5.0),
energy_max: 9.0,
energy_reward: 0.1,
crit_power: 0.08,
protection: Normal(4.0),
poise_resilience: Normal(3.0),
energy_max: 0.0,
energy_reward: 0.08,
crit_power: 0.01,
stealth: 0.0,
),
)),

2
assets/common/loadout/dungeon/tier-5/cultist.ron
View File

@ -8,6 +8,8 @@
Armor(Back): Item("common.items.armor.misc.back.dungeon_purple"),
Armor(Head): Item("common.items.armor.cultist.bandana"),
Lantern: Choice([
(1.0, Some(Item("common.items.lantern.black_0"))),
(2.0, None),

5
assets/common/loadout/spots/dwarf_graverobber.ron
View File

@ -5,8 +5,11 @@
Armor(Hands): Item("common.items.armor.hide.rawhide.hand"),
Armor(Legs): Item("common.items.armor.hide.rawhide.pants"),
Armor(Feet): Item("common.items.armor.hide.rawhide.foot"),
Armor(Head): Item("common.items.armor.misc.head.bandana.thief"),
Armor(Head): Choice([
(1.0, Some(Item("common.items.armor.misc.head.bandana.thief"))),
(1.0, Some(Item("common.items.armor.misc.head.bandana.red"))),
]),
Lantern: Choice([
(1.0, Some(Item("common.items.lantern.black_0"))),
(2.0, None),

1
assets/common/loadout/village/merchant.ron
View File

@ -5,6 +5,7 @@
Armor(Legs): Item("common.items.armor.twigsflowers.pants"),
Armor(Feet): Item("common.items.armor.twigsflowers.foot"),
Armor(Belt): Item("common.items.armor.twigsflowers.belt"),
Armor(Head): Item("common.items.armor.misc.head.hood"),
Lantern: Item("common.items.lantern.black_0"),
Armor(Neck): Item("common.items.armor.misc.neck.gem_of_resilience"),

12
assets/common/loadout/village/villager.ron
View File

@ -11,4 +11,16 @@
(1.0, Some(Item("common.items.armor.misc.chest.worker_orange_0"))),
(1.0, Some(Item("common.items.armor.misc.chest.worker_orange_1"))),
]),
Armor(Legs): Choice([
(1.0, Some(Item("common.items.armor.misc.pants.worker_blue"))),
(1.0, Some(Item("common.items.armor.misc.pants.worker_brown"))),
]),
Armor(Feet): Choice([
(1.0, Some(Item("common.items.armor.misc.foot.sandals"))),
(1.0, Some(Item("common.items.armor.cloth_blue.foot"))),
]),
Armor(Head): Choice([
(1.0, Some(Item("common.items.armor.misc.head.straw"))),
]),
})

1
assets/common/loot_tables/dungeon/tier-4/chest.ron
View File

@ -2,6 +2,7 @@
// Gear
(1.0, LootTable("common.loot_tables.weapons.tier-4")),
(1.0, LootTable("common.loot_tables.armor.tier-4")),
(3.0, ItemQuantity("common.items.armor.misc.head.spikeguard")),
// Currency
(3.0, ItemQuantity("common.items.utility.coins", 200, 500)),
// Materials

2
assets/common/loot_tables/dungeon/tier-4/miniboss.ron
View File

@ -7,4 +7,6 @@
(5.0, LootTable("common.loot_tables.consumable.good")),
// lantern
(1.0, Item("common.items.lantern.blue_0")),
// gear
(3.0, ItemQuantity("common.items.armor.misc.head.mitre")),
]

1
assets/common/loot_tables/dungeon/tier-5/chest.ron
View File

@ -2,6 +2,7 @@
// Gear
(1.0, LootTable("common.loot_tables.weapons.tier-4")),
(1.0, LootTable("common.loot_tables.armor.tier-4")),
(0.3, ItemQuantity("common.items.armor.cultist.bandana")),
// Currency
(3.0, ItemQuantity("common.items.utility.coins", 200, 500)),
// Materials

18
assets/common/loot_tables/spots/bandit.ron Normal file
View File

@ -0,0 +1,18 @@
[
// Crafting Ingredients
(5.0, LootTable("common.loot_tables.materials.common")),
// Consumables
(0.2, Item("common.items.consumable.potion_minor")),
// Ring
(0.02, Item("common.items.armor.misc.ring.gold")),
// Necklace
(0.02, Item("common.items.armor.misc.neck.gold")),
// Utility
(0.05, Item("common.items.utility.collar")),
// Armor
(0.01, Item("common.items.armor.misc.head.bandana.thief")),
(0.01, Item("common.items.armor.misc.head.bandana.red")),
// Food
(1.0, LootTable("common.loot_tables.food.wild_ingredients")),
(0.25, LootTable("common.loot_tables.food.prepared")),
]

18
assets/common/loot_tables/spots/pirate.ron Normal file
View File

@ -0,0 +1,18 @@
[
// Crafting Ingredients
(3.0, LootTable("common.loot_tables.materials.common")),
// Consumables
(0.2, Item("common.items.consumable.potion_minor")),
// Ring
(0.02, Item("common.items.armor.misc.ring.gold")),
// Necklace
(0.02, Item("common.items.armor.misc.neck.gold")),
// Utility
(0.05, Item("common.items.utility.collar")),
// Armor
(0.007, Item("common.items.armor.pirate.hat")),
(0.005, Item("common.items.armor.misc.head.crown")),
// Food
(1.0, LootTable("common.loot_tables.food.wild_ingredients")),
(0.25, LootTable("common.loot_tables.food.prepared")),
]

1
assets/common/loot_tables/spots/witch.ron
View File

@ -5,4 +5,5 @@
(1.0, LootTable("common.loot_tables.weapons.tier-3")),
(0.1, LootTable("common.loot_tables.weapons.tier-4")),
(1.5, LootTable("common.loot_tables.food.prepared")),
(0.01, Item("common.items.armor.witch.hat")),
]

24
assets/voxygen/item_image_manifest.ron
View File

@ -1166,6 +1166,10 @@
"voxel.armor.cultist.shoulder",
(0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
),
Armor(Head("Cultist")): VoxTrans(
"voxel.armor.cultist.bandana",
(0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
),
// Villager Clothing
Armor(Pants("WorkerBlue")): VoxTrans(
"voxel.armor.misc.pants.worker_blue",
@ -2166,6 +2170,26 @@
"voxel.armor.misc.head.straw",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
Armor(Head("Hood")): VoxTrans(
"voxel.armor.misc.head.hood",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
Armor(Head("Crown")): VoxTrans(
"voxel.armor.misc.head.crown",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
Armor(Head("Mitre")): VoxTrans(
"voxel.armor.misc.head.mitre",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
Armor(Head("Mitre")): VoxTrans(
"voxel.armor.misc.head.mitre",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
Armor(Head("Spikeguard")): VoxTrans(
"voxel.armor.misc.head.spikeguard",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
// Rings
Armor(Ring("Scratched")): VoxTrans(
"voxel.armor.misc.ring.scratched",

BIN
assets/voxygen/voxel/armor/cultist/bandana.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

BIN
assets/voxygen/voxel/armor/misc/head/headband/human_f.vox (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
assets/voxygen/voxel/armor/pirate/hat.vox (Stored with Git LFS)
View File

Binary file not shown.

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

@ -79,101 +79,198 @@
),
//
(Human, Male, "Pirate"): (
vox_spec: ("armor.pirate.hat", (-2.0, -2.0, 5.0)),
vox_spec: ("armor.pirate.hat", (-4.0, -4.0, 5.0)),
color: None
),
(Human, Female, "Pirate"): (
vox_spec: ("armor.pirate.hat", (-2.0, -1.0, 5.0)),
vox_spec: ("armor.pirate.hat", (-4.0, -4.0, 5.0)),
color: None
),
(Elf, Male, "Pirate"): (
vox_spec: ("armor.pirate.hat", (-1.0, -1.0, 5.0)),
vox_spec: ("armor.pirate.hat", (-3.0, -4.0, 5.0)),
color: None
),
(Elf, Female, "Pirate"): (
vox_spec: ("armor.pirate.hat", (-1.0, -2.0, 5.0)),
vox_spec: ("armor.pirate.hat", (-3.0, -5.0, 5.0)),
color: None
),
(Dwarf, Male, "Pirate"): (
vox_spec: ("armor.pirate.hat", (-3.0, -0.0, 5.0)),
vox_spec: ("armor.pirate.hat", (-5.0, -3.0, 5.0)),
color: None
),
(Dwarf, Female, "Pirate"): (
vox_spec: ("armor.pirate.hat", (-3.0, -0.0, 5.0)),
vox_spec: ("armor.pirate.hat", (-5.0, -3.0, 5.0)),
color: None
),
(Danari, Male, "Pirate"): (
vox_spec: ("armor.pirate.hat", (-0.0, -2.0, 7.0)),
vox_spec: ("armor.pirate.hat", (-2.0, -4.0, 7.0)),
color: None
),
(Danari, Female, "Pirate"): (
vox_spec: ("armor.pirate.hat", (-0.0, -2.0, 7.0)),
vox_spec: ("armor.pirate.hat", (-2.0, -4.0, 7.0)),
color: None
),
(Undead, Male, "Pirate"): (
vox_spec: ("armor.pirate.hat", (-4.0, -2.0, 7.0)),
vox_spec: ("armor.pirate.hat", (-6.0, -4.0, 7.0)),
color: None
),
(Undead, Female, "Pirate"): (
vox_spec: ("armor.pirate.hat", (-4.0, -2.0, 6.0)),
vox_spec: ("armor.pirate.hat", (-6.0, -4.0, 6.0)),
color: None
),
(Orc, Male, "Pirate"): (
vox_spec: ("armor.pirate.hat", (-1.0, -1.0, 8.0)),
vox_spec: ("armor.pirate.hat", (-3.0, -2.0, 8.0)),
color: None
),
(Orc, Female, "Pirate"): (
vox_spec: ("armor.pirate.hat", (-1.0, -2.0, 5.0)),
vox_spec: ("armor.pirate.hat", (-3.0, -5.0, 5.0)),
color: None
),
//
//
(Human, Male, "Straw"): (
vox_spec: ("armor.misc.head.straw", (-3.0, -3.0, 5.0)),
vox_spec: ("armor.misc.head.straw", (-4.0, -5.0, 5.0)),
color: None
),
(Human, Female, "Straw"): (
vox_spec: ("armor.misc.head.straw", (-3.0, -3.0, 5.0)),
vox_spec: ("armor.misc.head.straw", (-4.0, -5.0, 5.0)),
color: None
),
(Elf, Male, "Straw"): (
vox_spec: ("armor.misc.head.straw", (-2.0, -3.0, 5.0)),
vox_spec: ("armor.misc.head.straw", (-3.0, -5.0, 5.0)),
color: None
),
(Elf, Female, "Straw"): (
vox_spec: ("armor.misc.head.straw", (-2.0, -4.0, 5.0)),
vox_spec: ("armor.misc.head.straw", (-3.0, -6.0, 5.0)),
color: None
),
(Dwarf, Male, "Straw"): (
vox_spec: ("armor.misc.head.straw", (-4.0, -3.0, 5.0)),
vox_spec: ("armor.misc.head.straw", (-5.0, -4.0, 5.0)),
color: None
),
(Dwarf, Female, "Straw"): (
vox_spec: ("armor.misc.head.straw", (-4.0, -3.0, 5.0)),
vox_spec: ("armor.misc.head.straw", (-5.0, -4.0, 5.0)),
color: None
),
(Danari, Male, "Straw"): (
vox_spec: ("armor.misc.head.straw", (-1.0, -4.0, 7.0)),
vox_spec: ("armor.misc.head.straw", (-2.0, -5.0, 7.0)),
color: None
),
(Danari, Female, "Straw"): (
vox_spec: ("armor.misc.head.straw", (-1.0, -4.0, 7.0)),
vox_spec: ("armor.misc.head.straw", (-2.0, -5.0, 7.0)),
color: None
),
(Undead, Male, "Straw"): (
vox_spec: ("armor.misc.head.straw", (-5.0, -4.0, 7.0)),
vox_spec: ("armor.misc.head.straw", (-6.0, -5.0, 7.0)),
color: None
),
(Undead, Female, "Straw"): (
vox_spec: ("armor.misc.head.straw", (-5.0, -3.0, 6.0)),
vox_spec: ("armor.misc.head.straw", (-6.0, -5.0, 6.0)),
color: None
),
(Orc, Male, "Straw"): (
vox_spec: ("armor.misc.head.straw", (-2.0, -2.0, 8.0)),
vox_spec: ("armor.misc.head.straw", (-3.0, -3.0, 8.0)),
color: None
),
(Orc, Female, "Straw"): (
vox_spec: ("armor.misc.head.straw", (-2.0, -5.0, 5.0)),
vox_spec: ("armor.misc.head.straw", (-3.0, -6.0, 5.0)),
color: None
),
//
(Human, Male, "Crown"): (
vox_spec: ("armor.misc.head.crown", (-4.0, -5.0, 5.0)),
color: None
),
(Human, Female, "Crown"): (
vox_spec: ("armor.misc.head.crown", (-4.0, -5.0, 5.0)),
color: None
),
(Elf, Male, "Crown"): (
vox_spec: ("armor.misc.head.crown", (-3.0, -5.0, 5.0)),
color: None
),
(Elf, Female, "Crown"): (
vox_spec: ("armor.misc.head.crown", (-3.0, -6.0, 5.0)),
color: None
),
(Dwarf, Male, "Crown"): (
vox_spec: ("armor.misc.head.crown", (-5.0, -4.0, 5.0)),
color: None
),
(Dwarf, Female, "Crown"): (
vox_spec: ("armor.misc.head.crown", (-5.0, -4.0, 5.0)),
color: None
),
(Danari, Male, "Crown"): (
vox_spec: ("armor.misc.head.crown", (-2.0, -5.0, 7.0)),
color: None
),
(Danari, Female, "Crown"): (
vox_spec: ("armor.misc.head.crown", (-2.0, -5.0, 7.0)),
color: None
),
(Undead, Male, "Crown"): (
vox_spec: ("armor.misc.head.crown", (-6.0, -5.0, 7.0)),
color: None
),
(Undead, Female, "Crown"): (
vox_spec: ("armor.misc.head.crown", (-6.0, -5.0, 6.0)),
color: None
),
(Orc, Male, "Crown"): (
vox_spec: ("armor.misc.head.crown", (-3.0, -3.0, 8.0)),
color: None
),
(Orc, Female, "Crown"): (
vox_spec: ("armor.misc.head.crown", (-3.0, -6.0, 5.0)),
color: None
),
//
(Human, Male, "Mitre"): (
vox_spec: ("armor.misc.head.mitre", (-4.0, -5.0, 5.0)),
color: None
),
(Human, Female, "Mitre"): (
vox_spec: ("armor.misc.head.mitre", (-4.0, -5.0, 5.0)),
color: None
),
(Elf, Male, "Mitre"): (
vox_spec: ("armor.misc.head.mitre", (-3.0, -5.0, 5.0)),
color: None
),
(Elf, Female, "Mitre"): (
vox_spec: ("armor.misc.head.mitre", (-3.0, -6.0, 5.0)),
color: None
),
(Dwarf, Male, "Mitre"): (
vox_spec: ("armor.misc.head.mitre", (-5.0, -4.0, 5.0)),
color: None
),
(Dwarf, Female, "Mitre"): (
vox_spec: ("armor.misc.head.mitre", (-5.0, -4.0, 5.0)),
color: None
),
(Danari, Male, "Mitre"): (
vox_spec: ("armor.misc.head.mitre", (-2.0, -5.0, 7.0)),
color: None
),
(Danari, Female, "Mitre"): (
vox_spec: ("armor.misc.head.mitre", (-2.0, -5.0, 7.0)),
color: None
),
(Undead, Male, "Mitre"): (
vox_spec: ("armor.misc.head.mitre", (-6.0, -5.0, 7.0)),
color: None
),
(Undead, Female, "Mitre"): (
vox_spec: ("armor.misc.head.mitre", (-6.0, -5.0, 6.0)),
color: None
),
(Orc, Male, "Mitre"): (
vox_spec: ("armor.misc.head.mitre", (-3.0, -3.0, 8.0)),
color: None
),
(Orc, Female, "Mitre"): (
vox_spec: ("armor.misc.head.mitre", (-3.0, -6.0, 5.0)),
color: None
),
//
@ -198,7 +295,7 @@
color: None
),
(Human, Female, "Headband"): (
vox_spec: ("armor.misc.head.headband.human_f", (4.0, 2.0, 7.0)),
vox_spec: ("armor.misc.head.headband.human_f", (2.0, 3.0, 5.0)),
color: None
),
(Orc, Male, "Headband"): (
@ -273,6 +370,7 @@
vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)),
color: None
),
//
(Danari, Male, "Red"): (
vox_spec: ("armor.misc.head.bandana.red", (4.0, 6.0, -8.0)),
color: None
@ -321,6 +419,7 @@
vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)),
color: None
),
//
(Danari, Male, "Thief"): (
vox_spec: ("armor.misc.head.bandana.thief", (4.0, 6.0, -8.0)),
color: None
@ -369,12 +468,200 @@
vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)),
color: None
),
//
(Danari, Male, "Cultist"): (
vox_spec: ("armor.cultist.bandana", (4.0, 6.0, -8.0)),
color: None
),
(Danari, Female, "Cultist"): (
vox_spec: ("armor.cultist.bandana", (4.0, 6.0, -8.0)),
color: None
),
(Dwarf, Male, "Cultist"): (
vox_spec: ("armor.cultist.bandana", (1.0, 7.0, -10.0)),
color: None
),
(Dwarf, Female, "Cultist"): (
vox_spec: ("armor.cultist.bandana", (1.0, 7.0, -10.0)),
color: None
),
(Human, Male, "Cultist"): (
vox_spec: ("armor.cultist.bandana", (2.0, 6.0, -10.0)),
color: None
),
(Human, Female, "Cultist"): (
vox_spec: ("armor.cultist.bandana", (2.0, 7.0, -10.0)),
color: None
),
(Undead, Male, "Cultist"): (
vox_spec: ("armor.cultist.bandana", (0.0, 6.0, -8.0)),
color: None
),
(Undead, Female, "Cultist"): (
vox_spec: ("armor.cultist.bandana", (0.0, 6.0, -9.0)),
color: None
),
(Elf, Male, "Cultist"): (
vox_spec: ("armor.cultist.bandana", (3.0, 6.0, -10.0)),
color: None
),
(Elf, Female, "Cultist"): (
vox_spec: ("armor.cultist.bandana", (3.0, 6.0, -10.0)),
color: None
),
(Orc, Male, "Cultist"): (
vox_spec: ("armor.cultist.bandana", (3.0, 8.0, -8.0)),
color: None
),
(Orc, Female, "Cultist"): (
vox_spec: ("armor.cultist.bandana", (3.0, 6.0, -10.0)),
color: None
),
//
(Human, Male, "Hood"): (
vox_spec: ("armor.misc.head.hood", (1.0, 0.0, -1.0)),
vox_spec: ("armor.misc.head.hood", (-4.0, -5.0, -2.0)),
color: None
),
(Human, Female, "Hood"): (
vox_spec: ("armor.misc.head.hood", (-4.0, -5.0, -2.0)),
color: None
),
(Elf, Male, "Hood"): (
vox_spec: ("armor.misc.head.hood", (-3.0, -5.0, -2.0)),
color: None
),
(Elf, Female, "Hood"): (
vox_spec: ("armor.misc.head.hood", (-3.0, -6.0, -2.0)),
color: None
),
(Dwarf, Male, "Hood"): (
vox_spec: ("armor.misc.head.hood", (-5.0, -4.0, -2.0)),
color: None
),
(Dwarf, Female, "Hood"): (
vox_spec: ("armor.misc.head.hood", (-5.0, -4.0, -2.0)),
color: None
),
(Danari, Male, "Hood"): (
vox_spec: ("armor.misc.head.hood", (-2.0, -5.0, 0.0)),
color: None
),
(Danari, Female, "Hood"): (
vox_spec: ("armor.misc.head.hood", (-2.0, -5.0, 0.0)),
color: None
),
(Undead, Male, "Hood"): (
vox_spec: ("armor.misc.head.hood", (-6.0, -5.0, 0.0)),
color: None
),
(Undead, Female, "Hood"): (
vox_spec: ("armor.misc.head.hood", (-6.0, -5.0, -1.0)),
color: None
),
(Orc, Male, "Hood"): (
vox_spec: ("armor.misc.head.hood", (-3.0, -3.0, 0.0)),
color: None
),
(Orc, Female, "Hood"): (
vox_spec: ("armor.misc.head.hood", (2.0, -1.0, -1.0)),
vox_spec: ("armor.misc.head.hood", (-3.0, -6.0, -2.0)),
color: None
),
//
(Human, Male, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-4.0, -5.0, -1.0)),
color: None
),
(Human, Female, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-4.0, -5.0, -1.0)),
color: None
),
(Elf, Male, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-3.0, -5.0, -1.0)),
color: None
),
(Elf, Female, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-3.0, -6.0, -1.0)),
color: None
),
(Dwarf, Male, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-5.0, -4.0, -1.0)),
color: None
),
(Dwarf, Female, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-5.0, -4.0, -1.0)),
color: None
),
(Danari, Male, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-2.0, -5.0, 1.0)),
color: None
),
(Danari, Female, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-2.0, -5.0, 1.0)),
color: None
),
(Undead, Male, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-6.0, -5.0, 1.0)),
color: None
),
(Undead, Female, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-6.0, -5.0, -0.0)),
color: None
),
(Orc, Male, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-3.0, -3.0, 1.0)),
color: None
),
(Orc, Female, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-3.0, -6.0, -1.0)),
color: None
),
//
(Human, Male, "Spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-4.0, -5.0, -2.0)),
color: None
),
(Human, Female, "Spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-4.0, -5.0, -2.0)),
color: None
),
(Elf, Male, "Spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)),
color: None
),
(Elf, Female, "Spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-3.0, -6.0, -2.0)),
color: None
),
(Dwarf, Male, "Spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-5.0, -4.0, -2.0)),
color: None
),
(Dwarf, Female, "Spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-5.0, -4.0, -2.0)),
color: None
),
(Danari, Male, "Spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-2.0, -5.0, -0.0)),
color: None
),
(Danari, Female, "Spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-2.0, -5.0, -0.0)),
color: None
),
(Undead, Male, "Spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-6.0, -5.0, -0.0)),
color: None
),
(Undead, Female, "Spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-6.0, -5.0, -1.0)),
color: None
),
(Orc, Male, "Spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-3.0, -3.0, -0.0)),
color: None
),
(Orc, Female, "Spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-3.0, -6.0, -2.0)),
color: None
),
}

38
frame-trace_1634705763589.json
View File

@ -1,38 +0,0 @@
{
"traceEvents": [
{ "pid":1, "tid":1, "ts":1634705763488162, "dur":5681.276321411133, "ph":"X", "name":"frame" },
{ "pid":1, "tid":1, "ts":1634705763488195, "dur":661.1347198486328, "ph":"X", "name":"shadow_pass" },
{ "pid":1, "tid":1, "ts":1634705763488195.3, "dur":643.0149078369141, "ph":"X", "name":"direcred_terrain_shadows" },
{ "pid":1, "tid":1, "ts":1634705763488839.3, "dur":15.497207641601563, "ph":"X", "name":"direcred_figure_shadows" },
{ "pid":1, "tid":1, "ts":1634705763488858.8, "dur":690.460205078125, "ph":"X", "name":"point shadows" },
{ "pid":1, "tid":1, "ts":1634705763488867, "dur":43.15376281738281, "ph":"X", "name":"point shadow face-0 pass" },
{ "pid":1, "tid":1, "ts":1634705763488917.5, "dur":45.7763671875, "ph":"X", "name":"point shadow face-1 pass" },
{ "pid":1, "tid":1, "ts":1634705763488970.8, "dur":51.25999450683594, "ph":"X", "name":"point shadow face-2 pass" },
{ "pid":1, "tid":1, "ts":1634705763489028.8, "dur":51.25999450683594, "ph":"X", "name":"point shadow face-3 pass" },
{ "pid":1, "tid":1, "ts":1634705763489088.5, "dur":42.438507080078125, "ph":"X", "name":"point shadow face-4 pass" },
{ "pid":1, "tid":1, "ts":1634705763489501.8, "dur":45.06111145019531, "ph":"X", "name":"point shadow face-5 pass" },
{ "pid":1, "tid":1, "ts":1634705763489573, "dur":3035.5453491210938, "ph":"X", "name":"first_pass" },
{ "pid":1, "tid":1, "ts":1634705763489573.8, "dur":20.503997802734375, "ph":"X", "name":"figures" },
{ "pid":1, "tid":1, "ts":1634705763489594.3, "dur":1816.2727355957031, "ph":"X", "name":"terrain" },
{ "pid":1, "tid":1, "ts":1634705763491410.8, "dur":41.00799560546875, "ph":"X", "name":"figures" },
{ "pid":1, "tid":1, "ts":1634705763491451.8, "dur":1039.9818420410156, "ph":"X", "name":"lod_terrain" },
{ "pid":1, "tid":1, "ts":1634705763492492, "dur":3.337860107421875, "ph":"X", "name":"skybox" },
{ "pid":1, "tid":1, "ts":1634705763492495.8, "dur":96.08268737792969, "ph":"X", "name":"sprites" },
{ "pid":1, "tid":1, "ts":1634705763492592.3, "dur":0, "ph":"X", "name":"fluid" },
{ "pid":1, "tid":1, "ts":1634705763492593.5, "dur":13.113021850585938, "ph":"X", "name":"particles" },
{ "pid":1, "tid":1, "ts":1634705763492606.8, "dur":1.430511474609375, "ph":"X", "name":"debug" },
{ "pid":1, "tid":1, "ts":1634705763492621, "dur":546.4553833007813, "ph":"X", "name":"second_pass" },
{ "pid":1, "tid":1, "ts":1634705763493169.8, "dur":466.1083221435547, "ph":"X", "name":"bloom" },
{ "pid":1, "tid":1, "ts":1634705763493174, "dur":41.00799560546875, "ph":"X", "name":"downsample filtered 1" },
{ "pid":1, "tid":1, "ts":1634705763493220.5, "dur":12.874603271484375, "ph":"X", "name":"downsample 2" },
{ "pid":1, "tid":1, "ts":1634705763493237.5, "dur":4.0531158447265625, "ph":"X", "name":"downsample 3" },
{ "pid":1, "tid":1, "ts":1634705763493247.3, "dur":2.6226043701171875, "ph":"X", "name":"downsample 4" },
{ "pid":1, "tid":1, "ts":1634705763493255.3, "dur":5.0067901611328125, "ph":"X", "name":"upsample 1" },
{ "pid":1, "tid":1, "ts":1634705763493438.3, "dur":11.205673217773438, "ph":"X", "name":"upsample 2" },
{ "pid":1, "tid":1, "ts":1634705763493456.3, "dur":31.948089599609375, "ph":"X", "name":"upsample 3" },
{ "pid":1, "tid":1, "ts":1634705763493501.8, "dur":131.13021850585938, "ph":"X", "name":"upsample 4" },
{ "pid":1, "tid":1, "ts":1634705763493646.8, "dur":193.11904907226563, "ph":"X", "name":"third_pass" },
{ "pid":1, "tid":1, "ts":1634705763493647.3, "dur":181.1981201171875, "ph":"X", "name":"postprocess" },
{ "pid":1, "tid":1, "ts":1634705763493829.5, "dur":9.5367431640625, "ph":"X", "name":"ui" }
]
}

38
frame-trace_1635217738690.json
View File

@ -1,38 +0,0 @@
{
"traceEvents": [
{ "pid":1, "tid":1, "ts":1635217738642844.8, "dur":4531.383514404297, "ph":"X", "name":"frame" },
{ "pid":1, "tid":1, "ts":1635217738642866, "dur":304.4605255126953, "ph":"X", "name":"shadow_pass" },
{ "pid":1, "tid":1, "ts":1635217738642866, "dur":297.0695495605469, "ph":"X", "name":"direcred_terrain_shadows" },
{ "pid":1, "tid":1, "ts":1635217738643163, "dur":5.9604644775390625, "ph":"X", "name":"direcred_figure_shadows" },
{ "pid":1, "tid":1, "ts":1635217738643172.8, "dur":211.95411682128906, "ph":"X", "name":"point shadows" },
{ "pid":1, "tid":1, "ts":1635217738643182.3, "dur":21.696090698242188, "ph":"X", "name":"point shadow face-0 pass" },
{ "pid":1, "tid":1, "ts":1635217738643212, "dur":28.848648071289063, "ph":"X", "name":"point shadow face-1 pass" },
{ "pid":1, "tid":1, "ts":1635217738643248.3, "dur":28.133392333984375, "ph":"X", "name":"point shadow face-2 pass" },
{ "pid":1, "tid":1, "ts":1635217738643283.3, "dur":33.14018249511719, "ph":"X", "name":"point shadow face-3 pass" },
{ "pid":1, "tid":1, "ts":1635217738643322.8, "dur":26.464462280273438, "ph":"X", "name":"point shadow face-4 pass" },
{ "pid":1, "tid":1, "ts":1635217738643357, "dur":25.033950805664063, "ph":"X", "name":"point shadow face-5 pass" },
{ "pid":1, "tid":1, "ts":1635217738643402.3, "dur":1906.8717956542969, "ph":"X", "name":"first_pass" },
{ "pid":1, "tid":1, "ts":1635217738643402.5, "dur":21.696090698242188, "ph":"X", "name":"figures" },
{ "pid":1, "tid":1, "ts":1635217738643424.8, "dur":672.1019744873047, "ph":"X", "name":"terrain" },
{ "pid":1, "tid":1, "ts":1635217738644098.3, "dur":18.596649169921875, "ph":"X", "name":"figures" },
{ "pid":1, "tid":1, "ts":1635217738644117.5, "dur":808.4774017333984, "ph":"X", "name":"lod_terrain" },
{ "pid":1, "tid":1, "ts":1635217738644926.3, "dur":18.358230590820313, "ph":"X", "name":"skybox" },
{ "pid":1, "tid":1, "ts":1635217738644944.5, "dur":349.99847412109375, "ph":"X", "name":"sprites" },
{ "pid":1, "tid":1, "ts":1635217738645295, "dur":0, "ph":"X", "name":"fluid" },
{ "pid":1, "tid":1, "ts":1635217738645296.3, "dur":10.967254638671875, "ph":"X", "name":"particles" },
{ "pid":1, "tid":1, "ts":1635217738645308.3, "dur":0.476837158203125, "ph":"X", "name":"debug" },
{ "pid":1, "tid":1, "ts":1635217738645319.5, "dur":1293.8976287841797, "ph":"X", "name":"second_pass" },
{ "pid":1, "tid":1, "ts":1635217738646615.5, "dur":278.9497375488281, "ph":"X", "name":"bloom" },
{ "pid":1, "tid":1, "ts":1635217738646620, "dur":40.76957702636719, "ph":"X", "name":"downsample filtered 1" },
{ "pid":1, "tid":1, "ts":1635217738646666, "dur":12.159347534179688, "ph":"X", "name":"downsample 2" },
{ "pid":1, "tid":1, "ts":1635217738646683.3, "dur":4.0531158447265625, "ph":"X", "name":"downsample 3" },
{ "pid":1, "tid":1, "ts":1635217738646691.8, "dur":3.814697265625, "ph":"X", "name":"downsample 4" },
{ "pid":1, "tid":1, "ts":1635217738646699.5, "dur":4.5299530029296875, "ph":"X", "name":"upsample 1" },
{ "pid":1, "tid":1, "ts":1635217738646708, "dur":9.775161743164063, "ph":"X", "name":"upsample 2" },
{ "pid":1, "tid":1, "ts":1635217738646722, "dur":30.994415283203125, "ph":"X", "name":"upsample 3" },
{ "pid":1, "tid":1, "ts":1635217738646762.8, "dur":129.46128845214844, "ph":"X", "name":"upsample 4" },
{ "pid":1, "tid":1, "ts":1635217738646902, "dur":470.87669372558594, "ph":"X", "name":"third_pass" },
{ "pid":1, "tid":1, "ts":1635217738646902.5, "dur":468.4925079345703, "ph":"X", "name":"postprocess" },
{ "pid":1, "tid":1, "ts":1635217738647371.5, "dur":0.95367431640625, "ph":"X", "name":"ui" }
]
}

38
frame-trace_1635388024283.json Normal file
View File

@ -0,0 +1,38 @@
{
"traceEvents": [
{ "pid":1, "tid":1, "ts":1635388024230823, "dur":5888.700485229492, "ph":"X", "name":"frame" },
{ "pid":1, "tid":1, "ts":1635388024230850, "dur":1027.5840759277344, "ph":"X", "name":"shadow_pass" },
{ "pid":1, "tid":1, "ts":1635388024230850, "dur":1015.4247283935547, "ph":"X", "name":"direcred_terrain_shadows" },
{ "pid":1, "tid":1, "ts":1635388024231866.3, "dur":10.251998901367188, "ph":"X", "name":"direcred_figure_shadows" },
{ "pid":1, "tid":1, "ts":1635388024231880.5, "dur":253.91578674316406, "ph":"X", "name":"point shadows" },
{ "pid":1, "tid":1, "ts":1635388024231894.8, "dur":25.987625122070313, "ph":"X", "name":"point shadow face-0 pass" },
{ "pid":1, "tid":1, "ts":1635388024231931.3, "dur":36.95487976074219, "ph":"X", "name":"point shadow face-1 pass" },
{ "pid":1, "tid":1, "ts":1635388024231977.8, "dur":31.47125244140625, "ph":"X", "name":"point shadow face-2 pass" },
{ "pid":1, "tid":1, "ts":1635388024232019, "dur":34.57069396972656, "ph":"X", "name":"point shadow face-3 pass" },
{ "pid":1, "tid":1, "ts":1635388024232062.8, "dur":29.802322387695313, "ph":"X", "name":"point shadow face-4 pass" },
{ "pid":1, "tid":1, "ts":1635388024232101.5, "dur":30.279159545898438, "ph":"X", "name":"point shadow face-5 pass" },
{ "pid":1, "tid":1, "ts":1635388024232160.5, "dur":2982.616424560547, "ph":"X", "name":"first_pass" },
{ "pid":1, "tid":1, "ts":1635388024232161.3, "dur":36.00120544433594, "ph":"X", "name":"figures" },
{ "pid":1, "tid":1, "ts":1635388024232197.8, "dur":1394.7486877441406, "ph":"X", "name":"terrain" },
{ "pid":1, "tid":1, "ts":1635388024233593.8, "dur":17.404556274414063, "ph":"X", "name":"figures" },
{ "pid":1, "tid":1, "ts":1635388024233612.3, "dur":794.4107055664063, "ph":"X", "name":"lod_terrain" },
{ "pid":1, "tid":1, "ts":1635388024234407.3, "dur":10.728836059570313, "ph":"X", "name":"skybox" },
{ "pid":1, "tid":1, "ts":1635388024234419.8, "dur":689.9833679199219, "ph":"X", "name":"sprites" },
{ "pid":1, "tid":1, "ts":1635388024235110, "dur":1.6689300537109375, "ph":"X", "name":"fluid" },
{ "pid":1, "tid":1, "ts":1635388024235112.3, "dur":30.040740966796875, "ph":"X", "name":"particles" },
{ "pid":1, "tid":1, "ts":1635388024235143, "dur":0, "ph":"X", "name":"debug" },
{ "pid":1, "tid":1, "ts":1635388024235156.8, "dur":1069.5457458496094, "ph":"X", "name":"second_pass" },
{ "pid":1, "tid":1, "ts":1635388024236229, "dur":281.5723419189453, "ph":"X", "name":"bloom" },
{ "pid":1, "tid":1, "ts":1635388024236234, "dur":42.438507080078125, "ph":"X", "name":"downsample filtered 1" },
{ "pid":1, "tid":1, "ts":1635388024236281.5, "dur":12.39776611328125, "ph":"X", "name":"downsample 2" },
{ "pid":1, "tid":1, "ts":1635388024236298, "dur":5.0067901611328125, "ph":"X", "name":"downsample 3" },
{ "pid":1, "tid":1, "ts":1635388024236307.3, "dur":2.86102294921875, "ph":"X", "name":"downsample 4" },
{ "pid":1, "tid":1, "ts":1635388024236314.3, "dur":4.291534423828125, "ph":"X", "name":"upsample 1" },
{ "pid":1, "tid":1, "ts":1635388024236322.8, "dur":10.251998901367188, "ph":"X", "name":"upsample 2" },
{ "pid":1, "tid":1, "ts":1635388024236337, "dur":30.755996704101563, "ph":"X", "name":"upsample 3" },
{ "pid":1, "tid":1, "ts":1635388024236379, "dur":129.46128845214844, "ph":"X", "name":"upsample 4" },
{ "pid":1, "tid":1, "ts":1635388024236518.5, "dur":190.97328186035156, "ph":"X", "name":"third_pass" },
{ "pid":1, "tid":1, "ts":1635388024236519, "dur":180.0060272216797, "ph":"X", "name":"postprocess" },
{ "pid":1, "tid":1, "ts":1635388024236699.5, "dur":9.775161743164063, "ph":"X", "name":"ui" }
]
}

6
world/src/layer/spot.rs
View File

@ -101,7 +101,7 @@ impl Spot {
Self::generate_spots(
Spot::PirateHideout,
world,
2.0,
1.3,
|g, c| {
g < 0.25
&& !c.near_cliffs()
@ -115,7 +115,7 @@ impl Spot {
Self::generate_spots(
Spot::DwarvenGrave,
world,
1.0,
1.3,
|g, c| {
g < 0.25
&& !c.near_cliffs()
@ -284,7 +284,7 @@ impl Spot {
Self::generate_spots(
Spot::AirshipCrash,
world,
0.5,
0.7,
|g, c| {
g < 0.25
&& !c.near_cliffs()