Commit Graph

4349 Commits

Author SHA1 Message Date
unknown
6684685679 Attempt to fix BarrelCactus 2023-06-14 13:49:40 -04:00
unknown
526386e51c Initial cacti work 2023-06-07 14:46:54 -04:00
Imbris
599e25c9c6 Address review on !3971 2023-06-04 21:12:39 -04:00
Imbris
ea77a443a2 Fix conditions on some error logging spots 2023-06-04 12:59:09 -04:00
Imbris
42ba445ea2 Add RtsimEntity mapping if it is included as a component on a newly
created npc.

Also, improve wording of a comment.
2023-06-04 12:58:16 -04:00
Imbris
01df87bdb4 Address/cleanup a couple TODOs, mainly comment improvements 2023-06-04 12:58:16 -04:00
Imbris
b8af76deff Remove potential for client to delete its own entity.
Also:
* Fix some clippy warnings
* Remove unused clippy allow
* Document semantics of `DeletedEntities`
2023-06-04 12:58:16 -04:00
Imbris
65efa779b5 Steps towards properly synchronizing when a client exits in-game to
return to the character screeen. And other related improvements.

* Uid now optional when removing an entity from IdMaps since that Uid
  may have been transferred to the new entity created when the client
  exits "in-game".
* Added notes about making sure to update the CharacterId mapping when
  changing the `kind` field of `Presence`.
* Add a parameter to `delete_entity_recorded` that indicates whether it
  is being called from `handle_exit_ingame` and that provides the `Uid`
  that was removed from the entity so that we can more explicitly and
  correctly handle that case.
* We now add the Uid of the client to the deleted entities list when it
  exits "ingame". (still need to rework code so that the client doesn't
  delete its own entity).
* Improved integration of possession code with ForceUpdate logic.
* Don't remove `Presence` component from old entity in possession so
  that deleting that entity will properly handle updating the
  CharacterId unmapping (if the old entity isn't going to be deleted we
  still remove the `Presence` component so that it doesn't keep terrain
  loaded).
* Added a couple TODOs on existing tangential things I noticed.
2023-06-04 12:58:16 -04:00
Imbris
62abed1eec Replace u64 with Uid in some places and add/modify some comments 2023-06-04 12:58:16 -04:00
Imbris
c60f994c7f Some random changes and a fmt 2023-06-04 12:58:16 -04:00
Imbris
f11baed9fa Adapting various things to the new interface, fixing compilation errors,
and progressing on half done things. Also, added a few TODO comments.
2023-06-04 12:58:16 -04:00
Imbris
4094887997 Rename UidAllocator to IdMaps everywhere, also rename lookup_entity to
uid_entity.

Also made more progress on changes in common/src/uid.rs

