Merge branch 'slipped/gnarlingstuff' into 'master'

gnarling depth

See merge request veloren/veloren!3068
This commit is contained in:
Samuel Keiffer 2022-01-14 07:22:11 +00:00
commit 589189315c
149 changed files with 1495 additions and 118 deletions

View File

@ -65,7 +65,12 @@
),
Custom("Axe Simple"): (
primary: "common.abilities.axesimple.doublestrike",
secondary: "common.abilities.axesimple.dash",
secondary: "common.abilities.axesimple.doublestrike",
abilities: [],
),
Custom("Dagger Simple"): (
primary: "common.abilities.daggersimple.singlestrike",
secondary: "common.abilities.daggersimple.singlestrike",
abilities: [],
),
Custom("Sword Simple"): (
@ -84,6 +89,12 @@
abilities: [
],
),
Tool(Blowgun): (
primary: "common.abilities.blowgun.basic",
secondary: "common.abilities.blowgun.basic",
abilities: [
],
),
Tool(Dagger): (
primary: "common.abilities.dagger.tempbasic",
secondary: "common.abilities.dagger.tempbasic",
@ -268,6 +279,11 @@
(None, "common.abilities.custom.harvester.explodingpumpkin"),
],
),
Custom("Oni"): (
primary: "common.abilities.custom.oni.dash",
secondary: "common.abilities.custom.oni.doublestrike",
abilities: [],
),
Custom("Bird Large Breathe"): (
primary: "common.abilities.custom.birdlargebreathe.firebomb",
secondary: "common.abilities.custom.birdlargebreathe.triplestrike",

View File

@ -2,18 +2,18 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 9.0,
base_damage: 8.0,
damage_increase: 1.0,
base_poise_damage: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 4.0,
knockback: 8.0,
range: 3.5,
angle: 50.0,
base_buildup_duration: 0.6,
base_swing_duration: 0.12,
base_buildup_duration: 0.4,
base_swing_duration: 0.08,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 3.5,
base_recover_duration: 0.5,
forward_movement: 2.5,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
@ -24,18 +24,18 @@ ComboMelee(
),
(
stage: 2,
base_damage: 13.0,
base_damage: 10.0,
damage_increase: 1.5,
base_poise_damage: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 16.0,
range: 5.5,
angle: 15.0,
base_buildup_duration: 0.5,
base_swing_duration: 0.15,
knockback: 12.0,
range: 3.5,
angle: 30.0,
base_buildup_duration: 0.7,
base_swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 1.2,
forward_movement: 4.5,
base_recover_duration: 0.7,
forward_movement: 2.0,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
@ -52,5 +52,5 @@ ComboMelee(
max_speed_increase: 0.0,
scales_from_combo: 0,
is_interruptible: false,
ori_modifier: 0.6,
ori_modifier: 0.7,
)

View File

@ -0,0 +1,15 @@
BasicRanged(
energy_cost: 0,
buildup_duration: 0.5,
recover_duration: 0.3,
projectile: Arrow(
damage: 3.5,
knockback: 5.0,
energy_regen: 4.0,
),
projectile_body: Object(Arrow),
projectile_light: None,
projectile_speed: 100.0,
num_projectiles: 1,
projectile_spread: 0.0,
)

View File

@ -0,0 +1,56 @@
ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 9.0,
damage_increase: 1.0,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 4.0,
range: 3.5,
angle: 50.0,
base_buildup_duration: 0.6,
base_swing_duration: 0.12,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 3.5,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
),
(
stage: 2,
base_damage: 13.0,
damage_increase: 1.5,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 16.0,
range: 5.5,
angle: 15.0,
base_buildup_duration: 0.5,
base_swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 1.2,
forward_movement: 4.5,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
is_interruptible: false,
ori_modifier: 0.6,
)

View File

@ -0,0 +1,34 @@
ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 2.0,
damage_increase: 1.0,
base_poise_damage: 8,
poise_damage_increase: 0,
knockback: 8.0,
range: 3.5,
angle: 50.0,
base_buildup_duration: 0.1,
base_swing_duration: 0.05,
hit_timing: 0.5,
base_recover_duration: 0.05,
forward_movement: 1.0,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
is_interruptible: false,
ori_modifier: 0.7,
)

