frost_gigas

This commit is contained in:
flo 2023-02-15 00:10:37 +00:00 committed by Marcel
parent 968e4b721c
commit bf81ffc029
175 changed files with 2837 additions and 79 deletions

View File

@ -516,6 +516,31 @@
secondary: "common.abilities.custom.birdmediumbasic.singlestrike", secondary: "common.abilities.custom.birdmediumbasic.singlestrike",
abilities: [], abilities: [],
), ),
Custom("Frost Gigas"): (
primary: "common.abilities.custom.gigas_frost.cleave",
secondary: "common.abilities.custom.gigas_frost.wide_cleave",
abilities: [
Simple(None, "common.abilities.custom.gigas_frost.icespike_smash"),
Simple(None, "common.abilities.custom.gigas_frost.leapshockwave"),
Simple(None, "common.abilities.custom.gigas_frost.ice_volley"),
Simple(None, "common.abilities.custom.gigas_frost.frost_summons"),
Simple(None, "common.abilities.custom.gigas_frost.flashfreeze"),
],
),
Custom("Boreal Bow"): (
primary: "common.abilities.custom.boreal_warrior.bow.charged",
secondary: "common.abilities.custom.boreal_warrior.bow.repeater",
abilities: [
Simple(None, "common.abilities.custom.boreal_warrior.bow.shotgun")
],
),
Custom("Boreal Hammer"): (
primary: "common.abilities.custom.boreal_warrior.hammer.singlestrike",
secondary: "common.abilities.custom.boreal_warrior.hammer.dash",
abilities: [
Simple(None, "common.abilities.custom.boreal_warrior.hammer.leap")
],
),
Custom("Tornado"): ( Custom("Tornado"): (
primary: "common.abilities.custom.tornado.spin", primary: "common.abilities.custom.tornado.spin",
secondary: "common.abilities.empty.basic", secondary: "common.abilities.empty.basic",

View File

@ -6,4 +6,5 @@ SpriteSummon(
del_timeout: None, del_timeout: None,
summon_distance: (0, 10), summon_distance: (0, 10),
sparseness: 0.76, sparseness: 0.76,
angle: 360,
) )

View File

@ -6,4 +6,5 @@ SpriteSummon(
del_timeout: None, del_timeout: None,
summon_distance: (0, 9), summon_distance: (0, 9),
sparseness: 0.8, sparseness: 0.8,
angle: 360,
) )

View File

@ -14,4 +14,5 @@ Shockwave(
move_efficiency: 0.1, move_efficiency: 0.1,
damage_kind: Energy, damage_kind: Energy,
specifier: Fire, specifier: Fire,
ori_rate: 1.0,
) )

View File

@ -0,0 +1,24 @@
ChargedRanged(
energy_cost: 0,
energy_drain: 0,
initial_regen: 2,
scaled_regen: 14,
initial_damage: 2,
scaled_damage: 12,
initial_knockback: 0,
scaled_knockback: 12,
buildup_duration: 0.25,
charge_duration: 1.0,
recover_duration: 0.4,
projectile_body: Object(Arrow),
projectile_light: None,
initial_projectile_speed: 50.0,
scaled_projectile_speed: 200.0,
damage_effect: Some(Buff((
kind: Frozen,
dur_secs: 2.0,
strength: DamageFraction(0.1),
chance: 1.0,
))),
move_speed: 0.6,
)

View File

@ -0,0 +1,22 @@
RepeaterRanged(
energy_cost: 6.0,
buildup_duration: 0.2,
shoot_duration: 0.3,
recover_duration: 0.5,
max_speed: 4.0,
half_speed_at: 3,
projectile: Arrow(
damage: 5.0,
knockback: 0,
energy_regen: 0,
),
projectile_body: Object(Arrow),
projectile_light: None,
projectile_speed: 100.0,
damage_effect: Some(Buff((
kind: Frozen,
dur_secs: 2.0,
strength: DamageFraction(0.1),
chance: 1.0,
))),
)

View File

@ -0,0 +1,21 @@
BasicRanged(
energy_cost: 25.0,
buildup_duration: 0.3,
recover_duration: 0.3,
projectile_spread: 0.05,
projectile: Arrow(
damage: 6,
knockback: 5,
energy_regen: 0,
),
projectile_body: Object(Arrow),
projectile_light: None,
projectile_speed: 80.0,
num_projectiles: 5,
damage_effect: Some(Buff((
kind: Frozen,
dur_secs: 2.0,
strength: DamageFraction(0.1),
chance: 1.0,
))),
)

View File

@ -0,0 +1,33 @@
DashMelee(
energy_cost: 3.0,
melee_constructor: (
kind: Bash(
damage: 9.0,
poise: 40.0,
knockback: 16.0,
energy_regen: 0.0,
),
scaled: Some(Bash(
damage: 10.0,
poise: 0.0,
knockback: 20.0,
energy_regen: 0.0,
)),
range: 5.0,
angle: 45.0,
damage_effect: Some(Buff((
kind: Frozen,
dur_secs: 2.0,
strength: DamageFraction(0.1),
chance: 1.0,
))),
),
energy_drain: 0,
forward_speed: 12.0,
buildup_duration: 0.6,
charge_duration: 0.2,
swing_duration: 0.1,
recover_duration: 0.9,
ori_modifier: 0.3,
charge_through: false,
)

View File

@ -0,0 +1,26 @@
LeapMelee(
energy_cost: 35.0,
buildup_duration: 0.1,
movement_duration: 0.6,
swing_duration: 0.15,
recover_duration: 0.2,
melee_constructor: (
kind: Bash(
damage: 25.0,
poise: 40.0,
knockback: 25.0,
energy_regen: 0.0,
),
range: 4.5,
angle: 360.0,
multi_target: Some(Normal),
damage_effect: Some(Buff((
kind: Frozen,
dur_secs: 2.0,
strength: DamageFraction(0.1),
chance: 1.0,
))),
),
forward_leap_strength: 20.0,
vertical_leap_strength: 8.0,
)

View File

@ -0,0 +1,31 @@
ComboMelee(
stage_data: [(
stage: 1,
base_damage: 15.0,
damage_increase: 0.75,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 3.5,
range: 4.5,
angle: 50.0,
base_buildup_duration: 0.7,
base_swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.45,
forward_movement: 0.0,
damage_kind: Crushing,
damage_effect: Some(Buff((
kind: Frozen,
dur_secs: 2.0,
strength: DamageFraction(0.1),
chance: 1.0,
))),
)],
initial_energy_gain: 5.0,
max_energy_gain: 12.5,
energy_increase: 2.5,
speed_increase: 0.1,
max_speed_increase: 0.4,
scales_from_combo: 2,
ori_modifier: 1.0,
)

View File

