From 64045ed7bd0f94a173063dd7e5ee473a798b2bb3 Mon Sep 17 00:00:00 2001 From: Snowram Date: Sun, 27 Jun 2021 23:45:07 +0200 Subject: [PATCH] Adds an outcome to death with SFX and VFX --- CHANGELOG.md | 1 + assets/voxygen/audio/sfx.ron | 8 ++++++++ assets/voxygen/audio/sfx/character/death_1.ogg | Bin 0 -> 11029 bytes assets/voxygen/audio/sfx/character/death_2.ogg | Bin 0 -> 11038 bytes assets/voxygen/audio/sfx/character/death_3.ogg | Bin 0 -> 11060 bytes assets/voxygen/shaders/particle-vert.glsl | 15 ++++++++++++++- common/src/outcome.rs | 4 ++++ server/src/events/entity_manipulation.rs | 15 +++++++++++++++ voxygen/src/audio/sfx/mod.rs | 5 +++++ voxygen/src/render/pipelines/particle.rs | 1 + voxygen/src/scene/particle.rs | 13 +++++++++++++ 11 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 assets/voxygen/audio/sfx/character/death_1.ogg create mode 100644 assets/voxygen/audio/sfx/character/death_2.ogg create mode 100644 assets/voxygen/audio/sfx/character/death_3.ogg diff --git a/CHANGELOG.md b/CHANGELOG.md index e7c26d1a12..4b4690b7f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Made strafing slightly slower - Food now has limited regeneration strength but longer duration. - Harvester boss now has new abilities and AI +- Death particles and SFX ### Removed diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index eaac0f0241..9a794c203a 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/assets/voxygen/audio/sfx.ron @@ -777,6 +777,14 @@ ], threshold: 0.2, ), + Death: ( + files: [ + "voxygen.audio.sfx.character.death_1", + "voxygen.audio.sfx.character.death_2", + "voxygen.audio.sfx.character.death_3", + ], + threshold: 0.2, + ), Block: ( files: [ "voxygen.audio.sfx.character.block_1", diff --git a/assets/voxygen/audio/sfx/character/death_1.ogg b/assets/voxygen/audio/sfx/character/death_1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..9d278fc67cdcecdd39536a85bcff84c525fdf553 GIT binary patch literal 11029 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 z zInoTsFjpcFd|X#!cjVJKZ%b(Z)-V`b)|U5!qrUL87X7kz@pWCDtkFPD9>?$(5bf7w z-!^Vjnq@xX;}}r6J@<4-Kzdbceo6A7ZMwY+f5zAw=l$yysPCxxvsuCFIO26vlCtCi zw7;?8k>EW=l16*}8_373vxkG#<4U<=7PSb*7ZG!Os9a-WX`b&Kx}?q2!=>X%4vw-@!#%4tq6RV^mw z5fSkqD$!`>F#R}cl2Y<|-<%mC-r==Jwyo--|zN-Ph|LDftlY^5c|y<2+2bJe?QS=mORRVLm2hZmG8;+3$(hYui`5N;ocToO(sX#)yFDEaV*8 zl^Z>4Q5M9&!S~k4qxW0y7N6|1c+9=YwDk^1n|h>4%l7!C`dmcaD&?vA!RruLdAq6M zG~%u$gF;J<4L~KMnBlbTm?wbmm0~#4TL;PbWg70f;n0KUACc)z$kU4YtZy#BcszOMic6ip8`GhjSqJTi&Ci^O>5gm-bKvDe z=u?(+<5#g7xO7gWvNjqkEnOr6II)i?n1-+@wF`L>zdD7m0d9TYd8aecpEd9B-8rn% z6L}Pkw8$y*apQH01nk};bI%&6fw0=!3VS)JmPrEq?72=3T_YN!W2~7*bqbOO8f3Z> zg1q0oAHF!l;tyWFcT0~_Of);=W{7w7r(XW2#pI&zqAZ4#C|I(2zGxRPSag0J$%}=* zzbFiQ$)7qKQk(xRQEV#%-sqkQ(f=l+mwA20S(`=<+17R=<|Du>Kv50 zaugxT4;yGq3n=_N#2{y}6ZWlEpUA%GCJHW^wv>2`=<|i+h7sPFjo*4JakE~9Q-?rJ z=>+v`T)DT|-j&}nVPcM@hXp9OaXi10>qn&~DXjFlk_SOKwX!f&RVw8`2>%$7Vngme zF?ATdxPkW`JzvU>zyipBY()U1!*m7ey;QOyK%3ti>;5L?R;paH(U&_~v%X@jsB`5< z`05pv{FQ31)k)9y2#TTZI7W1gCO8lsvpyy~9G`xWD9U#i<`&^eQ@#{=W%S?yVA2c#DRXb0ewmhfqXh|g0 zkX_PU!1`g;$g|urv}qToWL;8;8b&|wP*lQriyg9vo-Z2Pz0R*h;jt*e53x5!dxj>{ z0h`&aUHk>7pQpFc$dARH8ZW0b;~x}N5~e7SzE>)6DsO$dVHn&j(b0MQ@iVlFZt~A= zUiN|EfY|c42j)!lYKC|5jk^TAR51K6=Ww)Se^<{)B@i$oAh_%G)}H{$I;ME>Uj}17wKL?a*UhYL z95Pf${Zwf)n}4qy<9E+u?x?imY5eerA9gMrJ3we3Du2f zZnAL27LJ646YHi-(qk(C$U2$*4BVW3mU3s;fy~hgm zlY{S4Mh@u8;$}UoP9$CD^*aO=g|An5kLHs(4W5)9H&&wn^qCGkt$ z3uApo?vzf)7W!!gW9;CP!39 zM509$$2#s*SFdVnyxJtSOn159B`ds}<9v>dYqkRaHl!BQ5xYxGw=MsnUG38=mayfU zE5&k*K4JpXpWfKN*HAl$-+BJg;u@Ln^khT-mfC|>13V9z>YAmVd%fwy=205P`WGv` z4%e}(n&*7yyc<5TcHNI8er4>nog*TxXyRD1dsyoNHN-hN0vwuD0oH`cr+z(0SmD|_BO-CGpN~#?T^g~0sg+f5&1WzrPD(s(@dgq$Jahc{W(xF z3amBEb3Z?f;IGW!MmoDy7%D)d=QQf1$nA)rGk%WmHf%LMkjufDHpIK-8Wx6JmX+Jb meS4Sbl9wl4oMTZRVcF&44Vm^YGPk_3le_B}I>>J~F#jK$6Kt{o literal 0 HcmV?d00001 diff --git a/assets/voxygen/audio/sfx/character/death_2.ogg b/assets/voxygen/audio/sfx/character/death_2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..faef94bfb9d152141803f932f5c015127c4dbf71 GIT binary patch literal 11038 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 K=!qDKf&T;U0CbiB literal 0 HcmV?d00001 diff --git a/assets/voxygen/audio/sfx/character/death_3.ogg b/assets/voxygen/audio/sfx/character/death_3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..c99cf45b156a0714444b7946306fa906d9afecb5 GIT binary patch literal 11060 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, }, + Death { + pos: Vec3, + }, Block { pos: Vec3, parry: bool, @@ -90,6 +93,7 @@ impl Outcome { | Outcome::SkillPointGain { pos, .. } | Outcome::SummonedCreature { pos, .. } | Outcome::Damage { pos, .. } + | Outcome::Death { pos, .. } | Outcome::Block { pos, .. } | Outcome::PoiseChange { pos, .. } | Outcome::GroundSlam { pos } diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index b01f17e13a..e7ae6e47f1 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -138,6 +138,21 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc } }; + // Push an outcome + if state + .ecs() + .read_storage::() + .get(entity) + .is_none() + { + if let Some(pos) = state.ecs().read_storage::().get(entity) { + state + .ecs() + .write_resource::>() + .push(Outcome::Death { pos: pos.0 }); + } + } + // Chat message // If it was a player that died if let Some(_player) = state.ecs().read_storage::().get(entity) { diff --git a/voxygen/src/audio/sfx/mod.rs b/voxygen/src/audio/sfx/mod.rs index 061cd592ca..0bc8f53c5f 100644 --- a/voxygen/src/audio/sfx/mod.rs +++ b/voxygen/src/audio/sfx/mod.rs @@ -171,6 +171,7 @@ pub enum SfxEvent { Inventory(SfxInventoryEvent), Explosion, Damage, + Death, Parry, Block, BreakBlock, @@ -505,6 +506,10 @@ impl SfxMgr { let sfx_trigger_item = triggers.get_key_value(&SfxEvent::Damage); audio.emit_sfx(sfx_trigger_item, *pos, Some(1.5), false); }, + Outcome::Death { pos, .. } => { + let sfx_trigger_item = triggers.get_key_value(&SfxEvent::Death); + audio.emit_sfx(sfx_trigger_item, *pos, Some(1.5), false); + }, Outcome::Block { pos, parry, .. } => { if *parry { let sfx_trigger_item = triggers.get_key_value(&SfxEvent::Parry); diff --git a/voxygen/src/render/pipelines/particle.rs b/voxygen/src/render/pipelines/particle.rs index 381ff30cd2..d064348eea 100644 --- a/voxygen/src/render/pipelines/particle.rs +++ b/voxygen/src/render/pipelines/particle.rs @@ -84,6 +84,7 @@ pub enum ParticleMode { IceSpikes = 31, Drip = 32, Tornado = 33, + Death = 34, } impl ParticleMode { diff --git a/voxygen/src/scene/particle.rs b/voxygen/src/scene/particle.rs index 1b70bd660f..9465868dc3 100644 --- a/voxygen/src/scene/particle.rs +++ b/voxygen/src/scene/particle.rs @@ -242,6 +242,19 @@ impl ParticleMgr { ) }); }, + Outcome::Death { pos, .. } => { + self.particles.resize_with(self.particles.len() + 40, || { + Particle::new( + Duration::from_millis(400 + rng.gen_range(0..100)), + time, + ParticleMode::Death, + *pos + Vec3::unit_z() + + Vec3::::zero() + .map(|_| rng.gen_range(-0.1..0.1)) + .normalized(), + ) + }); + }, Outcome::ProjectileShot { .. } | Outcome::Beam { .. } | Outcome::ExpChange { .. }