View File

@ -0,0 +1,13 @@
EntityConfig (
name: Name("Gnarling Chieftain"),
body: RandomWith("gnarling"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.chieftain_staff")),
meta: [
LoadoutAsset("common.loadout.dungeon.tier-0.gnarling_chieftain"),
],
)

View File

@ -1,13 +1,13 @@
EntityConfig (
name: Name("Gnarling Shaman"),
name: Name("Gnarling Logger"),
body: RandomWith("gnarling"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.gnoll_staff")),
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.axe")),
meta: [
LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
LoadoutAsset("common.loadout.dungeon.tier-0.logger"),
],
)

View File

@ -5,9 +5,9 @@ EntityConfig (
loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.wooden_spear")),
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.dagger")),
meta: [
LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
LoadoutAsset("common.loadout.dungeon.tier-0.mugger"),
],
)

View File

@ -5,9 +5,9 @@ EntityConfig (
loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.adlet_bow")),
hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.blowgun")),
meta: [
LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
LoadoutAsset("common.loadout.dungeon.tier-0.stalker"),
],
)

View File

@ -0,0 +1,11 @@
EntityConfig (
name: Automatic,
body: RandomWith("akhlut"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.creature.quad_medium.ice"),
hands: Uninit,
meta: [],
)

View File

@ -0,0 +1,11 @@
EntityConfig (
name: Automatic,
body: RandomWith("icedrake"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.creature.quad_medium.ice"),
hands: Uninit,
meta: [],
)

View File

@ -0,0 +1,11 @@
EntityConfig (
name: Automatic,
body: RandomWith("penguin"),
alignment: Alignment(Wild),
loot: LootTable("common.loot_tables.creature.quad_medium.gentle"),
hands: Uninit,
meta: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling Chieftain",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Chest("GnarlingChieftain"),
stats: (
protection: Some(Normal(2.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(2.7),
energy_reward: Some(0.027),
crit_power: Some(0.025),
),
)),
quality: Low,
tags: [],
)

View File

@ -2,7 +2,7 @@ ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Chest("Gnarling"),
kind: Chest("GnarlingLogger"),
stats: (
protection: Some(Normal(2.0)),
poise_resilience: Some(Normal(1.0)),

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Chest("GnarlingMugger"),
stats: (
protection: Some(Normal(2.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(2.7),
energy_reward: Some(0.027),
crit_power: Some(0.025),
),
)),
quality: Low,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Chest("GnarlingStalker"),
stats: (
protection: Some(Normal(2.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(2.7),
energy_reward: Some(0.027),
crit_power: Some(0.025),
),
)),
quality: Low,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling Chieftain",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Foot("GnarlingChieftain"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(0.9),
energy_reward: Some(0.009),
crit_power: Some(0.008),
),
)),
quality: Low,
tags: [],
)

View File

@ -2,7 +2,7 @@ ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Foot("Gnarling"),
kind: Foot("GnarlingLogger"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Foot("GnarlingMugger"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(0.9),
energy_reward: Some(0.009),
crit_power: Some(0.008),
),
)),
quality: Low,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Foot("GnarlingStalker"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(0.9),
energy_reward: Some(0.009),
crit_power: Some(0.008),
),
)),
quality: Low,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling Chieftain",
description: "Ceremonial attire used by members..",
kind: Armor((
kind: Hand("GnarlingChieftain"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(0.9),
energy_reward: Some(0.009),
crit_power: Some(0.008),
),
)),
quality: Low,
tags: [],
)

View File