@ -14,4 +14,5 @@ Shockwave(
move_efficiency: 0.0, move_efficiency: 0.0,
damage_kind: Crushing, damage_kind: Crushing,
specifier: Ground, specifier: Ground,
ori_rate: 1.0,
) )

View File

@ -14,4 +14,5 @@ Shockwave(
move_efficiency: 0.1, move_efficiency: 0.1,
damage_kind: Energy, damage_kind: Energy,
specifier: Water, specifier: Water,
ori_rate: 1.0,
) )

View File

@ -6,4 +6,5 @@ SpriteSummon(
del_timeout: Some((4, 5)), del_timeout: Some((4, 5)),
summon_distance: (5, 3.1), summon_distance: (5, 3.1),
sparseness: 0.2, sparseness: 0.2,
angle: 360,
) )

View File

@ -14,4 +14,5 @@ Shockwave(
move_efficiency: 0.0, move_efficiency: 0.0,
damage_kind: Crushing, damage_kind: Crushing,
specifier: Steam, specifier: Steam,
ori_rate: 1.0,
) )

View File

@ -14,4 +14,5 @@ Shockwave(
move_efficiency: 0.1, move_efficiency: 0.1,
damage_kind: Energy, damage_kind: Energy,
specifier: Fire, specifier: Fire,
ori_rate: 1.0,
) )

View File

@ -14,4 +14,5 @@ Shockwave(
move_efficiency: 0.1, move_efficiency: 0.1,
damage_kind: Energy, damage_kind: Energy,
specifier: IceSpikes, specifier: IceSpikes,
ori_rate: 1.0,
) )

View File

@ -0,0 +1,24 @@
BasicMelee(
energy_cost: 0,
buildup_duration: 0.9,
swing_duration: 0.1,
recover_duration: 0.7,
melee_constructor: (
kind: Slash(
damage: 85.0,
poise: 5.0,
knockback: 5.0,
energy_regen: 10.0,
),
range: 5.0,
angle: 75.0,
damage_effect: Some(Buff((
kind: Frozen,
dur_secs: 1.0,
strength: DamageFraction(0.1),
chance: 0.3,
))),
multi_target: Some(Normal),
),
ori_modifier: 0.2,
)

View File

@ -0,0 +1,24 @@
Shockwave(
energy_cost: 0,
buildup_duration: 2.0,
swing_duration: 0.12,
recover_duration: 1.5,
damage: 45.0,
poise_damage: 30,
knockback: (strength: 0.0, direction: TowardsUp),
shockwave_angle: 240.0,
shockwave_vertical_angle: 360.0,
shockwave_speed: 200.0,
shockwave_duration: 0.15,
requires_ground: false,
move_efficiency: 0.0,
damage_kind: Piercing,
specifier: IceSpikes,
ori_rate: 0.0,
damage_effect: Some(Buff((
kind: Frozen,
dur_secs: 2.0,
strength: DamageFraction(0.3),
chance: 1.0,
))),
)

View File

@ -0,0 +1,18 @@
BasicSummon(
buildup_duration: 1.75,
cast_duration: 1.5,
recover_duration: 0.75,
summon_amount: 12,
summon_distance: (10, 15),
summon_info: (
body: BipedSmall((
species: Boreal,
body_type: Male,
)),
scale: None,
has_health: true,
loadout_config: Some(BorealSummon),
skillset_config: None,
),
duration: None,
)

View File

@ -0,0 +1,15 @@
BasicRanged(
energy_cost: 0,
buildup_duration: 0.5,
recover_duration: 0.9,
projectile: IceBomb(
damage: 30.0,
radius: 3.0,
knockback: 12.0,
min_falloff: 0.1,
),
projectile_body: Object(IceBomb),
projectile_speed: 25.0,
num_projectiles: 5,
projectile_spread: 0.07,
)

View File

@ -0,0 +1,10 @@
SpriteSummon(
buildup_duration: 1.3,
cast_duration: 0.1,
recover_duration: 1.1,
sprite: IceSpike,
del_timeout: Some((2, 5)),
summon_distance: (2, 12),
sparseness: 0.95,
angle: 360,
)

View File

@ -0,0 +1,26 @@
LeapShockwave(
energy_cost: 0,
buildup_duration: 1.4,
movement_duration: 0.8,
swing_duration: 0.15,
recover_duration: 0.9,
damage: 45.0,
poise_damage: 10,
knockback: (strength: 3.0, direction: Up),
shockwave_angle: 360.0,
shockwave_vertical_angle: 15.0,
shockwave_speed: 20.0,
shockwave_duration: 0.8,
requires_ground: true,
move_efficiency: 0.2,
damage_kind: Piercing,
specifier: IceSpikes,
damage_effect: Some(Buff((
kind: Frozen,
dur_secs: 1.0,
strength: DamageFraction(0.1),
chance: 1.0,
))),
forward_leap_strength: 45.0,
vertical_leap_strength: 10.0,
)

View File

@ -0,0 +1,24 @@
BasicMelee(
energy_cost: 0,
buildup_duration: 0.4,
swing_duration: 0.1,
recover_duration: 0.8,
melee_constructor: (
kind: Slash(
damage: 90.0,
poise: 20.0,
knockback: 5.0,
energy_regen: 5.0,
),
range: 5.0,
angle: 120.0,
damage_effect: Some(Buff((
kind: Frozen,
dur_secs: 1.0,
strength: DamageFraction(0.1),
chance: 0.5,
))),
multi_target: Some(Normal),
),
ori_modifier: 1.0,
)

View File

@ -6,4 +6,5 @@ SpriteSummon(
del_timeout: None, del_timeout: None,
summon_distance: (0, 25), summon_distance: (0, 25),
sparseness: 0.67, sparseness: 0.67,
angle: 360,
) )

View File

