mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'haniwa' into 'master'
haniwa See merge request veloren/veloren!4234
This commit is contained in:
commit
5d6824aace
@ -416,6 +416,11 @@
|
||||
secondary: Simple(None, "common.abilities.custom.quadmedhoof.basic"),
|
||||
abilities: [],
|
||||
),
|
||||
Custom("ClaySteed"): (
|
||||
primary: Simple(None, "common.abilities.custom.claysteed.basic"),
|
||||
secondary: Simple(None, "common.abilities.custom.claysteed.shockwave"),
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Quad Med Basic"): (
|
||||
primary: Simple(None, "common.abilities.custom.quadmedbasic.singlestrike"),
|
||||
secondary: Simple(None, "common.abilities.custom.quadmedbasic.triplestrike"),
|
||||
@ -654,13 +659,18 @@
|
||||
|
||||
],
|
||||
),
|
||||
Custom("Grave Warden"): (
|
||||
primary: Simple(None, "common.abilities.custom.gravewarden.strike"),
|
||||
secondary: Simple(None, "common.abilities.custom.gravewarden.laser"),
|
||||
abilities: [
|
||||
Simple(None, "common.abilities.custom.gravewarden.shockwave"),
|
||||
Simple(None, "common.abilities.custom.gravewarden.rocket"),
|
||||
],
|
||||
),
|
||||
Custom("Clay Golem"): (
|
||||
primary: Simple(None, "common.abilities.custom.claygolem.strike"),
|
||||
secondary: Simple(None, "common.abilities.custom.claygolem.laser"),
|
||||
abilities: [
|
||||
Simple(None, "common.abilities.custom.claygolem.shockwave"),
|
||||
Simple(None, "common.abilities.custom.claygolem.rocket"),
|
||||
],
|
||||
secondary: Simple(None, "common.abilities.custom.claygolem.dashstrike"),
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Yeti"): (
|
||||
primary: Simple(None, "common.abilities.custom.yeti.strike"),
|
||||
@ -670,6 +680,11 @@
|
||||
Simple(None, "common.abilities.custom.yeti.snowball"),
|
||||
],
|
||||
),
|
||||
Custom("Ancient Effigy"): (
|
||||
primary: Simple(None, "common.abilities.custom.ancienteffigy.laser"),
|
||||
secondary: Simple(None, "common.abilities.custom.ancienteffigy.blast"),
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Harvester"): (
|
||||
primary: Simple(None, "common.abilities.custom.harvester.scythe"),
|
||||
secondary: Simple(None, "common.abilities.custom.harvester.firebreath"),
|
||||
@ -892,6 +907,16 @@
|
||||
secondary: Simple(None, "common.abilities.music.sitar"),
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Steeldrum"): (
|
||||
primary: Simple(None, "common.abilities.music.steeldrum"),
|
||||
secondary: Simple(None, "common.abilities.music.steeldrum"),
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Shamisen"): (
|
||||
primary: Simple(None, "common.abilities.music.shamisen"),
|
||||
secondary: Simple(None, "common.abilities.music.shamisen"),
|
||||
abilities: [],
|
||||
),
|
||||
Tool(Debug): (
|
||||
primary: Simple(None, "common.abilities.debug.forwardboost"),
|
||||
secondary: Simple(None, "common.abilities.debug.upboost"),
|
||||
@ -944,4 +969,25 @@
|
||||
Simple(None, "common.abilities.adlet.elder.leap"),
|
||||
],
|
||||
),
|
||||
// Haniwa
|
||||
Custom("Haniwa Soldier"): (
|
||||
primary: Simple(None, "common.abilities.haniwa.soldier.strike"),
|
||||
secondary: Simple(None, "common.abilities.haniwa.soldier.riposte"),
|
||||
guard: Simple(None, "common.abilities.haniwa.soldier.guard"),
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Haniwa Guard"): (
|
||||
primary: Simple(None, "common.abilities.haniwa.guard.strike"),
|
||||
secondary: Simple(None, "common.abilities.haniwa.guard.flurry"),
|
||||
abilities: [
|
||||
Simple(None, "common.abilities.haniwa.guard.backpedal")
|
||||
],
|
||||
),
|
||||
Custom("Haniwa Archer"): (
|
||||
primary: Simple(None, "common.abilities.haniwa.archer.arrow"),
|
||||
secondary: Simple(None, "common.abilities.haniwa.archer.kick"),
|
||||
abilities: [
|
||||
Simple(None, "common.abilities.haniwa.archer.explosive")
|
||||
],
|
||||
),
|
||||
})
|
||||
|
16
assets/common/abilities/custom/ancienteffigy/blast.ron
Normal file
16
assets/common/abilities/custom/ancienteffigy/blast.ron
Normal file
@ -0,0 +1,16 @@
|
||||
BasicRanged(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 2.5,
|
||||
recover_duration: 1.0,
|
||||
projectile: ClayRocket(
|
||||
damage: 75.0,
|
||||
knockback: 35.0,
|
||||
radius: 10.0,
|
||||
min_falloff: 0.75,
|
||||
),
|
||||
projectile_body: Object(FireRainDrop),
|
||||
projectile_speed: 0.0,
|
||||
num_projectiles: 1,
|
||||
projectile_spread: 0.0,
|
||||
move_efficiency: 0.3,
|
||||
)
|
19
assets/common/abilities/custom/ancienteffigy/laser.ron
Normal file
19
assets/common/abilities/custom/ancienteffigy/laser.ron
Normal file
@ -0,0 +1,19 @@
|
||||
BasicBeam(
|
||||
buildup_duration: 0.9,
|
||||
recover_duration: 2.8,
|
||||
beam_duration: 0.25,
|
||||
damage: 5.5,
|
||||
tick_rate: 2.0,
|
||||
range: 40.0,
|
||||
max_angle: 1.0,
|
||||
damage_effect: Some(Buff((
|
||||
kind: Burning,
|
||||
dur_secs: 5.0,
|
||||
strength: DamageFraction(0.50),
|
||||
chance: 0.75,
|
||||
))),
|
||||
energy_regen: 0,
|
||||
energy_drain: 0,
|
||||
ori_rate: 0.5,
|
||||
specifier: Gravewarden,
|
||||
)
|
28
assets/common/abilities/custom/claygolem/dashstrike.ron
Normal file
28
assets/common/abilities/custom/claygolem/dashstrike.ron
Normal file
@ -0,0 +1,28 @@
|
||||
ComboMelee2(
|
||||
strikes: [
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 60,
|
||||
poise: 40,
|
||||
knockback: 35.0,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 4.0,
|
||||
angle: 60.0,
|
||||
),
|
||||
buildup_duration: 2.0,
|
||||
swing_duration: 0.8,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 3.0,
|
||||
movement: (
|
||||
buildup: Some(Forward(1.0)),
|
||||
),
|
||||
ori_modifier: 0.7,
|
||||
),
|
||||
],
|
||||
energy_cost_per_strike: 0,
|
||||
auto_progress: true,
|
||||
specifier: Some(ClayGolemDash),
|
||||
)
|
||||
|
@ -1,19 +1,26 @@
|
||||
BasicMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 1.2,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 1.0,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 30.0,
|
||||
poise: 50.0,
|
||||
knockback: 10.0,
|
||||
energy_regen: 0.0,
|
||||
ComboMelee2(
|
||||
strikes: [
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 60,
|
||||
poise: 40,
|
||||
knockback: 35.0,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 4.0,
|
||||
angle: 60.0,
|
||||
),
|
||||
buildup_duration: 1.4,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.5,
|
||||
movement: (
|
||||
swing: Some(Forward(0.5)),
|
||||
),
|
||||
ori_modifier: 0.7,
|
||||
),
|
||||
range: 4.0,
|
||||
angle: 45.0,
|
||||
multi_target: Some(Normal),
|
||||
),
|
||||
ori_modifier: 1.0,
|
||||
)
|
||||
],
|
||||
energy_cost_per_strike: 0,
|
||||
auto_progress: true,
|
||||
)
|
18
assets/common/abilities/custom/claysteed/basic.ron
Normal file
18
assets/common/abilities/custom/claysteed/basic.ron
Normal file
@ -0,0 +1,18 @@
|
||||
BasicMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 0.50,
|
||||
swing_duration: 0.6,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 0.85,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage:20.0,
|
||||
poise: 28.0,
|
||||
knockback: 15.0,
|
||||
energy_regen: 0.0,
|
||||
),
|
||||
range: 0.8,
|
||||
angle: 50.0,
|
||||
),
|
||||
ori_modifier: 1.0,
|
||||
)
|
18
assets/common/abilities/custom/claysteed/shockwave.ron
Normal file
18
assets/common/abilities/custom/claysteed/shockwave.ron
Normal file
@ -0,0 +1,18 @@
|
||||
Shockwave(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 1.0,
|
||||
swing_duration: 0.12,
|
||||
recover_duration: 2.0,
|
||||
damage: 30.0,
|
||||
poise_damage: 20,
|
||||
knockback: (strength: 20.0, direction: TowardsUp),
|
||||
shockwave_angle: 360.0,
|
||||
shockwave_vertical_angle: 90.0,
|
||||
shockwave_speed: 25.0,
|
||||
shockwave_duration: 2.0,
|
||||
dodgeable: Jump,
|
||||
move_efficiency: 0.0,
|
||||
damage_kind: Crushing,
|
||||
specifier: Ground,
|
||||
ori_rate: 1.0,
|
||||
)
|
@ -15,5 +15,5 @@ BasicBeam(
|
||||
energy_regen: 0,
|
||||
energy_drain: 0,
|
||||
ori_rate: 0.07,
|
||||
specifier: ClayGolem,
|
||||
specifier: Gravewarden,
|
||||
)
|
26
assets/common/abilities/custom/gravewarden/strike.ron
Normal file
26
assets/common/abilities/custom/gravewarden/strike.ron
Normal file
@ -0,0 +1,26 @@
|
||||
ComboMelee2(
|
||||
strikes: [
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 30,
|
||||
poise: 50,
|
||||
knockback: 10.0,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 4.0,
|
||||
angle: 45.0,
|
||||
),
|
||||
buildup_duration: 1.2,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 1.0,
|
||||
movement: (
|
||||
swing: Some(Forward(0.5)),
|
||||
),
|
||||
ori_modifier: 1.0,
|
||||
),
|
||||
],
|
||||
energy_cost_per_strike: 0,
|
||||
auto_progress: true,
|
||||
)
|
@ -1,6 +1,6 @@
|
||||
BasicMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 1.15,
|
||||
buildup_duration: 0.55,
|
||||
swing_duration: 0.3,
|
||||
hit_timing: 0.4,
|
||||
recover_duration: 0.85,
|
||||
|
16
assets/common/abilities/haniwa/archer/arrow.ron
Normal file
16
assets/common/abilities/haniwa/archer/arrow.ron
Normal file
@ -0,0 +1,16 @@
|
||||
BasicRanged(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 1.3,
|
||||
recover_duration: 1.2,
|
||||
projectile: Arrow(
|
||||
damage: 25,
|
||||
knockback: 8.0,
|
||||
energy_regen: 0,
|
||||
),
|
||||
projectile_body: Object(ArrowClay),
|
||||
projectile_light: None,
|
||||
projectile_speed: 75.0,
|
||||
num_projectiles: 1,
|
||||
projectile_spread: 0.0,
|
||||
move_efficiency: 0.2,
|
||||
)
|
17
assets/common/abilities/haniwa/archer/explosive.ron
Normal file
17
assets/common/abilities/haniwa/archer/explosive.ron
Normal file
@ -0,0 +1,17 @@
|
||||
BasicRanged(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 2.4,
|
||||
recover_duration: 0.6,
|
||||
projectile: ClayRocket(
|
||||
damage: 30,
|
||||
knockback: 10.0,
|
||||
radius: 5.0,
|
||||
min_falloff: 0.75,
|
||||
),
|
||||
projectile_body: Object(GrenadeClay),
|
||||
projectile_light: None,
|
||||
projectile_speed: 50.0,
|
||||
num_projectiles: 1,
|
||||
projectile_spread: 0.0,
|
||||
move_efficiency: 0.5,
|
||||
)
|
18
assets/common/abilities/haniwa/archer/kick.ron
Normal file
18
assets/common/abilities/haniwa/archer/kick.ron
Normal file
@ -0,0 +1,18 @@
|
||||
BasicMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 0.4,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.5,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 20,
|
||||
poise: 20,
|
||||
knockback: 25,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.0,
|
||||
angle: 90.0,
|
||||
),
|
||||
ori_modifier: 1.0,
|
||||
)
|
25
assets/common/abilities/haniwa/guard/backpedal.ron
Normal file
25
assets/common/abilities/haniwa/guard/backpedal.ron
Normal file
@ -0,0 +1,25 @@
|
||||
ComboMelee2(
|
||||
strikes: [
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Stab(
|
||||
damage: 20,
|
||||
poise: 10,
|
||||
knockback: 10,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 4.0,
|
||||
angle: 10.0,
|
||||
),
|
||||
buildup_duration: 0.2,
|
||||
swing_duration: 0.2,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.8,
|
||||
movement: (
|
||||
recover: Some(Reverse(1.5)),
|
||||
),
|
||||
ori_modifier: 1.0,
|
||||
),
|
||||
],
|
||||
energy_cost_per_strike: 0,
|
||||
)
|
19
assets/common/abilities/haniwa/guard/flurry.ron
Normal file
19
assets/common/abilities/haniwa/guard/flurry.ron
Normal file
@ -0,0 +1,19 @@
|
||||
RapidMelee(
|
||||
buildup_duration: 0.5,
|
||||
swing_duration: 0.3,
|
||||
recover_duration: 0.5,
|
||||
melee_constructor: (
|
||||
kind: Stab(
|
||||
damage: 10,
|
||||
poise: 5,
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 4.0,
|
||||
angle: 10.0,
|
||||
),
|
||||
energy_cost: 0,
|
||||
max_strikes: Some(5),
|
||||
move_modifier: 0.7,
|
||||
ori_modifier: 0.7,
|
||||
)
|
18
assets/common/abilities/haniwa/guard/strike.ron
Normal file
18
assets/common/abilities/haniwa/guard/strike.ron
Normal file
@ -0,0 +1,18 @@
|
||||
BasicMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 1.0,
|
||||
swing_duration: 0.2,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.8,
|
||||
melee_constructor: (
|
||||
kind: Stab(
|
||||
damage: 30,
|
||||
poise: 15,
|
||||
knockback: 5,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 4.0,
|
||||
angle: 10.0,
|
||||
),
|
||||
ori_modifier: 1.0,
|
||||
)
|
21
assets/common/abilities/haniwa/soldier/guard.ron
Normal file
21
assets/common/abilities/haniwa/soldier/guard.ron
Normal file
@ -0,0 +1,21 @@
|
||||
BasicBlock(
|
||||
buildup_duration: 0.25,
|
||||
recover_duration: 0.25,
|
||||
max_angle: 90.0,
|
||||
block_strength: 0.5,
|
||||
parry_window: (
|
||||
buildup: false,
|
||||
recover: false,
|
||||
),
|
||||
energy_cost: 0,
|
||||
energy_regen: 0,
|
||||
can_hold: true,
|
||||
blocked_attacks: (
|
||||
melee: true,
|
||||
projectiles: true,
|
||||
beams: true,
|
||||
ground_shockwaves: false,
|
||||
air_shockwaves: true,
|
||||
explosions: true,
|
||||
),
|
||||
)
|
16
assets/common/abilities/haniwa/soldier/riposte.ron
Normal file
16
assets/common/abilities/haniwa/soldier/riposte.ron
Normal file
@ -0,0 +1,16 @@
|
||||
RiposteMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 0.7,
|
||||
swing_duration: 0.3,
|
||||
recover_duration: 0.2,
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 30,
|
||||
poise: 60,
|
||||
knockback: 15,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 4.0,
|
||||
angle: 60.0,
|
||||
),
|
||||
)
|
18
assets/common/abilities/haniwa/soldier/strike.ron
Normal file
18
assets/common/abilities/haniwa/soldier/strike.ron
Normal file
@ -0,0 +1,18 @@
|
||||
BasicMelee(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 0.8,
|
||||
swing_duration: 0.2,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.6,
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 40,
|
||||
poise: 40,
|
||||
knockback: 10,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 4.0,
|
||||
angle: 45.0,
|
||||
),
|
||||
ori_modifier: 1.0,
|
||||
)
|
4
assets/common/abilities/music/shamisen.ron
Normal file
4
assets/common/abilities/music/shamisen.ron
Normal file
@ -0,0 +1,4 @@
|
||||
Music(
|
||||
play_duration: 0.4,
|
||||
ori_modifier: 1.0,
|
||||
)
|
4
assets/common/abilities/music/steeldrum.ron
Normal file
4
assets/common/abilities/music/steeldrum.ron
Normal file
@ -0,0 +1,4 @@
|
||||
Music(
|
||||
play_duration: 0.4,
|
||||
ori_modifier: 1.0,
|
||||
)
|
11
assets/common/entity/dungeon/haniwa/ancienteffigy.ron
Normal file
11
assets/common/entity/dungeon/haniwa/ancienteffigy.ron
Normal file
@ -0,0 +1,11 @@
|
||||
#![enable(implicit_some)]
|
||||
(
|
||||
name: Name("Ancient Effigy"),
|
||||
body: RandomWith("ancienteffigy"),
|
||||
alignment: Alignment(Enemy),
|
||||
loot: LootTable("common.loot_tables.dungeon.haniwa.enemy"),
|
||||
inventory: (
|
||||
loadout: FromBody,
|
||||
),
|
||||
meta: [],
|
||||
)
|
@ -1,11 +0,0 @@
|
||||
#![enable(implicit_some)]
|
||||
(
|
||||
name: Name("Bonerattler"),
|
||||
body: RandomWith("bonerattler"),
|
||||
alignment: Alignment(Enemy),
|
||||
loot: LootTable("common.loot_tables.creature.quad_medium.carapace"),
|
||||
inventory: (
|
||||
loadout: FromBody,
|
||||
),
|
||||
meta: [],
|
||||
)
|
@ -3,7 +3,7 @@
|
||||
name: Name("Clay Golem"),
|
||||
body: RandomWith("claygolem"),
|
||||
alignment: Alignment(Enemy),
|
||||
loot: LootTable("common.loot_tables.dungeon.haniwa.claygolem"),
|
||||
loot: LootTable("common.loot_tables.dungeon.haniwa.enemy"),
|
||||
inventory: (
|
||||
loadout: FromBody,
|
||||
),
|
||||
|
11
assets/common/entity/dungeon/haniwa/claysteed.ron
Normal file
11
assets/common/entity/dungeon/haniwa/claysteed.ron
Normal file
@ -0,0 +1,11 @@
|
||||
#![enable(implicit_some)]
|
||||
(
|
||||
name: Automatic,
|
||||
body: RandomWith("claysteed"),
|
||||
alignment: Alignment(Enemy),
|
||||
loot: LootTable("common.loot_tables.dungeon.haniwa.enemy"),
|
||||
inventory: (
|
||||
loadout: FromBody,
|
||||
),
|
||||
meta: [],
|
||||
)
|
11
assets/common/entity/dungeon/haniwa/general.ron
Normal file
11
assets/common/entity/dungeon/haniwa/general.ron
Normal file
@ -0,0 +1,11 @@
|
||||
#![enable(implicit_some)]
|
||||
(
|
||||
name: Automatic,
|
||||
body: RandomWith("haniwa_general"),
|
||||
alignment: Alignment(Enemy),
|
||||
loot: LootTable("common.loot_tables.dungeon.haniwa.enemy"),
|
||||
inventory: (
|
||||
loadout: FromBody,
|
||||
),
|
||||
meta: [],
|
||||
)
|
11
assets/common/entity/dungeon/haniwa/gravewarden.ron
Normal file
11
assets/common/entity/dungeon/haniwa/gravewarden.ron
Normal file
@ -0,0 +1,11 @@
|
||||
#![enable(implicit_some)]
|
||||
(
|
||||
name: Name("Gravewarden"),
|
||||
body: RandomWith("gravewarden"),
|
||||
alignment: Alignment(Enemy),
|
||||
loot: LootTable("common.loot_tables.dungeon.haniwa.gravewarden"),
|
||||
inventory: (
|
||||
loadout: FromBody,
|
||||
),
|
||||
meta: [],
|
||||
)
|
@ -36,6 +36,12 @@
|
||||
Simple(
|
||||
"common.items.npc_armor.golem.woodgolem",
|
||||
): "common-items-npc_armor-golem-woodgolem",
|
||||
Simple(
|
||||
"common.items.npc_armor.golem.ancienteffigy",
|
||||
): "common-items-npc_armor-golem-ancienteffigy",
|
||||
Simple(
|
||||
"common.items.npc_armor.golem.gravewarden",
|
||||
): "common-items-npc_armor-golem-gravewarden",
|
||||
Simple(
|
||||
"common.items.npc_armor.biped_small.myrmidon.foot.hoplite",
|
||||
): "common-items-npc_armor-biped_small-myrmidon-foot-hoplite",
|
||||
@ -519,6 +525,9 @@
|
||||
Simple(
|
||||
"common.items.npc_armor.quadruped_medium.roshwalr",
|
||||
): "common-items-npc_armor-quadruped_medium-roshwalr",
|
||||
Simple(
|
||||
"common.items.npc_armor.quadruped_medium.claysteed",
|
||||
): "common-items-npc_armor-quadruped_medium-claysteed",
|
||||
Simple(
|
||||
"common.items.npc_armor.theropod.rugged",
|
||||
): "common-items-npc_armor-theropod-rugged",
|
||||
@ -564,9 +573,15 @@
|
||||
Simple(
|
||||
"common.items.npc_armor.biped_large.yeti",
|
||||
): "common-items-npc_armor-biped_large-yeti",
|
||||
Simple(
|
||||
"common.items.npc_armor.biped_large.haniwageneral",
|
||||
): "common-items-npc_armor-biped_large-haniwageneral",
|
||||
Simple(
|
||||
"common.items.keys.bone_key",
|
||||
): "object-key_bone",
|
||||
Simple(
|
||||
"common.items.keys.haniwa_key",
|
||||
): "object-key_haniwa",
|
||||
Simple(
|
||||
"common.items.keys.glass_key",
|
||||
): "object-key_glass",
|
||||
@ -2249,6 +2264,12 @@
|
||||
Simple(
|
||||
"common.items.tool.instruments.wildskin_drum",
|
||||
): "weapon-tool-wildskin_drum",
|
||||
Simple(
|
||||
"common.items.tool.instruments.steeldrum",
|
||||
): "weapon-tool-steeldrum",
|
||||
Simple(
|
||||
"common.items.tool.instruments.shamisen",
|
||||
): "weapon-tool-shamisen",
|
||||
Simple(
|
||||
"common.items.log.bamboo",
|
||||
): "sprite-wood-item-bamboo",
|
||||
@ -2379,6 +2400,9 @@
|
||||
Simple(
|
||||
"common.items.npc_weapons.sword.saurok_sword",
|
||||
): "common-items-npc_weapons-sword-saurok_sword",
|
||||
Simple(
|
||||
"common.items.npc_weapons.sword.haniwa_general_sword",
|
||||
): "common-items-npc_weapons-sword-haniwa_general_sword",
|
||||
Simple(
|
||||
"common.items.npc_weapons.unique.akhlut",
|
||||
): "common-items-npc_weapons-unique-akhlut",
|
||||
@ -2571,6 +2595,15 @@
|
||||
Simple(
|
||||
"common.items.npc_weapons.unique.wood_golem_fist",
|
||||
): "common-items-npc_weapons-unique-wood_golem_fist",
|
||||
Simple(
|
||||
"common.items.npc_weapons.unique.ancient_effigy_eyes",
|
||||
): "common-items-npc_weapons-unique-ancient_effigy_eyes",
|
||||
Simple(
|
||||
"common.items.npc_weapons.unique.claysteed",
|
||||
): "common-items-npc_weapons-unique-claysteed",
|
||||
Simple(
|
||||
"common.items.npc_weapons.unique.gravewarden_fist",
|
||||
): "common-items-npc_weapons-unique-gravewarden_fist",
|
||||
Simple(
|
||||
"common.items.npc_weapons.unique.arthropods.antlion",
|
||||
): "common-items-npc_weapons-unique-arthropods-antlion",
|
||||
|
11
assets/common/items/keys/haniwa_key.ron
Normal file
11
assets/common/items/keys/haniwa_key.ron
Normal file
@ -0,0 +1,11 @@
|
||||
ItemDef(
|
||||
legacy_name: "Haniwa Keystone",
|
||||
legacy_description: "Used to open doors. Will break after use.",
|
||||
kind: Utility(
|
||||
kind: Key,
|
||||
),
|
||||
amount: 1,
|
||||
quality: Common,
|
||||
tags: [Utility],
|
||||
)
|
||||
|
13
assets/common/items/npc_armor/biped_large/haniwageneral.ron
Normal file
13
assets/common/items/npc_armor/biped_large/haniwageneral.ron
Normal file
@ -0,0 +1,13 @@
|
||||
ItemDef(
|
||||
legacy_name: "Haniwa General Armor",
|
||||
legacy_description: "Worn by haniwa general.",
|
||||
kind: Armor((
|
||||
kind: Chest,
|
||||
stats: Direct((
|
||||
protection: Some(Normal(80.0)),
|
||||
poise_resilience: Some(Normal(30.0)),
|
||||
)),
|
||||
)),
|
||||
quality: Epic,
|
||||
tags: [],
|
||||
)
|
13
assets/common/items/npc_armor/golem/ancienteffigy.ron
Normal file
13
assets/common/items/npc_armor/golem/ancienteffigy.ron
Normal file
@ -0,0 +1,13 @@
|
||||
ItemDef(
|
||||
legacy_name: "Ancient Effigy Armor",
|
||||
legacy_description: "Worn by ancient effigy.",
|
||||
kind: Armor((
|
||||
kind: Chest,
|
||||
stats: Direct((
|
||||
protection: Some(Normal(100.0)),
|
||||
poise_resilience: Some(Normal(1.0)),
|
||||
)),
|
||||
)),
|
||||
quality: Legendary,
|
||||
tags: [],
|
||||
)
|
@ -4,7 +4,7 @@ ItemDef(
|
||||
kind: Armor((
|
||||
kind: Chest,
|
||||
stats: Direct((
|
||||
protection: Some(Normal(180.0)),
|
||||
protection: Some(Normal(100.0)),
|
||||
poise_resilience: Some(Normal(1.0)),
|
||||
)),
|
||||
)),
|
||||
|
13
assets/common/items/npc_armor/golem/gravewarden.ron
Normal file
13
assets/common/items/npc_armor/golem/gravewarden.ron
Normal file
@ -0,0 +1,13 @@
|
||||
ItemDef(
|
||||
legacy_name: "Grave Warden Armor",
|
||||
legacy_description: "Worn by grave warden.",
|
||||
kind: Armor((
|
||||
kind: Chest,
|
||||
stats: Direct((
|
||||
protection: Some(Normal(180.0)),
|
||||
poise_resilience: Some(Normal(1.0)),
|
||||
)),
|
||||
)),
|
||||
quality: Legendary,
|
||||
tags: [],
|
||||
)
|
13
assets/common/items/npc_armor/quadruped_medium/claysteed.ron
Normal file
13
assets/common/items/npc_armor/quadruped_medium/claysteed.ron
Normal file
@ -0,0 +1,13 @@
|
||||
ItemDef(
|
||||
legacy_name: "Clay Steed's Thick Fur",
|
||||
legacy_description: "testing123",
|
||||
kind: Armor((
|
||||
kind: Chest,
|
||||
stats: Direct((
|
||||
protection: Some(Normal(40.0)),
|
||||
poise_resilience: Some(Normal(1.0)),
|
||||
)),
|
||||
)),
|
||||
quality: Common,
|
||||
tags: [],
|
||||
)
|
@ -6,9 +6,9 @@ ItemDef(
|
||||
hands: Two,
|
||||
stats: (
|
||||
equip_time_secs: 0.0,
|
||||
power: 1.6,
|
||||
effect_power: 0.8,
|
||||
speed: 0.7,
|
||||
power: 1.0,
|
||||
effect_power: 1.0,
|
||||
speed: 1.0,
|
||||
range: 1.0,
|
||||
energy_efficiency: 1.0,
|
||||
buff_strength: 1.0,
|
||||
@ -16,5 +16,5 @@ ItemDef(
|
||||
)),
|
||||
quality: Moderate,
|
||||
tags: [],
|
||||
ability_spec: Some(Custom("Bow Simple")),
|
||||
ability_spec: Some(Custom("Haniwa Archer")),
|
||||
)
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
hands: Two,
|
||||
stats: (
|
||||
equip_time_secs: 0.0,
|
||||
power: 1.6,
|
||||
power: 1.0,
|
||||
effect_power: 1.0,
|
||||
speed: 1.0,
|
||||
range: 1.0,
|
||||
@ -16,5 +16,5 @@ ItemDef(
|
||||
)),
|
||||
quality: Low,
|
||||
tags: [],
|
||||
ability_spec: None,
|
||||
ability_spec: Some(Custom("Haniwa Guard")),
|
||||
)
|
@ -2,13 +2,13 @@ ItemDef(
|
||||
legacy_name: "Soldier Sword",
|
||||
legacy_description: "",
|
||||
kind: Tool((
|
||||
kind: Dagger,
|
||||
kind: Sword,
|
||||
hands: Two,
|
||||
stats: (
|
||||
equip_time_secs: 0.0,
|
||||
power: 1.6,
|
||||
effect_power: 0.8,
|
||||
speed: 0.8,
|
||||
power: 1.0,
|
||||
effect_power: 1.0,
|
||||
speed: 1.0,
|
||||
range: 1.0,
|
||||
energy_efficiency: 1.0,
|
||||
buff_strength: 1.0,
|
||||
@ -16,5 +16,5 @@ ItemDef(
|
||||
)),
|
||||
quality: Low,
|
||||
tags: [],
|
||||
ability_spec: Some(Custom("Dagger Simple")),
|
||||
ability_spec: Some(Custom("Haniwa Soldier")),
|
||||
)
|
@ -0,0 +1,20 @@
|
||||
ItemDef(
|
||||
legacy_name: "Haniwa General Sword",
|
||||
legacy_description: "Placeholder",
|
||||
kind: Tool((
|
||||
kind: Sword,
|
||||
hands: One,
|
||||
stats: (
|
||||
equip_time_secs: 0.5,
|
||||
power: 1.5,
|
||||
effect_power: 1.0,
|
||||
speed: 0.75,
|
||||
range: 1.0,
|
||||
energy_efficiency: 1.0,
|
||||
buff_strength: 1.0,
|
||||
),
|
||||
)),
|
||||
quality: Low,
|
||||
tags: [],
|
||||
ability_spec: Some(Custom("Sword Simple")),
|
||||
)
|
@ -0,0 +1,20 @@
|
||||
ItemDef(
|
||||
legacy_name: "Ancient Effigy Eyes",
|
||||
legacy_description: "Yeet.",
|
||||
kind: Tool((
|
||||
kind: Natural,
|
||||
hands: Two,
|
||||
stats: (
|
||||
equip_time_secs: 0.001,
|
||||
power: 1.0,
|
||||
effect_power: 1.0,
|
||||
speed: 1.0,
|
||||
range: 1.0,
|
||||
energy_efficiency: 1.0,
|
||||
buff_strength: 1.0,
|
||||
),
|
||||
)),
|
||||
quality: Low,
|
||||
tags: [],
|
||||
ability_spec: Some(Custom("Ancient Effigy")),
|
||||
)
|
20
assets/common/items/npc_weapons/unique/claysteed.ron
Normal file
20
assets/common/items/npc_weapons/unique/claysteed.ron
Normal file
@ -0,0 +1,20 @@
|
||||
ItemDef(
|
||||
legacy_name: "ClaySteed",
|
||||
legacy_description: "testing123",
|
||||
kind: Tool((
|
||||
kind: Natural,
|
||||
hands: Two,
|
||||
stats: (
|
||||
equip_time_secs: 0.01,
|
||||
power: 1.0,
|
||||
effect_power: 1.0,
|
||||
speed: 1.0,
|
||||
range: 1.0,
|
||||
energy_efficiency: 1.0,
|
||||
buff_strength: 1.0,
|
||||
),
|
||||
)),
|
||||
quality: Low,
|
||||
tags: [],
|
||||
ability_spec: Some(Custom("ClaySteed")),
|
||||
)
|
20
assets/common/items/npc_weapons/unique/gravewarden_fist.ron
Normal file
20
assets/common/items/npc_weapons/unique/gravewarden_fist.ron
Normal file
@ -0,0 +1,20 @@
|
||||
ItemDef(
|
||||
legacy_name: "Grave Warden Fists",
|
||||
legacy_description: "Yeet.",
|
||||
kind: Tool((
|
||||
kind: Natural,
|
||||
hands: Two,
|
||||
stats: (
|
||||
equip_time_secs: 0.001,
|
||||
power: 1.0,
|
||||
effect_power: 1.0,
|
||||
speed: 1.0,
|
||||
range: 1.0,
|
||||
energy_efficiency: 1.0,
|
||||
buff_strength: 1.0,
|
||||
),
|
||||
)),
|
||||
quality: Low,
|
||||
tags: [],
|
||||
ability_spec: Some(Custom("Grave Warden")),
|
||||
)
|
21
assets/common/items/tool/instruments/shamisen.ron
Normal file
21
assets/common/items/tool/instruments/shamisen.ron
Normal file
@ -0,0 +1,21 @@
|
||||
ItemDef(
|
||||
legacy_name: "Shamisen",
|
||||
legacy_description: "Shamisen.",
|
||||
kind: Tool((
|
||||
kind: Instrument,
|
||||
hands: Two,
|
||||
stats: (
|
||||
equip_time_secs: 0.4,
|
||||
power: 0.0,
|
||||
effect_power: 1.0,
|
||||
speed: 1.0,
|
||||
crit_chance: 0.0,
|
||||
range: 0.0,
|
||||
energy_efficiency: 1.0,
|
||||
buff_strength: 1.0,
|
||||
),
|
||||
)),
|
||||
quality: Legendary,
|
||||
tags: [Utility],
|
||||
ability_spec: Some(Custom("Shamisen")),
|
||||
)
|
21
assets/common/items/tool/instruments/steeldrum.ron
Normal file
21
assets/common/items/tool/instruments/steeldrum.ron
Normal file
@ -0,0 +1,21 @@
|
||||
ItemDef(
|
||||
legacy_name: "Steeldrum",
|
||||
legacy_description: "Steeldrum.",
|
||||
kind: Tool((
|
||||
kind: Instrument,
|
||||
hands: Two,
|
||||
stats: (
|
||||
equip_time_secs: 0.4,
|
||||
power: 0.0,
|
||||
effect_power: 1.0,
|
||||
speed: 1.0,
|
||||
crit_chance: 0.0,
|
||||
range: 0.0,
|
||||
energy_efficiency: 1.0,
|
||||
buff_strength: 1.0,
|
||||
),
|
||||
)),
|
||||
quality: Legendary,
|
||||
tags: [Utility],
|
||||
ability_spec: Some(Custom("Steeldrum")),
|
||||
)
|
@ -5,4 +5,5 @@
|
||||
(3.0, LootTable("common.loot_tables.armor.tier-4")),
|
||||
// Misc
|
||||
(2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
|
||||
(0.2, Item("common.items.tool.instruments.shamisen")),
|
||||
]
|
3
assets/common/loot_tables/dungeon/haniwa/key.ron
Normal file
3
assets/common/loot_tables/dungeon/haniwa/key.ron
Normal file
@ -0,0 +1,3 @@
|
||||
[
|
||||
(1.0, Item("common.items.keys.haniwa_key")),
|
||||
]
|
@ -571,6 +571,10 @@
|
||||
keyword: "bristleback",
|
||||
generic: "Bristleback"
|
||||
),
|
||||
claysteed: (
|
||||
keyword: "claysteed",
|
||||
generic: "Clay Steed"
|
||||
),
|
||||
)
|
||||
),
|
||||
quadruped_small: (
|
||||
@ -981,6 +985,10 @@
|
||||
sea_bishop: (
|
||||
keyword: "sea_bishop",
|
||||
generic: "Sea Bishop"
|
||||
),
|
||||
haniwa_general: (
|
||||
keyword: "haniwa_general",
|
||||
generic: "Haniwa General"
|
||||
)
|
||||
)
|
||||
),
|
||||
@ -994,7 +1002,7 @@
|
||||
species: (
|
||||
stonegolem: (
|
||||
keyword: "stonegolem",
|
||||
generic: "StoneGolem"
|
||||
generic: "Stone Golem"
|
||||
),
|
||||
treant: (
|
||||
keyword: "treant",
|
||||
@ -1004,13 +1012,21 @@
|
||||
keyword: "woodgolem",
|
||||
generic: "Wooden Golem"
|
||||
),
|
||||
gravewarden: (
|
||||
keyword: "gravewarden",
|
||||
generic: "Gravewarden"
|
||||
),
|
||||
claygolem: (
|
||||
keyword: "claygolem",
|
||||
generic: "ClayGolem"
|
||||
generic: "Clay Golem"
|
||||
),
|
||||
ancienteffigy: (
|
||||
keyword: "ancienteffigy",
|
||||
generic: "Ancient Effigy"
|
||||
),
|
||||
coralgolem: (
|
||||
keyword: "coralgolem",
|
||||
generic: "CoralGolem"
|
||||
generic: "Coral Golem"
|
||||
)
|
||||
)
|
||||
),
|
||||
|
@ -412,5 +412,7 @@
|
||||
(Item("common.items.tool.instruments.sitar"),1),
|
||||
(Item("common.items.tool.instruments.washboard"),1),
|
||||
(Item("common.items.tool.instruments.wildskin_drum"),1),
|
||||
(Item("common.items.tool.instruments.steeldrum"),1),
|
||||
(Item("common.items.tool.instruments.shamisen"),1),
|
||||
],
|
||||
})
|
||||
|
@ -760,6 +760,50 @@
|
||||
threshold: 0.5,
|
||||
subtitle: "subtitle-instrument_lute",
|
||||
),
|
||||
Music(Instrument, Custom("Steeldrum")): (
|
||||
files: [
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_eg",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_ec1g",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_e",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_d1c1",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_d1",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_d",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_ce",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_c1ag",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_c1ae",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_c1",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_c",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_ac1",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_a",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_c1c1",
|
||||
"voxygen.audio.sfx.instrument.steeldrum.steeldrum_g",
|
||||
],
|
||||
threshold: 0.5,
|
||||
subtitle: "subtitle-instrument_steeldrum",
|
||||
),
|
||||
Music(Instrument, Custom("Shamisen")): (
|
||||
files: [
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_a",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_aec1",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_c",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_c1",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_c1c1a",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_cc",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_cdc1",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_cea",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_ceg",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_cge",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_d",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_dac",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_e",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_ea",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_eac1c",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_g",
|
||||
"voxygen.audio.sfx.instrument.shamisen.shamisen_gg",
|
||||
],
|
||||
threshold: 0.5,
|
||||
subtitle: "subtitle-instrument_shamisen",
|
||||
),
|
||||
Music(Instrument, Custom("Sitar")): (
|
||||
files: [
|
||||
"voxygen.audio.sfx.instrument.sitar.sitar_c",
|
||||
@ -1412,6 +1456,13 @@
|
||||
threshold: 0.3,
|
||||
subtitle: "subtitle-attack-cyclops_charge",
|
||||
),
|
||||
FuseCharge: (
|
||||
files: [
|
||||
"voxygen.audio.sfx.abilities.fuse",
|
||||
],
|
||||
threshold: 0.2,
|
||||
subtitle: "subtitle-attack-fuse_charge",
|
||||
),
|
||||
GigaRoar: (
|
||||
files: [
|
||||
"voxygen.audio.sfx.abilities.gigas_frost_roar",
|
||||
|
BIN
assets/voxygen/audio/sfx/abilities/fuse.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/abilities/fuse.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_a.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_a.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_aec1.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_aec1.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_c.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_c.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_c1.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_c1.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_c1c1a.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_c1c1a.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_cc.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_cc.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_cdc1.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_cdc1.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_cea.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_cea.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_ceg.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_ceg.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_cge.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_cge.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_d.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_d.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_dac.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_dac.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_e.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_e.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_ea.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_ea.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_eac1c.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_eac1c.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_g.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_g.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_gg.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/shamisen/shamisen_gg.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_a.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_a.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_ac1.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_ac1.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_c.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_c.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_c1.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_c1.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_c1ae.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_c1ae.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_c1ag.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_c1ag.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_c1c1.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_c1c1.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_ce.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_ce.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_d.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_d.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_d1.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_d1.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_d1c1.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_d1c1.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_e.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_e.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_ec1g.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_ec1g.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_eg.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_eg.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_g.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/instrument/steeldrum/steeldrum_g.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/ui/map/buttons/haniwa.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/ui/map/buttons/haniwa.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/ui/map/buttons/haniwa_bg.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/ui/map/buttons/haniwa_bg.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/ui/map/buttons/haniwa_hover.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/ui/map/buttons/haniwa_hover.png
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -35,4 +35,5 @@ hud-map-zoom_minimap_explanation =
|
||||
hud-map-gnarling = Gnarling Fortification
|
||||
hud-map-chapel_site = Sea Chapel
|
||||
hud-map-adlet = Adlet Stronghold
|
||||
hud-map-haniwa = Haniwa Catacomb
|
||||
hud-map-placed_by = Placed by { $name }
|
@ -78,6 +78,8 @@ subtitle-instrument_icy_talharpa = Icy Talharpa playing
|
||||
subtitle-instrument_kalimba = Kalimba playing
|
||||
subtitle-instrument_melodica = Melodica playing
|
||||
subtitle-instrument_lute = Lute playing
|
||||
subtitle-instrument_steeldrum = Steeldrum playing
|
||||
subtitle-instrument_shamisen = Shamisen playing
|
||||
subtitle-instrument_sitar = Sitar playing
|
||||
subtitle-instrument_guitar = Guitar playing
|
||||
subtitle-instrument_dark_guitar = Dark Guitar playing
|
||||
@ -104,6 +106,7 @@ subtitle-knocked_down = Knocked down
|
||||
subtitle-attack-ground_slam = Ground slam
|
||||
subtitle-attack-laser_beam = Laser beam
|
||||
subtitle-attack-cyclops_charge = Cyclops charge
|
||||
subtitle-attack-fuse_charge = Fuse sizzling
|
||||
subtitle-giga_roar = Frost gigas roar
|
||||
subtitle-deep_laugh = Deep Laugh
|
||||
subtitle-attack-flash_freeze = Flash freeze
|
||||
|
@ -48,6 +48,12 @@ common-items-npc_armor-golem-claygolem = Clay Golem Armor
|
||||
common-items-npc_armor-golem-woodgolem = Wood Golem Armor
|
||||
.desc = Yeet
|
||||
|
||||
common-items-npc_armor-golem-ancienteffigy = Ancient Effigy Armor
|
||||
.desc = Worn by ancient effigy.
|
||||
|
||||
common-items-npc_armor-golem-gravewarden = Grave Warden Armor
|
||||
.desc = Worn by grave warden.
|
||||
|
||||
common-items-npc_armor-biped_small-myrmidon-foot-hoplite = Myrmidon Hoplite
|
||||
.desc = Ceremonial attire used by members..
|
||||
|
||||
@ -528,6 +534,9 @@ common-items-npc_armor-quadruped_medium-frostfang = Frostfang's Thick Skin
|
||||
common-items-npc_armor-quadruped_medium-roshwalr = Roshwalr's Thick Skin
|
||||
.desc = testing123
|
||||
|
||||
common-items-npc_armor-quadruped_medium-claysteed = Claysteeds's Thick Skin
|
||||
.desc = testing123
|
||||
|
||||
common-items-npc_armor-theropod-rugged = Theropod Rugged
|
||||
.desc = stronk.
|
||||
|
||||
@ -567,6 +576,9 @@ common-items-npc_armor-biped_large-warlord = Giant Warlord Chest
|
||||
common-items-npc_armor-biped_large-yeti = Yeti Hide
|
||||
.desc = Strong as Yeti itself.
|
||||
|
||||
common-items-npc_armor-biped_large-haniwageneral = Haniwa General Uniform
|
||||
.desc = Has seen combat.
|
||||
|
||||
common-items-weapons-empty-empty = Empty Item
|
||||
.desc = This item may grant abilities, but is invisible
|
||||
|
||||
@ -837,6 +849,9 @@ common-items-npc_weapons-sword-pickaxe_velorite_sword = Velorite Pickaxe
|
||||
common-items-npc_weapons-sword-saurok_sword = Saurok Sword
|
||||
.desc = Placeholder
|
||||
|
||||
common-items-npc_weapons-sword-haniwa_general_sword = Haniwa General Sword
|
||||
.desc = Placeholder
|
||||
|
||||
common-items-npc_weapons-unique-akhlut = Quad Med Basic
|
||||
.desc = testing123
|
||||
|
||||
@ -1029,6 +1044,15 @@ common-items-npc_weapons-unique-wendigo_magic = Wendigo Magic
|
||||
common-items-npc_weapons-unique-wood_golem_fist = Wood Golem Fists
|
||||
.desc = Yeet
|
||||
|
||||
common-items-npc_weapons-unique-ancient_effigy_eyes = Ancient Effigy Eyes
|
||||
.desc = testing123
|
||||
|
||||
common-items-npc_weapons-unique-claysteed = Claysteed Hoof
|
||||
.desc = testing123
|
||||
|
||||
common-items-npc_weapons-unique-gravewarden_fist = Gravewarden Fist
|
||||
.desc = testing123
|
||||
|
||||
common-items-npc_weapons-unique-arthropods-antlion = Antlion
|
||||
.desc = testing123
|
||||
|
||||
|
@ -15,6 +15,9 @@
|
||||
object-key_bone = Bone Key
|
||||
.desc = Used to open bone locks. Will break after use.
|
||||
|
||||
object-key_haniwa = Haniwa Keystone
|
||||
.desc = Used to open doors. Will break after use.
|
||||
|
||||
object-key_glass = Glass Key
|
||||
.desc = Used to open Glass Barriers. Will break after use.
|
||||
|
||||
|
@ -207,6 +207,12 @@ weapon-tool-melodica = Melodica
|
||||
weapon-tool-wooden_sitar = Sitar
|
||||
.desc = Wooden Sitar.
|
||||
|
||||
weapon-tool-steeldrum = Steeldrum
|
||||
.desc = Steeldrum.
|
||||
|
||||
weapon-tool-shamisen = Shamisen
|
||||
.desc = Shamisen.
|
||||
|
||||
weapon-tool-washboard = Washboard
|
||||
.desc = Washboard.
|
||||
|
||||
|
@ -1662,6 +1662,14 @@
|
||||
"voxel.weapon.tool.wooden_lute",
|
||||
(0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.0,
|
||||
),
|
||||
Simple("common.items.tool.instruments.steeldrum"): VoxTrans(
|
||||
"voxel.weapon.tool.steeldrum",
|
||||
(0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.0,
|
||||
),
|
||||
Simple("common.items.tool.instruments.shamisen"): VoxTrans(
|
||||
"voxel.weapon.tool.shamisen",
|
||||
(0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.0,
|
||||
),
|
||||
Simple("common.items.tool.instruments.guitar"): VoxTrans(
|
||||
"voxel.weapon.tool.wooden_guitar",
|
||||
(0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.1,
|
||||
@ -4930,6 +4938,10 @@
|
||||
"voxel.object.key_bone",
|
||||
(0.0, 0.0, 0.0), (-100.0, 250.0, 15.0), 1.0,
|
||||
),
|
||||
Simple("common.items.keys.haniwa_key"): VoxTrans(
|
||||
"voxel.object.key_haniwa",
|
||||
(0.0, 0.0, 0.0), (-100.0, 250.0, 15.0), 1.0,
|
||||
),
|
||||
Simple("common.items.keys.glass_key"): VoxTrans(
|
||||
"voxel.object.key_glass",
|
||||
(0.0, 0.0, 0.0), (-100.0, 250.0, 15.0), 1.0,
|
||||
|
@ -94,6 +94,7 @@ const int FIERY_DROPLET_TRACE = 54;
|
||||
const int ENERGY_PHOENIX = 55;
|
||||
const int PHOENIX_BEAM = 56;
|
||||
const int PHOENIX_BUILD_UP_AIM = 57;
|
||||
const int CLAY_SHRAPNEL = 58;
|
||||
|
||||
// meters per second squared (acceleration)
|
||||
const float earth_gravity = 9.807;
|
||||
@ -971,6 +972,18 @@ void main() {
|
||||
spin_in_axis(vec3(rand6, rand7, rand8), perc_t * 10.0 + 3.0 * rand9)
|
||||
);
|
||||
break;
|
||||
case CLAY_SHRAPNEL:
|
||||
float clay_color = 0.025 + 0.02 * rand1;
|
||||
attr = Attr(
|
||||
linear_motion(
|
||||
vec3(0),
|
||||
normalize(vec3(rand4, rand5, rand6)) * 15.0 + grav_vel(earth_gravity)
|
||||
),
|
||||
vec3(5 * (1 - percent())),
|
||||
vec4(vec3(clay_color * 3, clay_color * 2, clay_color), 1),
|
||||
spin_in_axis(vec3(1,0,0),0)
|
||||
);
|
||||
break;
|
||||
default:
|
||||
attr = Attr(
|
||||
linear_motion(
|
||||
|
@ -1300,4 +1300,60 @@
|
||||
central: ("armor.empty"),
|
||||
)
|
||||
),
|
||||
(HaniwaGeneral, Male): (
|
||||
head: (
|
||||
offset: (-7.5, 0.0, -6.5),
|
||||
central: ("npc.haniwa.general.haniwa_general"),
|
||||
),
|
||||
torso_upper: (
|
||||
offset: (-6.5, -4.0, -4.5),
|
||||
central: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 1,
|
||||
),
|
||||
torso_lower: (
|
||||
offset: (-7.5, -6.0, -5.0),
|
||||
central: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 2,
|
||||
),
|
||||
jaw: (
|
||||
offset: (-5.0, 0.0, -3.5),
|
||||
central: ("armor.empty"),
|
||||
),
|
||||
tail: (
|
||||
offset: (-2.0, -17.0, -1.0),
|
||||
central: ("armor.empty"),
|
||||
),
|
||||
second: (
|
||||
offset: (0.0, 0.0, 0.0),
|
||||
central: ("armor.empty"),
|
||||
)
|
||||
),
|
||||
(HaniwaGeneral, Female): (
|
||||
head: (
|
||||
offset: (-7.5, 0.0, -6.5),
|
||||
central: ("npc.haniwa.general.haniwa_general"),
|
||||
),
|
||||
torso_upper: (
|
||||
offset: (-6.5, -4.0, -4.5),
|
||||
central: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 1,
|
||||
),
|
||||
torso_lower: (
|
||||
offset: (-7.5, -6.0, -5.0),
|
||||
central: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 2,
|
||||
),
|
||||
jaw: (
|
||||
offset: (-5.0, 0.0, -3.5),
|
||||
central: ("armor.empty"),
|
||||
),
|
||||
tail: (
|
||||
offset: (-2.0, -17.0, -1.0),
|
||||
central: ("armor.empty"),
|
||||
),
|
||||
second: (
|
||||
offset: (0.0, 0.0, 0.0),
|
||||
central: ("armor.empty"),
|
||||
)
|
||||
),
|
||||
})
|
||||
|
@ -1699,4 +1699,88 @@
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
),
|
||||
(HaniwaGeneral, Male): (
|
||||
shoulder_l: (
|
||||
offset: (-3.5, -3.0, -7.0),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 3,
|
||||
),
|
||||
shoulder_r: (
|
||||
offset: (-3.5, -3.0, -7.0),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 4,
|
||||
),
|
||||
hand_l: (
|
||||
offset: (-2.5, -2.0, -8.0),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 5,
|
||||
),
|
||||
hand_r: (
|
||||
offset: (-2.5, -2.0, -8.0),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 6,
|
||||
),
|
||||
leg_l: (
|
||||
offset: (-2.5, -3.0, -3.0),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 7,
|
||||
),
|
||||
leg_r: (
|
||||
offset: (-2.5, -3.0, -3.0),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 8,
|
||||
),
|
||||
foot_l: (
|
||||
offset: (-1.5, -3.0, -2.5),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 9,
|
||||
),
|
||||
foot_r: (
|
||||
offset: (-1.5, -3.0, -2.5),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 10,
|
||||
),
|
||||
),
|
||||
(HaniwaGeneral, Female): (
|
||||
shoulder_l: (
|
||||
offset: (-3.5, -3.0, -7.0),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 3,
|
||||
),
|
||||
shoulder_r: (
|
||||
offset: (-3.5, -3.0, -7.0),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 4,
|
||||
),
|
||||
hand_l: (
|
||||
offset: (-2.5, -2.0, -8.0),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 5,
|
||||
),
|
||||
hand_r: (
|
||||
offset: (-2.5, -2.0, -8.0),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 6,
|
||||
),
|
||||
leg_l: (
|
||||
offset: (-2.5, -3.0, -3.0),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 7,
|
||||
),
|
||||
leg_r: (
|
||||
offset: (-2.5, -3.0, -3.0),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 8,
|
||||
),
|
||||
foot_l: (
|
||||
offset: (-1.5, -3.0, -2.5),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 9,
|
||||
),
|
||||
foot_r: (
|
||||
offset: (-1.5, -3.0, -2.5),
|
||||
lateral: ("npc.haniwa.general.haniwa_general"),
|
||||
model_index: 10,
|
||||
),
|
||||
),
|
||||
})
|
@ -1160,6 +1160,14 @@
|
||||
vox_spec: ("weapon.tool.wooden_lute", (-2.5, -6.0, 4.0)),
|
||||
color: None
|
||||
),
|
||||
Tool("common.items.tool.instruments.steeldrum"): (
|
||||
vox_spec: ("weapon.tool.steeldrum", (-4.5, -8.0, 8.0)),
|
||||
color: None
|
||||
),
|
||||
Tool("common.items.tool.instruments.shamisen"): (
|
||||
vox_spec: ("weapon.tool.shamisen", (-2.5, -6.0, 0.0)),
|
||||
color: None
|
||||
),
|
||||
Tool("common.items.tool.instruments.guitar"): (
|
||||
vox_spec: ("weapon.tool.wooden_guitar", (-4.5, -6.0, 0.0)),
|
||||
color: None
|
||||
@ -1639,10 +1647,14 @@
|
||||
vox_spec: ("weapon.sword.long_2h_saurok", (-2.5, -4.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
Tool("common.items.npc_weapons.sword.adlet_elder_sword"): (
|
||||
Tool("common.items.npc_weapons.sword.haniwa_general_sword"): (
|
||||
vox_spec: ("weapon.sword.adlet_elder_sword", (-2.5, -5.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
Tool("common.items.npc_weapons.sword.haniwa_general_sword"): (
|
||||
vox_spec: ("weapon.sword.haniwa_general_sword", (-2.5, -5.0, -5.0)),
|
||||
color: None
|
||||
),
|
||||
Tool("common.items.npc_weapons.bow.saurok_bow"): (
|
||||
vox_spec: ("weapon.bow.longbow_saurok", (-2.5, -4.0, -16.5)),
|
||||
color: None
|
||||
|
@ -71,10 +71,10 @@
|
||||
central: ("npc.treant.male.chest_lower"),
|
||||
),
|
||||
),
|
||||
(ClayGolem, Male): (
|
||||
(Gravewarden, Male): (
|
||||
head: (
|
||||
offset: (-10.5, -3.0, -3.0),
|
||||
central: ("npc.claygolem.male.head"),
|
||||
central: ("npc.gravewarden.male.head"),
|
||||
),
|
||||
jaw: (
|
||||
offset: (-9.5, 0.0, -3.0),
|
||||
@ -82,29 +82,113 @@
|
||||
),
|
||||
torso_upper: (
|
||||
offset: (-9.5, -7.0, -6.5),
|
||||
central: ("npc.claygolem.male.chest_upper"),
|
||||
central: ("npc.gravewarden.male.chest_upper"),
|
||||
),
|
||||
torso_lower: (
|
||||
offset: (-9.5, -7.0, -8.0),
|
||||
central: ("npc.claygolem.male.chest_lower"),
|
||||
central: ("npc.gravewarden.male.chest_lower"),
|
||||
),
|
||||
),
|
||||
(Gravewarden, Female): (
|
||||
head: (
|
||||
offset: (-10.5, -3.0, -3.0),
|
||||
central: ("npc.gravewarden.male.head"),
|
||||
),
|
||||
jaw: (
|
||||
offset: (-9.5, 0.0, -3.0),
|
||||
central: ("armor.empty"),
|
||||
),
|
||||
torso_upper: (
|
||||
offset: (-9.5, -7.0, -6.5),
|
||||
central: ("npc.gravewarden.male.chest_upper"),
|
||||
),
|
||||
torso_lower: (
|
||||
offset: (-9.5, -7.0, -8.0),
|
||||
central: ("npc.gravewarden.male.chest_lower"),
|
||||
),
|
||||
),
|
||||
(ClayGolem, Male): (
|
||||
head: (
|
||||
offset: (-7.5, -3.5, -3.0),
|
||||
central: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 0,
|
||||
),
|
||||
jaw: (
|
||||
offset: (-9.5, 0.0, -3.0),
|
||||
central: ("armor.empty"),
|
||||
),
|
||||
torso_upper: (
|
||||
offset: (-13.5, -7.5, -8.0),
|
||||
central: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 1,
|
||||
),
|
||||
torso_lower: (
|
||||
offset: (-8.5, -7.0, -7.0),
|
||||
central: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 2,
|
||||
),
|
||||
),
|
||||
(ClayGolem, Female): (
|
||||
head: (
|
||||
offset: (-10.5, -3.0, -3.0),
|
||||
central: ("npc.claygolem.male.head"),
|
||||
offset: (-7.5, -3.5, -3.0),
|
||||
central: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 0,
|
||||
),
|
||||
jaw: (
|
||||
offset: (-9.5, 0.0, -3.0),
|
||||
central: ("armor.empty"),
|
||||
),
|
||||
torso_upper: (
|
||||
offset: (-9.5, -7.0, -6.5),
|
||||
central: ("npc.claygolem.male.chest_upper"),
|
||||
offset: (-13.5, -7.5, -8.0),
|
||||
central: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 1,
|
||||
),
|
||||
torso_lower: (
|
||||
offset: (-9.5, -7.0, -8.0),
|
||||
central: ("npc.claygolem.male.chest_lower"),
|
||||
offset: (-8.5, -7.0, -7.0),
|
||||
central: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 2,
|
||||
),
|
||||
),
|
||||
(AncientEffigy, Male): (
|
||||
head: (
|
||||
offset: (-7.5, -3.0, -5.0),
|
||||
central: ("npc.ancienteffigy.male.ancienteffigy"),
|
||||
model_index: 0,
|
||||
),
|
||||
jaw: (
|
||||
offset: (-9.5, 0.0, -3.0),
|
||||
central: ("armor.empty"),
|
||||
),
|
||||
torso_upper: (
|
||||
offset: (-11.5, -5.0, -5.5),
|
||||
central: ("npc.ancienteffigy.male.ancienteffigy"),
|
||||
model_index: 1,
|
||||
),
|
||||
torso_lower: (
|
||||
offset: (-7.5, -5.5, -5.5),
|
||||
central: ("npc.ancienteffigy.male.ancienteffigy"),
|
||||
model_index: 2,
|
||||
),
|
||||
),
|
||||
(AncientEffigy, Female): (
|
||||
head: (
|
||||
offset: (-7.5, -3.0, -5.0),
|
||||
central: ("npc.ancienteffigy.male.ancienteffigy"),
|
||||
model_index: 0,
|
||||
),
|
||||
jaw: (
|
||||
offset: (-9.5, 0.0, -3.0),
|
||||
central: ("armor.empty"),
|
||||
),
|
||||
torso_upper: (
|
||||
offset: (-11.5, -5.0, -5.5),
|
||||
central: ("npc.ancienteffigy.male.ancienteffigy"),
|
||||
model_index: 1,
|
||||
),
|
||||
torso_lower: (
|
||||
offset: (-7.5, -5.5, -5.5),
|
||||
central: ("npc.ancienteffigy.male.ancienteffigy"),
|
||||
model_index: 2,
|
||||
),
|
||||
),
|
||||
(WoodGolem, Male): (
|
||||
|
@ -135,73 +135,227 @@
|
||||
lateral: ("npc.treant.male.foot_r"),
|
||||
)
|
||||
),
|
||||
(ClayGolem, Male): (
|
||||
(Gravewarden, Male): (
|
||||
shoulder_l: (
|
||||
offset: (-13.0, -3.5, -6.5),
|
||||
lateral: ("npc.claygolem.male.shoulder_l"),
|
||||
lateral: ("npc.gravewarden.male.shoulder_l"),
|
||||
),
|
||||
shoulder_r: (
|
||||
offset: (0.0, -3.5, -6.5),
|
||||
lateral: ("npc.claygolem.male.shoulder_r"),
|
||||
lateral: ("npc.gravewarden.male.shoulder_r"),
|
||||
),
|
||||
hand_l: (
|
||||
offset: (-7.5, -6.5, -17.0),
|
||||
lateral: ("npc.claygolem.male.hand_l"),
|
||||
lateral: ("npc.gravewarden.male.hand_l"),
|
||||
),
|
||||
hand_r: (
|
||||
offset: (-7.5, -6.5, -17.0),
|
||||
lateral: ("npc.claygolem.male.hand_r"),
|
||||
lateral: ("npc.gravewarden.male.hand_r"),
|
||||
),
|
||||
leg_l: (
|
||||
offset: (-8.0, -4.0, -10.0),
|
||||
lateral: ("npc.claygolem.male.leg_l"),
|
||||
lateral: ("npc.gravewarden.male.leg_l"),
|
||||
),
|
||||
leg_r: (
|
||||
offset: (0.0, -4.0, -10.0),
|
||||
lateral: ("npc.claygolem.male.leg_r"),
|
||||
lateral: ("npc.gravewarden.male.leg_r"),
|
||||
),
|
||||
foot_l: (
|
||||
offset: (-2.5, -3.0, -7.0),
|
||||
lateral: ("npc.claygolem.male.foot_l"),
|
||||
lateral: ("npc.gravewarden.male.foot_l"),
|
||||
),
|
||||
foot_r: (
|
||||
offset: (-2.5, -3.0, -7.0),
|
||||
lateral: ("npc.claygolem.male.foot_r"),
|
||||
lateral: ("npc.gravewarden.male.foot_r"),
|
||||
)
|
||||
),
|
||||
(Gravewarden, Female): (
|
||||
shoulder_l: (
|
||||
offset: (-13.0, -3.5, -6.5),
|
||||
lateral: ("npc.gravewarden.male.shoulder_l"),
|
||||
),
|
||||
shoulder_r: (
|
||||
offset: (0.0, -3.5, -6.5),
|
||||
lateral: ("npc.gravewarden.male.shoulder_r"),
|
||||
),
|
||||
hand_l: (
|
||||
offset: (-7.5, -6.5, -17.0),
|
||||
lateral: ("npc.gravewarden.male.hand_l"),
|
||||
),
|
||||
hand_r: (
|
||||
offset: (-7.5, -6.5, -17.0),
|
||||
lateral: ("npc.gravewarden.male.hand_r"),
|
||||
),
|
||||
leg_l: (
|
||||
offset: (-8.0, -4.0, -10.0),
|
||||
lateral: ("npc.gravewarden.male.leg_l"),
|
||||
),
|
||||
leg_r: (
|
||||
offset: (0.0, -4.0, -10.0),
|
||||
lateral: ("npc.gravewarden.male.leg_r"),
|
||||
),
|
||||
foot_l: (
|
||||
offset: (-2.5, -3.0, -7.0),
|
||||
lateral: ("npc.gravewarden.male.foot_l"),
|
||||
),
|
||||
foot_r: (
|
||||
offset: (-2.5, -3.0, -7.0),
|
||||
lateral: ("npc.gravewarden.male.foot_r"),
|
||||
)
|
||||
),
|
||||
(ClayGolem, Male): (
|
||||
shoulder_l: (
|
||||
offset: (-9.0, -2.5, -4.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 3,
|
||||
),
|
||||
shoulder_r: (
|
||||
offset: (0.0, -2.5, -4.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 4,
|
||||
),
|
||||
hand_l: (
|
||||
offset: (-5.5, -5.0, -18.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 5,
|
||||
),
|
||||
hand_r: (
|
||||
offset: (-5.5, -5.0, -18.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 6,
|
||||
),
|
||||
leg_l: (
|
||||
offset: (-7.0, -4.0, -7.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 7,
|
||||
),
|
||||
leg_r: (
|
||||
offset: (0.0, -4.0, -7.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 8,
|
||||
),
|
||||
foot_l: (
|
||||
offset: (-4.0, -5.0, -7.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 9,
|
||||
),
|
||||
foot_r: (
|
||||
offset: (-4.0, -5.0, -7.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 10,
|
||||
),
|
||||
),
|
||||
(ClayGolem, Female): (
|
||||
shoulder_l: (
|
||||
offset: (-13.0, -3.5, -6.5),
|
||||
lateral: ("npc.claygolem.male.shoulder_l"),
|
||||
offset: (-9.0, -2.5, -4.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 3,
|
||||
),
|
||||
shoulder_r: (
|
||||
offset: (0.0, -3.5, -6.5),
|
||||
lateral: ("npc.claygolem.male.shoulder_r"),
|
||||
offset: (0.0, -2.5, -4.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 4,
|
||||
),
|
||||
hand_l: (
|
||||
offset: (-7.5, -6.5, -17.0),
|
||||
lateral: ("npc.claygolem.male.hand_l"),
|
||||
offset: (-5.5, -5.0, -18.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 5,
|
||||
),
|
||||
hand_r: (
|
||||
offset: (-7.5, -6.5, -17.0),
|
||||
lateral: ("npc.claygolem.male.hand_r"),
|
||||
offset: (-5.5, -5.0, -18.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 6,
|
||||
),
|
||||
leg_l: (
|
||||
offset: (-8.0, -4.0, -10.0),
|
||||
lateral: ("npc.claygolem.male.leg_l"),
|
||||
offset: (-7.0, -4.0, -7.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 7,
|
||||
),
|
||||
leg_r: (
|
||||
offset: (0.0, -4.0, -10.0),
|
||||
lateral: ("npc.claygolem.male.leg_r"),
|
||||
offset: (0.0, -4.0, -7.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 8,
|
||||
),
|
||||
foot_l: (
|
||||
offset: (-2.5, -3.0, -7.0),
|
||||
lateral: ("npc.claygolem.male.foot_l"),
|
||||
offset: (-4.0, -5.0, -7.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 9,
|
||||
),
|
||||
foot_r: (
|
||||
offset: (-2.5, -3.0, -7.0),
|
||||
lateral: ("npc.claygolem.male.foot_r"),
|
||||
)
|
||||
offset: (-4.0, -5.0, -7.0),
|
||||
lateral: ("npc.claygolem.male.claygolem"),
|
||||
model_index: 10,
|
||||
),
|
||||
),
|
||||
(AncientEffigy, Male): (
|
||||
shoulder_l: (
|
||||
offset: (-9.0, -2.5, -4.0),
|
||||
lateral: ("armor.empty"),
|
||||
|
||||
),
|
||||
shoulder_r: (
|
||||
offset: (0.0, -2.5, -4.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
hand_l: (
|
||||
offset: (-5.5, -5.0, -18.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
hand_r: (
|
||||
offset: (-5.5, -5.0, -18.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
leg_l: (
|
||||
offset: (-7.0, -4.0, -7.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
leg_r: (
|
||||
offset: (0.0, -4.0, -7.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
foot_l: (
|
||||
offset: (-4.0, -5.0, -7.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
foot_r: (
|
||||
offset: (-4.0, -5.0, -7.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
),
|
||||
(AncientEffigy, Female): (
|
||||
shoulder_l: (
|
||||
offset: (-9.0, -2.5, -4.0),
|
||||
lateral: ("armor.empty"),
|
||||
|
||||
),
|
||||
shoulder_r: (
|
||||
offset: (0.0, -2.5, -4.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
hand_l: (
|
||||
offset: (-5.5, -5.0, -18.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
hand_r: (
|
||||
offset: (-5.5, -5.0, -18.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
leg_l: (
|
||||
offset: (-7.0, -4.0, -7.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
leg_r: (
|
||||
offset: (0.0, -4.0, -7.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
foot_l: (
|
||||
offset: (-4.0, -5.0, -7.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
foot_r: (
|
||||
offset: (-4.0, -5.0, -7.0),
|
||||
lateral: ("armor.empty"),
|
||||
),
|
||||
),
|
||||
(WoodGolem, Male): (
|
||||
shoulder_l: (
|
||||
|
@ -408,6 +408,8 @@
|
||||
Simple("common.items.tool.instruments.kalimba"): "voxel.weapon.tool.wooden_kalimba",
|
||||
Simple("common.items.tool.instruments.melodica"): "voxel.weapon.tool.melodica",
|
||||
Simple("common.items.tool.instruments.lute"): "voxel.weapon.tool.wooden_lute",
|
||||
Simple("common.items.tool.instruments.steeldrum"): "voxel.weapon.tool.steeldrum",
|
||||
Simple("common.items.tool.instruments.shamisen"): "voxel.weapon.tool.shamisen",
|
||||
Simple("common.items.tool.instruments.sitar"): "voxel.weapon.tool.wooden_sitar",
|
||||
Simple("common.items.tool.instruments.guitar"): "voxel.weapon.tool.wooden_guitar",
|
||||
Simple("common.items.tool.instruments.guitar_dark"): "voxel.weapon.tool.black_velvet_guitar",
|
||||
@ -946,6 +948,7 @@
|
||||
// Keys and Lockpicks
|
||||
Simple("common.items.keys.rusty_tower_key"): "voxel.object.key_rusty-0",
|
||||
Simple("common.items.keys.bone_key"): "voxel.object.key_bone",
|
||||
Simple("common.items.keys.haniwa_key"): "voxel.object.key_haniwa",
|
||||
Simple("common.items.keys.glass_key"): "voxel.object.key_glass",
|
||||
Simple("common.items.utility.lockpick_0"): "voxel.object.lockpick",
|
||||
Simple("common.items.keys.quarry_keys.ancient"): "voxel.object.key_rusty-0",
|
||||
|
BIN
assets/voxygen/voxel/npc/ancienteffigy/male/ancienteffigy.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/npc/ancienteffigy/male/ancienteffigy.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
Loading…
Reference in New Issue
Block a user