holychowders
dda85e4bc3
Address code review.
2022-05-01 18:23:23 -05:00
holychowders
645bbf7b0d
Refactor: re-order function signature to make more sense.
2022-05-01 17:30:23 -05:00
holychowders
d3873e357e
Agent: Use FOV when scanning for hostile targets and refactor choose_target().
...
- Refactors `choose_target()`, renaming it and extracting functions with more meaningful names and more correct behavior.
- Adds FOV for agents scanning for hostile targets.
2022-05-01 17:29:45 -05:00
holychowders
914b44c714
Fix villagers seeing cultists and familiar enemies through objects.
2022-05-01 15:06:43 +00:00
Marcel Märtens
fa49248c31
switch to upstream vek again
2022-04-28 09:10:55 +02:00
Youssef Fahmy
aec866e5ec
Balance tweaks
2022-04-23 14:54:01 +00:00
holychowders
cc409fd537
Extract some retargeting logic.
2022-04-11 11:54:09 -05:00
James Melkonian
b590bc50d7
Fix #1516 Add else branch to allow for agent idling when no sound events
2022-04-05 03:40:26 +00:00
Marcel
50fd55daef
Merge branch 'tormod-personalities' into 'master'
...
Give NPCs random Big Five personalities.
See merge request veloren/veloren!3280
2022-04-04 19:03:05 +00:00
Tormod G. Hellen
cb88648cca
Give NPCs random Big Five personalities.
2022-04-04 20:17:50 +02:00
Marcel Märtens
64b9602760
update further dependencies, including strum and get rid of old strum_macro
2022-04-04 16:06:47 +02:00
Marcel Märtens
affdf3131f
update a bunch of dependencies, including clap3
2022-04-04 11:43:29 +02:00
flo
3d24b1d635
CliffTowns
2022-03-29 12:52:08 +00:00
holychowders
39d5a73c10
Fix deadwood not attacking if target is at a different elevation than deadwood.
2022-03-27 20:02:38 +00:00
Samuel Keiffer
4aaefdf6be
Merge branch 'ubruntu/site2-guards-raiders' into 'master'
...
Bring raiders and guards to site2 towns
See merge request veloren/veloren!3300
2022-03-26 00:29:53 +00:00
ubruntu
6d30f7f748
Bring raiders and guards to site2 towns
2022-03-26 00:29:52 +00:00
Justin Shipsey
aee1aa7c1d
Merge branch 'holychowders/prevent_undesired_movement_on_agent_interaction' into 'master'
...
Agent Perception: Improve Awareness System
See merge request veloren/veloren!3263
2022-03-26 00:28:18 +00:00
holychowders
a88d8ada0f
Comment out unused awareness increment/decrement calls and un-nest conditional for early return.
2022-03-19 12:02:29 -05:00
James Melkonian
8c06dc9a5c
Add chunk reload command (admin only)
2022-03-19 08:43:38 +00:00
Manuel Schmidbauer
0037518472
Impl #1357 : Agent chase abort
...
- Adds util funcs to calculate benefit of continue pursue vs letting
target escape
- Hooks util funcs into agent's hostile tree
2022-03-14 18:06:57 +01:00
Imbris
06b605a8d0
Add note on reasoning in optional argument parsing behavior
2022-03-13 16:03:29 -04:00
Imbris
008e9051f7
Don't consume command args that fail parsing, so that optional args are properly skipped.
2022-03-13 15:41:37 -04:00
holychowders
c6bc6b63ee
Prevent enemy agents from reacting to sounds from too far away and remove an inconsequential distance check.
2022-03-12 18:13:02 -06:00
holychowders
cc808251e6
Make Enemy agents flee from dangerous sounds instead of follow.
2022-03-12 16:58:06 -06:00
holychowders
3ffb1a7706
Also restrict when Enemy agents respond to sounds and fix potential conditional bug.
2022-03-12 16:58:06 -06:00
holychowders
8d98ade15e
Agent perception: Make handling of sounds and awareness more intuitive.
...
When a sound was received in `idle_tree()`, awareness would be
incremented, causing a call to `handle_elevated_awareness()`, which
handled sounds heard. Instead, just `handle_sounds()` when they are heard and
increment awareness as part of hearing them.
The code more straightforwardly shows the agent first hearing a sound and then
becoming more aware based on that.
2022-03-12 16:58:06 -06:00
holychowders
df91f665d7
Agent Perception: Restrict when idling agents respond to sounds.
...
- Prevent utterances and other sounds from causing undesired jitters and
fleeing, such as those caused by greeting villagers.
- Agents will no longer flee from quieter weapon sounds such as melee.
2022-03-12 16:58:06 -06:00
Samuel Keiffer
a411db17bf
Merge branch 'tygyh/Refactor-path_toward_target' into 'master'
...
Tygyh/refactor path toward target
See merge request veloren/veloren!3241
2022-03-08 16:43:37 +00:00
Dr. Dystopia
1810998641
Remove redundant 'pos' variable
2022-03-05 09:54:01 +01:00
Dr. Dystopia
1cb7a083e7
Remove redundant if-statement
2022-03-05 09:53:28 +01:00
Dr. Dystopia
4aab1eea43
Remove redundant 'tgt_pos' variables
2022-03-01 22:54:44 +01:00
Dr. Dystopia
5aa1d3ceaf
Rename 'vec3' parameter to 'pos_difference'
2022-03-01 22:47:01 +01:00
Dr. Dystopia
f99a637606
Rename 'dist_to_pos' variable to 'pos_diff'
2022-03-01 22:44:55 +01:00
Dr. Dystopia
50f877bdf6
Rename 'dist_to_pos_xy' variable to 'dist_xy'
2022-03-01 22:42:03 +01:00
Dr. Dystopia
83f46658a9
Fix pathing execution
2022-03-01 22:40:43 +01:00
Dr. Dystopia
0a3de57be6
Rename 'distance_to_target' variable to 'pos_difference'
2022-03-01 22:38:35 +01:00
Dr. Dystopia
4d24ff0027
Rename 'target_position' clojure to 'partial_path_tgt_pos'
2022-03-01 22:33:25 +01:00
ubruntu
94a9b407c2
Fix waypoints being movable
2022-02-28 19:20:37 +00:00
InfRandomness
042d258161
Modify message catch-all arms
2022-02-27 23:08:47 +00:00
Imbris
7be5b4c051
Merge branch 'imbris/fix-possesion-comp-sync' into 'master'
...
Improve possession edge cases
See merge request veloren/veloren!3233
2022-02-27 20:10:16 +00:00
Imbris
8742a37e0f
Changes based on review. Fix tests.
2022-02-27 14:43:08 -05:00
N A
fc9c3c3be9
worth_choosing refactor
2022-02-27 19:21:21 +00:00
Imbris
e6c2239744
Fix typo. cargo fmt.
2022-02-27 13:47:13 -05:00
Imbris
e52159f638
Remove original character from game world when possessing to make persistence more robust.
2022-02-27 13:47:13 -05:00
Imbris
10803a9735
Stop using Character presence kind when possessing so that persistence doesn't get messed up.
2022-02-27 13:47:12 -05:00
Imbris
c2ad763b9c
Handle removing/inserting SyncFrom::ClientEntity components properly during possession.
2022-02-27 13:47:12 -05:00
Imbris
63ed36bdde
Limit possesse to regions which possessor is subscribed to.
2022-02-27 13:47:12 -05:00
Imbris
6f9ff17ce8
Properly handle cleanup of old entity controller during possession on both the client and server sides
2022-02-27 13:47:12 -05:00
Imbris
1a744808f0
Cleanup up possession code and add TODOs for issues to fix. Remove
...
SyncFrom debug_assertions hack.
2022-02-27 13:47:12 -05:00
Dr. Dystopia
7e70d7648e
Dereference 'tgt_pos' variables
2022-02-27 10:36:01 +01:00
Dr. Dystopia
a39d514bae
Replace 'tgt_data' parameter with 'tgt_pos' parameter
2022-02-27 10:19:45 +01:00
Imbris
fb2f731ac3
Small fix
2022-02-26 01:05:28 -05:00
Dr. Dystopia
75322ddfc0
Extract 'dist_to_pos' variable
2022-02-25 22:00:42 +01:00
Dr. Dystopia
ee26778118
Extract 'dist_to_pos_xy' variable
2022-02-25 21:57:29 +01:00
Dr. Dystopia
019d619cf6
Extract 'spacing' variable
2022-02-25 21:48:29 +01:00
Dr. Dystopia
15bea26823
Extract 'target_position' clojure
2022-02-25 21:44:43 +01:00
Dr. Dystopia
d921e1e3ea
Extract 'pos' variable
2022-02-25 21:40:42 +01:00
Dr. Dystopia
e2d42207a4
Update 'path_toward_target' doc comment
2022-02-25 21:37:01 +01:00
Dr. Dystopia
4aebe19d94
Extract 'distance_to_target' variable
2022-02-25 21:35:50 +01:00
Dr. Dystopia
0dad86e1ca
Replace flag parameters with 'Path' enum
2022-02-25 21:35:35 +01:00
Inojelis
9bdb7198f5
Fix imports
2022-02-21 03:46:02 +02:00
Inojelis
3e5a220980
Fix generate_chunk to also accept Calendar
2022-02-21 02:48:12 +02:00
Marcel
6506a97dcd
Merge branch 'zesterer/enable-site2-towns' into 'master'
...
Enabled site2 towns by default
See merge request veloren/veloren!3206
2022-02-20 14:02:53 +00:00
Marcel
df7cd2da1a
Merge branch 'isse/shared-waypoints' into 'master'
...
Shared and persistent waypoints
See merge request veloren/veloren!3162
2022-02-20 10:10:18 +00:00
Isidor Nielsen
a685a353cb
Shared and persistent waypoints
2022-02-20 10:10:18 +00:00
Marcel Märtens
802b9e7914
Change the version number to 0.12
2022-02-18 22:36:53 +01:00
James Melkonian
7f21cbf4bc
Fix airship command by splitting out ships
2022-02-18 08:34:14 +00:00
Joshua Barretto
34871c9355
List locations on empty command
2022-02-17 16:01:18 +00:00
Joshua Barretto
b786570470
Added location system, switched to release map
2022-02-17 14:51:59 +00:00
jshipsey
e569ee24c3
fix
2022-02-17 00:58:25 -05:00
Marcel
b09698b8ac
Merge branch 'shouvik/prevent_empty_trades' into 'master'
...
Fixes #1452 - Prevents empty trades
Closes #1452
See merge request veloren/veloren!3202
2022-02-16 21:41:26 +00:00
ShouvikGhosh2048
d72f43190b
Fixes #1452 - Prevents empty trades
2022-02-16 21:41:26 +00:00
Joshua Barretto
00b003a23c
Enabled site2 towns by default
2022-02-15 19:01:43 +00:00
James Melkonian
c906c9e2dc
Fix NPC humanoids not rolling when on fire
2022-02-15 08:28:37 +00:00
Samuel Keiffer
6c7c0eefae
Merge branch 'gnarlings' into 'master'
...
Gnarlings
See merge request veloren/veloren!3194
2022-02-15 00:22:37 +00:00
Joshua Barretto
6e46b4ddef
Fixed CI
2022-02-14 11:46:42 -05:00
unvariant
9d98cd9e58
Render item drops instead of placeholder textures
2022-02-14 02:09:45 +00:00
Sam
c77270b799
Addressed feedback
2022-02-12 20:52:01 -05:00
jshipsey
2eee43865f
chieftain anims
2022-02-11 02:18:48 -05:00
Sam
4991f7ecea
Gnarlign site tweaks and chieftain buff
2022-02-11 01:23:09 -05:00
Sam
0031aa6f5f
Chieftain AI and attacks
2022-02-10 14:58:35 -05:00
Sam
fcb0f8d8f0
Wood golem attacks and ai
2022-02-10 14:58:32 -05:00
Sam
e044bf5091
Mandragora attacks and ai
2022-02-10 14:58:32 -05:00
Sam
f1801560fa
Deadwood ai
2022-02-10 14:58:31 -05:00
Sam
40bb74c42f
Gnarling stalker AI
2022-02-10 14:58:28 -05:00
Sam
c15fb2b68f
Better mugger AI
2022-02-10 14:58:28 -05:00
Sam
e1f164d099
Initial AI for gnarling logger/mugger.
2022-02-10 14:58:27 -05:00
jshipsey
786ae39fb4
new entities
2022-02-09 20:10:59 -05:00
Tormod G. Hellen
a00121bedf
Make entities protect owned bodies.
2022-02-08 22:53:00 +01:00
Tormod G. Hellen
82273f0f36
Make friendly creatures defend each other.
2022-02-08 22:32:25 +01:00
juliancoffee
d9726e5b90
Define 4 traveler kinds in RtSim
2022-02-08 01:35:54 +02:00
juliancoffee
ffac9f1b9c
Smol RtSim refactor
...
- Remove traveler branch from adhoc_loadout
- Rename RtSimEntityKind::Random to RtSimEntityKind::Wanderer, which
encompasses all wandering stuff like birds that travel from site to
site, humanoid travelers, ships, etc.
2022-02-08 01:35:54 +02:00
juliancoffee
79e5a20960
Add stub implementation in RtSim
2022-02-08 01:35:54 +02:00
Marcel Märtens
7ba45fa7e5
adjust tracing and remove unused coding
2022-02-05 13:04:16 +01:00
protheory8
7148737252
Remove quic_files server setting
...
(cherry picked from commit 38339d90ceb87008bbb0ce31ad4e28350213a401)
2022-02-05 13:04:16 +01:00
protheory8
89580eba8c
Remove gameserver_address setting and add protocols_and_addresses setting
...
(cherry picked from commit a5e4575ad349aacb1f41a7e93e3d5ff9eeafc6ae)
2022-02-05 13:04:16 +01:00
James Melkonian
f21e0f31fb
Restrict RtSim ships to airships
2022-02-03 21:41:20 -08:00
Marcel
72e270368d
Merge branch 'aweinstock/resolve-clippy-lints' into 'master'
...
Globally allow more clippy lints and reconfigure complexity to be less verbose
See merge request veloren/veloren!3052
2022-01-30 22:53:36 +00:00
James Melkonian
44865d99ff
Fix guards menacing instead of defending villagers
2022-01-30 13:14:24 -08:00
Avi Weinstock
f3f08936d8
Decrease too-many-arguments-threshold and type-complexity-threshold.
2022-01-30 20:16:21 +01:00
Avi Weinstock
5f8957d8ef
Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}.
2022-01-30 20:16:20 +01:00
Joshua Barretto
d8c4284a32
Merge branch 'zesterer/worldgen' into 'master'
...
Improvements to site2
See merge request veloren/veloren!3159
2022-01-28 17:14:07 +00:00
Joshua Barretto
5b3d826396
Better hazard checks
2022-01-28 15:17:56 +00:00
Joshua Barretto
69436db64c
Added wall lamps
2022-01-28 13:58:41 +00:00
juliancoffee
ed593cd0cb
Adress review №2
2022-01-28 00:02:34 +02:00
juliancoffee
6ae25d5956
Require rng from EntityInfo::with_asset_expect
2022-01-28 00:02:34 +02:00
juliancoffee
e004fba9da
Adress review
2022-01-28 00:02:34 +02:00
juliancoffee
5a370cb6f7
Loadout Update: Use
...
Delete guard and villager lazy_loadout and use LoadoutKind::Extended
with potions instead
2022-01-28 00:02:34 +02:00
juliancoffee
4a4f2f8d8f
Loadout Update: Managed Rng
...
Rewrite EntityInfo api to take Rng from caller.
2022-01-28 00:02:34 +02:00
juliancoffee
d5b927602a
Loadout Udpate: NpcData part
...
Actually implement creating npc with new EntitytInfo by chaning
CreateNpc.loadout to CreateNpc.inventory and cleaning code in
NpcData::from_entity_info.
2022-01-28 00:02:34 +02:00
Samuel Keiffer
d89edc9357
Merge branch 'tygyh/Extract-controller-functions' into 'master'
...
Tygyh/extract controller functions
See merge request veloren/veloren!3151
2022-01-26 22:36:36 +00:00
Dr. Dystopia
b0d6a68e8c
Create 'push_initiate_invite' function
2022-01-26 21:23:37 +01:00
Dr. Dystopia
027154a5be
Create 'push_invite_response' function
2022-01-26 21:16:29 +01:00
Dr. Dystopia
0516526985
Create 'push_utterance' function
2022-01-26 21:12:19 +01:00
Dr. Dystopia
765e858c19
Create 'push_cancel_input' function
2022-01-26 21:07:36 +01:00
Dr. Dystopia
b2b208687c
Create 'push_basic_input' function
2022-01-26 20:09:59 +01:00
Dr. Dystopia
bc0a8c7704
Create 'push_action' function
2022-01-26 19:52:19 +01:00
Dr. Dystopia
f47184df85
Use 'push_event' function in more places
2022-01-26 19:40:18 +01:00
juliancoffee
e3927ed3f6
Move server to 2021 edition
2022-01-26 15:57:50 +02:00
James Melkonian
2671f824d0
Prohibit accidental cliff diving by NPCs
2022-01-25 16:25:40 +00:00
Justin Shipsey
54d5a06a0d
Merge branch 'unvariant/lantern_bug' into 'master'
...
Fixes #1406 - Lantern light does not change when dragging it from inventory
Closes #1406
See merge request veloren/veloren!3107
2022-01-25 02:59:29 +00:00
ninefox
04b0277e33
Changed how lantern swap is caught
2022-01-23 13:28:23 -08:00
Dr. Dystopia
dd76438299
Revert parameter removal
2022-01-23 19:03:47 +01:00
Dr. Dystopia
bb48267827
Fix warnings
2022-01-23 19:03:47 +01:00
Samuel Keiffer
7052aad11b
Merge branch 'snowram/arthropods' into 'master'
...
Snowram/arthropods
See merge request veloren/veloren!3071
2022-01-20 00:20:24 +00:00
Snowram
a6e396e29a
Stunned and jump anims, stats, spawns, more IA work
2022-01-20 00:53:29 +01:00
InfRandomness
dabae7ece8
Remove bomb pile item
2022-01-19 19:31:43 +00:00
Snowram
fd3ed89899
More arthropod animations
2022-01-19 19:01:15 +01:00
Snowram
38bbd60fd2
Arthropod basic attack
2022-01-19 19:01:14 +01:00
Snowram
1e6ead4005
Arthropod charge
2022-01-19 19:01:13 +01:00
Snowram
02ed6ffd60
More arthropod work
2022-01-19 19:01:13 +01:00
Snowram
ae71f2e4f0
Adds poisoned debuff (energy change over time)
2022-01-19 19:01:13 +01:00
Snowram
f67bf2a539
Adds arthropod skeleton
2022-01-19 19:01:11 +01:00
Imbris
13d970bf6f
Rename SyncFrom::AllEntities to SyncFrom::AnyEntity for more clarity, add more comments for component syncing code, address MR comment
2022-01-19 00:56:42 -05:00
Imbris
7f7dc5ff8a
Add ability to plot component update counts each tick in tracy, controlled by the PLOT_UPDATE_COUNTS env var
2022-01-19 00:56:42 -05:00
Imbris
aa122c1a18
Sync some components only from the client's own entity. Vastly reduce the amount of places to modify when adding/removing a component from network syncing.
2022-01-19 00:56:42 -05:00
ninefox
973b392e38
Fixed code quality issues
2022-01-18 21:14:27 -08:00
ninefox
8ca627342a
Changed how the lantern swap is caught
2022-01-18 20:21:12 -08:00
James Melkonian
ac6f53922f
Move agent code into separate files
2022-01-18 03:02:43 +00:00
ninefox
64f6faece5
Switched to using existing swap_lantern function
...
Removed unnecessary function
2022-01-17 11:24:18 -08:00
Joshua Barretto
9c565dadc5
Merge branch 'zesterer/mount-everest' into 'master'
...
Mount Everest
See merge request veloren/veloren!3101
2022-01-17 13:21:38 +00:00
Joshua Barretto
60b7528199
Improved rtsim entity pathfinding
2022-01-17 12:34:31 +00:00
Joshua Barretto
c9762568d6
Don't block teleportation when mounted
2022-01-17 09:47:29 +00:00
ninefox
889a593b13
cargo fmt
2022-01-16 16:32:03 -08:00
ninefox
fc012b4989
Lantern color will now change when swapping lanterns while lantern is activated
2022-01-16 16:24:31 -08:00
Joshua Barretto
3b7ea72a9c
Fixed review comments
2022-01-16 21:13:13 +00:00
terrarier2111
5da2850624
Fix loot forcing
2022-01-16 21:12:59 +00:00
Joshua Barretto
043016a433
Don't try to mount unmountable entities, clippy fixes and fmt
2022-01-16 17:53:14 +00:00
Joshua Barretto
504e2a38d5
Added overhead hints, smoother mount movement
2022-01-16 17:53:14 +00:00
Joshua Barretto
2923d3cd2b
Made NPCs prefer food when idle
2022-01-16 17:53:13 +00:00