@ -14,6 +14,7 @@ Shockwave(
move_efficiency: 0.2, move_efficiency: 0.2,
damage_kind: Piercing, damage_kind: Piercing,
specifier: IceSpikes, specifier: IceSpikes,
ori_rate: 1.0,
damage_effect: Some(Buff(( damage_effect: Some(Buff((
kind: Frozen, kind: Frozen,
dur_secs: 4.0, dur_secs: 4.0,

View File

@ -14,4 +14,5 @@ Shockwave(
move_efficiency: 0.1, move_efficiency: 0.1,
damage_kind: Energy, damage_kind: Energy,
specifier: Water, specifier: Water,
ori_rate: 1.0,
) )

View File

@ -14,4 +14,5 @@ Shockwave(
move_efficiency: 0.05, move_efficiency: 0.05,
damage_kind: Crushing, damage_kind: Crushing,
specifier: Ground, specifier: Ground,
ori_rate: 1.0,
) )

View File

@ -14,4 +14,5 @@ Shockwave(
move_efficiency: 0.0, move_efficiency: 0.0,
damage_kind: Crushing, damage_kind: Crushing,
specifier: Water, specifier: Water,
ori_rate: 0.0,
) )

View File

@ -14,4 +14,5 @@ Shockwave(
move_efficiency: 0.1, move_efficiency: 0.1,
damage_kind: Energy, damage_kind: Energy,
specifier: Fire, specifier: Fire,
ori_rate: 1.0,
) )

View File

@ -14,4 +14,5 @@ Shockwave(
move_efficiency: 0.0, move_efficiency: 0.0,
damage_kind: Crushing, damage_kind: Crushing,
specifier: Ground, specifier: Ground,
ori_rate: 1.0,
) )

View File

@ -14,6 +14,7 @@ Shockwave(
move_efficiency: 0.2, move_efficiency: 0.2,
damage_kind: Piercing, damage_kind: Piercing,
specifier: IceSpikes, specifier: IceSpikes,
ori_rate: 1.0,
damage_effect: Some(Buff(( damage_effect: Some(Buff((
kind: Bleeding, kind: Bleeding,
dur_secs: 10.0, dur_secs: 10.0,

View File

@ -14,4 +14,5 @@ Shockwave(
move_efficiency: 0, move_efficiency: 0,
damage_kind: Energy, damage_kind: Energy,
specifier: Fire, specifier: Fire,
ori_rate: 1.0,
) )

View File

@ -14,4 +14,5 @@ Shockwave(
move_efficiency: 0.1, move_efficiency: 0.1,
damage_kind: Energy, damage_kind: Energy,
specifier: Fire, specifier: Fire,
ori_rate: 1.0,
) )

View File

@ -0,0 +1,11 @@
#![enable(implicit_some)]
(
name: Name("Frost Gigas"),
body: RandomWith("gigas_frost"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.world.world_bosses.gigas_frost.boss"),
inventory: (
loadout: FromBody,
),
meta: [],
)

View File

@ -0,0 +1,19 @@
#![enable(implicit_some)]
(
name: Name("Boreal Warrior"),
body: RandomWith("boreal"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.world.world_bosses.gigas_frost.summon"),
inventory: (
loadout: Inline((
inherit: Asset("common.loadout.world.boreal.boreal_warrior"),
active_hands: InHands((Choice([
(1, Item("common.items.npc_weapons.biped_small.boreal.bow")),
(1, Item("common.items.npc_weapons.biped_small.boreal.hammer")),
]), None)),
)),
),
meta: [
SkillSetAsset("common.skillset.preset.rank5.fullskill"),
],
)

View File

@ -0,0 +1,10 @@
ItemDef(
name: "Boreal's Cloak",
description: "Thick yet surprisingly cold.",
kind: Armor((
kind: Back,
stats: FromSet("Boreal"),
)),
quality: Legendary,
tags: [],
)

View File

@ -0,0 +1,10 @@
ItemDef(
name: "Boreal Belt",
description: "It's cold.",
kind: Armor((
kind: Belt,
stats: FromSet("Boreal"),
)),
quality: Legendary,
tags: [],
)

View File

@ -0,0 +1,10 @@
ItemDef(
name: "Boreal's Chestplate",
description: "So frigid that you can feel it in your heart.",
kind: Armor((
kind: Chest,
stats: FromSet("Boreal"),
)),
quality: Legendary,
tags: [],
)

View File

@ -0,0 +1,10 @@
ItemDef(
name: "Boreal's Wrappings",
description: "The blistering cold makes it hard to move.",
kind: Armor((
kind: Foot,
stats: FromSet("Boreal"),
)),
quality: Legendary,
tags: [],
)

View File

@ -0,0 +1,10 @@
ItemDef(
name: "Boreal's Guantlets",
description: "Colder than the touch of death.",
kind: Armor((
kind: Hand,
stats: FromSet("Boreal"),
)),
quality: Legendary,
tags: [],
)

View File

@ -0,0 +1,10 @@
ItemDef(
name: "Boreal's Tunic",
description: "Colder than the climate it protects you from.",
kind: Armor((
kind: Pants,
stats: FromSet("Boreal"),
)),
quality: Legendary,
tags: [],
)

View File

@ -0,0 +1,10 @@
ItemDef(
name: "Boreal's Spaulders",
description: "I should probbaly think of something before merging",
kind: Armor((
kind: Shoulder,
stats: FromSet("Boreal"),
)),
quality: Legendary,
tags: [],
)

View File

@ -0,0 +1,9 @@
ItemDef(
name: "Glacial Crystal",
description: "The purest form of ice, cold enough to cool lava.",
kind: Ingredient(
// Descriptor not needed
descriptor: "", ),
quality: Legendary,
tags: [],
)

View File

@ -0,0 +1,9 @@
ItemDef(
name: "Pearl",
description: "Would make a nice lamp.",
kind: Ingredient(
// Descriptor not needed
descriptor: "", ),
quality: Epic,
tags: [],
)

View File

@ -0,0 +1,7 @@
ItemDef(
name: "Wings of Winter",
description: "Sparkles brilliantly and cooly even under the warm sun.",
kind: Glider,
quality: Legendary,
tags: [],
)

View File

@ -0,0 +1,14 @@
ItemDef(
name: "Frost Gigas Armor",
description: "The best defense is a good offense.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(140.0)),
poise_resilience: Some(Normal(25.0)),
energy_max: Some(150.0),
)),
)),
quality: Legendary,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Boreal's Chestplate",
description: "So frigid that you can feel it in your heart.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(80.0)),
poise_resilience: Some(Normal(60.0)),
energy_max: Some(120.0),
energy_reward: Some(0.027),
crit_power: Some(0.025),
)),
)),
quality: Legendary,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Boreal's Wrappings",
description: "The blistering cold makes it hard to move.",
kind: Armor((
kind: Foot,
stats: Direct((
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: Legendary,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Boreal's Guantlets",
description: "Colder than the touch of death.",
kind: Armor((
kind: Hand,
stats: Direct((
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: Legendary,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Boreal Helmet",
description: "Did somebody say...BRAINFREEZE?!",
kind: Armor((
kind: Head,
stats: Direct((
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: Legendary,
tags: [],
)

View File

@ -0,0 +1,16 @@
ItemDef(
name: "Boreal's Tunic",
description: "Colder than the climate it protects you from.",
kind: Armor((
kind: Pants,
stats: Direct((
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: Legendary,
tags: [],
)

View File

@ -0,0 +1,21 @@
ItemDef(
name: "Frost Gigas Axe",
description: "Placeholder",
kind: Tool((
kind: Axe,
hands: Two,
stats: (
equip_time_secs: 0.5,
power: 1.0,
effect_power: 1.0,
speed: 1.0,
crit_chance: 0.1,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
),
)),
quality: Legendary,
tags: [],
ability_spec: Some(Custom("Frost Gigas")),
)

View File

@ -0,0 +1,21 @@
ItemDef(
name: "Boreal Bow",
description: "",
kind: Tool((
kind: Bow,
hands: Two,
stats: (
equip_time_secs: 0.0,
power: 1.0,
effect_power: 1.0,
speed: 1.0,
crit_chance: 0.12,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
),
)),
quality: Epic,
tags: [],
ability_spec: Some(Custom("Boreal Bow")),
)

View File

@ -0,0 +1,21 @@
ItemDef(
name: "Boreal Hammer",
description: "",
kind: Tool((
kind: Hammer,
hands: Two,
stats: (
equip_time_secs: 0.0,
power: 1.0,
effect_power: 1.0,
speed: 1.0,
crit_chance: 0.12,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
),
)),
quality: Epic,
tags: [],
ability_spec: Some(Custom("Boreal Hammer")),
)

View File

@ -15,7 +15,7 @@ ItemDef(
buff_strength: 1.0, buff_strength: 1.0,
), ),
)), )),
quality: Common, quality: Legendary,
tags: [Utility], tags: [Utility],
ability_spec: Some(Custom("GlassFlute")), ability_spec: Some(Custom("GlassFlute")),
) )

View File

@ -15,7 +15,7 @@ ItemDef(
buff_strength: 1.0, buff_strength: 1.0,
), ),
)), )),
quality: Common, quality: Legendary,
tags: [Utility], tags: [Utility],
ability_spec: Some(Custom("DarkGuitar")), ability_spec: Some(Custom("DarkGuitar")),
) )

View File

@ -15,7 +15,7 @@ ItemDef(
buff_strength: 1.0, buff_strength: 1.0,
), ),
)), )),
quality: Common, quality: Legendary,
tags: [Utility], tags: [Utility],
ability_spec: Some(Custom("IcyTalharpa")), ability_spec: Some(Custom("IcyTalharpa")),
) )