@ -2,7 +2,7 @@ ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members..",
kind: Armor((
kind: Hand("Gnarling"),
kind: Hand("GnarlingLogger"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members..",
kind: Armor((
kind: Hand("GnarlingMugger"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(0.9),
energy_reward: Some(0.009),
crit_power: Some(0.008),
),
)),
quality: Low,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members..",
kind: Armor((
kind: Hand("GnarlingStalker"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(0.9),
energy_reward: Some(0.009),
crit_power: Some(0.008),
),
)),
quality: Low,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling Chieftain",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Head("GnarlingChieftain"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(1.8),
energy_reward: Some(0.02),
crit_power: Some(0.016),
),
)),
quality: Low,
tags: [],
)

View File

@ -2,7 +2,7 @@ ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Head("Gnarling"),
kind: Head("GnarlingLogger"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Head("GnarlingMugger"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(1.8),
energy_reward: Some(0.02),
crit_power: Some(0.016),
),
)),
quality: Low,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Head("GnarlingStalker"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(1.8),
energy_reward: Some(0.02),
crit_power: Some(0.016),
),
)),
quality: Low,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling Chieftain",
description: "Ceremonial attire used by members..",
kind: Armor((
kind: Pants("GnarlingChieftain"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(1.8),
energy_reward: Some(0.02),
crit_power: Some(0.016),
),
)),
quality: Low,
tags: [],
)

View File

@ -2,7 +2,7 @@ ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members..",
kind: Armor((
kind: Pants("Gnarling"),
kind: Pants("GnarlingLogger"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members..",
kind: Armor((
kind: Pants("GnarlingMugger"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(1.8),
energy_reward: Some(0.02),
crit_power: Some(0.016),
),
)),
quality: Low,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members..",
kind: Armor((
kind: Pants("GnarlingStalker"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(1.8),
energy_reward: Some(0.02),
crit_power: Some(0.016),
),
)),
quality: Low,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling Chieftain",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Belt("GnarlingChieftain"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(0.4),
energy_reward: Some(0.005),
crit_power: Some(0.004),
),
)),
quality: Low,
tags: [],
)

View File

@ -2,7 +2,7 @@ ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Belt("Gnarling"),
kind: Belt("GnarlingLogger"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Belt("GnarlingMugger"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(0.4),
energy_reward: Some(0.005),
crit_power: Some(0.004),
),
)),
quality: Low,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Gnarling",
description: "Ceremonial attire used by members.",
kind: Armor((
kind: Belt("GnarlingStalker"),
stats: (
protection: Some(Normal(1.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(0.4),
energy_reward: Some(0.005),
crit_power: Some(0.004),
),
)),
quality: Low,
tags: [],
)

View File

@ -17,5 +17,5 @@ ItemDef(
)),
quality: Low,
tags: [],
ability_spec: Some(Custom("Axe Simple")),
ability_spec: Some(Custom("Oni")),
)

View File

