Commit Graph

2759 Commits

Author SHA1 Message Date
juliancoffee
8a83ecf57f Fix Beam orientation, remove orientation_behavior
* make old OrientationBehavior::FromOri default behaviour
* use rotation formed from look_dir instead of constructing
ori on the fly (which is altered after normalization).
2021-08-05 21:07:46 +03:00
Samuel Keiffer
92b32b4c36 Merge branch 'ygor/fix-axe-energy-reward' into 'master'
Allow axe combo to reward energy without skillpoint

See merge request veloren/veloren!2722
2021-08-05 00:38:41 +00:00
Joshua Barretto
31a49d26a9 Added action timer system for agent code 2021-08-04 14:04:56 +01:00
juliancoffee
4766450258 Avoid negative bounds in harm checks
* disallow_harm -> allow_harm to avoid negative reasoning since it mostly
requires double negation in code
* allow_harm -> may_harm to specify side-effect free
2021-08-03 18:57:53 +03:00
juliancoffee
5e6007db03 Return self-harm 2021-08-03 16:43:56 +03:00
juliancoffee
497a94cd7a Post review refactoring
* inline `target_dodging` into struct declaration as they are named
anyway
* move `avoid_harm` check out of `Attack::apply_attack` so we don't need
to pass whole Player component.
* another cosmetic things
2021-08-03 16:43:55 +03:00
juliancoffee
229e7b9cec Add CHANGELOG note about battle_mode setting 2021-08-03 16:43:54 +03:00
juliancoffee
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
juliancoffee
c7fdb640ac Cleaning 2021-08-03 16:42:58 +03:00
juliancoffee
7d4a8cbfa4 Add battle_mode server setting and player flag 2021-08-03 16:42:58 +03:00
Ygor Souza
1b5c3883a4 Allow axe combo to reward energy without skillpoint
When the character does not have the Double Strike Combo skill, the
ability's stage_data only contains one element, and thus the
stage_data.len() - 1 expression would set the max_energy_regen to 0.
This change forces the multiplier to 1 in this specific case, so the axe
can still reward energy without the combo skill point, to match the
other weapons.
2021-08-03 07:10:03 +02:00
Joshua Barretto
45f94b0bce Better Agent API 2021-08-02 13:08:39 +01:00
Ludvig Böklin
400734cc0a Fix gliderwield downhill run jitter 2021-08-01 11:20:46 +00:00
Joshua Barretto
f51c4ed860 Merge branch 'zesterer/menacing' into 'master'
Added menacing, made agent code less hacky

See merge request veloren/veloren!2707
2021-08-01 00:27:02 +00:00
Joshua Barretto
422e1c30f4 Added menacing, made agent code less hacky 2021-07-31 20:33:28 +01:00
Imbris
89eee332c9 Replace stamina -> energy in code, i18n keys, and asset names 2021-07-31 01:34:40 -04:00
Imbris
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
Thomas Kosel
2bf8a8c55c
improving code quality by removing superfluous & 2021-07-30 10:12:20 +02:00
Thomas Kosel
005c33bb28
renaming methods to match the names of the methods called within 2021-07-29 22:55:58 +02:00
Thomas Kosel
0b07b14093
moving CharacterState interpreting methods to character_state.rs 2021-07-29 22:38:20 +02:00
Imbris
6b54bedcd0 Merge branch 'imbris/1002-fix' into 'master'
Add comment to physics and replace magic number in climbing boost with a named...

Closes #1002

See merge request veloren/veloren!2694
2021-07-29 17:46:14 +00:00
Imbris
9fb6b84670 Merge branch 'juliancoffee/hud_refactor' into 'master'
Skillbar hud refactoring (+ shortened key names)

See merge request veloren/veloren!2663
2021-07-29 16:08:56 +00:00
Imbris
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
Marcel
680492cea6 Merge branch 'juliancoffee/entity_refactor' into 'master'
Improve terms of EntityConfig and LoadoutBuilder