View File

@ -0,0 +1,12 @@
#![enable(implicit_some)]
(
head: Item("common.items.npc_armor.biped_small.boreal.head.warrior"),
chest: Item("common.items.npc_armor.biped_small.boreal.chest.warrior"),
gloves: Item("common.items.npc_armor.biped_small.boreal.hand.warrior"),
legs: Item("common.items.npc_armor.biped_small.boreal.pants.warrior"),
feet: Item("common.items.npc_armor.biped_small.boreal.foot.warrior"),
active_hands: InHands((Choice([
(1, Item("common.items.npc_weapons.biped_small.boreal.bow")),
(1, Item("common.items.npc_weapons.biped_small.boreal.hammer")),
]), None)),
)

View File

@ -0,0 +1,10 @@
[
(1.0, Item("common.items.armor.boreal.belt")),
(1.0, Item("common.items.armor.boreal.chest")),
(1.0, Item("common.items.armor.boreal.foot")),
(1.0, Item("common.items.armor.boreal.hand")),
(1.0, Item("common.items.armor.boreal.pants")),
(1.0, Item("common.items.armor.boreal.shoulder")),
(1.0, Item("common.items.armor.boreal.back")),
(1.0, Item("common.items.armor.misc.head.boreal_warhelm")),
]

View File

@ -1,5 +1,6 @@
[ [
// Ingredients // Ingredients
(0.5, Item("common.items.crafting_ing.coral_branch")), (0.5, Item("common.items.crafting_ing.coral_branch")),
(0.3, Item("common.items.crafting_ing.pearl")),
(5.0, Item("common.items.crafting_ing.seashells")), (5.0, Item("common.items.crafting_ing.seashells")),
] ]

View File

@ -1,5 +1,6 @@
[ [
(0.5, Item("common.items.crafting_ing.abyssal_heart")), (0.5, Item("common.items.crafting_ing.abyssal_heart")),
(0.5, Item("common.items.crafting_ing.pearl")),
(5.0, LootTable("common.loot_tables.creature.quad_low.fanged")), (5.0, LootTable("common.loot_tables.creature.quad_low.fanged")),
(5.0, Item("common.items.food.meat.tough_raw")), (5.0, Item("common.items.food.meat.tough_raw")),
] ]

View File

@ -0,0 +1,4 @@
[
(1.0, LootTable("common.loot_tables.armor.boreal")),
(1.0, ItemQuantity("common.items.crafting_ing.glacial_crystal", 5, 15)),
]

View File

@ -0,0 +1,8 @@
[
// Currency
(1.0, ItemQuantity("common.items.utility.coins", 40, 100)),
// Food
(1.0, LootTable("common.loot_tables.food.prepared")),
// Nothing
(2.0, Nothing),
]

View File

@ -317,5 +317,12 @@
energy_reward: Some(0.5), energy_reward: Some(0.5),
crit_power: Some(0.8), crit_power: Some(0.8),
), ),
"Boreal": (
protection: Some(Normal(98.0)),
poise_resilence: Some(Normal(34.0)),
energy_reward: Some(-0.35),
crit_power: Some(0.35),
stealth: Some(0.5),
)
}, },
) )

View File

@ -961,6 +961,10 @@
tursus: ( tursus: (
keyword: "tursus", keyword: "tursus",
generic: "Tursus" generic: "Tursus"
),
gigas_frost: (
keyword: "gigas_frost",
generic: "Frost Gigas"
) )
) )
), ),
@ -1128,7 +1132,11 @@
husk: ( husk: (
keyword: "husk", keyword: "husk",
generic: "Husk" generic: "Husk"
) ),
boreal: (
keyword: "boreal",
generic: "Boreal",
),
) )
), ),
fish_small: ( fish_small: (

View File

@ -489,6 +489,17 @@
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
is_recycling: false, is_recycling: false,
), ),
"winter_wings": (
output: ("common.items.glider.winter_wings", 1),
inputs: [
(Item("common.items.crafting_ing.glacial_crystal"), 2, false),
(Item("common.items.crafting_ing.animal_misc.icy_fang"), 32, false),
(Item("common.items.mineral.gem.sapphire"), 18, false),
(Item("common.items.tool.craftsman_hammer"), 0, false),
],
craft_sprite: Some(CraftingBench),
is_recycling: false,
),
"healing_sceptre": ( "healing_sceptre": (
output: ("common.items.weapons.sceptre.starter_sceptre", 1), output: ("common.items.weapons.sceptre.starter_sceptre", 1),
inputs: [ inputs: [
@ -1899,6 +1910,17 @@
], ],
craft_sprite: Some(Anvil), craft_sprite: Some(Anvil),
), ),
"polaris": (
output: ("common.items.lantern.polaris", 1),
inputs: [
(Item("common.items.crafting_ing.glacial_crystal"), 1, false),
(Item("common.items.crafting_ing.animal_misc.icy_fang"), 16, false),
(Item("common.items.crafting_ing.pearl"), 1, false),
(Item("common.items.tool.craftsman_hammer"), 0, false),
],
craft_sprite: Some(CraftingBench),
is_recycling: false,
),
/// MODULAR WEAPONS/SWORDS/SECONDARY COMPONENTS /// MODULAR WEAPONS/SWORDS/SECONDARY COMPONENTS
"short_hilt": ( "short_hilt": (
output: ("common.items.modular.weapon.secondary.sword.short", 1), output: ("common.items.modular.weapon.secondary.sword.short", 1),
@ -2164,4 +2186,15 @@
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
is_recycling: false, is_recycling: false,
), ),
"icy_talharpa": (
output: ("common.items.tool.instruments.icy_talharpa", 1),
inputs: [
(Item("common.items.crafting_ing.glacial_crystal"), 4, false),
(Item("common.items.crafting_ing.animal_misc.icy_fang"), 8, false),
(Item("common.items.crafting_ing.cloth.silk"), 3, false),
(Item("common.items.tool.craftsman_hammer"), 0, false),
],
craft_sprite: Some(CraftingBench),
is_recycling: false,
),
} }

