1801 Commits

Author SHA1 Message Date
Ben Wallis
16b3aba412 Merge branch 'xvar/fix-add-admin-message' into 'master'
Fixed the message shown when adding an admin or moderator to show the correct role

See merge request veloren/veloren!2777
2021-08-21 15:40:27 +00:00
Ben Wallis
c1ca525ab0 Fixed the message shown when adding an admin or moderator to show the correct role 2021-08-21 15:43:33 +01:00
Samuel Keiffer
d924b48114 Merge branch 'ygor/combat-rating-all-stats' into 'master'
Use all armor stats to calculate combat rating

Closes #1285

See merge request veloren/veloren!2770
2021-08-20 21:16:05 +00:00
Marcel Märtens
de2ae0a184 simd must be last till we have a propper vek crate update 2021-08-20 12:44:46 +02:00
Ben Wallis
526269f62f Explosions no longer change block colours within the radius of a safe zone. Doubled the radius of the safe zone in the /home town. 2021-08-20 09:00:55 +01:00
Ygor Souza
9af9e58a85 Use all armor stats to calculate combat rating
- Added terms to account for poise (stun resistance), max energy bonus,
  energy reward bonus, and crit power.
- The weights were chosen to yield roughly the same CR for each of the 3
  types of armor in the same tier.
- Weapon rating multiplied by a constant to keep in the same order of
  magnitude as the other terms.
2021-08-16 19:59:54 +02:00
juliancoffee
b26228bec0 Remove giants 2021-08-16 18:15:01 +03:00
juliancoffee
dc69716cd0 Implement /make_npc 2021-08-16 17:27:59 +03:00
juliancoffee
0c2df96371 Refactor supplement evaluation to use NpcData 2021-08-16 17:27:59 +03:00
juliancoffee
d93c6e2470 Add MakeNPC admin command 2021-08-16 16:45:36 +03:00
Imbris
b05515e5bf Merge branch 'juliancoffee/explode_vines' into 'master'
Make Fireballs explode EnsnaringVines

See merge request veloren/veloren!2758
2021-08-14 19:09:05 +00:00
Joshua Barretto
6ad4791b11 Improved aggro system to reduce hyper-focused enemies 2021-08-14 11:09:33 +01:00
Joshua Barretto
432bfa91d9 Added feature flag for terrain persistence 2021-08-12 10:48:00 +01:00
Joshua Barretto
da58c3d143 Added experimental terrain persistence 2021-08-12 10:26:20 +01:00
juliancoffee
42debc32d3 Make Fireballs explode EnsnaringVines 2021-08-12 01:25:55 +03:00
juliancoffee
a93c6931d4 Implement /kit all and a bit of refactoring
+ notifying about sucessful kit application
+ notifying about case with insufficient space
+ handle case where you don't have enough free slots
+ handle quantity of non-stackable items
+ add test for items in kit manifest
2021-08-10 13:28:38 +03:00
Ben Wallis
e3ce3f0f97 Fixed issue caused by Uid component being removed too soon on logout 2021-08-08 14:59:11 +01:00
juliancoffee
174f0ba20d Add FIXME about Staff flamethrower 2021-08-08 00:41:39 +03:00
juliancoffee
0ccfb8e004 Expose beam_offsets to AI 2021-08-08 00:33:43 +03:00
juliancoffee
eb9285d000 Agent code TODO-s 2021-08-05 21:07:45 +03:00
Joshua Barretto
492a37d23a Added action timer system for agent code 2021-08-04 14:04:56 +01:00
Joshua Barretto
715e053356 Fix pets without agency 2021-08-04 00:22:03 +01:00
juliancoffee
f3e8328717 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
166e23cb8e continue -> filter_map to handle new players 2021-08-03 16:43:56 +03:00
juliancoffee
98e36ab641 Prettify server/sys/msg/register.rs 2021-08-03 16:43:56 +03:00
juliancoffee
7c738fb843 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
9d5ac63239 Use emitter.emit() in server/sys/msg/register 2021-08-03 16:43:55 +03:00
juliancoffee
94b48f5448 Cleaning 2021-08-03 16:42:58 +03:00
juliancoffee
eb770a7dd7 Add battle_mode server setting and player flag 2021-08-03 16:42:58 +03:00
Knightress Paladin
f4bea28092 Fix up comments relating to AI logic 2021-08-02 22:38:16 -07:00
Knightress Paladin
d12df2a88b Restyle logic in Staff AI 2021-08-02 16:22:40 -07:00
Knightress Paladin
de55aef71d Used adjusted_by_skills to correctly calculate ability values 2021-08-02 16:22:40 -07:00
Knightress Paladin
6913c54ab1 Allowed staff AI to queue shockwave if occupied by animation 2021-08-02 16:22:40 -07:00
Knightress Paladin
8d88457434 Restructured logic for staff AI 2021-08-02 16:22:40 -07:00
Joshua Barretto
697cf418c3 Better Agent API 2021-08-02 13:08:39 +01:00
Ludvig Böklin
0d7c0dfd50 Fix gliderwield downhill run jitter 2021-08-01 11:20:46 +00:00
Joshua Barretto
d74c2b47c8 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
f311556c0b Merge branch 'imbris/small-fix' into 'master'
Fix typo in log message and remove prefixed '_' from a few used variables

See merge request veloren/veloren!2703
2021-07-31 21:54:25 +00:00
Joshua Barretto
243790a0df Added menacing, made agent code less hacky 2021-07-31 20:33:28 +01:00
Imbris
330c743305 Fix typo in log message and remove prefixed '_' from a few used variables 2021-07-30 22:10:12 -04:00
Monty Marz
2466cad155 Remove sceptre, add swords 2021-07-29 22:38:35 +00:00
Joshua Barretto
a27ea9aab1 Prevented mountable pets 2021-07-29 19:04:07 +00:00
Marcel
9b30bb9e7d 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
f4b3d463c8 * 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
Tavo Annus
709ca85db4 Combine multiple inventory loading queries into single reccursive query 2021-07-28 21:11:57 +00:00
juliancoffee
9c7f96b6c1 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
Sam
449b4bb3d5 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
Joshua Barretto
6162076246 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
d5e2fcca0f Resolve unused '#[allow(clippy::unnecessary_wraps)]' error supressions 2021-07-24 20:14:26 +02:00
Dr. Dystopia
9156470ed3 Resolve unused '#[allow(clippy::same_item_push)]' error supressions 2021-07-24 20:08:08 +02:00