2735 Commits

Author	SHA1	Message	Date
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