View File

@ -378,6 +378,16 @@
(Item("common.items.armor.merchant.pants"),1), (Item("common.items.armor.merchant.pants"),1),
(Item("common.items.armor.merchant.shoulder"),1), (Item("common.items.armor.merchant.shoulder"),1),
], ],
"boreal": [
(Item("common.items.armor.boreal.chest"),1),
(Item("common.items.armor.boreal.pants"),1),
(Item("common.items.armor.boreal.hand"),1),
(Item("common.items.armor.boreal.foot"),1),
(Item("common.items.armor.boreal.shoulder"),1),
(Item("common.items.armor.boreal.belt"),1),
(Item("common.items.armor.boreal.back"),1),
(Item("common.items.armor.misc.head.boreal_warhelm"),1),
],
"instruments": [ "instruments": [
(Item("common.items.tool.instruments.double_bass"),1), (Item("common.items.tool.instruments.double_bass"),1),
(Item("common.items.tool.instruments.flute"),1), (Item("common.items.tool.instruments.flute"),1),

View File

@ -348,6 +348,12 @@
], ],
threshold: 0.8, threshold: 0.8,
), ),
Attack(DashMelee(Action), Hammer): (
files: [
"voxygen.audio.sfx.abilities.swing",
],
threshold: 0.7,
),
Attack(SpinMelee(Action), Sword): ( Attack(SpinMelee(Action), Sword): (
files: [ files: [
"voxygen.audio.sfx.abilities.swing_sword", "voxygen.audio.sfx.abilities.swing_sword",
@ -458,6 +464,12 @@
], ],
threshold: 0.8, threshold: 0.8,
), ),
Attack(BasicMelee(Action), Axe): (
files: [
"voxygen.audio.sfx.abilities.swing",
],
threshold: 0.8,
),
Inventory(CollectedTool(Axe)): ( Inventory(CollectedTool(Axe)): (
files: [ files: [
"voxygen.audio.sfx.inventory.pickup_sword", "voxygen.audio.sfx.inventory.pickup_sword",
@ -1232,6 +1244,30 @@
], ],
threshold: 0.2, threshold: 0.2,
), ),
GigaRoar: (
files: [
"voxygen.audio.sfx.abilities.gigas_frost_roar",
],
threshold: 1.3,
),
FlashFreeze: (
files: [
"voxygen.audio.sfx.abilities.minotaur_smash_2",
],
threshold: 0.2,
),
IceSpikes: (
files: [
"voxygen.audio.sfx.abilities.minotaur_smash_2",
],
threshold: 0.2,
),
IceCrack: (
files: [
"voxygen.audio.sfx.abilities.ice_crack",
],
threshold: 0.9,
),
Utterance(Angry, Alligator): ( Utterance(Angry, Alligator): (
files: [ files: [
"voxygen.audio.sfx.utterance.alligator_angry1", "voxygen.audio.sfx.utterance.alligator_angry1",

BIN
assets/voxygen/audio/sfx/abilities/gigas_frost_roar.ogg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/audio/sfx/abilities/ice_crack.ogg (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1950,6 +1950,35 @@
"voxel.armor.ferocious.back", "voxel.armor.ferocious.back",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
), ),
//Boreal Armor
Simple("common.items.armor.boreal.chest"): VoxTrans(
"voxel.armor.boreal.chest",
(0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
),
Simple("common.items.armor.boreal.pants"): VoxTrans(
"voxel.armor.boreal.pants",
(0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
Simple("common.items.armor.boreal.belt"): VoxTrans(
"voxel.armor.boreal.belt",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
Simple("common.items.armor.boreal.foot"): VoxTrans(
"voxel.armor.boreal.foot",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
Simple("common.items.armor.boreal.hand"): VoxTrans(
"voxel.armor.boreal.hand",
(0.0, 0.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
Simple("common.items.armor.boreal.shoulder"): VoxTrans(
"voxel.armor.boreal.shoulder",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
),
Simple("common.items.armor.boreal.back"): VoxTrans(
"voxel.armor.boreal.back",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
//Blue Leather Armor //Blue Leather Armor
Simple("common.items.npc_armor.chest.leather_blue"): VoxTrans( Simple("common.items.npc_armor.chest.leather_blue"): VoxTrans(
"voxel.armor.leather_blue.chest", "voxel.armor.leather_blue.chest",
@ -3592,10 +3621,18 @@
"voxel.sprite.crafting_ing.abyssal_heart", "voxel.sprite.crafting_ing.abyssal_heart",
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
), ),
Simple("common.items.crafting_ing.pearl"): VoxTrans(
"voxel.sprite.crafting_ing.pearl",
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.5,
),
Simple("common.items.crafting_ing.coral_branch"): VoxTrans( Simple("common.items.crafting_ing.coral_branch"): VoxTrans(
"voxel.sprite.crafting_ing.coral_branch", "voxel.sprite.crafting_ing.coral_branch",
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
), ),
Simple("common.items.crafting_ing.glacial_crystal"): VoxTrans(
"voxel.object.glacial_crystal",
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
),
// Gliders // Gliders
Simple("common.items.glider.cloverleaf"): VoxTrans( Simple("common.items.glider.cloverleaf"): VoxTrans(
"voxel.glider.starter", "voxel.glider.starter",
@ -3657,6 +3694,10 @@
"voxel.glider.leaves", "voxel.glider.leaves",
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
), ),
Simple("common.items.glider.winter_wings"): VoxTrans(
"voxel.glider.winter_wings",
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
),
// Debug Items // Debug Items
Simple("common.items.debug.admin_stick"): VoxTrans( Simple("common.items.debug.admin_stick"): VoxTrans(
"voxel.weapon.tool.broom_belzeshrub_purple", "voxel.weapon.tool.broom_belzeshrub_purple",

View File

@ -79,6 +79,7 @@ const int LIGHTNING = 38;
const int STEAM = 39; const int STEAM = 39;
const int BARRELORGAN = 40; const int BARRELORGAN = 40;
const int POTION_SICKNESS = 41; const int POTION_SICKNESS = 41;
const int GIGA_SNOW = 42;
// meters per second squared (acceleration) // meters per second squared (acceleration)
const float earth_gravity = 9.807; const float earth_gravity = 9.807;
@ -656,6 +657,15 @@ void main() {
spin_in_axis(vec3(1,0,0),0) spin_in_axis(vec3(1,0,0),0)
); );
break; break;
case GIGA_SNOW:
f_reflect = 0.0;
attr = Attr(
(inst_dir * slow_end(1.5)) + vec3(rand0, rand1, rand2) * (percent() + 2) * 0.1,
vec3((3.5 * (1 - slow_start(0.2)))),
vec4(vec3(2, 2, 2), 1),
spin_in_axis(vec3(rand6, rand7, rand8), percent() * 10 + 3 * rand9)
);
break;
default: default:
attr = Attr( attr = Attr(
linear_motion( linear_motion(

BIN
assets/voxygen/voxel/armor/boreal/back.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/boreal/belt.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/boreal/chest.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/boreal/foot.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/boreal/hand.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/boreal/hat.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/boreal/pants.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/boreal/shoulder.vox (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1144,4 +1144,56 @@
central: ("armor.empty"), central: ("armor.empty"),
) )
), ),
(Gigasfrost, Male): (
head: (
offset: (-13.0, -7.0, 0.0),
central: ("npc.gigas_frost.male.head"),
),
torso_upper: (
offset: (-11.0, -15.5, -10.0),
central: ("npc.gigas_frost.male.torso_upper"),
),
torso_lower: (
offset: (-15.0, -12.5, -17.0),
central: ("npc.gigas_frost.male.torso_lower"),
),
jaw: (
offset: (-3.0, 0.0, -3.5),
central: ("npc.gigas_frost.male.jaw"),
),
tail: (
offset: (-1.5, -17.0, -8.0),
central: ("armor.empty"),
),
second: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
)
),
(Gigasfrost, Female): (
head: (
offset: (-13.0, -7.0, 0.0),
central: ("npc.gigas_frost.male.head"),
),
torso_upper: (
offset: (-11.0, -15.5, -10.0),
central: ("npc.gigas_frost.male.torso_upper"),
),
torso_lower: (
offset: (-15.0, -12.5, -17.0),
central: ("npc.gigas_frost.male.torso_lower"),
),
jaw: (
offset: (-3.0, 0.0, -3.5),
central: ("npc.gigas_frost.male.jaw"),
),
tail: (
offset: (-1.5, -17.0, -8.0),
central: ("armor.empty"),
),
second: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
)
),
}) })

View File

@ -1495,4 +1495,72 @@
lateral: ("npc.tursus.male.foot_r"), lateral: ("npc.tursus.male.foot_r"),
), ),
), ),
(Gigasfrost, Male): (
shoulder_l: (
offset: (-5.5, -4.5, -5.5),
lateral: ("npc.gigas_frost.male.shoulder_l"),
),
shoulder_r: (
offset: (-5.5, -4.5, -5.5),
lateral: ("npc.gigas_frost.male.shoulder_r"),
),
hand_l: (
offset: (-7.5, -5.5, -16.0),
lateral: ("npc.gigas_frost.male.hand_l"),
),
hand_r: (
offset: (-7.5, -5.5, -16.0),
lateral: ("npc.gigas_frost.male.hand_r"),
),
leg_l: (
offset: (-4.0, -4.0, -6.0),
lateral: ("npc.gigas_frost.male.leg_l"),
),
leg_r: (
offset: (-4.0, -4.0, -6.0),
lateral: ("npc.gigas_frost.male.leg_r"),
),
foot_l: (
offset: (-4.5, -6.5, -4.5),
lateral: ("npc.gigas_frost.male.foot_l"),
),
foot_r: (
offset: (-4.5, -6.5, -4.5),
lateral: ("npc.gigas_frost.male.foot_r"),
)
),
(Gigasfrost, Female): (
shoulder_l: (
offset: (-5.5, -4.5, -5.5),
lateral: ("npc.gigas_frost.male.shoulder_l"),
),
shoulder_r: (
offset: (-5.5, -4.5, -5.5),
lateral: ("npc.gigas_frost.male.shoulder_r"),
),
hand_l: (
offset: (-7.5, -5.5, -16.0),
lateral: ("npc.gigas_frost.male.hand_l"),
),
hand_r: (
offset: (-7.5, -5.5, -16.0),
lateral: ("npc.gigas_frost.male.hand_r"),
),
leg_l: (
offset: (-4.0, -4.0, -6.0),
lateral: ("npc.gigas_frost.male.leg_l"),
),
leg_r: (
offset: (-4.0, -4.0, -6.0),
lateral: ("npc.gigas_frost.male.leg_r"),
),
foot_l: (
offset: (-4.5, -6.5, -4.5),
lateral: ("npc.gigas_frost.male.foot_l"),
),
foot_r: (
offset: (-4.5, -6.5, -4.5),
lateral: ("npc.gigas_frost.male.foot_r"),
)
),
}) })

