Isse
d1f6e6bef6
somewhat fix airships
2023-04-14 11:22:10 +02:00
Joshua Barretto
504ea158d2
Merge branch 'zesterer/towns' into 'master'
...
Improvements to towns and NPCs
See merge request veloren/veloren!3867
2023-04-13 21:03:02 +00:00
Joshua Barretto
daacadaedb
Made NPCs give directions to nearby towns, fixed player death propagation
2023-04-13 14:34:31 +01:00
Samuel Keiffer
7aa43e9e8a
Merge branch 'taoist/better-dullahan' into 'master'
...
taoist&floppy/cyclops&dullahan
See merge request veloren/veloren!3859
2023-04-12 22:53:38 +00:00
Tao In Way
e32460f9ee
taoist&floppy/cyclops&dullahan
2023-04-12 22:53:38 +00:00
Joshua Barretto
9e17042bf6
Merge branch 'rtsim2' into 'master'
...
Initial implementation of rtsim2
Closes #1476
See merge request veloren/veloren!3517
2023-04-12 16:17:52 +00:00
Isse
f13ae63985
make reposition_on_load join immutable
2023-04-12 17:08:16 +02:00
Isse
fc3f7590c7
clamp chase_tgt to ground if we can't fly
2023-04-12 17:04:25 +02:00
Joshua Barretto
16e3227f78
Correct localisation of numeric values, use coordinate conversions in rtsim
2023-04-12 10:36:11 +01:00
Isse
0c688a9b50
remove comment
2023-04-12 10:19:19 +02:00
Isse
0bb6fa7946
add flag to clamp to ground for RepositionOnChunkLoad
2023-04-12 10:17:49 +02:00
Isse
6be4a2b33f
only add RepositionOnChunkLoad to rtsim npcs and don't add Waypoint if it doesn't exist
2023-04-12 09:24:07 +02:00
Joshua Barretto
cf701fb604
Localised rtsim NPC speech
2023-04-11 17:00:08 +01:00
Joshua Barretto
edcc2f1870
Overhauled chat message representation to allow for more exhaustive localisation
2023-04-11 15:46:36 +01:00
Joshua Barretto
08afe26112
Directly compare rtism resources to avoid unnecessary hooks
2023-04-11 11:49:10 +01:00
Joshua Barretto
81b52298f0
Addressed review feedback
2023-04-11 10:34:06 +01:00
Imbris
4ea635cc8d
Merge branch 'imbris/random-tweaks-35902u8' into 'master'
...
Some misc tweaks
See merge request veloren/veloren!3861
2023-04-11 02:07:35 +00:00
Joshua Barretto
92ead1cf38
Removed vehicle riders, for now
2023-04-10 20:58:08 +01:00
Joshua Barretto
b50645c1ee
Addressed review comments
2023-04-10 17:59:43 +01:00
Joshua Barretto
859eb95033
Log error instead of panicking
2023-04-09 19:25:58 +01:00
Joshua Barretto
c6a7d7aa9b
Synchronise rtsim saves
2023-04-09 19:25:58 +01:00
Joshua Barretto
d751a22af7
Fixed buggy NPC aggro behaviour
2023-04-09 19:25:58 +01:00
Joshua Barretto
251ab95ac5
Neater rtsim_npc
2023-04-09 19:25:58 +01:00
Joshua Barretto
326aa3f8ff
Made /rtsim_npc order NPCs by distance
2023-04-09 19:25:58 +01:00
Joshua Barretto
2fbddafd0a
Added report system, information sharing, made NPCs act on sentiments
2023-04-09 19:25:58 +01:00
Joshua Barretto
08338436ea
Added sentiments
2023-04-09 19:25:58 +01:00
Joshua Barretto
d7ba4ecef7
Allow OnDeath event to handle all actors
2023-04-09 19:25:58 +01:00
Joshua Barretto
ce5ef481e1
Added interrupt_with combinator, guard patrol patterns
2023-04-09 19:25:58 +01:00
Joshua Barretto
a7a08763f2
Gave NPCs names
2023-04-09 19:25:58 +01:00
Joshua Barretto
74610833d0
Cleaned up rtsim tick handling
2023-04-09 19:25:58 +01:00
Joshua Barretto
80e4e8deae
Fixed NPCs talking to themselves
2023-04-09 19:25:57 +01:00
Joshua Barretto
5614eaa7a5
Cleaned up rtsim rules
2023-04-09 19:25:57 +01:00
Joshua Barretto
3e0f5295c0
Added CharacterActivity, made NPCs look at the player when speaking to them
2023-04-09 19:25:57 +01:00
Joshua Barretto
2e047f6723
Use atomic file for rtsim data
2023-04-09 19:25:57 +01:00
Joshua Barretto
082bcdb755
Don't hunt friendly animals
2023-04-09 19:25:57 +01:00
Joshua Barretto
c8d0443111
Clippy fixes
2023-04-09 19:25:57 +01:00
Joshua Barretto
9f025de27d
Addressed feedback
2023-04-09 19:25:57 +01:00
Joshua Barretto
1fcb46ae0c
Made merchants advertise wares
2023-04-09 19:25:56 +01:00
Joshua Barretto
b72d8f3192
Added the ability for rtsim to tell NPCs to speak
2023-04-09 19:25:56 +01:00
Joshua Barretto
7dfbc2bdab
Made socialising NPCs dance
2023-04-09 19:25:56 +01:00
Joshua Barretto
5aaee96cb1
Removed special-casing of merchants
2023-04-09 19:25:56 +01:00
Joshua Barretto
2d7d172f49
Made rtsim aware of character locations
2023-04-09 19:25:56 +01:00
Joshua Barretto
7175f7f02f
Hunters explore forests to hunt game
2023-04-09 19:25:56 +01:00
Joshua Barretto
b402e450cf
Added rtsim_npc, made herbalists gather ingredients
2023-04-09 19:25:56 +01:00
Joshua Barretto
dfb5e32803
Don't interact forever
2023-04-09 19:25:56 +01:00
Joshua Barretto
364255c7fe
Allowed rtsim NPCs to greet nearby actors
2023-04-09 19:25:55 +01:00
Isse
d53b344c23
make merchants use tell, and general cleanup
2023-04-09 19:25:55 +01:00
Joshua Barretto
8ba68e30f3
Merchants no longer buy/sell things they don't know the price of
2023-04-09 19:25:55 +01:00
Joshua Barretto
ea007ff702
Cleaning up
2023-04-09 19:25:55 +01:00
Joshua Barretto
6035234c6e
Removed old rtsim
2023-04-09 19:25:55 +01:00
Joshua Barretto
5062920b5c
Better NPC spawning
2023-04-09 19:25:55 +01:00
Joshua Barretto
64324262c7
Added /rtsim_purge command
2023-04-09 19:25:55 +01:00
Isse
1c0fdf9228
rtsim personalities
2023-04-09 19:25:55 +01:00
Isse
7ac6c6b453
fix warnings in rtsim
2023-04-09 19:25:55 +01:00
Isse
adb2e1ba85
very simple repopulation
2023-04-09 19:25:55 +01:00
Isse
dda1be58d4
big birds!
2023-04-09 19:25:54 +01:00
Isse
64bd11d34a
use wpos_to_cpos
2023-04-09 19:25:54 +01:00
Isse
1a117f1331
rtsim vehicles
2023-04-09 19:25:54 +01:00
Isse
a7588e274d
clean up mounting
2023-04-09 19:25:54 +01:00
Isse
a6b2f04518
use push_basic_input instead of actions.push
2023-04-09 19:25:54 +01:00
Joshua Barretto
bb96e92362
Track almost all collectable sprites, added resource replenishment
2023-04-09 19:25:54 +01:00
Joshua Barretto
94390331e0
Rtsim death event
2023-04-09 19:25:54 +01:00
Joshua Barretto
077da13a5f
Improved herbalist, hunter, farmer, added cultist factions
2023-04-09 19:25:54 +01:00
Joshua Barretto
2aa6ced357
Removed patrol origin from humanoid NPCs
2023-04-09 19:25:54 +01:00
Joshua Barretto
84eb7b0653
Made adventurers explore sites before moving on
2023-04-09 19:25:54 +01:00
Joshua Barretto
2b3f0737d0
Added npc_info, action backtraces
2023-04-09 19:25:54 +01:00
Joshua Barretto
b2f92e4a6c
Switch to combinator-driven NPC AI API
2023-04-09 19:25:53 +01:00
Joshua Barretto
acecc62d40
sync
2023-04-09 19:25:53 +01:00
Joshua Barretto
0b4d3c9e20
Fixed scaling of airships
2023-04-09 19:25:53 +01:00
Joshua Barretto
7e9474ab70
Overhauled rtsim2 pathfinding with TravelTo
2023-04-09 19:25:53 +01:00
Joshua Barretto
1b439d0897
New behaviour tree system for rtsim2
2023-04-09 19:25:53 +01:00
Joshua Barretto
e8b489a71a
sync
2023-04-09 19:25:53 +01:00
TaylorNAlbarnaz
3a52cc1fa3
NPCs walk in when pathing in intrasite
2023-04-09 19:25:53 +01:00
IsseW
63f1ac0e31
trade with alchemists
2023-04-09 19:25:53 +01:00
IsseW
c026b4d20a
travelers say where they're going
2023-04-09 19:25:53 +01:00
IsseW
9be6c7b527
Pathing between sites.
2023-04-09 19:25:53 +01:00
IsseW
ca02b5e97c
cleaner entity creation
2023-04-09 19:25:52 +01:00
Joshua Barretto
6397e283b2
Added world settings
2023-04-09 19:25:52 +01:00
Joshua Barretto
e08f7d4fa9
Added blacksmith
2023-04-09 19:25:52 +01:00
IsseW
afd9ea5462
site pathing
2023-04-09 19:25:52 +01:00
Joshua Barretto
f40cfb4ac3
Made farmers sell food
2023-04-09 19:25:52 +01:00
Joshua Barretto
e204789ce9
Persist TimeOfDay with rtsim
2023-04-09 19:25:52 +01:00
Joshua Barretto
ee048ad5a2
Made NPCs talk and trade
2023-04-09 19:25:52 +01:00
IsseW
21f9bcb8e2
added professions, and loadouts
2023-04-09 19:25:52 +01:00
IsseW
ac0e62df8e
tp_npc command
2023-04-09 19:25:52 +01:00
Joshua Barretto
587996abb7
Correctly scale glider physics
2023-04-09 19:25:52 +01:00
Joshua Barretto
558dd99fd3
Added basic rtsim NPC simulation, rtsim controller support
2023-04-09 19:25:51 +01:00
Joshua Barretto
8ff438bb5b
Smol animals
2023-04-09 19:25:51 +01:00
Joshua Barretto
c856f2625c
Added rtsim sites
2023-04-09 19:25:51 +01:00
Joshua Barretto
1dc7518200
Added rtsim entity unload hook
2023-04-09 19:25:51 +01:00
Joshua Barretto
87a6143375
Began adding rtsim2 NPCs, scale command
2023-04-09 19:25:51 +01:00
Joshua Barretto
9d3dadfaba
Make resource depletion an rtsim rule
2023-04-09 19:25:51 +01:00
Joshua Barretto
0b06eaec6f
Use MessagePack for more compact rtsim state persistence
2023-04-09 19:25:51 +01:00
Joshua Barretto
a421c1239d
Use BufReader/BufWriter for rtsim2 operations
2023-04-09 19:25:51 +01:00
Joshua Barretto
c168ff2f9b
Added rtsim saving, chunk resources, chunk resource depletion
2023-04-09 19:25:51 +01:00
Joshua Barretto
0cafafdaa7
Began integrating rtsim2 into server
2023-04-09 19:25:51 +01:00
Imbris
e20cf5f14f
Reduce rand::thread_rng calls, document MeleeConstructor scaled field more, remove extra stances.get() in hud/mod.rs
2023-04-07 01:59:41 -04:00
Sam
132f26dbc0
Addressed review
2023-04-06 10:57:16 -04:00
Sam
79812a7326
Addressed persistence review comments.
2023-04-06 10:57:15 -04:00
Sam
00710a4eb0
Fixed csv tools
2023-04-06 10:57:13 -04:00
Sam
52a62420db
Changed durability persistence to a NonZeroU32
2023-04-06 10:54:49 -04:00
Sam
011b6c3feb
Changed how durability was persisted so that a more general system can be used for future item properties.
2023-04-06 10:54:49 -04:00
Sam
0966753699
Added repair recipes
2023-04-06 10:54:48 -04:00
Sam
c3f5bc13f1
Equipment can now be repaired at sprites in town.
2023-04-06 10:54:48 -04:00
Sam
c586db8feb
Item durability is now persisted
2023-04-06 10:54:47 -04:00
Sam
a07e042fa2
Items now lose durability on death
2023-04-06 10:54:46 -04:00
Antonios Barotsis
34cdd2d7f5
fmt
2023-04-04 23:25:11 +02:00
Antonios Barotsis
093b1c924c
Refactored according to review
2023-04-04 23:16:00 +02:00
Antonios Barotsis
3adea9cdbb
Temporarily patch underwater fall damage bug
2023-04-04 19:16:58 +02:00
Samuel Keiffer
494019ecc2
Merge branch 'sam/polymorph-buff-fix' into 'master'
...
Fix multiple polymorph buffs
See merge request veloren/veloren!3850
2023-04-02 22:45:54 +00:00
Joshua Barretto
33ebb0a4a3
Make clippy happy
2023-04-01 22:55:45 +01:00
Joshua Barretto
ab4e3d23e3
Make clippy happy
2023-04-01 22:03:24 +01:00
Sam
f40ef0d5dd
Polymorph effect now more correctly handles when multiple polymorph buffs are applied.
2023-04-01 13:11:59 -04:00
Joshua Barretto
63a949b95c
Removed spawn town and safe spawn settings
2023-04-01 17:51:05 +01:00
Joshua Barretto
42c534b7b4
Removed /home, replaced with /respawn
2023-04-01 17:37:01 +01:00
Joshua Barretto
2e3870cf6d
Shut up, clippy
2023-03-31 21:17:38 +01:00
Joshua Barretto
9e76561ad6
Spawn new players at the highest point in a chunk
2023-03-31 14:38:32 +01:00
Joshua Barretto
acec45b756
Initial implementation of starting site choice
2023-03-31 14:24:14 +01:00
Isse
c34e5ad4ed
Small fixes
2023-03-29 23:11:59 +00:00
Sam
cdaf9e5c0e
Ability changes
2023-03-26 21:41:22 -04:00
Sam
ef7b400cca
Number tweaking
2023-03-26 19:50:42 -04:00
Sam
f2dfaf0276
Fixed dullahan AI. Some number tweaks.
2023-03-23 21:56:16 -04:00
Isse
1298fc792b
Merge branch 'ProfessionalHobbyist/configurable_day_night_length' into 'master'
...
Add setting to control length of day/night cycle for servers. ("Fix" for https://gitlab.com/veloren/veloren/-/issues/1798 )
See merge request veloren/veloren!3836
2023-03-23 16:33:39 +00:00
Sophia Waggoner
b1943cdb26
Handle invalid settings gracefully (use default, give warning).
2023-03-22 11:16:30 -07:00
Sophia Waggoner
30251221e5
Fix math mistakes (24 * 60 is 1440 not 1400)
2023-03-22 06:19:38 -07:00
Sophia Waggoner
83d66a180a
Delete TODO
2023-03-22 06:14:51 -07:00
Sophia Waggoner
264e4a53f8
cargo clippy + fmt
2023-03-22 05:49:54 -07:00
Sophia Waggoner
4a3d1bbb86
Ultimately use setting in day cycle updates.
...
(First functional commit.)
2023-03-21 21:32:05 -07:00
Sophia Waggoner
7e4ea483e0
Add a ServerConstants to Client and Server structs and sync on register.
2023-03-21 20:28:08 -07:00
Sam
c78c45ec73
Addressed review
2023-03-21 20:16:59 -04:00
Sam
0dc25c8389
Addressed review
2023-03-21 20:16:57 -04:00
Sam
610d47f787
Effect power now affects more than just poise
2023-03-21 20:16:55 -04:00
Sam
e37e4016d6
Balance tweaks
2023-03-21 20:10:44 -04:00
Sam
34168d9c76
Advanced AI for every stance.
2023-03-21 20:03:21 -04:00
Sam
e31668b188
Fixed dynlib features to not have UB when allocating.
2023-03-21 20:03:20 -04:00
Sam
1edd064611
Simple AI for each of the stances.
2023-03-21 20:03:20 -04:00
Sam
43d7e9357a
Basic sword AI
2023-03-21 20:03:19 -04:00
Sam
c4154b0160
Unskilled sword AI
2023-03-21 20:03:19 -04:00
Sam
387ea16598
Non-attack potion of sword AI
2023-03-21 20:03:18 -04:00
Sam
99f6312e59
Sword AI structure
2023-03-21 20:03:17 -04:00
Sam
7365fcb530
Rolls cancel recover at the cost of additional energy, sitting ends active stances.
2023-03-21 20:03:15 -04:00
Sam
a3d655970e
Heavy stance required abilities
2023-03-21 19:56:32 -04:00
Sam
e0a7449a99
Crescent slash
2023-03-21 19:39:40 -04:00
Sam
fce9211d49
Secondaries for all stances
2023-03-21 19:39:39 -04:00
Sam
57806d7be9
Sword M1 abilities
2023-03-21 19:39:22 -04:00
Sam
61f0b424b9
Old sword mostly torn out, new sword framework in place
2023-03-21 19:39:22 -04:00
Sam
b376228d45
Primary and secondary abilities can now be contextual. BasicStance character state added.
2023-03-21 19:38:15 -04:00
Sam
9875008efa
Added stance component that persists even after sheathing weapon (does not yet work with M1 replacement).
2023-03-21 19:29:34 -04:00
Sophia Waggoner
ea23d066c6
Add (currently dummy) setting for day length and validation for that setting.
2023-03-20 21:58:57 -07:00
Imbris
61cb0ad39b
Merge branch 'imbris/small-tweaks' into 'master'
...
Various small tweaks / fixes
Closes #1475
See merge request veloren/veloren!3817
2023-03-18 00:52:20 +00:00
Imbris
94dd8c2b70
Address review on 3817
2023-03-17 20:17:46 -04:00
Imbris
9e212935e5
Merge branch 'imbris/time-local-event-handling' into 'master'
...
Add metrics for timing subsections of State::tick
See merge request veloren/veloren!3825
2023-03-14 14:52:57 +00:00
Imbris
87bf44241b
Add metrics for timing subsections of State::tick
2023-03-14 01:03:05 -04:00
Ben Wallis
45c8934b79
Merge branch 'xvar/queue-char-deletes' into 'master'
...
Changed character deletion to go via batch update
See merge request veloren/veloren!3562
2023-03-12 23:21:54 +00:00
Ben Wallis
6eedc02286
Changed character deletion to go via batch update
2023-03-12 23:21:53 +00:00
Sam
42388976d7
Fixed issue with max health change over time buff being reset if re-applied. Addressed review comments.
2023-03-12 16:37:02 -04:00
Sam
4c79936c07
Added wrapper type to durations related to buffs and auras.
2023-03-11 16:47:11 -05:00
Sam
663db06844
Made auras no longer need to be mutably accessed every tick.
2023-03-11 16:45:12 -05:00
Sam
9efac9957d
Changed buff effects so they did not need to mutably change buffs every tick. Buff system now no longer mutably accesses buffs component.
2023-03-11 16:45:11 -05:00
Sam
b1b41e95f6
Queueable buffs now work with buffs without using a timer, tests too
2023-03-11 16:45:11 -05:00
Sam
89aa934c3c
Initial work
2023-03-11 16:45:10 -05:00
Imbris
619f62cb63
Use try_set for door destruction to avoid accidentally overwriting any
...
other changes that already occured that tick.
Also get terrain/block change resources from the ecs once to avoid the
overhead of fetching them from the ecs (and aquiring/releasing runtime
borrow).
2023-03-11 10:24:45 -05:00
Imbris
dd6e6ccf91
Add Vec3::one * 0.5 to sprite item drop position instead of Vec3::unit_z, this should put the new enity in the center of the voxel that the sprite occupied
2023-03-11 10:24:45 -05:00
Imbris
2eb7d366d9
Always try to remove a block if it is bonked, even if we can't reclaim an item from it!
2023-03-11 10:21:39 -05:00
Marcel
9396fa9741
Merge branch 'Thegaming_Life/replacing_all_map2_with_RECT_SIZE_with_cpos_to_wpos_and_wpos_to_cpos' into 'master'
...
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
See merge request veloren/veloren!3807
2023-03-06 21:03:35 +00:00
Thegaming Life
5ddc55be52
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
2023-03-06 21:03:35 +00:00
Monty Marz
9a025cfcc8
More spot features
2023-03-03 23:21:37 +00:00
flo
bf81ffc029
frost_gigas
2023-02-15 00:10:37 +00:00
flo
0531b40fae
bird_medium_2
2023-02-14 23:17:20 +00:00
flo
4de4de758b
fix_possess_crash
2023-01-31 17:18:52 +00:00
Marcel
c165d28e7d
Merge branch 'wyvern_wings' into 'master'
...
wyverns
See merge request veloren/veloren!3720
2023-01-28 21:25:17 +00:00
flo
5e1fd02095
wyverns
2023-01-28 21:25:17 +00:00
Ellen Sun
d774319cf0
cleanup and fixes + added change to CHANGELOG.md
2023-01-27 20:32:41 -05:00
Ellen Sun
74cb514094
move client commands to voxygen + add Admin to be shared with client for permissions + unit test for alphabetical server command
2023-01-27 20:31:56 -05:00
Ellen Sun
361e5204e3
added levenshtein for most similar string and words starting with what user entered + check permissions + added clientside commands to /help
2023-01-27 20:31:56 -05:00
Joseph Donofry
74ee861dde
Add glow to dropped lanterns
2023-01-23 16:13:43 +00:00
Avi Weinstock
060b8cc0ec
Decrease the duration of potion sickness to 45 seconds. Make agents more averse to incurring further stacks of potion sickness, and give villagers iced tea.
2023-01-19 15:06:13 -05:00
Avi Weinstock
78845a0d73
Implement potion sickness, which causes diminishing returns on healing from potions.
2023-01-19 15:06:12 -05:00
Nils Ascheuer
43b61ea6d9
#1725 do not clear target during trading.
2023-01-18 08:15:13 +01:00
James Melkonian
9d31baf500
Make bats easier to combat and fix hitbox scaling bug
2023-01-15 16:25:43 -08:00
flo
650ef9a5e2
autodelete of summoned sprites
2023-01-15 18:28:38 +00:00
Sam
4f26e37ae6
Addressed review
2023-01-09 20:18:31 -05:00
Sam
7d42c45fdd
Site2 code is now hot-reloadable with 'hot-site2' feature.
2023-01-09 20:06:35 -05:00
Marcel Märtens
25906e05df
Change the version number to 0.14
2023-01-06 18:41:03 +01:00
Tine Jozelj
e77537365f
Fixes #1563 - Implements Quad Med Hoof tactic/attack
2022-12-13 21:16:48 +01:00
flo
466ed2c382
dagon_kit
2022-11-30 15:27:21 +00:00
Marcel Märtens
225cbf472f
update tag and fix empty maps, other bugs introduced by auto fix
2022-11-29 09:19:10 +01:00
Marcel Märtens
dad73ba2a3
fix clamp clippy errors
2022-11-28 14:26:27 +01:00
Marcel Märtens
0ab7a2543e
fix clippy errors
2022-11-28 14:08:11 +01:00
holychowders
dc9074ae6b
Revert "[REVERT ME] Display debug information for code reviewers."
...
This reverts commit bae5c5b675
2022-11-20 15:51:09 -06:00
holychowders
23dd1d1be3
MVP for searching target's last known position.
2022-11-20 02:36:11 -06:00
holychowders
1331b046b5
Rename mouthful variable.
2022-11-17 19:21:22 -06:00
holychowders
2c745bed30
Update target's last known position.
...
Before, it was set only upon targeting.
2022-11-16 20:54:32 -06:00
holychowders
bae5c5b675
[REVERT ME] Display debug information for code reviewers.
2022-11-16 20:12:14 -06:00
holychowders
61aa49fa66
Add last_known_pos to Target struct.
2022-11-16 18:26:07 -06:00
Marcel
997c5a4e61
Merge branch 'ythern/more_unique_abilities' into 'master'
...
Ythern/roshwalr kit
See merge request veloren/veloren!3692
2022-11-15 09:58:06 +00:00
Christof Petig
24aac2d92f
Merge branch 'floppy_savannahpit_merchants' into 'master'
...
add merchants to savannah pits
See merge request veloren/veloren!3690
2022-11-13 19:14:27 +00:00
flo
6d8f2c8c7b
add merchants to savannah pits
2022-11-13 19:14:26 +00:00
Eternalisime
19fb2e6416
fixed format
2022-11-13 11:45:03 +01:00
Eternalisime
8aa4f782f4
added a space
2022-11-13 11:27:17 +01:00
Samuel Keiffer
1173c8257f
Merge branch 'holychowders/agent_awareness2' into 'master'
...
Rework internal representation of agent awareness
See merge request veloren/veloren!3661
2022-11-12 18:48:32 +00:00
holychowders
95fd092e26
Fix awareness changes.
2022-11-12 12:12:32 -06:00
Eternalisime
ed25a84c72
combat: tweaked roshwalr melee detection and range
2022-11-12 13:51:27 +01:00
Eternalisime
13980861f8
combat: tweaked roshwalr AI
2022-11-11 16:37:58 +01:00
Marcel
7a75b72aa3
Merge branch 'KingPEPSALT/improve_time_command' into 'master'
...
FIX #1622 , /time command will not allow time going backwards as rtsim cannot...
See merge request veloren/veloren!3570
2022-11-11 10:30:44 +00:00
Monty Marz
a763a865fe
Musical Instruments part 2
2022-11-10 20:59:53 +00:00
pepsalt
5294603431
changed {:?}s to {}s in format strings
2022-11-10 17:18:59 +01:00
pepsalt
3e580138df
FIX #1622 , /time command will not allow time going backwards as rtsim cannot handle time regression, time given in seconds is treated as if it were seconds ahead of the next midnight
2022-11-10 17:06:53 +01:00
Eternalisime
e1e78a914f
combat: added angle condition on shockwave
2022-11-10 14:24:06 +01:00
Eternalisime
918d5eb345
combat: added a unique kit to roshwalr
2022-11-10 13:53:12 +01:00
holychowders
571b07d54a
Remove dt and multiplication by 30.
2022-11-06 13:10:17 -06:00
Avi Weinstock
f83afcd5a8
Make train tracks configurable as a worldgen feature. Fixes for clippy and fmt.
2022-10-29 14:50:52 -04:00
Avi Weinstock
372ffe45d7
Add command for debugging ways.
2022-10-29 14:32:48 -04:00
holychowders
641a5c4cda
Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2
2022-10-29 13:21:27 -05:00
Avi Weinstock
08a50afd9f
Mostly working train tracks.
2022-10-28 21:36:42 -04:00
holychowders
3d4ad29d1d
Flee if attacked even if attacker is not close.
2022-10-28 21:31:49 +00:00
holychowders
3f3f8605af
Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2
2022-10-28 15:16:44 -05:00
holychowders
4426972057
Refer to the fully aware state of an agent as "alert".
2022-10-28 15:03:11 -05:00
Sam
7022350693
Sword AI now randomly rolls again
2022-10-27 20:07:11 -04:00
Sam
d60839010a
Rebase commit
2022-10-27 20:07:10 -04:00
Sam
0fe073fcdc
Addressed feedback from testing
2022-10-27 20:07:10 -04:00
Sam
b5682c4682
Addressed review comments
2022-10-27 20:07:09 -04:00
Sam
e1f76e0127
Fixed sword AI after contextualized sword abilities.
2022-10-27 20:07:08 -04:00
Sam
8cfe62e6dc
Activated abilities can now be contextualized
2022-10-27 20:07:07 -04:00
Sam
38ce87d80b
Initial balance pass on sword ability stats
2022-10-27 20:07:05 -04:00
Sam
eb67cc2cf7
Reaching stance AI
2022-10-27 20:07:04 -04:00
Sam
9b4dcbfdde
Heavy stance AI
2022-10-27 20:07:04 -04:00
Sam
43a5a2a93a
Parrying stance AI
2022-10-27 20:07:03 -04:00
Sam
df9ef691fd
Cleaving stance AI
2022-10-27 20:07:03 -04:00
Sam
5358016ba0
Crippling stance AI
2022-10-27 20:07:02 -04:00
Sam
c7d3aa19e4
Mobility stance AI
2022-10-27 20:07:02 -04:00
Sam
c97bfdfb94
Defensive stance AI
2022-10-27 20:07:01 -04:00
Sam
7dcb3582e6
Sword AI for offensive abilities
2022-10-27 20:07:01 -04:00
Sam
4ab3abfc07
Balanced stance AI
2022-10-27 20:07:01 -04:00
Sam
221b0aff5f
Sword AI can now choose their abilities
2022-10-27 20:07:00 -04:00
Sam
8d3567b6b2
Made combo melee more ergonomic to use when it is a stance
2022-10-27 20:06:59 -04:00
Sam
21aabb5663
Parries now correctly return to their stance.
2022-10-27 20:06:58 -04:00
Sam
a8212d6f41
Dive melee now scales its attack off of the entity's vertical speed.
...
Parries now cause the attacker to effectively have a recover that is either twice as long or 0.5s longer, whichever is more.
Counters now deal twice as much damage to the target if the target is in the buildup portion of an ability.
2022-10-27 20:06:55 -04:00
Sam
5d5fbde291
Minor tweaks
2022-10-27 20:06:36 -04:00
Sam
500e0ae3d0
Heavy abilities
2022-10-27 20:06:34 -04:00
Sam
8a578bf3f6
Parrying abilities
2022-10-27 20:06:34 -04:00
Sam
ec03bd7032
Cleaving abilities
2022-10-27 20:06:33 -04:00
Sam
17258975fc
Combo melee 2 state
2022-10-27 20:06:26 -04:00
Marcel
51d4c8dd51
Merge branch 'halloween' into 'master'
...
Halloween event
See merge request veloren/veloren!3668
2022-10-25 21:37:34 +00:00
Timothy Finnegan
1922d69154
Ran Cargo fmt
2022-10-24 19:52:37 -07:00
flo666
9b1efe1bee
clippy, fmt, remove leftover file, fix sitenames in soundtrack
2022-10-25 00:33:23 +02:00
Timothy Finnegan
498cb86be9
Updated enum names for consistency
2022-10-23 18:31:09 -07:00
Timothy Finnegan
5e5e1066eb
Added support for multiple timers, conditions, and counters in a single action node.
2022-10-23 18:31:09 -07:00
James Melkonian
6bacb487f3
Bat AI
2022-10-23 20:05:39 +02:00
holychowders
65b6bf62f9
Revert "[REVERT THIS] Show awareness info via agent chat for code reviewers."
...
This reverts commit ed991b681ae56bcb414d24f773bc540dc390b5fa.
2022-10-21 20:25:55 -05:00
holychowders
1121cb5d3f
[REVERT THIS] Show awareness info via agent chat for code reviewers.
2022-10-21 20:25:54 -05:00
holychowders
7502cd664a
Have agents update awareness of targets.
...
This is preliminary and has no visible effect.
2022-10-21 20:25:54 -05:00
holychowders
bc20744cd3
Remove old unused awareness stuff.
2022-10-20 11:36:16 -05:00
Tavo Annus
fcd7447991
Fix npcs untargeting trade partner while in trade
2022-10-07 15:17:49 +03:00
Avi Weinstock
e6576f0cf3
Make the trading AI for pets only accept food.
2022-09-30 15:11:03 -04:00
Avi Weinstock
ff781198d3
Fix 18-slot pets (they now properly get inventories based on their body type, which is usually 1-slot).
...
Also fixes a related issue where pets lose their natural weapons/armour.
2022-09-30 14:51:49 -04:00
Avi Weinstock
60f5383f8b
Address comments for MR 3633.
2022-09-30 14:51:49 -04:00
Avi Weinstock
c62bc0dd0d
Allow pets to be traded with.
2022-09-30 14:51:49 -04:00
Marcel Märtens
cf6a764aa4
update toolchain to 2022-09-23
2022-09-25 15:58:32 +02:00
Marcel Märtens
c2b453f6f1
update toolchain to 2022-09-08
...
This reverts commit 6c9deee491a32b269252
2022-09-24 00:04:40 +02:00
Marcel Märtens
29d0f5b25d
update dependencies
2022-09-22 11:57:55 +02:00
Samuel Keiffer
59d8d287d9
Merge branch 'seachapel_npc_work' into 'master'
...
seachapel npc work
See merge request veloren/veloren!3599
2022-09-22 01:04:01 +00:00
flo
a37e1f8d99
seachapel npc work
2022-09-22 01:04:01 +00:00
Joshua Yanovski
57ea753bff
Merge branch 'sharp/parallel-ingame' into 'master'
...
Parallelize ingame messages.
See merge request veloren/veloren!3627
2022-09-21 19:44:40 +00:00
Joshua Yanovski
1c14ec7ee1
Parallelize ingame messages.
2022-09-21 10:25:57 -07:00
Joshua Yanovski
67231aff90
Remove persistence loading error from SkillSet.
...
This is needed (for now) in order to parallelize ingame_chat, because
one of the handled messages updates this value on the server. It turns
out that the value is not actually used on the server, only the client,
so this was mostly a matter of threading this back to the correct place.
Additionally, we took the opportunity to modify the UI to not log you
into the game until your character was confirmed to be loaded, which
was a todo item that lets us simplify some error handling logic and
remove stuff from global state.
2022-09-21 09:29:25 -07:00
Samuel Keiffer
188db01a7b
Merge branch 'sam/hot-agent' into 'master'
...
Agent combat tactics hot reloading
See merge request veloren/veloren!3629
2022-09-21 02:44:51 +00:00
Imbris
1b48a3008c
Merge branch 'Couls/TestBed' into 'master'
...
Extend item pickup UI to group members
Closes #1402
See merge request veloren/veloren!3521
2022-09-20 22:13:50 +00:00
Couls
4a4c061b55
Extend item pickup UI to group members
2022-09-20 22:13:50 +00:00
Sam
c228d9cc3f
Addressed comments
2022-09-17 13:10:01 -04:00
Sam
3d6c9a780d
Removed redundant package parameter from init function of hot reloading
2022-09-17 00:55:28 -04:00
Sam
cfeb197f85
Removed duplicate crates added so there could be dynamic crates, now compiled with crate type specified instead.
2022-09-17 00:50:59 -04:00
Sam
23c51af437
Consolidated voxygen and server dynlibs into a common dynlib
2022-09-16 23:43:26 -04:00
Sam
b632dbffdd
Hot reloading attack code in agent now functional
2022-09-16 22:13:18 -04:00
Sam
ddb56bd560
Dynamic library compiles, but still panics
2022-09-16 22:13:18 -04:00
Sam
525630c37a
Moved some agent code into separate crate to facilitate hot reloading of that agent code.
2022-09-16 22:13:18 -04:00
Joshua Yanovski
e9a463d459
Revert "Merge branch 'xMAC94x/update-deps' into 'master'"
...
This reverts merge request !3608
2022-09-15 18:51:48 +00:00
Joshua Yanovski
cafdcad8ce
Merge branch 'sharp/improve-msg' into 'master'
...
Improve some server system performance
See merge request veloren/veloren!3614
2022-09-15 04:30:31 +00:00
Joshua Yanovski
2c15d0af56
Reduce overhead of messaging systems.
2022-09-14 21:04:53 -07:00
James Melkonian
5d5cb28b59
Fix pet aggro
2022-09-14 19:48:34 +00:00
flo
dc688bccb9
fix_salamander_and_elbst
2022-09-13 17:32:53 +00:00
Marcel Märtens
a32b269252
steal sharps clippy improvements to the old nightly
2022-09-11 16:10:56 +02:00
Joshua Yanovski
986d104faa
Update Rust toolchain.
2022-09-08 15:43:53 -07:00
Marcel Märtens
d9e6f10688
update dependencies
2022-09-08 23:29:08 +02:00
Joshua Yanovski
f5aee1d2a7
Allow mods/admins to log in when server is full.
...
As a side effect, this moves the initial game server sync message into
the login code, since that's the first place we can check for admin
permissions and we want to avoid sending large messages to users who are
not authenticated (especially if the player cap has been reached;
previously, the player cap check limited the damage that could be done
by unauthenticated players).
Some fallout from this is that we don't synchronize the Player component
anymore, which had some minor effects on voxygen. This update also
breaks Torvus, since Client::new now expects the username and password
to be provided from the getgo--an accompanying MR will be submitted to
fix it.
2022-09-06 21:42:31 -07:00
Samuel Keiffer
34fa03a425
Merge branch 'juliancoffee/bigger-kit' into 'master'
...
Make /kit use all weapons from possible modulars
See merge request veloren/veloren!3595
2022-09-06 04:45:12 +00:00
juliancoffee
68da12ab6b
Reduce traversal_config min dist
...
* Fix LOS pillar cheesing
2022-09-05 02:17:15 +03:00
juliancoffee
421aa44d5f
Make kit generate all possible modulars
2022-09-05 00:24:58 +03:00
flo
6c89cd8fbf
put Organ under Toolkind Instrument
2022-08-30 16:55:02 +00:00
Samuel Keiffer
52ce12f383
Merge branch 'floppy-music-instruments' into 'master'
...
Music Instruments
See merge request veloren/veloren!3535
2022-08-28 18:48:18 +00:00
flo
9339971032
Music Instruments
2022-08-28 18:48:18 +00:00
Imbris
334937568e
Add an entity view distance setting that allows limiting the distance
...
entities are synced from and displayed in.
NOTE: Syncing entities work at the granularity regions which are
multi-chunk squares but the display of entities in voxygen is limited in
a circle with the radiues of the supplied distance.
Additional details and changes:
* Added `ViewDistances` struct in `common` that contains separate
terrain and entity view distances (the entity view distance will be
clamped by the terrain view distance in uses of this).
* View distance requests from the client to the server now use this
type.
* When requesting the character or spectate state the client now passes
its desired view distances. This is exposed as a new parameter on
`Client::request_character`/`Client::request_spectate`. And the client
no longer needs to send a view distance request after entering these
states. This also allows us to avoid needing to initialize `Presence`
with a default view distance value on the server.
* Removed `DerefFlaggedStorage` from `Presence` and `RegionSubscription` since the
change tracking isn't used for these components.
* Add sliders in voxygen graphics and network tabs for this new setting.
Show the clamped value as well as the selected value next to the
slider.
* Rename existing "Entities View Distance" slider (which AFAIK controls
the distance at which different LOD levels apply to figures) to
"Entities Detail Distance" so we can use the former name for this new
slider.
2022-08-25 23:24:43 -04:00
Imbris
c36d6e873f
Fix issue with the region subscription system not updating on view
...
distance changes (until the player crossed a chunk boundary and
triggered the normal update).
This introduces a `ViewDistance` struct that provides an abstraction
around limiting the rate the view distance can be cycled up and down.
This helps avoid unnecessary sending, deleting, and then resending of
synced things like entities (the client will still delete its terrain
locally and re-request it though).
The second part of this fix is storing the last view distance in the
`RegionSubscription` struct and then updating region subscriptions if
this doesn't match the current view distance in the `Presence`
component.
2022-08-25 23:24:43 -04:00
Isse
20013e17ab
Merge branch 'isse/remove-print' into 'master'
...
Remove print
See merge request veloren/veloren!3563
2022-08-24 22:28:13 +00:00
flo
e882e62c08
seachapel
2022-08-24 21:50:53 +00:00
IsseW
5232b6e9af
remove print
2022-08-24 23:38:18 +02:00
Joshua Barretto
51d90707b5
Relaxed automod somewhat
2022-08-23 10:03:06 +01:00
Imbris
ce8b8b6f12
Update changelog, cargo fmt
2022-08-21 12:10:20 -04:00
Imbris
7439d09708
Ensure that the client clears pending trades on its side when exiting to
...
the character screen (and similar actions). When any entity is
deleted cancel any existing trades associated with it.
2022-08-20 18:47:09 -04:00
Imbris
87815b4615
Use send_fallible in notify_client implementation to document that any errors are ignored (and use if let instead of map)
2022-08-20 18:47:09 -04:00
Imbris
f1b6805c65
Remove outdated comments in handle_destroy and refactor map_err to if let Err
2022-08-20 18:47:09 -04:00
Imbris
0ee0d446f1
Make /kill_npcs delete entities instead of setting health to 0, to avoid drops or other undesired effects from occuring.
2022-08-20 18:47:09 -04:00
juliancoffee
6319dcfc22
Add more components in /body
...
* Add mass
* Add density
* Add collider.
This one is strange as always, I don't know what's wrong, but debug hitbox
changes only after death. Real one seems to work.
2022-08-20 17:02:08 +03:00
juliancoffee
a371aad05e
Add /body command that allows you to switch body
2022-08-20 15:20:27 +03:00
Tormod Gjeitnes Hellen
e306b3bfe3
Have the ambushers say something.
...
Very unsure about the way I did this...
2022-08-17 23:50:09 +02:00
Tormod G. Hellen
753a51e683
Make selfish bastards ambush people when they're alone.
2022-08-17 23:50:09 +02:00
Saverio Miroddi
021a8be62e
Server: Vacuum database on startup
...
Runs after the migrations. In some cases, it can reclaim a significant amount of space (reported 30%).
2022-08-17 20:12:20 +02:00
AldanTanneo
ba87a405af
Discord Activity
2022-08-15 15:58:37 +00:00
Samuel Keiffer
a1b5f53d15
Merge branch 'craft-all' into 'master'
...
Craft all
See merge request veloren/veloren!3525
2022-08-12 00:47:48 +00:00
Julio Cezar Silva
9315482fc4
Craft all
2022-08-12 00:47:48 +00:00
Samuel Keiffer
9112e2177a
Merge branch 'vfoulon80/agent-behavior-tree' into 'master'
...
Refactor agent's behavior tree
See merge request veloren/veloren!3500
2022-08-11 20:46:14 +00:00
Isse
e81dade43f
Fix compilation with worldgen turned off.
2022-08-11 20:27:25 +00:00
Vincent Foulon
b1baa09815
Address review comments
2022-08-11 21:15:46 +02:00
Joshua Barretto
602de267b1
Perform validation on all kinds of chat message
2022-08-11 11:11:33 +01:00
Joshua Barretto
4e103c433f
Simplified and improved alias validation
2022-08-11 11:11:31 +01:00
Joshua Barretto
4d110a542c
Improved banned words loading
2022-08-11 11:09:53 +01:00
Joshua Barretto
52bd7b2485
Added automod
2022-08-11 11:09:52 +01:00
IsseW
87821d5c1d
force update counter
2022-08-09 19:22:09 +02:00
Isse
0471e78f41
spectate mode :D
2022-08-09 18:43:13 +02:00
Samuel Keiffer
8602a04e71
Merge branch 'floppy-DesertCity' into 'master'
...
DesertCity
See merge request veloren/veloren!3495
2022-08-08 09:58:19 +00:00
flo
5dd9991311
DesertCity
2022-08-08 09:58:18 +00:00
Imbris
d5b59c2bb7
Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage
2022-08-08 00:38:20 -04:00
Vincent Foulon
c1dcb6e412
Fix missing translation key in interaction
2022-08-07 21:16:31 +02:00
Vincent Foulon
b82da6acdb
Reimplement !3508
2022-08-07 21:11:58 +02:00
Vincent Foulon
62568d2229
Add documentation
2022-08-07 20:54:09 +02:00
Vincent Foulon
3203051fc3
Move interaction-cancelling code in interaction behavior + includes missing fix from !3467
2022-08-07 20:54:08 +02:00
Vincent Foulon
4f53d055de
Reimplement !3467 + fix event being pushed in front of agent inbox
2022-08-07 20:54:07 +02:00
Vincent Foulon
6994b026b1
Remove unused import
2022-08-07 20:54:06 +02:00
Vincent Foulon
faf2b13ac1
Move recv_interactions into BehaviorTree + cleanup functions ^& warnings
2022-08-07 20:54:02 +02:00
Vincent Foulon
d105d7063c
Cleanup prof_span + finish unfinished module rename
2022-08-07 20:50:37 +02:00
Vincent Foulon
6fae4efd45
PoC: Refactor agent's behavior tree
2022-08-07 20:50:24 +02:00
juliancoffee
d000cc90a1
Migrate code to new i18n API
2022-08-06 21:56:01 +03:00
Vincent Foulon
8862258f61
Deny any interaction received during hostile_tree
2022-08-06 18:31:42 +00:00
Marcel Märtens
bfcc2cb802
Change the version number to 0.13
2022-07-23 14:06:08 +02:00
Forest Anderson
9d67deeeb7
Reverted removal of msg
2022-07-17 13:32:53 -04:00
tygyh
120ee6b6c0
Fix typos
2022-07-15 18:59:37 +02:00
tygyh
cbe4d9d807
Remove unused imports
2022-07-15 16:00:27 +02:00
tygyh
5e5698249b
Remove unnecessarily qualified paths
2022-07-15 14:49:46 +02:00
Isse
1e3b5383cf
Merge branch 'zesterer/better-rain' into 'master'
...
Better rain
See merge request veloren/veloren!3464
2022-07-13 23:25:33 +00:00
Joshua Barretto
f48665366b
More lightning position variety
2022-07-13 21:45:37 +01:00
Isse
9edfbaa29d
fix agent aggression when not recieving damage from attack
2022-07-13 19:46:48 +02:00
Joshua Barretto
25c55b6a25
Better rain performance, wetness
2022-07-13 18:34:34 +01:00
Socksonme
3f0f1c423c
Small fixes
2022-07-12 21:01:47 +00:00
Joshua Barretto
4e854a28ff
Fixed occlusion bias
2022-07-10 16:56:45 +01:00
Joshua Barretto
47b236b1f0
Better lightning rates, fixed shaders
2022-07-10 13:44:11 +01:00
Joshua Barretto
836fe2b1c6
Proper lightning
2022-07-09 01:59:18 +01:00
Joshua Barretto
6d1b46956d
Better storms
2022-07-09 00:14:59 +01:00
Joshua Barretto
4531a4e3f9
Added lightning
2022-07-08 23:26:33 +01:00
Joshua Barretto
6c4b10d881
Use existing humidity
2022-07-08 20:18:07 +01:00
Joshua Barretto
28bc9db198
Better cloud cover
2022-07-08 18:09:13 +01:00
