Commit Graph

4266 Commits

Author SHA1 Message Date
Imbris
c6f5e8dac2 Add more profiling spans to Server startup related things in order to
visualize where time is being spent. Make `Lod::from_world` use the same
rayon pool as other things during the server startup. Move parallel
iteration up out of structure_gen.par_iter in order to slightly optimize
Lod::from_world (saves a few hundred milliseconds on my machine)
2023-04-20 21:53:59 -04:00
Imbris
92a42ced18 Apply experimental astar2 changes to the original impl 2023-04-20 21:53:59 -04:00
Imbris
d1ca47da41 Remove astar node clustering related code 2023-04-20 21:53:59 -04:00
Imbris
81885fe8e5 Additional optimizations (such as avoiding calling find_path when we know we won't use the result or that it will fail), cleanup of excess notes and commented code, probably other misc optimizations 2023-04-20 21:53:59 -04:00
Imbris
1f5ebbd100 mess (server startup time related experimentation, in particular with
pathfinding between sites)
2023-04-20 21:53:59 -04:00
Sam
4f991190d3 Removed 3rd to_owned call 2023-04-19 18:43:43 -04:00
Sam
e819cd2309 Updated hashbrown, removed some to_owned calls in handling recently unequipped items 2023-04-19 18:43:40 -04:00
Sam
63bf8f3ac7 Responded to review comments and fixed tests 2023-04-19 18:34:17 -04:00
Sam
7fdfc0e71b Addressed review 2023-04-19 18:34:17 -04:00
Sam
c1a64e1d69 Recently unequipped items are now tracked and durability loss on death is applied to them 2023-04-19 18:34:16 -04:00
Imbris
f525be9b3b Update tracy-client to 0.15.2, also use tracy_client through the
re-export of `profiling` to make keeping the versions in-sync much less
tedious (and have `cargo update` not break this).
2023-04-18 21:28:15 -04:00
Sam
9d503d1e1f Debug items no longer have durability 2023-04-14 18:25:24 -04:00
Sam
553aa690b4 Added repair equipment command 2023-04-14 18:09:23 -04:00
Isse
3548b464da orient airships correctly on load 2023-04-14 11:25:59 +02:00
Isse
2208a3037e improve flying goto 2023-04-14 11:23:17 +02:00
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
a835ce7e26 Better starting site choices 2023-04-13 18:32:21 +01: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
Joshua Barretto
16e3227f78 Correct localisation of numeric values, use coordinate conversions in rtsim 2023-04-12 10:36:11 +01:00
Isse
0bb6fa7946 add flag to clamp to ground for RepositionOnChunkLoad 2023-04-12 10:17:49 +02:00
Joshua Barretto
3582d86c70 Simplified localisation logic 2023-04-11 23:51:07 +01:00
Joshua Barretto
3484e156d1 Allowed localisation content to be recursive 2023-04-11 23:18:34 +01: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
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
Isse
efe2eb046c add comment about a pure-proportional controller 2023-04-10 22:22:50 +02:00
Joshua Barretto
92ead1cf38 Removed vehicle riders, for now 2023-04-10 20:58:08 +01:00
Joshua Barretto
00559187d6 Fixed tests 2023-04-10 18:40:31 +01:00
Joshua Barretto
b50645c1ee Addressed review comments 2023-04-10 17:59:43 +01:00
Joshua Barretto
efbab102a5 Make LoD towns glow 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
70538dae66 Choose random plaza tile 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
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
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
85c572f6e2 Better town layout 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
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
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
364255c7fe Allowed rtsim NPCs to greet nearby actors 2023-04-09 19:25:55 +01:00
Joshua Barretto
8d91ebb23e Don't aim character when drinking 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
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
dda1be58d4 big birds! 2023-04-09 19:25:54 +01:00
Isse
259bb6fce4 fix phys test 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
28ebdbbe74 fix mount controller 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
077da13a5f Improved herbalist, hunter, farmer, added cultist factions 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
0b4d3c9e20 Fixed scaling of airships 2023-04-09 19:25:53 +01:00
Joshua Barretto
e8b489a71a sync 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
Joshua Barretto
feaaaa9a25 Added initial impl of factions 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
Joshua Barretto
f40cfb4ac3 Made farmers sell food 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
f140a94dc6 Fixed scaled terrain collisions 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
c168ff2f9b Added rtsim saving, chunk resources, chunk resource depletion 2023-04-09 19:25:51 +01:00
Imbris
3ef4af0195 Various tweaks:
* Store result of large condition expression in a variable before using
  in if statement (improves readability of code).
* Buff doc comment improvements. Adding periods is neccessary since
  these will be merged into one line in the generated docs.
* Add note on AbilityContext that AbilityContext::None is intended to be
  used rather than AbilityContext::Stance(Stance::None) perhaps in the
  future we can add some serde shenanigans to make this work better, but
  it is probably best to wait to see how this type evolves first.
2023-04-07 23:56:55 -04:00
Imbris
2cc2aa86f4 Synchronize DiveMelee checks 2023-04-07 01:59:41 -04: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
d523d31056 Fixed possible crash in crafting UI 2023-04-06 10:57:18 -04:00
Sam
132f26dbc0 Addressed review 2023-04-06 10:57:16 -04:00
Sam
92165a8fd8 Repair recipes no longer show ingredients as required when they are not damaged enough to need any 2023-04-06 10:57:14 -04:00
Sam
ff9f755c0c Changed repair recipe to round down on material costs. 2023-04-06 10:57:13 -04:00
Sam
00710a4eb0 Fixed csv tools 2023-04-06 10:57:13 -04:00
Sam
e4ebd17363 Addressed feedback 2023-04-06 10:57:12 -04:00
Sam
ca879173be Added a repair equipped and a repair all button. Cleaned up some hacks that used to exist. 2023-04-06 10:56:55 -04:00
Sam
536d88a2c7 Repair costs scale based on how damaged the item is. 2023-04-06 10:54:50 -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