mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'taoist/better-dullahan' into 'master'
taoist&floppy/cyclops&dullahan See merge request veloren/veloren!3859
This commit is contained in:
Samuel Keiffer
commit
7aa43e9e8a
@ -476,6 +476,24 @@
|
||||
Simple(None, "common.abilities.custom.minotaur.frenzy"),
|
||||
],
|
||||
),
|
||||
Custom("Dullahan"): (
|
||||
primary: Simple(None, "common.abilities.custom.dullahan.melee"),
|
||||
secondary: Simple(None, "common.abilities.custom.dullahan.fierce_darts"),
|
||||
abilities: [
|
||||
Simple(None, "common.abilities.custom.dullahan.knife_rain"),
|
||||
Simple(None, "common.abilities.custom.dullahan.dash"),
|
||||
],
|
||||
),
|
||||
Custom("Cyclops"): (
|
||||
primary: Simple(None, "common.abilities.custom.cyclops.doublestrike"),
|
||||
secondary: Simple(None, "common.abilities.custom.cyclops.optic_blast"),
|
||||
abilities: [
|
||||
Simple(None, "common.abilities.custom.cyclops.hammer_shockwave"),
|
||||
Simple(None, "common.abilities.custom.cyclops.dash"),
|
||||
Simple(None, "common.abilities.custom.cyclops.reinforce"),
|
||||
|
||||
],
|
||||
),
|
||||
Custom("Clay Golem"): (
|
||||
primary: Simple(None, "common.abilities.custom.claygolem.strike"),
|
||||
secondary: Simple(None, "common.abilities.custom.claygolem.laser"),
|
||||
|
||||
28
assets/common/abilities/custom/cyclops/dash.ron
Normal file
28
assets/common/abilities/custom/cyclops/dash.ron
Normal file
@ -0,0 +1,28 @@
|
||||
DashMelee(
|
||||
energy_cost: 0,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 28.0,
|
||||
poise: 20.0,
|
||||
knockback: 2.0,
|
||||
energy_regen: 0.0,
|
||||
),
|
||||
scaled: Some(Bash(
|
||||
damage: 36.0,
|
||||
poise: 60.0,
|
||||
knockback: 5.0,
|
||||
energy_regen: 0.0,
|
||||
)),
|
||||
range: 6.0,
|
||||
angle: 90.0,
|
||||
multi_target: Some(Normal),
|
||||
),
|
||||
energy_drain: 0,
|
||||
forward_speed: 9.0,
|
||||
buildup_duration: 0.8,
|
||||
charge_duration: 2.0,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 0.8,
|
||||
ori_modifier: 0.1,
|
||||
charge_through: false,
|
||||
)
|
||||
49
assets/common/abilities/custom/cyclops/doublestrike.ron
Normal file
49
assets/common/abilities/custom/cyclops/doublestrike.ron
Normal file
@ -0,0 +1,49 @@
|
||||
ComboMelee(
|
||||
stage_data: [
|
||||
(
|
||||
stage: 1,
|
||||
base_damage: 32.0,
|
||||
damage_increase: 0.0,
|
||||
base_poise_damage: 20,
|
||||
poise_damage_increase: 0.0,
|
||||
knockback: 5.0,
|
||||
range: 6,
|
||||
angle: 90.0,
|
||||
base_buildup_duration: 0.5,
|
||||
base_swing_duration: 0.4,
|
||||
hit_timing: 0.4,
|
||||
base_recover_duration: 0.4,
|
||||
forward_movement: 0.3,
|
||||
damage_kind: Crushing,
|
||||
),
|
||||
(
|
||||
stage: 2,
|
||||
base_damage: 36.0,
|
||||
damage_increase: 0.0,
|
||||
base_poise_damage: 40.0,
|
||||
poise_damage_increase: 0.0,
|
||||
knockback: 10.0,
|
||||
range: 8,
|
||||
angle: 45.0,
|
||||
base_buildup_duration: 0.6,
|
||||
base_swing_duration: 0.6,
|
||||
hit_timing: 0.3,
|
||||
base_recover_duration: 1.2,
|
||||
forward_movement: 0.2,
|
||||
damage_kind: Crushing,
|
||||
damage_effect: Some(Buff((
|
||||
kind: Crippled,
|
||||
dur_secs: 3.0,
|
||||
strength: DamageFraction(0.1),
|
||||
chance: 1.0,
|
||||
))),
|
||||
),
|
||||
],
|
||||
initial_energy_gain: 0,
|
||||
max_energy_gain: 0,
|
||||
energy_increase: 0,
|
||||
speed_increase: 0.0,
|
||||
max_speed_increase: 0.0,
|
||||
scales_from_combo: 0,
|
||||
ori_modifier: 0.65,
|
||||
)
|
||||
18
assets/common/abilities/custom/cyclops/hammer_shockwave.ron
Normal file
18
assets/common/abilities/custom/cyclops/hammer_shockwave.ron
Normal file
@ -0,0 +1,18 @@
|
||||
Shockwave(
|
||||
energy_cost: 0,
|
||||
buildup_duration: 1.2,
|
||||
swing_duration: 0.12,
|
||||
recover_duration: 0.8,
|
||||
damage: 45.0,
|
||||
poise_damage: 60,
|
||||
knockback: (strength: 10.0, direction: TowardsUp),
|
||||
shockwave_angle: 360.0,
|
||||
shockwave_vertical_angle: 360.0,
|
||||
shockwave_speed: 40.0,
|
||||
shockwave_duration: 0.4,
|
||||
requires_ground: true,
|
||||
move_efficiency: 0.0,
|
||||
damage_kind: Piercing,
|
||||
specifier: Ground,
|
||||
ori_rate: 1.0,
|
||||
)
|
||||
16
assets/common/abilities/custom/cyclops/optic_blast.ron
Normal file
16
assets/common/abilities/custom/cyclops/optic_blast.ron
Normal file
@ -0,0 +1,16 @@
|
||||
BasicRanged(
|
||||
energy_cost: 0.0,
|
||||
buildup_duration: 1.6,
|
||||
recover_duration: 1.2,
|
||||
projectile: LaserBeam(
|
||||
damage: 48.0,
|
||||
radius: 8.0,
|
||||
knockback: 5.0,
|
||||
energy_regen: 20.0,
|
||||
min_falloff: 0.0,
|
||||
),
|
||||
projectile_body: Object(LaserBeam),
|
||||
projectile_speed: 100.0,
|
||||
num_projectiles: 1,
|
||||
projectile_spread: 0,
|
||||
)
|
||||
9
assets/common/abilities/custom/cyclops/reinforce.ron
Normal file
9
assets/common/abilities/custom/cyclops/reinforce.ron
Normal file
@ -0,0 +1,9 @@
|
||||
SelfBuff(
|
||||
buildup_duration: 0.4,
|
||||
cast_duration: 0.8,
|
||||
recover_duration: 0.3,
|
||||
buff_kind: ProtectingWard,
|
||||
buff_strength: 2.0,
|
||||
buff_duration: Some(300.0),
|
||||
energy_cost: 0,
|
||||
)
|
||||
28
assets/common/abilities/custom/dullahan/dash.ron
Normal file
28
assets/common/abilities/custom/dullahan/dash.ron
Normal file
@ -0,0 +1,28 @@
|
||||
DashMelee(
|
||||
energy_cost: 0,
|
||||
melee_constructor: (
|
||||
kind: Bash(
|
||||
damage: 28.5,
|
||||
poise: 30.0,
|
||||
knockback: 2.0,
|
||||
energy_regen: 0.0,
|
||||
),
|
||||
scaled: Some(Bash(
|
||||
damage: 36.0,
|
||||
poise: 38.6,
|
||||
knockback: 3.0,
|
||||
energy_regen: 0.0,
|
||||
)),
|
||||
range: 5.0,
|
||||
angle: 90.0,
|
||||
multi_target: Some(Normal),
|
||||
),
|
||||
energy_drain: 0,
|
||||
forward_speed: 8.0,
|
||||
buildup_duration: 0.6,
|
||||
charge_duration: 2.0,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 1.2,
|
||||
ori_modifier: 0.1,
|
||||
charge_through: false,
|
||||
)
|
||||
15
assets/common/abilities/custom/dullahan/fierce_darts.ron
Normal file
15
assets/common/abilities/custom/dullahan/fierce_darts.ron
Normal file
@ -0,0 +1,15 @@
|
||||
BasicRanged(
|
||||
energy_cost: 0.0,
|
||||
buildup_duration: 0.55,
|
||||
recover_duration: 0.45,
|
||||
projectile: Knife(
|
||||
damage: 31.0,
|
||||
knockback: 5.0,
|
||||
energy_regen: 20.0,
|
||||
min_falloff: 0.0,
|
||||
),
|
||||
projectile_body: Object(SpectralSwordLarge),
|
||||
projectile_speed: 120.0,
|
||||
num_projectiles: 3,
|
||||
projectile_spread: 0.075,
|
||||
)
|
||||
16
assets/common/abilities/custom/dullahan/knife_rain.ron
Normal file
16
assets/common/abilities/custom/dullahan/knife_rain.ron
Normal file
@ -0,0 +1,16 @@
|
||||
BasicRanged(
|
||||
energy_cost: 0.0,
|
||||
buildup_duration: 1.1,
|
||||
recover_duration: 0.2,
|
||||
projectile: Knife(
|
||||
damage: 34.0,
|
||||
radius: 3.8,
|
||||
knockback: 5.0,
|
||||
energy_regen: 20.0,
|
||||
min_falloff: 0.3,
|
||||
),
|
||||
projectile_body: Object(SpectralSwordSmall),
|
||||
projectile_speed: 20.0,
|
||||
num_projectiles: 36,
|
||||
projectile_spread: 0.4,
|
||||
)
|
||||
55
assets/common/abilities/custom/dullahan/melee.ron
Normal file
55
assets/common/abilities/custom/dullahan/melee.ron
Normal file
@ -0,0 +1,55 @@
|
||||
ComboMelee(
|
||||
stage_data: [
|
||||
(
|
||||
stage: 1,
|
||||
base_damage: 35.5,
|
||||
damage_increase: 0.0,
|
||||
base_poise_damage: 15.0,
|
||||
poise_damage_increase: 0.0,
|
||||
knockback: 2.0,
|
||||
range: 6.0,
|
||||
angle: 60.0,
|
||||
base_buildup_duration: 0.8,
|
||||
base_swing_duration: 0.1,
|
||||
hit_timing: 0.4,
|
||||
base_recover_duration: 0.3,
|
||||
forward_movement: 0.8,
|
||||
damage_kind: Slashing,
|
||||
damage_effect: Some(Buff((
|
||||
kind: Bleeding,
|
||||
dur_secs: 3.0,
|
||||
strength: DamageFraction(0.05),
|
||||
chance: 0.3,
|
||||
))),
|
||||
),
|
||||
(
|
||||
stage: 2,
|
||||
base_damage: 38.5,
|
||||
damage_increase: 0.0,
|
||||
base_poise_damage: 20.0,
|
||||
poise_damage_increase: 0.0,
|
||||
knockback: 8.0,
|
||||
range: 6.0,
|
||||
angle: 60.0,
|
||||
base_buildup_duration: 0.7,
|
||||
base_swing_duration: 0.1,
|
||||
hit_timing: 0.4,
|
||||
base_recover_duration: 1.3,
|
||||
forward_movement: 0.2,
|
||||
damage_kind: Slashing,
|
||||
damage_effect: Some(Buff((
|
||||
kind: Bleeding,
|
||||
dur_secs: 3.0,
|
||||
strength: DamageFraction(0.1),
|
||||
chance: 0.15,
|
||||
))),
|
||||
),
|
||||
],
|
||||
initial_energy_gain: 0,
|
||||
max_energy_gain: 0,
|
||||
energy_increase: 0,
|
||||
speed_increase: 0.0,
|
||||
max_speed_increase: 0.0,
|
||||
scales_from_combo: 0,
|
||||
ori_modifier: 0.6,
|
||||
)
|
||||
@ -1,7 +1,7 @@
|
||||
#![enable(implicit_some)]
|
||||
(
|
||||
name: Name("Dullahan"),
|
||||
body: RandomWith("dullahan"),
|
||||
name: Automatic,
|
||||
body: RandomWith("cyclops"),
|
||||
alignment: Alignment(Enemy),
|
||||
loot: LootTable("common.loot_tables.dungeon.tier-4.miniboss"),
|
||||
inventory: (
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#![enable(implicit_some)]
|
||||
(
|
||||
name: Automatic,
|
||||
body: RandomWith("cyclops"),
|
||||
name: Name("Dullahan"),
|
||||
body: RandomWith("dullahan"),
|
||||
alignment: Alignment(Enemy),
|
||||
loot: LootTable("common.loot_tables.creature.biped_large.default"),
|
||||
inventory: (
|
||||
@ -2,7 +2,7 @@
|
||||
(
|
||||
name: Automatic,
|
||||
body: RandomWith("mammoth"),
|
||||
alignment: Alignment(Enemy),
|
||||
alignment: Alignment(Wild),
|
||||
loot: LootTable("common.loot_tables.creature.quad_medium.mammoth"),
|
||||
inventory: (
|
||||
loadout: FromBody,
|
||||
|
||||
13
assets/common/items/npc_armor/biped_large/cyclops.ron
Normal file
13
assets/common/items/npc_armor/biped_large/cyclops.ron
Normal file
@ -0,0 +1,13 @@
|
||||
ItemDef(
|
||||
name: "Cyclops Armor",
|
||||
description: "Made of mysteries.",
|
||||
kind: Armor((
|
||||
kind: Chest,
|
||||
stats: Direct((
|
||||
protection: Some(Normal(120.0)),
|
||||
poise_resilience: Some(Normal(60.0)),
|
||||
)),
|
||||
)),
|
||||
quality: Moderate,
|
||||
tags: [],
|
||||
)
|
||||
13
assets/common/items/npc_armor/biped_large/dullahan.ron
Normal file
13
assets/common/items/npc_armor/biped_large/dullahan.ron
Normal file
@ -0,0 +1,13 @@
|
||||
ItemDef(
|
||||
name: "Dullahan Itself Armor",
|
||||
description: "Made of It ownself.",
|
||||
kind: Armor((
|
||||
kind: Chest,
|
||||
stats: Direct((
|
||||
protection: Some(Normal(200.0)),
|
||||
poise_resilience: Some(Normal(10.0)),
|
||||
)),
|
||||
)),
|
||||
quality: Moderate,
|
||||
tags: [],
|
||||
)
|
||||
@ -17,5 +17,5 @@ ItemDef(
|
||||
)),
|
||||
quality: Low,
|
||||
tags: [],
|
||||
ability_spec: Some(Custom("Hammer Simple")),
|
||||
ability_spec: Some(Custom("Cyclops")),
|
||||
)
|
||||
@ -5,11 +5,11 @@ ItemDef(
|
||||
kind: Sword,
|
||||
hands: Two,
|
||||
stats: (
|
||||
equip_time_secs: 0.5,
|
||||
power: 1.5,
|
||||
equip_time_secs: 0.01,
|
||||
power: 1.0,
|
||||
effect_power: 1.0,
|
||||
speed: 0.75,
|
||||
crit_chance: 0.0625,
|
||||
speed: 1.0,
|
||||
crit_chance: 0.0645,
|
||||
range: 1.0,
|
||||
energy_efficiency: 1.0,
|
||||
buff_strength: 1.0,
|
||||
@ -17,5 +17,5 @@ ItemDef(
|
||||
)),
|
||||
quality: Low,
|
||||
tags: [],
|
||||
ability_spec: Some(Custom("Sword Simple")),
|
||||
ability_spec: Some(Custom("Dullahan")),
|
||||
)
|
||||
@ -1244,6 +1244,18 @@
|
||||
],
|
||||
threshold: 0.2,
|
||||
),
|
||||
LaserBeam: (
|
||||
files: [
|
||||
"voxygen.audio.sfx.abilities.laser_beam",
|
||||
],
|
||||
threshold: 1.25,
|
||||
),
|
||||
CyclopsCharge: (
|
||||
files: [
|
||||
"voxygen.audio.sfx.abilities.cyclops_charge",
|
||||
],
|
||||
threshold: 0.3,
|
||||
),
|
||||
GigaRoar: (
|
||||
files: [
|
||||
"voxygen.audio.sfx.abilities.gigas_frost_roar",
|
||||
|
||||
BIN
assets/voxygen/audio/sfx/abilities/cyclops_charge.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/abilities/cyclops_charge.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/abilities/laser_beam.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/abilities/laser_beam.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -80,6 +80,7 @@ const int STEAM = 39;
|
||||
const int BARRELORGAN = 40;
|
||||
const int POTION_SICKNESS = 41;
|
||||
const int GIGA_SNOW = 42;
|
||||
const int CYCLOPS_CHARGE = 43;
|
||||
|
||||
// meters per second squared (acceleration)
|
||||
const float earth_gravity = 9.807;
|
||||
@ -666,6 +667,16 @@ void main() {
|
||||
spin_in_axis(vec3(rand6, rand7, rand8), percent() * 10 + 3 * rand9)
|
||||
);
|
||||
break;
|
||||
case CYCLOPS_CHARGE:
|
||||
f_reflect = 0.0;
|
||||
float burn_size = 8.0 * (1 - slow_start(0.1)) * slow_end(0.15);
|
||||
attr = Attr(
|
||||
(inst_dir * slow_end(1.5)) + vec3(rand0, rand1, rand2) * (percent() + 2) * 0.1,
|
||||
vec3(burn_size),
|
||||
vec4(vec3(6.9, 0.0, 0.0), 1),
|
||||
spin_in_axis(vec3(rand6, rand7, rand8), percent() * 10 + 3 * rand9)
|
||||
);
|
||||
break;
|
||||
default:
|
||||
attr = Attr(
|
||||
linear_motion(
|
||||
|
||||
@ -889,4 +889,34 @@
|
||||
central: ("armor.empty"),
|
||||
)
|
||||
),
|
||||
SpectralSwordSmall: (
|
||||
bone0: (
|
||||
offset: (-0.5, -25.0, -8.5),
|
||||
central: ("weapon.projectile.spectral_sword_small"),
|
||||
),
|
||||
bone1: (
|
||||
offset: (0.0, 0.0, 0.0),
|
||||
central: ("armor.empty"),
|
||||
)
|
||||
),
|
||||
SpectralSwordLarge: (
|
||||
bone0: (
|
||||
offset: (-0.5, -30.0, -8.5),
|
||||
central: ("weapon.projectile.spectral_sword_large"),
|
||||
),
|
||||
bone1: (
|
||||
offset: (0.0, 0.0, 0.0),
|
||||
central: ("armor.empty"),
|
||||
)
|
||||
),
|
||||
LaserBeam: (
|
||||
bone0: (
|
||||
offset: (-6.0, -60.0, -17.0),
|
||||
central: ("weapon.projectile.laser_beam"),
|
||||
),
|
||||
bone1: (
|
||||
offset: (0.0, 0.0, 0.0),
|
||||
central: ("armor.empty"),
|
||||
)
|
||||
),
|
||||
})
|
||||
|
||||
BIN
assets/voxygen/voxel/weapon/projectile/laser_beam.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/weapon/projectile/laser_beam.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/weapon/projectile/spectral_sword_large.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/weapon/projectile/spectral_sword_large.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/weapon/projectile/spectral_sword_small.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/weapon/projectile/spectral_sword_small.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -6,7 +6,7 @@ SpawnEntry (
|
||||
groups: [
|
||||
(1, (1, 1, "common.entity.wild.aggressive.ogre")),
|
||||
(1, (1, 1, "common.entity.wild.aggressive.swamp_troll")),
|
||||
(1, (1, 1, "common.entity.wild.aggressive.cyclops")),
|
||||
(1, (1, 1, "common.entity.wild.aggressive.dullahan")),
|
||||
],
|
||||
spawn_mode: Land,
|
||||
day_period: [Night, Morning, Noon, Evening],
|
||||
|
||||
@ -783,12 +783,12 @@ impl Body {
|
||||
Body::FishSmall(_) => 3,
|
||||
Body::BipedLarge(biped_large) => match biped_large.species {
|
||||
biped_large::Species::Ogre => 320,
|
||||
biped_large::Species::Cyclops => 320,
|
||||
biped_large::Species::Cyclops => 1000,
|
||||
biped_large::Species::Wendigo => 280,
|
||||
biped_large::Species::Cavetroll => 240,
|
||||
biped_large::Species::Mountaintroll => 240,
|
||||
biped_large::Species::Swamptroll => 240,
|
||||
biped_large::Species::Dullahan => 700,
|
||||
biped_large::Species::Dullahan => 600,
|
||||
biped_large::Species::Mindflayer => 1250,
|
||||
biped_large::Species::Tidalwarrior => 1600,
|
||||
biped_large::Species::Yeti => 1200,
|
||||
@ -895,10 +895,17 @@ impl Body {
|
||||
),
|
||||
Body::BipedLarge(b) => matches!(
|
||||
b.species,
|
||||
biped_large::Species::Huskbrute | biped_large::Species::Gigasfrost
|
||||
biped_large::Species::Huskbrute
|
||||
| biped_large::Species::Gigasfrost
|
||||
| biped_large::Species::Dullahan
|
||||
),
|
||||
_ => false,
|
||||
},
|
||||
BuffKind::Crippled => match self {
|
||||
Body::Object(_) | Body::Golem(_) | Body::Ship(_) => true,
|
||||
Body::BipedLarge(b) => matches!(b.species, biped_large::Species::Dullahan),
|
||||
_ => false,
|
||||
},
|
||||
BuffKind::Burning => match self {
|
||||
Body::Golem(g) => matches!(g.species, golem::Species::ClayGolem),
|
||||
Body::BipedSmall(b) => matches!(b.species, biped_small::Species::Haniwa),
|
||||
@ -915,6 +922,7 @@ impl Body {
|
||||
| bird_large::Species::WealdWyvern
|
||||
),
|
||||
Body::Arthropod(b) => matches!(b.species, arthropod::Species::Moltencrawler),
|
||||
Body::BipedLarge(b) => matches!(b.species, biped_large::Species::Cyclops),
|
||||
_ => false,
|
||||
},
|
||||
BuffKind::Ensnared => match self {
|
||||
|
||||
@ -101,6 +101,9 @@ make_case_elim!(
|
||||
DagonBomb = 86,
|
||||
BarrelOrgan = 87,
|
||||
IceBomb = 88,
|
||||
SpectralSwordSmall = 89,
|
||||
SpectralSwordLarge = 90,
|
||||
LaserBeam = 91,
|
||||
}
|
||||
);
|
||||
|
||||
@ -111,7 +114,7 @@ impl Body {
|
||||
}
|
||||
}
|
||||
|
||||
pub const ALL_OBJECTS: [Body; 89] = [
|
||||
pub const ALL_OBJECTS: [Body; 92] = [
|
||||
Body::Arrow,
|
||||
Body::Bomb,
|
||||
Body::Scarecrow,
|
||||
@ -124,6 +127,8 @@ pub const ALL_OBJECTS: [Body; 89] = [
|
||||
Body::ChestLight,
|
||||
Body::ChestOpen,
|
||||
Body::ChestSkull,
|
||||
Body::SpectralSwordSmall,
|
||||
Body::SpectralSwordLarge,
|
||||
Body::Pumpkin,
|
||||
Body::Pumpkin2,
|
||||
Body::Pumpkin3,
|
||||
@ -201,6 +206,7 @@ pub const ALL_OBJECTS: [Body; 89] = [
|
||||
Body::DagonBomb,
|
||||
Body::BarrelOrgan,
|
||||
Body::IceBomb,
|
||||
Body::LaserBeam,
|
||||
];
|
||||
|
||||
impl From<Body> for super::Body {
|
||||
@ -299,6 +305,9 @@ impl Body {
|
||||
Body::DagonBomb => "dagon_bomb",
|
||||
Body::BarrelOrgan => "barrel_organ",
|
||||
Body::IceBomb => "ice_bomb",
|
||||
Body::SpectralSwordSmall => "spectral_sword_small",
|
||||
Body::SpectralSwordLarge => "spectral_sword_large",
|
||||
Body::LaserBeam => "laser_beam",
|
||||
}
|
||||
}
|
||||
|
||||
@ -321,7 +330,9 @@ impl Body {
|
||||
| Body::ArrowTurret
|
||||
| Body::MultiArrow
|
||||
| Body::Dart
|
||||
| Body::DagonBomb => 500.0,
|
||||
| Body::DagonBomb
|
||||
| Body::SpectralSwordSmall
|
||||
| Body::SpectralSwordLarge => 500.0,
|
||||
Body::Bomb => 2000.0, // I have no idea what it's supposed to be
|
||||
Body::Crate => 300.0, // let's say it's a lot of wood and maybe some contents
|
||||
Body::Scarecrow => 900.0,
|
||||
@ -341,6 +352,8 @@ impl Body {
|
||||
Body::Arrow | Body::ArrowSnake | Body::ArrowTurret | Body::MultiArrow | Body::Dart => {
|
||||
0.003
|
||||
},
|
||||
Body::SpectralSwordSmall => 0.5,
|
||||
Body::SpectralSwordLarge => 50.0,
|
||||
Body::BedBlue => 50.0,
|
||||
Body::Bedroll => 3.0,
|
||||
Body::Bench => 100.0,
|
||||
@ -413,6 +426,7 @@ impl Body {
|
||||
Body::Coconut => 2.0,
|
||||
Body::GnarlingTotemRed | Body::GnarlingTotemGreen | Body::GnarlingTotemWhite => 100.0,
|
||||
Body::IceBomb => 12298.0, // 2.5 m diamter but ice
|
||||
Body::LaserBeam => 80000.0,
|
||||
};
|
||||
|
||||
Mass(m)
|
||||
@ -424,6 +438,8 @@ impl Body {
|
||||
Vec3::new(0.01, 0.8, 0.01)
|
||||
},
|
||||
Body::BoltFire => Vec3::new(0.1, 0.1, 0.1),
|
||||
Body::SpectralSwordSmall => Vec3::new(0.2, 0.9, 0.1),
|
||||
Body::SpectralSwordLarge => Vec3::new(0.2, 1.5, 0.1),
|
||||
Body::Crossbow => Vec3::new(3.0, 3.0, 1.5),
|
||||
Body::HaniwaSentry => Vec3::new(0.8, 0.8, 1.4),
|
||||
Body::SeaLantern => Vec3::new(0.8, 0.8, 1.4),
|
||||
@ -435,6 +451,7 @@ impl Body {
|
||||
},
|
||||
Body::BarrelOrgan => Vec3::new(4.0, 2.0, 3.0),
|
||||
Body::IceBomb => Vec3::broadcast(2.5),
|
||||
Body::LaserBeam => Vec3::new(8.0, 8.0, 8.0),
|
||||
// FIXME: this *must* be exhaustive match
|
||||
_ => Vec3::broadcast(0.5),
|
||||
}
|
||||
|
||||
@ -910,13 +910,16 @@ impl LoadoutBuilder {
|
||||
Some("common.items.npc_armor.biped_large.harvester")
|
||||
},
|
||||
biped_large::Species::Ogre
|
||||
| biped_large::Species::Cyclops
|
||||
| biped_large::Species::Blueoni
|
||||
| biped_large::Species::Redoni
|
||||
| biped_large::Species::Cavetroll
|
||||
| biped_large::Species::Wendigo => {
|
||||
Some("common.items.npc_armor.biped_large.generic")
|
||||
},
|
||||
biped_large::Species::Cyclops => Some("common.items.npc_armor.biped_large.cyclops"),
|
||||
biped_large::Species::Dullahan => {
|
||||
Some("common.items.npc_armor.biped_large.dullahan")
|
||||
},
|
||||
biped_large::Species::Cultistwarlord => {
|
||||
Some("common.items.npc_armor.biped_large.warlord")
|
||||
},
|
||||
|
||||
@ -53,6 +53,11 @@ pub enum ProjectileConstructor {
|
||||
knockback: f32,
|
||||
energy_regen: f32,
|
||||
},
|
||||
Knife {
|
||||
damage: f32,
|
||||
knockback: f32,
|
||||
energy_regen: f32,
|
||||
},
|
||||
Fireball {
|
||||
damage: f32,
|
||||
radius: f32,
|
||||
@ -114,6 +119,12 @@ pub enum ProjectileConstructor {
|
||||
knockback: f32,
|
||||
min_falloff: f32,
|
||||
},
|
||||
LaserBeam {
|
||||
damage: f32,
|
||||
radius: f32,
|
||||
knockback: f32,
|
||||
min_falloff: f32,
|
||||
},
|
||||
}
|
||||
|
||||
impl ProjectileConstructor {
|
||||
@ -181,6 +192,59 @@ impl ProjectileConstructor {
|
||||
is_point: true,
|
||||
}
|
||||
},
|
||||
Knife {
|
||||
damage,
|
||||
knockback,
|
||||
energy_regen,
|
||||
} => {
|
||||
let knockback = AttackEffect::new(
|
||||
Some(GroupTarget::OutOfGroup),
|
||||
CombatEffect::Knockback(Knockback {
|
||||
strength: knockback,
|
||||
direction: KnockbackDir::Away,
|
||||
})
|
||||
.adjusted_by_stats(tool_stats),
|
||||
)
|
||||
.with_requirement(CombatRequirement::AnyDamage);
|
||||
let energy = AttackEffect::new(None, CombatEffect::EnergyReward(energy_regen))
|
||||
.with_requirement(CombatRequirement::AnyDamage);
|
||||
let buff = CombatEffect::Buff(CombatBuff {
|
||||
kind: BuffKind::Bleeding,
|
||||
dur_secs: 10.0,
|
||||
strength: CombatBuffStrength::DamageFraction(0.1),
|
||||
chance: 0.1,
|
||||
})
|
||||
.adjusted_by_stats(tool_stats);
|
||||
let mut damage = AttackDamage::new(
|
||||
Damage {
|
||||
source: DamageSource::Projectile,
|
||||
kind: DamageKind::Piercing,
|
||||
value: damage,
|
||||
},
|
||||
Some(GroupTarget::OutOfGroup),
|
||||
instance,
|
||||
)
|
||||
.with_effect(buff);
|
||||
if let Some(damage_effect) = damage_effect {
|
||||
damage = damage.with_effect(damage_effect);
|
||||
}
|
||||
let attack = Attack::default()
|
||||
.with_damage(damage)
|
||||
.with_crit(crit_chance, crit_mult)
|
||||
.with_effect(energy)
|
||||
.with_effect(knockback)
|
||||
.with_combo_increment();
|
||||
|
||||
Projectile {
|
||||
hit_solid: vec![Effect::Stick, Effect::Bonk],
|
||||
hit_entity: vec![Effect::Attack(attack), Effect::Vanish],
|
||||
time_left: Duration::from_secs(15),
|
||||
owner,
|
||||
ignore_group: true,
|
||||
is_sticky: true,
|
||||
is_point: true,
|
||||
}
|
||||
},
|
||||
Fireball {
|
||||
damage,
|
||||
radius,
|
||||
@ -679,6 +743,53 @@ impl ProjectileConstructor {
|
||||
is_point: true,
|
||||
}
|
||||
},
|
||||
LaserBeam {
|
||||
damage,
|
||||
radius,
|
||||
knockback,
|
||||
min_falloff,
|
||||
} => {
|
||||
let knockback = AttackEffect::new(
|
||||
Some(GroupTarget::OutOfGroup),
|
||||
CombatEffect::Knockback(Knockback {
|
||||
strength: knockback,
|
||||
direction: KnockbackDir::Away,
|
||||
})
|
||||
.adjusted_by_stats(tool_stats),
|
||||
)
|
||||
.with_requirement(CombatRequirement::AnyDamage);
|
||||
let damage = AttackDamage::new(
|
||||
Damage {
|
||||
source: DamageSource::Explosion,
|
||||
kind: DamageKind::Energy,
|
||||
value: damage,
|
||||
},
|
||||
Some(GroupTarget::OutOfGroup),
|
||||
instance,
|
||||
);
|
||||
let attack = Attack::default()
|
||||
.with_damage(damage)
|
||||
.with_crit(crit_chance, crit_mult)
|
||||
.with_effect(knockback);
|
||||
let explosion = Explosion {
|
||||
effects: vec![
|
||||
RadiusEffect::Attack(attack),
|
||||
RadiusEffect::TerrainDestruction(10.0, Rgb::black()),
|
||||
],
|
||||
radius,
|
||||
reagent: Some(Reagent::Yellow),
|
||||
min_falloff,
|
||||
};
|
||||
Projectile {
|
||||
hit_solid: vec![Effect::Explode(explosion.clone()), Effect::Vanish],
|
||||
hit_entity: vec![Effect::Explode(explosion), Effect::Vanish],
|
||||
time_left: Duration::from_secs(10),
|
||||
owner,
|
||||
ignore_group: true,
|
||||
is_sticky: true,
|
||||
is_point: true,
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@ -695,6 +806,14 @@ impl ProjectileConstructor {
|
||||
*damage *= power;
|
||||
*energy_regen *= regen;
|
||||
},
|
||||
Knife {
|
||||
ref mut damage,
|
||||
ref mut energy_regen,
|
||||
..
|
||||
} => {
|
||||
*damage *= power;
|
||||
*energy_regen *= regen;
|
||||
},
|
||||
Fireball {
|
||||
ref mut damage,
|
||||
ref mut energy_regen,
|
||||
@ -786,6 +905,14 @@ impl ProjectileConstructor {
|
||||
*damage *= power;
|
||||
*radius *= range;
|
||||
},
|
||||
LaserBeam {
|
||||
ref mut damage,
|
||||
ref mut radius,
|
||||
..
|
||||
} => {
|
||||
*damage *= power;
|
||||
*radius *= range;
|
||||
},
|
||||
}
|
||||
self
|
||||
}
|
||||
@ -794,6 +921,7 @@ impl ProjectileConstructor {
|
||||
use ProjectileConstructor::*;
|
||||
match self {
|
||||
Arrow { .. } => false,
|
||||
Knife { .. } => false,
|
||||
Fireball { .. } => true,
|
||||
Frostball { .. } => true,
|
||||
Poisonball { .. } => true,
|
||||
@ -806,6 +934,7 @@ impl ProjectileConstructor {
|
||||
SeaBomb { .. } => true,
|
||||
WindBomb { .. } => true,
|
||||
IceBomb { .. } => true,
|
||||
LaserBeam { .. } => true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -97,6 +97,12 @@ pub enum Outcome {
|
||||
FlashFreeze {
|
||||
pos: Vec3<f32>,
|
||||
},
|
||||
LaserBeam {
|
||||
pos: Vec3<f32>,
|
||||
},
|
||||
CyclopsCharge {
|
||||
pos: Vec3<f32>,
|
||||
},
|
||||
Utterance {
|
||||
pos: Vec3<f32>,
|
||||
body: comp::Body,
|
||||
@ -138,6 +144,8 @@ impl Outcome {
|
||||
| Outcome::IceCrack { pos }
|
||||
| Outcome::Utterance { pos, .. }
|
||||
| Outcome::SpriteDelete { pos, .. }
|
||||
| Outcome::CyclopsCharge { pos }
|
||||
| Outcome::LaserBeam { pos }
|
||||
| Outcome::Glider { pos, .. } => Some(*pos),
|
||||
Outcome::BreakBlock { pos, .. }
|
||||
| Outcome::SpriteUnlocked { pos }
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
use crate::{
|
||||
combat::CombatEffect,
|
||||
comp::{
|
||||
character_state::OutputEvents, Body, CharacterState, LightEmitter, Pos,
|
||||
ProjectileConstructor, StateUpdate,
|
||||
character_state::OutputEvents, object::Body::LaserBeam, Body, CharacterState, LightEmitter,
|
||||
Pos, ProjectileConstructor, StateUpdate,
|
||||
},
|
||||
event::ServerEvent,
|
||||
event::{LocalEvent, ServerEvent},
|
||||
outcome::Outcome,
|
||||
states::{
|
||||
behavior::{CharacterBehavior, JoinData},
|
||||
utils::*,
|
||||
@ -66,6 +67,14 @@ impl CharacterBehavior for Data {
|
||||
timer: tick_attack_or_default(data, self.timer, None),
|
||||
..*self
|
||||
});
|
||||
if self.static_data.projectile_body == Body::Object(LaserBeam) {
|
||||
// Send local event used for frontend shenanigans
|
||||
output_events.emit_local(LocalEvent::CreateOutcome(
|
||||
Outcome::CyclopsCharge {
|
||||
pos: data.pos.0 + *data.ori.look_dir() * (data.body.max_radius()),
|
||||
},
|
||||
));
|
||||
}
|
||||
} else {
|
||||
// Transitions to recover section of stage
|
||||
update.character = CharacterState::BasicRanged(Data {
|
||||
|
||||
@ -143,10 +143,24 @@ impl CharacterBehavior for Data {
|
||||
..*self
|
||||
});
|
||||
// Send local event used for frontend shenanigans
|
||||
if self.static_data.specifier == shockwave::FrontendSpecifier::IceSpikes {
|
||||
output_events.emit_local(LocalEvent::CreateOutcome(Outcome::FlashFreeze {
|
||||
pos: data.pos.0 + *data.ori.look_dir() * (data.body.max_radius()),
|
||||
}));
|
||||
match self.static_data.specifier {
|
||||
shockwave::FrontendSpecifier::IceSpikes => {
|
||||
output_events.emit_local(LocalEvent::CreateOutcome(
|
||||
Outcome::FlashFreeze {
|
||||
pos: data.pos.0
|
||||
+ *data.ori.look_dir() * (data.body.max_radius()),
|
||||
},
|
||||
));
|
||||
},
|
||||
shockwave::FrontendSpecifier::Ground => {
|
||||
output_events.emit_local(LocalEvent::CreateOutcome(
|
||||
Outcome::GroundSlam {
|
||||
pos: data.pos.0
|
||||
+ *data.ori.look_dir() * (data.body.max_radius()),
|
||||
},
|
||||
));
|
||||
},
|
||||
_ => {},
|
||||
}
|
||||
} else {
|
||||
// Transitions to recover
|
||||
|
||||
@ -951,6 +951,8 @@ impl<'a> AgentData<'a> {
|
||||
"Bird Medium Basic" => Tactic::BirdMediumBasic,
|
||||
"Mindflayer" => Tactic::Mindflayer,
|
||||
"Minotaur" => Tactic::Minotaur,
|
||||
"Cyclops" => Tactic::Cyclops,
|
||||
"Dullahan" => Tactic::Dullahan,
|
||||
"Clay Golem" => Tactic::ClayGolem,
|
||||
"Tidal Warrior" => Tactic::TidalWarrior,
|
||||
"Tidal Totem"
|
||||
@ -1338,6 +1340,12 @@ impl<'a> AgentData<'a> {
|
||||
Tactic::Minotaur => {
|
||||
self.handle_minotaur_attack(agent, controller, &attack_data, tgt_data, read_data)
|
||||
},
|
||||
Tactic::Cyclops => {
|
||||
self.handle_cyclops_attack(agent, controller, &attack_data, tgt_data, read_data)
|
||||
},
|
||||
Tactic::Dullahan => {
|
||||
self.handle_dullahan_attack(agent, controller, &attack_data, tgt_data, read_data)
|
||||
},
|
||||
Tactic::ClayGolem => {
|
||||
self.handle_clay_golem_attack(agent, controller, &attack_data, tgt_data, read_data)
|
||||
},
|
||||
|
||||
@ -3222,6 +3222,159 @@ impl<'a> AgentData<'a> {
|
||||
);
|
||||
}
|
||||
|
||||
pub fn handle_cyclops_attack(
|
||||
&self,
|
||||
agent: &mut Agent,
|
||||
controller: &mut Controller,
|
||||
attack_data: &AttackData,
|
||||
tgt_data: &TargetData,
|
||||
read_data: &ReadData,
|
||||
) {
|
||||
// Primary
|
||||
const CYCLOPS_MELEE_RANGE: f32 = 9.0;
|
||||
// Secondary
|
||||
const CYCLOPS_FIRE_RANGE: f32 = 30.0;
|
||||
// Ability(1)
|
||||
const CYCLOPS_CHARGE_RANGE: f32 = 18.0;
|
||||
// Ability(0) - Ablity (2)
|
||||
const SHOCKWAVE_THRESHOLD: f32 = 0.6;
|
||||
|
||||
enum FCounters {
|
||||
ShockwaveThreshold = 0,
|
||||
}
|
||||
enum Timers {
|
||||
AttackChange = 0,
|
||||
}
|
||||
|
||||
if agent.action_state.timers[Timers::AttackChange as usize] > 2.5 {
|
||||
agent.action_state.timers[Timers::AttackChange as usize] = 0.0;
|
||||
}
|
||||
|
||||
let health_fraction = self.health.map_or(0.5, |h| h.fraction());
|
||||
// Sets counter at start of combat, using `condition` to keep track of whether
|
||||
// it was already initialized
|
||||
if !agent.action_state.initialized {
|
||||
agent.action_state.counters[FCounters::ShockwaveThreshold as usize] =
|
||||
1.0 - SHOCKWAVE_THRESHOLD;
|
||||
agent.action_state.initialized = true;
|
||||
} else if health_fraction
|
||||
< agent.action_state.counters[FCounters::ShockwaveThreshold as usize]
|
||||
{
|
||||
// Scream when threshold is reached
|
||||
controller.push_basic_input(InputKind::Ability(2));
|
||||
|
||||
if matches!(self.char_state, CharacterState::SelfBuff(c) if matches!(c.stage_section, StageSection::Recover))
|
||||
{
|
||||
agent.action_state.counters[FCounters::ShockwaveThreshold as usize] -=
|
||||
SHOCKWAVE_THRESHOLD;
|
||||
}
|
||||
} else if matches!(self.char_state, CharacterState::DashMelee(c) if !matches!(c.stage_section, StageSection::Recover))
|
||||
{
|
||||
// If already AOEing, keep AOEing if not in recover
|
||||
controller.push_basic_input(InputKind::Ability(0));
|
||||
} else if attack_data.dist_sqrd > CYCLOPS_FIRE_RANGE.powi(2) {
|
||||
// Chase
|
||||
controller.push_basic_input(InputKind::Ability(1));
|
||||
} else if attack_data.dist_sqrd > CYCLOPS_CHARGE_RANGE.powi(2) {
|
||||
// Shoot after target if they attempt to "flee"
|
||||
controller.push_basic_input(InputKind::Secondary);
|
||||
} else if attack_data.dist_sqrd < CYCLOPS_MELEE_RANGE {
|
||||
if attack_data.angle < 60.0 {
|
||||
// Melee target if close enough and within angle
|
||||
controller.push_basic_input(InputKind::Primary);
|
||||
} else if attack_data.angle > 60.0 {
|
||||
// Scream if target exceeds angle but is close enough
|
||||
controller.push_basic_input(InputKind::Ability(0));
|
||||
}
|
||||
}
|
||||
|
||||
// Always attempt to path towards target
|
||||
self.path_toward_target(
|
||||
agent,
|
||||
controller,
|
||||
tgt_data.pos.0,
|
||||
read_data,
|
||||
Path::Partial,
|
||||
None,
|
||||
);
|
||||
}
|
||||
|
||||
pub fn handle_dullahan_attack(
|
||||
&self,
|
||||
agent: &mut Agent,
|
||||
controller: &mut Controller,
|
||||
attack_data: &AttackData,
|
||||
tgt_data: &TargetData,
|
||||
read_data: &ReadData,
|
||||
) {
|
||||
// Primary (12 Default / Melee)
|
||||
const MELEE_RANGE: f32 = 9.0;
|
||||
// Secondary (30 Default / Range)
|
||||
const LONG_RANGE: f32 = 30.0;
|
||||
// Ability(0) (0.1 aka 10% Default / AOE)
|
||||
const HP_THRESHOLD: f32 = 0.1;
|
||||
// Ability(1) (18 Default / Dash)
|
||||
const MID_RANGE: f32 = 18.0;
|
||||
|
||||
enum FCounters {
|
||||
HealthThreshold = 0,
|
||||
}
|
||||
enum Timers {
|
||||
AttackChange = 0,
|
||||
}
|
||||
if agent.action_state.timers[Timers::AttackChange as usize] > 2.5 {
|
||||
agent.action_state.timers[Timers::AttackChange as usize] = 0.0;
|
||||
}
|
||||
|
||||
let health_fraction = self.health.map_or(0.5, |h| h.fraction());
|
||||
// Sets counter at start of combat, using `condition` to keep track of whether
|
||||
// it was already initialized
|
||||
if !agent.action_state.initialized {
|
||||
agent.action_state.counters[FCounters::HealthThreshold as usize] = 1.0 - HP_THRESHOLD;
|
||||
agent.action_state.initialized = true;
|
||||
} else if health_fraction < agent.action_state.counters[FCounters::HealthThreshold as usize]
|
||||
{
|
||||
// InputKind when threshold is reached (Default is Ability(0))
|
||||
controller.push_basic_input(InputKind::Ability(0));
|
||||
|
||||
if matches!(
|
||||
self.char_state.ability_info().map(|ai| ai.input),
|
||||
Some(InputKind::Ability(0))
|
||||
) && matches!(self.char_state.stage_section(), Some(StageSection::Recover))
|
||||
{
|
||||
agent.action_state.counters[FCounters::HealthThreshold as usize] -= HP_THRESHOLD;
|
||||
}
|
||||
} else if matches!(self.char_state, CharacterState::DashMelee(c) if !matches!(c.stage_section, StageSection::Recover))
|
||||
{
|
||||
// If already InputKind, keep InputKind if not in recover (Default is Shockwave)
|
||||
controller.push_basic_input(InputKind::Ability(0));
|
||||
} else if attack_data.dist_sqrd > LONG_RANGE.powi(2) {
|
||||
// InputKind after target if they attempt to "flee" (>LONG)
|
||||
controller.push_basic_input(InputKind::Ability(1));
|
||||
} else if attack_data.dist_sqrd > MID_RANGE.powi(2) {
|
||||
// InputKind after target if they attempt to "flee" (MID-LONG)
|
||||
controller.push_basic_input(InputKind::Secondary);
|
||||
} else if attack_data.dist_sqrd < MELEE_RANGE {
|
||||
if attack_data.angle < 60.0 {
|
||||
// InputKind target if close enough and within angle (<MELEE)
|
||||
controller.push_basic_input(InputKind::Primary);
|
||||
} else if attack_data.angle > 60.0 {
|
||||
// InputKind if target exceeds angle but is close enough (FLANK/STRAFE)
|
||||
controller.push_basic_input(InputKind::Ability(0));
|
||||
}
|
||||
}
|
||||
|
||||
// Always attempt to path towards target
|
||||
self.path_toward_target(
|
||||
agent,
|
||||
controller,
|
||||
tgt_data.pos.0,
|
||||
read_data,
|
||||
Path::Full,
|
||||
None,
|
||||
);
|
||||
}
|
||||
|
||||
pub fn handle_clay_golem_attack(
|
||||
&self,
|
||||
agent: &mut Agent,
|
||||
|
||||
@ -169,6 +169,8 @@ pub enum Tactic {
|
||||
Roshwalr,
|
||||
FrostGigas,
|
||||
BorealHammer,
|
||||
Dullahan,
|
||||
Cyclops,
|
||||
}
|
||||
|
||||
#[derive(Copy, Clone)]
|
||||
|
||||
@ -214,6 +214,40 @@ impl Animation for DashAnimation {
|
||||
},
|
||||
_ => {},
|
||||
},
|
||||
Some(ToolKind::Hammer) => match ability_id {
|
||||
Some("common.abilities.custom.cyclops.dash") => {
|
||||
next.control_l.position = Vec3::new(-1.0, 2.0, 12.0 + move3 * 3.0);
|
||||
next.control_r.position = Vec3::new(1.0, 2.0, -2.0);
|
||||
|
||||
next.control.position = Vec3::new(
|
||||
4.0 + move1 * -3.0 + move3 * -5.0,
|
||||
(s_a.grip.0 / 1.0) + move1 * -1.0 + move3 * 1.0 + footrotl * 2.0,
|
||||
(-s_a.grip.0 / 0.8) + move1 * 2.0 + move3 * -3.0,
|
||||
);
|
||||
next.head.orientation = Quaternion::rotation_x(move1 * -0.5 + move3 * 0.5)
|
||||
* Quaternion::rotation_z(move1 * 0.3 + move3 * 0.3);
|
||||
next.upper_torso.orientation =
|
||||
Quaternion::rotation_x(move1 * -0.4 + move3 * 0.9)
|
||||
* Quaternion::rotation_z(move1 * 0.6 + move3 * -1.5);
|
||||
next.lower_torso.orientation =
|
||||
Quaternion::rotation_y(move1 * -0.2 + move3 * -0.1)
|
||||
* Quaternion::rotation_x(move1 * 0.4 + move3 * -0.7 + footrotr * 0.1)
|
||||
* Quaternion::rotation_z(move1 * -0.6 + move3 * 1.6);
|
||||
|
||||
next.control_l.orientation = Quaternion::rotation_x(PI / 2.0 + move3 * 0.3)
|
||||
* Quaternion::rotation_y(move1 * 0.7);
|
||||
next.control_r.orientation =
|
||||
Quaternion::rotation_x(PI / 2.0 + 0.2 + move3 * -0.2)
|
||||
* Quaternion::rotation_y(0.0)
|
||||
* Quaternion::rotation_z(0.0);
|
||||
|
||||
next.control.orientation =
|
||||
Quaternion::rotation_x(-1.0 + move1 * -0.2 + move3 * -0.2)
|
||||
* Quaternion::rotation_y(-1.8 + move1 * -0.2 + move3 * -0.2)
|
||||
* Quaternion::rotation_z(move1 * -0.8 + move3 * -0.1);
|
||||
},
|
||||
_ => {},
|
||||
},
|
||||
_ => {},
|
||||
}
|
||||
|
||||
|
||||
@ -102,7 +102,7 @@ impl Animation for SelfBuffAnimation {
|
||||
// TODO: Remove clippy allow when second species is added
|
||||
#[allow(clippy::single_match)]
|
||||
match active_tool_kind {
|
||||
Some(ToolKind::Axe) => {
|
||||
Some(ToolKind::Axe | ToolKind::Hammer) => {
|
||||
next.control_l.position = Vec3::new(-1.0, 2.0, 12.0);
|
||||
next.control_r.position = Vec3::new(1.0, 2.0, -2.0);
|
||||
|
||||
|
||||
@ -250,6 +250,68 @@ impl Animation for ShockwaveAnimation {
|
||||
},
|
||||
_ => {},
|
||||
},
|
||||
Some(ToolKind::Hammer) => match ability_id {
|
||||
Some("common.abilities.custom.cyclops.hammer_shockwave") => {
|
||||
next.second.scale = Vec3::one() * 0.0;
|
||||
|
||||
next.head.orientation = Quaternion::rotation_x(move1pow * 0.8 + move2 * -1.2);
|
||||
next.jaw.position = Vec3::new(0.0, s_a.jaw.0, s_a.jaw.1);
|
||||
next.jaw.orientation = Quaternion::rotation_x(move2 * -0.3);
|
||||
next.control_l.position = Vec3::new(-0.5, 4.0, 1.0);
|
||||
next.control_r.position = Vec3::new(-0.5, 4.0, 1.0);
|
||||
next.control_l.orientation = Quaternion::rotation_x(PI / 2.0);
|
||||
next.control_r.orientation = Quaternion::rotation_x(PI / 2.0);
|
||||
next.weapon_l.position =
|
||||
Vec3::new(-12.0 + (move1pow * 20.0).min(10.0), -1.0, -15.0);
|
||||
next.weapon_r.position =
|
||||
Vec3::new(12.0 + (move1pow * -20.0).max(-10.0), -1.0, -15.0);
|
||||
|
||||
next.weapon_l.orientation = Quaternion::rotation_x(-PI / 2.0 - 0.1)
|
||||
* Quaternion::rotation_z(move1pow * -1.0);
|
||||
next.weapon_r.orientation = Quaternion::rotation_x(-PI / 2.0 - 0.1)
|
||||
* Quaternion::rotation_z(move1pow * 1.0);
|
||||
|
||||
next.shoulder_l.orientation =
|
||||
Quaternion::rotation_x(-0.3 + move1pow * 2.8 + move2 * -2.8);
|
||||
|
||||
next.shoulder_r.orientation =
|
||||
Quaternion::rotation_x(-0.3 + move1pow * 2.8 + move2 * -2.8);
|
||||
|
||||
next.control.orientation =
|
||||
Quaternion::rotation_x(move1pow * 2.5 + move2 * -2.0);
|
||||
|
||||
let twist = move1 * 0.6 + move3 * -0.6;
|
||||
next.upper_torso.position =
|
||||
Vec3::new(0.0, s_a.upper_torso.0, s_a.upper_torso.1);
|
||||
next.upper_torso.orientation =
|
||||
Quaternion::rotation_x(move1pow * 0.8 + move2 * -1.1)
|
||||
* Quaternion::rotation_z(twist * -0.2 + move1 * -0.1 + move2 * 0.3);
|
||||
|
||||
next.lower_torso.orientation =
|
||||
Quaternion::rotation_x(move1pow * -0.8 + move2 * 1.1)
|
||||
* Quaternion::rotation_z(twist);
|
||||
|
||||
next.foot_l.position = Vec3::new(
|
||||
-s_a.foot.0,
|
||||
s_a.foot.1 + move1pow * -7.0 + move2 * 7.0,
|
||||
s_a.foot.2,
|
||||
);
|
||||
next.foot_l.orientation = Quaternion::rotation_x(move1pow * -0.8 + move2 * 0.8)
|
||||
* Quaternion::rotation_z(move1pow * 0.3 + move2 * -0.3);
|
||||
|
||||
next.foot_r.position = Vec3::new(
|
||||
s_a.foot.0,
|
||||
s_a.foot.1 + move1pow * 5.0 + move2 * -5.0,
|
||||
s_a.foot.2,
|
||||
);
|
||||
next.foot_r.orientation = Quaternion::rotation_y(move1pow * -0.3 + move2 * 0.3)
|
||||
* Quaternion::rotation_z(move1pow * 0.4 + move2 * -0.4);
|
||||
|
||||
next.main.orientation = Quaternion::rotation_y(move1 * 0.4 + move2 * -0.6)
|
||||
* Quaternion::rotation_x(move2 * -0.4);
|
||||
},
|
||||
_ => {},
|
||||
},
|
||||
_ => {},
|
||||
}
|
||||
next
|
||||
|
||||
@ -91,6 +91,79 @@ impl Animation for ShootAnimation {
|
||||
next.hand_r.orientation = Quaternion::rotation_x(0.0);
|
||||
|
||||
match active_tool_kind {
|
||||
Some(ToolKind::Sword) => match ability_id {
|
||||
Some("common.abilities.custom.dullahan.knife_rain")
|
||||
| Some("common.abilities.custom.dullahan.fierce_darts") => {
|
||||
let (move1base, move2base, move3) = match stage_section {
|
||||
Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
|
||||
Some(StageSection::Action) => (1.0, anim_time, 0.0),
|
||||
Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
|
||||
_ => (0.0, 0.0, 0.0),
|
||||
};
|
||||
let pullback = 1.0 - move3;
|
||||
let move1 = move1base * pullback;
|
||||
let move2 = move2base * pullback;
|
||||
next.main.position = Vec3::new(-10.0, -8.0, 12.0);
|
||||
next.main.orientation =
|
||||
Quaternion::rotation_y(2.5) * Quaternion::rotation_z(PI / 2.0);
|
||||
next.hand_l.position = Vec3::new(-s_a.hand.0, s_a.hand.1 + 4.0, s_a.hand.2);
|
||||
next.hand_r.position = Vec3::new(s_a.hand.0, s_a.hand.1 + 4.0, s_a.hand.2);
|
||||
next.hand_l.orientation = Quaternion::rotation_x(move1 * 1.5)
|
||||
* Quaternion::rotation_y(move1 * -1.0 + move2 * 1.5);
|
||||
next.hand_r.orientation = Quaternion::rotation_x(move1 * 1.5)
|
||||
* Quaternion::rotation_y(move1 * 1.0 + move2 * -1.5);
|
||||
next.upper_torso.orientation =
|
||||
Quaternion::rotation_y(move1 * -0.1 + move2 * 0.1)
|
||||
* Quaternion::rotation_z(move1 * -0.1 + move2 * 0.1);
|
||||
next.foot_l.orientation = Quaternion::rotation_y(move1 * 0.3 + move2 * -0.3);
|
||||
next.foot_r.orientation = Quaternion::rotation_y(move1 * 0.3 + move2 * -0.3);
|
||||
},
|
||||
_ => {},
|
||||
},
|
||||
Some(ToolKind::Hammer) => match ability_id {
|
||||
Some("common.abilities.custom.cyclops.optic_blast") => {
|
||||
let (move1base, _move1shake, move2base, move3) = match stage_section {
|
||||
Some(StageSection::Buildup) => {
|
||||
(anim_time, (anim_time * 10.0 + PI).sin(), 0.0, 0.0)
|
||||
},
|
||||
Some(StageSection::Action) => (1.0, 1.0, anim_time.powf(0.25), 0.0),
|
||||
Some(StageSection::Recover) => (1.0, 1.0, 1.0, anim_time),
|
||||
_ => (0.0, 0.0, 0.0, 0.0),
|
||||
};
|
||||
let pullback = 1.0 - move3;
|
||||
let move1 = move1base * pullback;
|
||||
let move2 = move2base * pullback;
|
||||
next.head.orientation = Quaternion::rotation_x(move1 * 0.25 + move2 * -0.25)
|
||||
* Quaternion::rotation_z(move1 * 0.25);
|
||||
next.torso.orientation = Quaternion::rotation_x(move1 * -0.25 + move2 * 0.25);
|
||||
next.upper_torso.orientation =
|
||||
Quaternion::rotation_x(move1 * -0.1 + move2 * 0.1)
|
||||
* Quaternion::rotation_z(move1 * -0.1 + move2 * 0.1);
|
||||
next.foot_l.orientation = Quaternion::rotation_x(move1 * 0.3 + move2 * -0.3);
|
||||
next.foot_r.orientation = Quaternion::rotation_x(move1 * 0.3 + move2 * -0.3);
|
||||
next.main.position = Vec3::new(0.0, -10.0, 3.0);
|
||||
next.main.orientation = Quaternion::rotation_x(PI / -2.0);
|
||||
next.weapon_l.position = Vec3::new(
|
||||
-s_a.hand.0 - 3.0 * move1,
|
||||
s_a.hand.1 + 4.0 + 8.0 * move1,
|
||||
-15.0 + 2.0 * move1,
|
||||
);
|
||||
next.weapon_l.orientation = Quaternion::rotation_x(move1 * 0.6);
|
||||
next.hand_r.position = Vec3::new(
|
||||
s_a.hand.0 + 6.0 * move1,
|
||||
s_a.hand.1 + 4.0,
|
||||
s_a.hand.2 + 6.0 * move1,
|
||||
);
|
||||
next.hand_r.orientation =
|
||||
Quaternion::rotation_x(move1 * 1.0) * Quaternion::rotation_y(move1 * -1.4);
|
||||
|
||||
next.shoulder_l.orientation =
|
||||
Quaternion::rotation_x(move1 * 0.6) * Quaternion::rotation_y(move1 * 0.5);
|
||||
next.shoulder_r.orientation =
|
||||
Quaternion::rotation_x(move1 * 1.4) * Quaternion::rotation_y(move1 * -0.5);
|
||||
},
|
||||
_ => {},
|
||||
},
|
||||
Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => {
|
||||
let (move1base, move1shake, move2base, move3) = match stage_section {
|
||||
Some(StageSection::Buildup) => {
|
||||
|
||||
@ -171,6 +171,8 @@ pub enum SfxEvent {
|
||||
IceCrack,
|
||||
Utterance(UtteranceKind, VoiceKind),
|
||||
Lightning,
|
||||
CyclopsCharge,
|
||||
LaserBeam,
|
||||
Music(ToolKind, AbilitySpec),
|
||||
}
|
||||
|
||||
@ -430,6 +432,14 @@ impl SfxMgr {
|
||||
let sfx_trigger_item = triggers.get_key_value(&SfxEvent::GroundSlam);
|
||||
audio.emit_sfx(sfx_trigger_item, *pos, Some(2.0), underwater);
|
||||
},
|
||||
Outcome::LaserBeam { pos, .. } => {
|
||||
let sfx_trigger_item = triggers.get_key_value(&SfxEvent::LaserBeam);
|
||||
audio.emit_sfx(sfx_trigger_item, *pos, Some(2.0), underwater);
|
||||
},
|
||||
Outcome::CyclopsCharge { pos, .. } => {
|
||||
let sfx_trigger_item = triggers.get_key_value(&SfxEvent::CyclopsCharge);
|
||||
audio.emit_sfx(sfx_trigger_item, *pos, Some(2.0), underwater);
|
||||
},
|
||||
Outcome::FlashFreeze { pos, .. } => {
|
||||
let sfx_trigger_item = triggers.get_key_value(&SfxEvent::FlashFreeze);
|
||||
audio.emit_sfx(sfx_trigger_item, *pos, Some(2.0), underwater);
|
||||
@ -461,7 +471,9 @@ impl SfxMgr {
|
||||
object::Body::Arrow
|
||||
| object::Body::MultiArrow
|
||||
| object::Body::ArrowSnake
|
||||
| object::Body::ArrowTurret,
|
||||
| object::Body::ArrowTurret
|
||||
| object::Body::SpectralSwordSmall
|
||||
| object::Body::SpectralSwordLarge,
|
||||
) => {
|
||||
let sfx_trigger_item = triggers.get_key_value(&SfxEvent::ArrowShot);
|
||||
audio.emit_sfx(sfx_trigger_item, *pos, None, underwater);
|
||||
@ -474,6 +486,10 @@ impl SfxMgr {
|
||||
let sfx_trigger_item = triggers.get_key_value(&SfxEvent::FireShot);
|
||||
audio.emit_sfx(sfx_trigger_item, *pos, None, underwater);
|
||||
},
|
||||
Body::Object(object::Body::LaserBeam) => {
|
||||
let sfx_trigger_item = triggers.get_key_value(&SfxEvent::LaserBeam);
|
||||
audio.emit_sfx(sfx_trigger_item, *pos, None, underwater);
|
||||
},
|
||||
_ => {
|
||||
// not mapped to sfx file
|
||||
},
|
||||
@ -490,7 +506,9 @@ impl SfxMgr {
|
||||
object::Body::Arrow
|
||||
| object::Body::MultiArrow
|
||||
| object::Body::ArrowSnake
|
||||
| object::Body::ArrowTurret,
|
||||
| object::Body::ArrowTurret
|
||||
| object::Body::SpectralSwordSmall
|
||||
| object::Body::SpectralSwordLarge,
|
||||
) => {
|
||||
if target.is_none() {
|
||||
let sfx_trigger_item = triggers.get_key_value(&SfxEvent::ArrowMiss);
|
||||
|
||||
@ -94,7 +94,8 @@ pub enum ParticleMode {
|
||||
BarrelOrgan = 40,
|
||||
PotionSickness = 41,
|
||||
GigaSnow = 42,
|
||||
SnowStorm = 43,
|
||||
CyclopsCharge = 43,
|
||||
SnowStorm = 44,
|
||||
}
|
||||
|
||||
impl ParticleMode {
|
||||
|
||||
@ -358,6 +358,15 @@ impl ParticleMgr {
|
||||
},
|
||||
);
|
||||
},
|
||||
Outcome::CyclopsCharge { pos } => {
|
||||
self.particles.push(Particle::new_directed(
|
||||
Duration::from_secs_f32(rng.gen_range(0.1..0.2)),
|
||||
time,
|
||||
ParticleMode::CyclopsCharge,
|
||||
*pos + Vec3::new(0.0, 0.0, 5.3),
|
||||
*pos + Vec3::new(0.0, 0.0, 5.6 + 0.5 * rng.gen_range(0.0..0.2)),
|
||||
));
|
||||
},
|
||||
Outcome::Death { pos, .. } => {
|
||||
self.particles.resize_with(self.particles.len() + 40, || {
|
||||
Particle::new(
|
||||
@ -381,7 +390,8 @@ impl ParticleMgr {
|
||||
| Outcome::Utterance { .. }
|
||||
| Outcome::IceSpikes { .. }
|
||||
| Outcome::IceCrack { .. }
|
||||
| Outcome::Glider { .. } => {},
|
||||
| Outcome::Glider { .. }
|
||||
| Outcome::LaserBeam { .. } => {},
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user