@ -1,8 +1,8 @@
ItemDef(
name: "Wooden Spear",
name: "Gnarling Logger Axe",
description: "Testing",
kind: Tool((
kind: Spear,
kind: Axe,
hands: Two,
stats: Direct((
equip_time_secs: 0.0,
@ -17,5 +17,5 @@ ItemDef(
)),
quality: Low,
tags: [],
ability_spec: None,
ability_spec: Some(Custom("Axe Simple")),
)

View File

@ -1,21 +1,21 @@
ItemDef(
name: "Adlet Bow",
description: "Strips of leather are wrapped around the handle.",
name: "Gnarling Blowgun",
description: "testing123",
kind: Tool((
kind: Bow,
kind: Blowgun,
hands: Two,
stats: Direct((
equip_time_secs: 0.0,
power: 0.3,
effect_power: 0.8,
speed: 0.5,
crit_chance: 0.13541667,
speed: 0.6,
crit_chance: 0.26764706,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
)),
)),
quality: Moderate,
quality: Low,
tags: [],
ability_spec: None,
)

View File

@ -1,5 +1,5 @@
ItemDef(
name: "Gnoll Staff",
name: "Chieftain Staff",
description: "eekum bokum",
kind: Tool((
kind: Staff,

View File

@ -0,0 +1,21 @@
ItemDef(
name: "Gnarling Mugger Dagger",
description: "Testing",
kind: Tool((
kind: Dagger,
hands: Two,
stats: Direct((
equip_time_secs: 0.0,
power: 0.3,
effect_power: 1.0,
speed: 1.0,
crit_chance: 0.12037037,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
)),
)),
quality: Low,
tags: [],
ability_spec: Some(Custom("Dagger Simple")),
)

View File

@ -0,0 +1,8 @@
({
Armor(Head): Item("common.items.npc_armor.biped_small.gnarling.head.chieftain"),
Armor(Feet): Item("common.items.npc_armor.biped_small.gnarling.foot.chieftain"),
Armor(Hands): Item("common.items.npc_armor.biped_small.gnarling.hand.chieftain"),
Armor(Chest): Item("common.items.npc_armor.biped_small.gnarling.chest.chieftain"),
Armor(Legs): Item("common.items.npc_armor.biped_small.gnarling.pants.chieftain"),
Armor(Belt): Item("common.items.npc_armor.biped_small.gnarling.tail.chieftain"),
})

View File

@ -1,8 +1,8 @@
({
Armor(Head): Item("common.items.npc_armor.biped_small.gnarling.head.gnarling"),
Armor(Feet): Item("common.items.npc_armor.biped_small.gnarling.foot.gnarling"),
Armor(Hands): Item("common.items.npc_armor.biped_small.gnarling.hand.gnarling"),
Armor(Chest): Item("common.items.npc_armor.biped_small.gnarling.chest.gnarling"),
Armor(Legs): Item("common.items.npc_armor.biped_small.gnarling.pants.gnarling"),
Armor(Belt): Item("common.items.npc_armor.biped_small.gnarling.tail.gnarling"),
Armor(Head): Item("common.items.npc_armor.biped_small.gnarling.head.logger"),
Armor(Feet): Item("common.items.npc_armor.biped_small.gnarling.foot.logger"),
Armor(Hands): Item("common.items.npc_armor.biped_small.gnarling.hand.logger"),
Armor(Chest): Item("common.items.npc_armor.biped_small.gnarling.chest.logger"),
Armor(Legs): Item("common.items.npc_armor.biped_small.gnarling.pants.logger"),
Armor(Belt): Item("common.items.npc_armor.biped_small.gnarling.tail.logger"),
})

View File

@ -0,0 +1,8 @@
({
Armor(Head): Item("common.items.npc_armor.biped_small.gnarling.head.mugger"),
Armor(Feet): Item("common.items.npc_armor.biped_small.gnarling.foot.mugger"),
Armor(Hands): Item("common.items.npc_armor.biped_small.gnarling.hand.mugger"),
Armor(Chest): Item("common.items.npc_armor.biped_small.gnarling.chest.mugger"),
Armor(Legs): Item("common.items.npc_armor.biped_small.gnarling.pants.mugger"),
Armor(Belt): Item("common.items.npc_armor.biped_small.gnarling.tail.mugger"),
})

View File

@ -0,0 +1,8 @@
({
Armor(Head): Item("common.items.npc_armor.biped_small.gnarling.head.stalker"),
Armor(Feet): Item("common.items.npc_armor.biped_small.gnarling.foot.stalker"),
Armor(Hands): Item("common.items.npc_armor.biped_small.gnarling.hand.stalker"),
Armor(Chest): Item("common.items.npc_armor.biped_small.gnarling.chest.stalker"),
Armor(Legs): Item("common.items.npc_armor.biped_small.gnarling.pants.stalker"),
Armor(Belt): Item("common.items.npc_armor.biped_small.gnarling.tail.stalker"),
})

View File

@ -563,6 +563,10 @@
keyword: "alpaca",
generic: "Alpaca"
),
akhlut: (
keyword: "akhlut",
generic: "Akhlut"
),
)
),
quadruped_small: (
@ -820,6 +824,10 @@
keyword: "parrot",
generic: "Parrot"
),
penguin: (
keyword: "penguin",
generic: "Penguin"
),
)
),
biped_large: (
@ -932,6 +940,10 @@
keyword: "treant",
generic: "Treant"
),
woodgolem: (
keyword: "woodgolem",
generic: "Wooden Golem"
),
claygolem: (
keyword: "claygolem",
generic: "ClayGolem"
@ -1182,6 +1194,10 @@
keyword: "lavadrake",
generic: "Lava Drake"
),
icedrake: (
keyword: "icedrake",
generic: "Ice Drake"
),
basilisk: (
keyword: "basilisk",
generic: "Basilisk"

View File

@ -15,8 +15,17 @@
"AdletBow": (
vox_spec: ("npc.adlet.male.bow.chest", (-5.0, -3.5, -2.0)),
),
"Gnarling": (
vox_spec: ("npc.gnarling.male.chest", (-4.5, -3.5, -2.5)),
"GnarlingMugger": (
vox_spec: ("npc.gnarling.mugger.chest", (-4.5, -3.5, -2.5)),
),
"GnarlingStalker": (
vox_spec: ("npc.gnarling.stalker.chest", (-4.5, -3.5, -2.5)),
),
"GnarlingLogger": (
vox_spec: ("npc.gnarling.logger.chest", (-4.5, -3.5, -2.5)),
),
"GnarlingChieftain": (
vox_spec: ("npc.gnarling.chieftain.chest", (-4.5, -3.5, -1.0)),
),
"Mandragora": (
vox_spec: ("npc.mandragora.male.chest", (-11.0, -11.0, -6.5)),

View File

@ -32,12 +32,36 @@
vox_spec: ("npc.adlet.male.foot_r", (-1.5, -3.0, -7.0)),
)
),
"Gnarling": (
"GnarlingMugger": (
left: (
vox_spec: ("npc.gnarling.male.foot_r", (-1.0, -2.0, -5.0)),
vox_spec: ("npc.gnarling.mugger.foot_r", (-1.0, -2.0, -5.0)),
),
right: (
vox_spec: ("npc.gnarling.male.foot_r", (-1.0, -2.0, -5.0)),
vox_spec: ("npc.gnarling.mugger.foot_r", (-1.0, -2.0, -5.0)),
)
),
"GnarlingStalker": (
left: (
vox_spec: ("npc.gnarling.stalker.foot_r", (-1.0, -2.0, -5.0)),
),
right: (
vox_spec: ("npc.gnarling.stalker.foot_r", (-1.0, -2.0, -5.0)),
)
),
"GnarlingLogger": (
left: (
vox_spec: ("npc.gnarling.logger.foot_r", (-1.0, -2.0, -5.0)),
),
right: (
vox_spec: ("npc.gnarling.logger.foot_r", (-1.0, -2.0, -5.0)),
)
),
"GnarlingChieftain": (
left: (
vox_spec: ("npc.gnarling.chieftain.foot_r", (-1.0, -2.0, -5.0)),
),
right: (
vox_spec: ("npc.gnarling.chieftain.foot_r", (-1.0, -2.0, -5.0)),
)
),
"Mandragora": (

View File

@ -40,12 +40,36 @@
vox_spec: ("npc.adlet.male.bow.hand_r", (0.0, -2.0, -7.0)),
)
),
"Gnarling": (
"GnarlingMugger": (
left: (
vox_spec: ("npc.gnarling.male.hand_r", (-3.0, -1.5, -7.0)),
vox_spec: ("npc.gnarling.mugger.hand_r", (-3.0, -1.5, -7.0)),
),
right: (
vox_spec: ("npc.gnarling.male.hand_r", (0.0, -1.5, -7.0)),
vox_spec: ("npc.gnarling.mugger.hand_r", (0.0, -1.5, -7.0)),
)
),
"GnarlingStalker": (
left: (
vox_spec: ("npc.gnarling.stalker.hand_r", (-3.0, -1.5, -7.0)),
),
right: (
vox_spec: ("npc.gnarling.stalker.hand_r", (0.0, -1.5, -7.0)),
)
),
"GnarlingLogger": (
left: (
vox_spec: ("npc.gnarling.logger.hand_r", (-3.0, -1.5, -7.0)),
),
right: (
vox_spec: ("npc.gnarling.logger.hand_r", (0.0, -1.5, -7.0)),
)
),
"GnarlingChieftain": (
left: (
vox_spec: ("npc.gnarling.chieftain.hand_r", (-3.5, -0.5, -8.0)),
),
right: (
vox_spec: ("npc.gnarling.chieftain.hand_r", (-0.5, -0.5, -8.0)),
)
),
"Mandragora": (

View File

@ -15,8 +15,17 @@
"AdletBow": (
vox_spec: ("npc.adlet.male.bow.head", (-7.0, -4.5, -6.0)),
),
"Gnarling": (
vox_spec: ("npc.gnarling.male.head", (-6.5, -5.5, -4.5)),
"GnarlingMugger": (
vox_spec: ("npc.gnarling.mugger.head", (-6.5, -5.5, -4.5)),
),
"GnarlingStalker": (
vox_spec: ("npc.gnarling.stalker.head", (-6.5, -5.5, -4.5)),
),
"GnarlingLogger": (
vox_spec: ("npc.gnarling.logger.head", (-6.5, -5.5, -4.5)),
),
"GnarlingChieftain": (
vox_spec: ("npc.gnarling.chieftain.head", (-6.5, -5.5, -4.5)),
),
"Mandragora": (
vox_spec: ("npc.mandragora.male.head", (0.0, 0.0, 0.0)),

View File

@ -15,8 +15,17 @@
"AdletBow": (
vox_spec: ("npc.adlet.male.bow.pants", (-5.0, -4.5, -3.0)),
),
"Gnarling": (
vox_spec: ("npc.gnarling.male.pants", (-3.5, -3.0, -2.5)),
"GnarlingMugger": (
vox_spec: ("npc.gnarling.mugger.pants", (-3.5, -3.0, -2.5)),
),
"GnarlingStalker": (
vox_spec: ("npc.gnarling.stalker.pants", (-3.5, -3.0, -2.5)),
),
"GnarlingLogger": (
vox_spec: ("npc.gnarling.logger.pants", (-3.5, -3.0, -2.5)),
),
"GnarlingChieftain": (
vox_spec: ("npc.gnarling.chieftain.pants", (-3.5, -3.0, -3.5)),
),
"Mandragora": (
vox_spec: ("npc.mandragora.male.pants", (-3.0, -3.0, -1.0)),

View File

@ -9,8 +9,17 @@
"Adlet": (
vox_spec: ("npc.adlet.male.tail", (-1.0, -5.0, -1.0)),
),
"Gnarling": (
vox_spec: ("npc.gnarling.male.tail", (-1.5, -13.0, -3.0)),
"GnarlingMugger": (
vox_spec: ("npc.gnarling.mugger.tail", (-1.5, -13.0, -3.0)),
),
"GnarlingStalker": (
vox_spec: ("npc.gnarling.stalker.tail", (-1.5, -13.0, -3.0)),
),
"GnarlingLogger": (
vox_spec: ("npc.gnarling.logger.tail", (-1.5, -13.0, -3.0)),
),
"GnarlingChieftain": (
vox_spec: ("npc.gnarling.chieftain.tail", (-1.5, -14.0, -3.0)),
),
"Kappa": (
vox_spec: ("npc.kappa.male.tail", (-2.5, -10.0, -5.0)),

View File

@ -1107,6 +1107,22 @@
vox_spec: ("weapon.biped_small.bow.adlet", (-2.5, -3.0, -5.0)),
color: None
),
"common.items.npc_weapons.biped_small.gnarling.chieftain_staff": (
vox_spec: ("weapon.biped_small.staff.chieftain_staff", (-0.5, -4.0, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.gnarling.blowgun": (
vox_spec: ("weapon.biped_small.blowgun", (-2.5, -2.5, -1.5)),
color: None
),
"common.items.npc_weapons.biped_small.gnarling.axe": (
vox_spec: ("weapon.biped_small.axe.axe", (-0.5, -3.0, -4.0)),
color: None
),
"common.items.npc_weapons.biped_small.gnarling.dagger": (
vox_spec: ("weapon.biped_small.dagger", (-0.5, -4.5, -0.0)),
color: None
),
"common.items.npc_weapons.biped_small.adlet.gnoll_staff": (
vox_spec: ("weapon.biped_small.staff.sahagin", (-0.5, -4.0, -4.0)),
color: None

View File

@ -191,8 +191,36 @@
central: ("npc.parrot.male.torso"),
),
tail: (
offset: (-1.5, -4.5, -1.5),
offset: (-2.5, -4.5, -1.5),
central: ("npc.parrot.male.tail"),
)
),
(Penguin, Male): (
head: (
offset: (-1.5, -2.0, -2.0),
central: ("npc.penguin.male.head"),
),
torso: (
offset: (-3.5, -4.0, -5.5),
central: ("npc.penguin.male.torso"),
),
tail: (
offset: (-2.5, -4.5, -1.5),
central: ("npc.penguin.male.tail"),
)
),
(Penguin, Female): (
head: (
offset: (-1.5, -2.0, -2.0),
central: ("npc.penguin.male.head"),
),
torso: (
offset: (-3.5, -4.0, -5.5),
central: ("npc.penguin.male.torso"),
),
tail: (
offset: (-2.5, -4.5, -1.5),
central: ("npc.penguin.male.tail"),
)
),
})

View File

@ -251,4 +251,40 @@
lateral: ("npc.parrot.male.leg_r"),
)
),
(Penguin, Male): (
wing_l: (
offset: (-0.5, -1.5, -8.0),
lateral: ("npc.penguin.male.wing"),
),
wing_r: (
offset: (-0.5, -1.5, -8.0),
lateral: ("npc.penguin.male.wing"),
),
foot_l: (
offset: (-2.5, 0.0, -6.0),
lateral: ("npc.penguin.male.leg_r"),
),
foot_r: (
offset: (-2.5, 0.0, -6.0),
lateral: ("npc.penguin.male.leg_r"),
)
),
(Penguin, Female): (
wing_l: (
offset: (-0.5, -1.5, -8.0),
lateral: ("npc.penguin.male.wing"),
),
wing_r: (
offset: (-0.5, -1.5, -8.0),
lateral: ("npc.penguin.male.wing"),
),
foot_l: (
offset: (-2.5, 0.0, -6.0),
lateral: ("npc.penguin.male.leg_r"),
),
foot_r: (
offset: (-2.5, 0.0, -6.0),
lateral: ("npc.penguin.male.leg_r"),
)
),
})

View File

@ -107,4 +107,40 @@
central: ("npc.claygolem.male.chest_lower"),
),
),
(WoodGolem, Male): (
head: (
offset: (-6.5, -4.5, -3.0),
central: ("npc.woodgolem.male.head"),
),
jaw: (
offset: (-9.5, 0.0, -3.0),
central: ("armor.empty"),
),
torso_upper: (
offset: (-6.5, -7.0, -4.5),
central: ("npc.woodgolem.male.chest_upper"),
),
torso_lower: (
offset: (-2.5, -3.5, -7.0),
central: ("npc.woodgolem.male.chest_lower"),
),
),
(WoodGolem, Female): (
head: (
offset: (-6.5, -4.5, -3.0),
central: ("npc.woodgolem.male.head"),
),
jaw: (
offset: (-9.5, 0.0, -3.0),
central: ("armor.empty"),
),
torso_upper: (
offset: (-6.5, -7.0, -4.5),
central: ("npc.woodgolem.male.chest_upper"),
),
torso_lower: (
offset: (-2.5, -3.5, -7.0),
central: ("npc.woodgolem.male.chest_lower"),
),
),
})

