2779 Commits

Author	SHA1	Message	Date
Imbris	95a38ff8f6	Merge branch 'imbris/revert-some' into 'master' ... Revert some of the updates to make windows cross compile directx work See merge request veloren/veloren!3918	2023-05-06 05:12:20 +00:00
Imbris	af0d0f3ea4	Second attempt (success)	2023-05-06 00:30:54 -04:00
Corvella	6367a51fa3	Cheesing fixes mainly focused on bosses	2023-05-06 01:57:41 +00:00
Marcel Märtens	cd7d889c13	get rid of oldtime in chrono	2023-05-05 18:25:49 +02:00
Marcel	223ae7ee98	Merge branch 'xMAC94x/update_deps' into 'master' ... update further dependencies See merge request veloren/veloren!3913	2023-05-05 08:42:43 +00:00
Joshua Barretto	b6d8182382	Merge branch 'zesterer/item-merging' into 'master' ... Zesterer/item merging See merge request veloren/veloren!3912	2023-05-05 00:03:22 +00:00
Joshua Barretto	73c84dfcc2	Clippy	2023-05-05 00:04:13 +01:00
Joshua Barretto	8d9625d6ee	Addressed comments	2023-05-04 23:18:40 +01:00
Marcel Märtens	4be1e82ba9	update further dependencies	2023-05-04 23:42:05 +02:00
Joshua Barretto	ee971e4056	Added item merging	2023-05-04 22:12:25 +01:00
Marcel Märtens	27620e665b	we need a new version of refinery that needs a new version of rusqlite, so update both	2023-05-04 20:53:00 +02:00
Marcel	ce4beff7fe	Merge branch 'xMAC94x/update_deps' into 'master' ... update veloren deps See merge request veloren/veloren!3911	2023-05-04 18:28:59 +00:00
Imbris	60dbcf86f9	Merge branch 'imbris/server-start-faster' into 'master' ... Improve server startup times, in particular, finding paths between sites. See merge request veloren/veloren!3888	2023-05-04 18:06:38 +00:00
Joshua Barretto	f000347cac	Make NPCs respond to each other	2023-05-04 11:53:01 +01:00
Joshua Barretto	a5b1e41d8b	Make NPC interaction go via rtsim	2023-05-04 11:23:46 +01:00
Marcel Märtens	054f4f9453	update veloren deps	2023-05-04 11:58:43 +02:00
Joshua Barretto	2ff0118df0	More rtsim monsters	2023-05-04 10:13:02 +01:00
Joshua Barretto	0f92f38967	Started adding wandering rtsim monsters	2023-05-01 18:29:32 +01:00
Isse	3d3a6eab2b	Fix items not dropping when no exp is given.	2023-04-25 11:33:44 +02:00
Isse	ab4076518f	Add multiloot	2023-04-23 19:17:39 +00:00
Imbris	cd02b3a172	Apply TODO from !3883 and refactor to avoid collect in Inventory::damage_items, also reduce to iterating over the hashmap once when culling the recently unequipped items list	2023-04-22 11:37:52 -04:00
Imbris	c82e6cfc77	Cleanup, fmt, appease clippy	2023-04-20 21:53:59 -04:00
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	ed4643e80b	Add profiling spans for Server::new and World::generate	2023-04-20 21:53:59 -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	7fdfc0e71b	Addressed review	2023-04-19 18:34:17 -04:00
Sam	d0a902d918	Being attacked now cancels all active trades.	2023-04-19 18:34:16 -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
Julian Tölle	573a2942c9	Add more info to the /rtsim_{npc,info} commands ... - Add the name of the NPC to /rtsim_npc to help identify this NPC in the world - Add faction & personality to /rtsim_info command to learn more about the NPC	2023-04-16 12:37:37 +02:00
Sam	553aa690b4	Added repair equipment command	2023-04-14 18:09:23 -04:00
Isse	60b626d3ee	don't load npc by themself if they're riding	2023-04-14 13:21:43 +02:00
Isse	3548b464da	orient airships correctly on load	2023-04-14 11:25:59 +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	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