Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,823 Commits 151 Branches 18 Tags 2.1 GiB
d814296676
Commit Graph

2757 Commits

Author SHA1 Message Date
Isse
bcc8c55b5e change 'force from mount' to 'force from volume' in commands 2023-05-09 19:43:10 +02:00
Isse
61ecd2c178 various small fixes 2023-05-09 19:43:10 +02:00
Isse
a6665ed988 some comments 2023-05-09 19:43:10 +02:00
Isse
192356f6c5 use interpolated pos and ori 2023-05-09 19:43:09 +02:00
Isse
b6c7316de9 place rtsim on sprite controllers 2023-05-09 19:43:09 +02:00
Isse
57551c479c force of mount in teleporting commands 2023-05-09 19:43:09 +02:00
Isse
134d0f0c04 varius fixes 2023-05-09 19:43:09 +02:00
Isse
b3a70627e5 fix volumes 2023-05-09 19:43:09 +02:00
Isse
6674cce2cc intercat with sprites on ships 2023-05-09 19:43:09 +02:00
Joshua Barretto
1cc221f653 Merge branch 'zesterer/rtsim-tweaks' into 'master' 
Started adding wandering rtsim monsters

See merge request veloren/veloren!3908
 2023-05-09 14:51:15 +00:00
Marcel Märtens
95bca5418a update toolchain to nightly-2023-04-20 2023-05-08 18:58:54 +02:00
Sam
faff715c4f Simultaneous melee hits now show separately in SCT 2023-05-07 20:43:52 -04:00
Sam
a38f336c9e Added dual wielding sword contextual abilities. 2023-05-07 20:43:51 -04: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
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
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
daacadaedb Made NPCs give directions to nearby towns, fixed player death propagation 2023-04-13 14:34:31 +01: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
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
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
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
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
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
ef7b400cca Number tweaking 2023-03-26 19:50:42 -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
610d47f787 Effect power now affects more than just poise 2023-03-21 20:16:55 -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
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
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
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
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
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
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
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
0fe073fcdc Addressed feedback from testing 2022-10-27 20:07:10 -04:00
Sam
9b4dcbfdde Heavy stance AI 2022-10-27 20:07:04 -04:00
Sam
df9ef691fd Cleaving stance AI 2022-10-27 20:07:03 -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
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
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
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
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 6c9deee491.
This reverts commit a32b269252.
 2022-09-24 00:04:40 +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