View File

@ -203,4 +203,72 @@
lateral: ("npc.claygolem.male.foot_r"),
)
),
(WoodGolem, Male): (
shoulder_l: (
offset: (-9.0, -5.5, -5.5),
lateral: ("npc.woodgolem.male.shoulder_l"),
),
shoulder_r: (
offset: (0.0, -5.5, -5.5),
lateral: ("npc.woodgolem.male.shoulder_r"),
),
hand_l: (
offset: (-4.0, -6.5, -14.0),
lateral: ("npc.woodgolem.male.hand_l"),
),
hand_r: (
offset: (-4.0, -6.5, -14.0),
lateral: ("npc.woodgolem.male.hand_r"),
),
leg_l: (
offset: (-4.0, -3.5, -4.5),
lateral: ("npc.woodgolem.male.leg_l"),
),
leg_r: (
offset: (0.0, -3.5, -4.5),
lateral: ("npc.woodgolem.male.leg_r"),
),
foot_l: (
offset: (-3.5, -4.0, -8.0),
lateral: ("npc.woodgolem.male.foot_l"),
),
foot_r: (
offset: (-3.5, -4.0, -8.0),
lateral: ("npc.woodgolem.male.foot_r"),
)
),
(WoodGolem, Female): (
shoulder_l: (
offset: (-9.0, -5.5, -5.5),
lateral: ("npc.woodgolem.male.shoulder_l"),
),
shoulder_r: (
offset: (0.0, -5.5, -5.5),
lateral: ("npc.woodgolem.male.shoulder_r"),
),
hand_l: (
offset: (-4.0, -6.5, -14.0),
lateral: ("npc.woodgolem.male.hand_l"),
),
hand_r: (
offset: (-4.0, -6.5, -14.0),
lateral: ("npc.woodgolem.male.hand_r"),
),
leg_l: (
offset: (-4.0, -3.5, -4.5),
lateral: ("npc.woodgolem.male.leg_l"),
),
leg_r: (
offset: (0.0, -3.5, -4.5),
lateral: ("npc.woodgolem.male.leg_r"),
),
foot_l: (
offset: (-3.5, -4.0, -8.0),
lateral: ("npc.woodgolem.male.foot_l"),
),
foot_r: (
offset: (-3.5, -4.0, -8.0),
lateral: ("npc.woodgolem.male.foot_r"),
)
),
})

BIN
assets/voxygen/voxel/npc/akhlut/male/foot_br.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/akhlut/male/foot_fr.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/akhlut/male/head.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/akhlut/male/jaw.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/akhlut/male/leg_br.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/akhlut/male/leg_fr.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/akhlut/male/neck.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/akhlut/male/tail.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/akhlut/male/torso_back.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/akhlut/male/torso_front.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/chieftain/chest.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/chieftain/foot_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/chieftain/hand_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/chieftain/head.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/chieftain/pants.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/chieftain/tail.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/logger/chest.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/logger/foot_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/logger/hand_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/logger/head.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/logger/pants.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/logger/tail.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/stalker/chest.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/stalker/foot_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/stalker/hand_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/stalker/head.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/stalker/pants.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gnarling/stalker/tail.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/icedrake/male/chest.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/icedrake/male/foot_br.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/icedrake/male/foot_fr.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/icedrake/male/head_lower.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/icedrake/male/head_upper.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/icedrake/male/jaw.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/icedrake/male/tail_front.vox (Stored with Git LFS) Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More