(does not compile so don't know if all rebase quirks resolved)
2023-06-04 12:58:16 -04:00
Imbris
35922866a8 Start refactoring UidAllocator to contain mappings for different Id
types.

* Add new `IdMaps` type that contains mappings to Entity from Uid, CharacterId, and
  RtsimEntity.
* Add PresenceKind::LoadingCharacter variant for when the CharacterId
  has not actually been confirmed to exist and belong to the logged in
  client. Switches to the regular PresenceKind::Character once the
  character is loaded from the database and that is used to update the
  entity.
* Start refactoring `delete_entity_recorded` to check for CharacterId
  and RtsimEntity values that may need to be removed from the map (just
  very start, not near complete).
* Other misc tweaks.
2023-06-04 12:58:16 -04:00
Imbris
3277d18265 Rename retrieve_entity_internal to lookup_entity 2023-06-04 12:58:16 -04:00
Imbris
ea725fffde Cleanup UidAllocator and Uid a bit:
* Remove unnecessary Marker/MarkAllocator trait implementations.
* Delete excess functions
* Change some methods to take Uid instead of u64
2023-06-04 12:58:15 -04:00
Isse
a884e0e058 Various rtsim related stuff 2023-06-03 22:14:18 +00:00
flo
16d58c6b4e plant creatures 2023-06-03 13:59:52 +00:00
Joshua Barretto
ec3a7d1898 Make items vanish after 5 minutes 2023-06-01 14:51:19 +01:00
Joshua Barretto
3a383050d5 Apply fall damage even after a block-hop 2023-06-01 14:14:28 +01:00
Joshua Barretto
f00f96636c Fixed weird fall damage application 2023-06-01 14:08:13 +01:00
flo
40832456f2 spawn frost gigas 2023-05-31 12:31:54 +00:00
Joshua Barretto
96b84dcbaa Transform surface normal to account for voxel entity orientation 2023-05-25 15:18:42 +01:00
Joshua Barretto
4fa799e7c7 Fixed volume mount orientation 2023-05-25 03:16:27 +01:00
Joshua Barretto
9127d6cbf2 Account for surface normal when calculating collision damage 2023-05-25 01:21:44 +01:00
Joshua Barretto
b086b43a88 Better wheeled ship movement 2023-05-25 00:28:36 +01:00
Joshua Barretto
8e85ff98a6 Better turning 2023-05-25 00:28:36 +01:00
Joshua Barretto
f986e0793d Better orientation, axels 2023-05-25 00:28:35 +01:00
Joshua Barretto
6a2796dc17 Everything damage 2023-05-25 00:28:35 +01:00
Joshua Barretto
8a8a5526f1 Added carriage 2023-05-25 00:28:28 +01:00
Joshua Barretto
623ab099b8 Fix ground_vel parameter 2023-05-25 00:25:28 +01:00
Joshua Barretto
dbcbd43b8f Added body kind argument to /airship and /ship 2023-05-25 00:25:28 +01:00
Joshua Barretto
a09dbf0396 Cleaned up and documented voxel collider code 2023-05-25 00:25:28 +01:00
Joshua Barretto
04687aa0b2 An underwater thing 2023-05-25 00:25:28 +01:00
Joshua Barretto
465a62a072 Correct for orientation movement on voxel entities 2023-05-25 00:25:28 +01:00
Joshua Barretto
610d1d8497 Simplified replacement drag logic, special-case volume entities to improve movement 2023-05-25 00:25:28 +01:00
Joshua Barretto
7b4bb2de99 Use non-physical mode for liquid drag 2023-05-25 00:25:28 +01:00
Joshua Barretto
3c1cfe574d Added skiff 2023-05-25 00:25:28 +01:00
Joshua Barretto
dfbd9e8132 Rebalanced ships 2023-05-25 00:25:27 +01:00
Joshua Barretto
b6a7401cd9 Balanced quad_low swim thrust 2023-05-25 00:25:27 +01:00
Joshua Barretto
96bf86dae0 Rebalanced masses, dimensions, swim thrusts, and made various improvements to water movement that help with gameplay and pathfinding. Also fixed swimming animations for many creatures. 2023-05-25 00:25:25 +01:00
Isse
68491dde55 Merge branch 'seachapel_rework' into 'master'
seachapel_rework

See merge request veloren/veloren!3856
2023-05-24 18:13:29 +00:00
flo
a55276ea73 seachapel_rework 2023-05-24 18:13:29 +00:00
Maxicarlos08
777a69e576
adressed review comments 2023-05-22 23:20:11 +02:00
Maxicarlos08
fbe32a9047
no_dura -> no_durability 2023-05-22 22:38:48 +02:00
Maxicarlos08
8ed311c5a9
made tests work 2023-05-22 22:38:47 +02:00
Maxicarlos08
174f75dc63
durability free areas 2023-05-22 22:38:47 +02:00
Joshua Barretto
f5b24a5953 Removed redundant hit code 2023-05-19 16:54:14 +01:00
Joshua Barretto
c73848b932 Fixed minor issues with walls, better particles 2023-05-19 14:25:49 +01:00
Joshua Barretto
b0556588b8 Actually use orientation when deciding on wall direction 2023-05-19 13:30:49 +01:00
Joshua Barretto
c94d6c502a Added one-way wall sprites 2023-05-19 13:24:45 +01:00