Commit Graph

295 Commits

Author SHA1 Message Date
61416faec3 Refactor Aura system, add avoid_harm flag
+ fix bug where you cast OutOfGroup on yourself and your group
2021-08-03 16:42:58 +03:00
c7fdb640ac Cleaning 2021-08-03 16:42:58 +03:00
7d4a8cbfa4 Add battle_mode server setting and player flag 2021-08-03 16:42:58 +03:00
3ddbb0a5fb Merge branch 'mohs/refactoring_character_behavior' into 'master'
reducing complexity of character_behavior's run method by extracting logical pieces.

See merge request veloren/veloren!2697
2021-07-31 02:47:55 +00:00
3735688e4c changing <Sys> to Self to be a little more speaking and less riddles. 2021-07-29 23:14:46 +02:00
005c33bb28 renaming methods to match the names of the methods called within 2021-07-29 22:55:58 +02:00
0b07b14093 moving CharacterState interpreting methods to character_state.rs 2021-07-29 22:38:20 +02:00
93045ba1ee reducing complexity of character_behavior's run method by extracting logical pieces. 2021-07-29 20:09:31 +02:00
01d1089a46 Add comment to physics and replace magic number in climbing boost with a named constant, fixes #1002 2021-07-29 03:11:44 -04:00
c8527491cc #918 reverting wrongly merged inventory related changes. 2021-07-28 21:13:09 +02:00
acb7f5dc4b #918 remove usages of .restrict_mut() from character_behavior.rs 2021-07-27 23:34:16 +02:00
27f666622f #918 remove usages of .restrict_mut() from mount.rs and stats.rs 2021-07-27 22:22:39 +02:00
Sam
f164d6036e Made swapping equipped weapons a server event instead of being called in common to prevent server-client desyncs. 2021-07-25 18:30:17 -05:00
199d56b1db Fix block-hopping with strangely sized blocks 2021-07-25 20:03:17 +01:00
c577a7d677 Resolve unused '#[allow(clippy::while_let_on_iterator)]' error supressions 2021-07-24 20:04:52 +02:00
d2b8a5a169 Fix check before calculating entity pushback, was causing a NaN and probably other bugs 2021-07-19 01:31:40 -04:00
3e6fd0ee1d Setup animation mount points for quadruped medium, update offsets in
common for new quadruped mediums, properly transform the offset in the
mount system using ori, fix issue with composing in the base ori with
the mounting bone ori in voxygen.
2021-07-18 15:09:36 -04:00
b2bf83e200 Rework mounting animation so that full hierarchies of animation transforms can be applied to the mounter, factor out some common code in figure/mod.rs 2021-07-18 15:04:02 -04:00
09cbb90f61 Make the mounter animations dependant of the mountee animation 2021-07-18 15:03:57 -04:00
b15f426ee5 Resolve all approved error supressions 2021-07-18 17:11:46 +00:00
eade248e1f Fixed handling of orientation changes for airships 2021-07-18 01:13:36 +01:00
f38cde9d40 Merge branch 'knightresspaladin/healing-aura' into 'master'
Knightresspaladin/healing aura

See merge request veloren/veloren!2587
2021-07-16 21:32:03 +00:00
f316f1da60 Make Guards Defend Villagers 2021-07-14 07:40:43 +00:00
9b3b21f368 fix clippy warnings 2021-07-12 12:09:09 +02:00
146f86be2c Removed references to Healing Beam, which Healing Aura is replacing 2021-07-10 21:39:11 -07:00
02151417f2 fix melee hit_count increment 2021-07-09 16:17:51 +00:00
c538a9696c Use Food after Buildup
+ Remove Saturation effect by rolling
+ Remove Saturation effect if interrupted with poise
+ Rename Potion to Drink, add ComplexFood
2021-07-05 10:56:29 +03:00
Sam
d8f68668b1 Addressed potential for divide by zero. 2021-07-04 22:00:13 -05:00
Sam
4ac9d9e0a5 Fix interaction of max health and max health over time buffs causing infinite health scaling. 2021-07-04 21:43:29 -05:00
110aa17642 Fix underwater campfires. 2021-06-30 18:36:43 -04:00
Sam
8a9de26132 Food now applies buff at end of state.
Rolling and poise states now cancel the potion buff.
UseItem character state now checks that the item in the slot has the same item_definition_id as when the entity enters the state.
Rolling can no cancel item use.
Rolling now checks for move_dir instead of velocity.
2021-06-29 05:59:02 -05:00
Sam
3559ce5803 Added UseItem character state. 2021-06-29 05:59:02 -05:00
Sam
645cc60dc0 Balance tweaks. 2021-06-23 22:38:37 -05:00
Sam
aac24ad601 Added ensnared debuff icon. 2021-06-23 22:38:16 -05:00
Sam
0a32b676c8 Vines now ensnare you by applying a buff. 2021-06-23 22:38:16 -05:00
Sam
763461ebef Ensnaring vines now ensnare you. 2021-06-23 22:38:16 -05:00
Sam
ed503236d6 Slightly functional sprite summon. 2021-06-23 22:38:16 -05:00
8356e2ffca Merge branch 'aweinstock/lava' into 'master'
Lava

See merge request veloren/veloren!2482
2021-06-21 20:49:44 +00:00
e930ff6779 Sanitise controller inputs 2021-06-21 21:13:49 +01:00
0f9181cbcb Address MR 2482 comments.
- Change lava density to 3x water density.
- Use `ServerEvent::Buff` instead of modifying the buff component directly.
- Revert commented-out changes to fluid shaders.
2021-06-20 11:32:05 -04:00
f1a1160b80 Make lava solid w.r.t. rendering while still being liquid w.r.t. physics. 2021-06-19 16:52:21 -04:00
2226a4c6a9 Add lava to caves, which sets you on fire if you swim in it. Currently requires uncommenting #define LAVA in the shaders, and only looks good with cheap fluid mode. 2021-06-19 16:31:21 -04:00
46dfc119fb Merge branch 'aweinstock/tighten_e2t' into 'master'
Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels.

See merge request veloren/veloren!2460
2021-06-18 16:27:20 +00:00
fb51fd3230 Emit sound from head 2021-06-16 17:23:22 +01:00
0ef29a6989 VoiceKind for better sound effect specs 2021-06-16 17:23:22 +01:00
559311e1b0 Chasing sounds 2021-06-16 17:23:22 +01:00
96ffae4387 Address MR 2460 comments.
- Switch from point query to AABB query to take into account block thickness.
2021-06-15 22:52:02 -04:00
5e6363dbcc Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels. 2021-06-15 21:29:29 -04:00
3ba0500b90 Tornado summoning attack 2021-06-15 09:49:13 +02:00
1b36f6cab3 Merge branch 'aweinstock/forcemove-no-pushback' into 'master'
Don't apply e2e pushback during a forced movement character state.

See merge request veloren/veloren!2429
2021-06-14 14:42:01 +00:00