View File

@ -75,5 +75,8 @@
"common.items.npc_armor.biped_small.husk.chest.husk": ( "common.items.npc_armor.biped_small.husk.chest.husk": (
vox_spec: ("npc.husk.male.chest", (-6.0, -4.5, -4.0)), vox_spec: ("npc.husk.male.chest", (-6.0, -4.5, -4.0)),
), ),
"common.items.npc_armor.biped_small.boreal.chest.warrior": (
vox_spec: ("npc.boreal.warrior.chest", (-9.0, -6.0, -8.5)),
),
}, },
)) ))

View File

@ -200,5 +200,13 @@
vox_spec: ("npc.husk.male.foot_r", (-2.0, -3.5, -7.0)), vox_spec: ("npc.husk.male.foot_r", (-2.0, -3.5, -7.0)),
) )
), ),
"common.items.npc_armor.biped_small.boreal.foot.warrior": (
left: (
vox_spec: ("npc.boreal.warrior.foot_r", (-2.5, -3.5, -9.0)),
),
right: (
vox_spec: ("npc.boreal.warrior.foot_r", (-2.5, -3.5, -9.0)),
)
),
}, },
)) ))

View File

@ -200,5 +200,13 @@
vox_spec: ("npc.husk.male.hand_r", (0.0, -2.5, -10.0)), vox_spec: ("npc.husk.male.hand_r", (0.0, -2.5, -10.0)),
) )
), ),
}, "common.items.npc_armor.biped_small.boreal.hand.warrior": (
left: (
vox_spec: ("npc.boreal.warrior.hand_r", (-6.0, -2.5, -10.0)),
),
right: (
vox_spec: ("npc.boreal.warrior.hand_r", (0.0, -2.5, -10.0)),
)
),
}
)) ))