See merge request veloren/veloren!2688
2021-07-28 23:19:04 +00:00
Ben Wallis
01ca6911a9 * Pets are now saved on logout and spawned with the player on login
* Pets now teleport to their owner when they are too far away from them
* Limited the animals that can be tamed to `QuadrupedLow` and `QuadrupedSmall` to prevent players taming overly powerful creatures before the pet feature is further developed
* Added `Pet` component used to store pet information about an entity - currently only used to store the pet's database ID
* Added `pet` database table which stores a pet's `body_id` and `name`, alongside the `character_id` that it belongs to
* Replaced `HomeChunk` component with more flexible `Anchor` component which supports anchoring entities to other entities as well as chunks.
2021-07-28 22:36:41 +00:00
juliancoffee
4adc045627 Added comments on PositionSpecifier usage 2021-07-28 20:03:23 +03:00
juliancoffee
14ac9a8b4e Improve terms of EntityConfig and LoadoutBuilder
* rename LoadoutBuilder::new to LoadoutBuilder::empty
* remove LoadoutBuilder::default as Default makes no sense here
* move comments from template.ron to EntityConfig struct
* add FIXME comments to split EntityConfig into EntityBase and
EntityExtension
2021-07-28 19:19:10 +03:00
juliancoffee
1bdab02aad Deduplicate bar text 2021-07-28 10:33:51 +03:00
Thomas Kosel
acb7f5dc4b
#918 remove usages of .restrict_mut() from character_behavior.rs 2021-07-27 23:34:16 +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
Imbris
1a081cdc5b Merge branch 'james/map-ui' into 'master'
Reduce number of map layers and remove unneeded alpha channel

See merge request veloren/veloren!2676
2021-07-25 17:24:50 +00:00
Avi Weinstock
edad38098f Revert "Resolve all '#[allow(clippy::excessive_precision)]' error supressions"
This reverts commit 0247ae2bf6.
2021-07-25 12:29:21 -04:00
Avi Weinstock
516ad1c772 Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions"
This reverts commit 63eff216f0.
2021-07-25 12:28:25 -04:00
Jonathan Berglin
cd2992afd3 Tygyh/resolve clippy error supressions 2021-07-25 15:35:14 +00:00
James Melkonian
54eb97b9de Reduce number of map layers and remove unneeded alpha channel 2021-07-24 19:54:40 -07:00
Joshua Barretto
37077b5703 Merge branch 'Resolve-unused-clippy-supressions' into 'master'
Resolve unused clippy supressions

See merge request veloren/veloren!2673
2021-07-24 20:44:06 +00:00
Dr. Dystopia
f039321cd7 Resolve unused '#[allow(clippy::redundant_pattern_matching)]' error supressions 2021-07-24 20:19:16 +02:00
Dr. Dystopia
575db6f51d Resolve unused '#[allow(clippy::assign_op_pattern)]' error supressions 2021-07-24 20:01:11 +02:00
Joshua Barretto
6fa3ac610b Merge branch 'aweinstock/fix-waypoint-2' into 'master'
Further improve handling of underground waypoints:

See merge request veloren/veloren!2665
2021-07-24 17:59:58 +00:00
Avi Weinstock
5dd56b724c Rename find_space_opt to try_find_space. 2021-07-24 13:09:10 -04:00
Samuel Keiffer
85b9f70469 Merge branch 'knightresspaladin/fix-circle-charge' into 'master'
Fixed CircleCharge and buffed Rugged Hide droppers

See merge request veloren/veloren!2613
2021-07-23 14:56:36 +00:00
Avi Weinstock
ca10d89068 Further improve handling of underground waypoints:
- Set the waypoint to the valid position after chunk load, so that respawns work.
- Search for the nearest valid surface before falling back to the top of the chunk, so that waypoints inside caves/buildings work.
2021-07-22 23:03:52 -04:00
Marcel Märtens
baf19b4d60 remove an unused queue_created in the Queue, might be added in the future again for more metrics. Also use core than std in one place 2021-07-22 20:57:16 +02:00
Marcel Märtens
7d93d907f6 implement slowjob metrics to measuere time in queue and execution time 2021-07-22 19:31:21 +02:00
Knightress Paladin
7ce9a3e284 Removed exhausted check from BasicAura and reformat max call 2021-07-21 20:20:27 -07:00
Knightress Paladin
c48a7c0072 Used integer types to store combo values 2021-07-21 16:46:26 -07:00
Knightress Paladin
578cacc194 Relocated BasicAura's combo reading to its static data 2021-07-21 16:46:26 -07:00
Knightress Paladin
9be690770a Added check to prevent heal aura from being negative 2021-07-21 16:46:26 -07:00
Knightress Paladin
ce31ac9fd1 Added exhaustion check to BasicAura to try to prevent repeated casts 2021-07-21 16:46:26 -07:00
Knightress Paladin
68725a0131 Added check for 0 combo in healing aura strength equation 2021-07-21 16:46:26 -07:00