View File

@ -1,4 +1,5 @@
(( ((
// (<x>, <y>, <z>)
default: ( default: (
vox_spec: ("armor.empty", (0.0, 0.0, 0.0)), vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
), ),
@ -75,5 +76,8 @@
"common.items.npc_armor.biped_small.husk.head.husk": ( "common.items.npc_armor.biped_small.husk.head.husk": (
vox_spec: ("npc.husk.male.head", (-6.0, -6.0, -5.5)), vox_spec: ("npc.husk.male.head", (-6.0, -6.0, -5.5)),
), ),
"common.items.npc_armor.biped_small.boreal.head.warrior": (
vox_spec: ("npc.boreal.warrior.head", (-8.0, -6.0, -8.0)),
),
}, },
)) ))

View File

@ -75,5 +75,8 @@
"common.items.npc_armor.biped_small.husk.pants.husk": ( "common.items.npc_armor.biped_small.husk.pants.husk": (
vox_spec: ("npc.husk.male.pants", (-5.0, -4.5, -6.0)), vox_spec: ("npc.husk.male.pants", (-5.0, -4.5, -6.0)),
), ),
"common.items.npc_armor.biped_small.boreal.pants.warrior": (
vox_spec: ("npc.boreal.warrior.pants", (-7.0, -5.0, -3.5)),
),
}, },
)) ))

View File

@ -1751,4 +1751,16 @@
vox_spec: ("armor.empty", (0.0, 0.0, 0.0)), vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
color: None color: None
), ),
Tool("common.items.npc_weapons.axe.gigas_frost_axe"): (
vox_spec: ("weapon.axe.2haxe_gigas_frost", (-3.0, -15.5, -14.0)),
color: None
),
Tool("common.items.npc_weapons.biped_small.boreal.bow"): (
vox_spec: ("weapon.biped_small.bow.boreal_bow", (-2.5, -6.0, -12.0)),
color: None
),
Tool("common.items.npc_weapons.biped_small.boreal.hammer"): (
vox_spec: ("weapon.biped_small.hammer.boreal_hammer", (-2.5, -6.0, -4.0)),
color: None
),
}) })

BIN
assets/voxygen/voxel/glider/winter_wings.vox (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -28,6 +28,10 @@
vox_spec: ("armor.ferocious.back", (-5.0, -1.5, -14.0)), vox_spec: ("armor.ferocious.back", (-5.0, -1.5, -14.0)),
color: None color: None
), ),
"common.items.armor.boreal.back": (
vox_spec: ("armor.boreal.back", (-5.0, -2.0, -14.0)),
color: None
),
"common.items.armor.misc.back.backpack": ( "common.items.armor.misc.back.backpack": (
vox_spec: ("armor.misc.back.backpack", (-7.0, -5.0, -10.0)), vox_spec: ("armor.misc.back.backpack", (-7.0, -5.0, -10.0)),
color: None color: None

View File

@ -28,6 +28,10 @@
vox_spec: ("armor.ferocious.belt", (-4.0, -3.5, -1.0)), vox_spec: ("armor.ferocious.belt", (-4.0, -3.5, -1.0)),
color: None color: None
), ),
"common.items.armor.boreal.belt": (
vox_spec: ("armor.boreal.belt", (-4.0, -3.0, 2.0)),
color: None
),
"common.items.armor.cloth_purple.belt": ( "common.items.armor.cloth_purple.belt": (
vox_spec: ("armor.cloth_purple.belt", (-5.0, -3.5, 2.0)), vox_spec: ("armor.cloth_purple.belt", (-5.0, -3.5, 2.0)),
color: None color: None

View File

@ -32,6 +32,10 @@
vox_spec: ("armor.ferocious.chest", (-7.0, -3.5, 2.0)), vox_spec: ("armor.ferocious.chest", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.boreal.chest": (
vox_spec: ("armor.boreal.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.assassin.chest": ( "common.items.armor.assassin.chest": (
vox_spec: ("armor.assassin.chest", (-7.0, -3.5, 2.0)), vox_spec: ("armor.assassin.chest", (-7.0, -3.5, 2.0)),
color: None color: None

View File

@ -24,6 +24,10 @@
vox_spec: ("armor.ferocious.foot", (-2.5, -3.5, -2.0)), vox_spec: ("armor.ferocious.foot", (-2.5, -3.5, -2.0)),
color: None color: None
), ),
"common.items.armor.boreal.foot": (
vox_spec: ("armor.boreal.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.cloth_blue.foot": ( "common.items.armor.cloth_blue.foot": (
vox_spec: ("armor.cloth_blue.foot", (-2.5, -3.5, -2.0)), vox_spec: ("armor.cloth_blue.foot", (-2.5, -3.5, -2.0)),
color: None color: None

View File

@ -40,6 +40,16 @@
color: None color: None
) )
), ),
"common.items.armor.boreal.hand": (
left: (
vox_spec: ("armor.boreal.hand", (-2.0, -1.5, -3.0)),
color: None
),
right: (
vox_spec: ("armor.boreal.hand", (-2.0, -1.5, -3.0)),
color: None
)
),
"common.items.armor.cloth_purple.hand": ( "common.items.armor.cloth_purple.hand": (
left: ( left: (
vox_spec: ("armor.cloth_purple.hand", (-1.5, -1.5, -2.5)), vox_spec: ("armor.cloth_purple.hand", (-1.5, -1.5, -2.5)),

View File

@ -35,6 +35,10 @@
"common.items.armor.ferocious.pants": ( "common.items.armor.ferocious.pants": (
vox_spec: ("armor.ferocious.pants", (-5.0, -3.5, 1.0)), vox_spec: ("armor.ferocious.pants", (-5.0, -3.5, 1.0)),
color: None color: None
),
"common.items.armor.boreal.pants": (
vox_spec: ("armor.boreal.pants", (-5.0, -3.5, 0.0)),
color: None
), ),
"common.items.npc_armor.pants.plate_red": ( "common.items.npc_armor.pants.plate_red": (
vox_spec: ("armor.misc.pants.plate_grey", (-5.0, -3.5, 1.0)), vox_spec: ("armor.misc.pants.plate_grey", (-5.0, -3.5, 1.0)),

View File

@ -51,6 +51,16 @@
color: None color: None
) )
), ),
"common.items.armor.boreal.shoulder": (
left: (
vox_spec: ("armor.boreal.shoulder", (-3.5, -3.5, -3.0)),
color: None
),
right: (
vox_spec: ("armor.boreal.shoulder", (-1.5, -3.5, -3.0)),
color: None
)
),
"common.items.armor.cloth_purple.shoulder": ( "common.items.armor.cloth_purple.shoulder": (
left: ( left: (
vox_spec: ("armor.cloth_purple.shoulder", (-3.2, -3.5, 0.0)), vox_spec: ("armor.cloth_purple.shoulder", (-3.2, -3.5, 0.0)),

View File

@ -64,5 +64,9 @@
vox_spec: ("glider.leaves", (-26.0, -26.0, 0.0)), vox_spec: ("glider.leaves", (-26.0, -26.0, 0.0)),
color: None color: None
), ),
"common.items.glider.winter_wings": (
vox_spec: ("glider.winter_wings", (-26.0, -26.0, 0.0)),
color: None
),
}, },
)) ))

View File

@ -479,6 +479,14 @@
Simple("common.items.armor.ferocious.hand"): "voxel.armor.ferocious.hand", Simple("common.items.armor.ferocious.hand"): "voxel.armor.ferocious.hand",
Simple("common.items.armor.ferocious.shoulder"): "voxel.armor.ferocious.shoulder", Simple("common.items.armor.ferocious.shoulder"): "voxel.armor.ferocious.shoulder",
Simple("common.items.armor.ferocious.back"): "voxel.armor.ferocious.back", Simple("common.items.armor.ferocious.back"): "voxel.armor.ferocious.back",
//Boreal Armor
Simple("common.items.armor.boreal.chest"): "voxel.armor.boreal.chest",
Simple("common.items.armor.boreal.pants"): "voxel.armor.boreal.pants",
Simple("common.items.armor.boreal.belt"): "voxel.armor.boreal.belt",
Simple("common.items.armor.boreal.foot"): "voxel.armor.boreal.foot",
Simple("common.items.armor.boreal.hand"): "voxel.armor.boreal.hand",
Simple("common.items.armor.boreal.shoulder"): "voxel.armor.boreal.shoulder",
Simple("common.items.armor.boreal.back"): "voxel.armor.boreal.back",
//Blue Leather Armor //Blue Leather Armor
Simple("common.items.npc_armor.chest.leather_blue"): "voxel.armor.leather_blue.chest", Simple("common.items.npc_armor.chest.leather_blue"): "voxel.armor.leather_blue.chest",
Simple("common.items.npc_armor.pants.leather_blue"): "voxel.armor.leather_blue.pants", Simple("common.items.npc_armor.pants.leather_blue"): "voxel.armor.leather_blue.pants",
@ -863,6 +871,7 @@
Simple("common.items.flowers.plant_fiber"): "voxel.sprite.crafting_ing.plant_fiber", Simple("common.items.flowers.plant_fiber"): "voxel.sprite.crafting_ing.plant_fiber",
Simple("common.items.flowers.moonbell"): "voxel.sprite.flowers.moonbell", Simple("common.items.flowers.moonbell"): "voxel.sprite.flowers.moonbell",
Simple("common.items.crafting_ing.abyssal_heart"): "voxel.sprite.crafting_ing.abyssal_heart", Simple("common.items.crafting_ing.abyssal_heart"): "voxel.sprite.crafting_ing.abyssal_heart",
Simple("common.items.crafting_ing.pearl"): "voxel.sprite.crafting_ing.pearl",
Simple("common.items.crafting_ing.coral_branch"): "voxel.sprite.crafting_ing.coral_branch", Simple("common.items.crafting_ing.coral_branch"): "voxel.sprite.crafting_ing.coral_branch",
Simple("common.items.flowers.pyrebloom"): "voxel.sprite.flowers.pyrebloom", Simple("common.items.flowers.pyrebloom"): "voxel.sprite.flowers.pyrebloom",
Simple("common.items.flowers.wild_flax"): "voxel.sprite.flowers.flax", Simple("common.items.flowers.wild_flax"): "voxel.sprite.flowers.flax",
@ -877,6 +886,7 @@
Simple("common.items.crafting_ing.cloth.linen_red"): "voxel.sprite.crafting_ing.cloth.linen_red", Simple("common.items.crafting_ing.cloth.linen_red"): "voxel.sprite.crafting_ing.cloth.linen_red",
Simple("common.items.crafting_ing.sticky_thread"): "voxel.sprite.crafting_ing.sticky_thread", Simple("common.items.crafting_ing.sticky_thread"): "voxel.sprite.crafting_ing.sticky_thread",
Simple("common.items.crafting_ing.resin"): "voxel.sprite.crafting_ing.resin", Simple("common.items.crafting_ing.resin"): "voxel.sprite.crafting_ing.resin",
Simple("common.items.crafting_ing.glacial_crystal"): "voxel.object.glacial_crystal",
Simple("common.items.mineral.ingot.silver"): "voxel.sprite.mineral.ingot.silver", Simple("common.items.mineral.ingot.silver"): "voxel.sprite.mineral.ingot.silver",
Simple("common.items.mineral.ingot.gold"): "voxel.sprite.mineral.ingot.gold", Simple("common.items.mineral.ingot.gold"): "voxel.sprite.mineral.ingot.gold",
Simple("common.items.mineral.ingot.orichalcum"): "voxel.sprite.mineral.ingot.orichalcum", Simple("common.items.mineral.ingot.orichalcum"): "voxel.sprite.mineral.ingot.orichalcum",
@ -925,6 +935,7 @@
Simple("common.items.glider.moonrise"): "voxel.glider.moonrise", Simple("common.items.glider.moonrise"): "voxel.glider.moonrise",
Simple("common.items.glider.skullgrin"): "voxel.glider.cultists", Simple("common.items.glider.skullgrin"): "voxel.glider.cultists",
Simple("common.items.glider.leaves"): "voxel.glider.leaves", Simple("common.items.glider.leaves"): "voxel.glider.leaves",
Simple("common.items.glider.winter_wings"): "voxel.glider.winter_wings",
// Debug Items // Debug Items
Simple("common.items.debug.admin_stick"): "voxel.weapon.tool.broom_belzeshrub_purple", Simple("common.items.debug.admin_stick"): "voxel.weapon.tool.broom_belzeshrub_purple",
// Misc // Misc

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

Binary file not shown.

BIN
assets/voxygen/voxel/npc/boreal/warrior/foot_r.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