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
12,387 Commits 151 Branches 18 Tags 2.1 GiB
e55b541bcc
Commit Graph

2363 Commits

Author SHA1 Message Date
holychowders
645bbf7b0d Refactor: re-order function signature to make more sense. 2022-05-01 17:30:23 -05:00
holychowders
d3873e357e Agent: Use FOV when scanning for hostile targets and refactor choose_target(). 
- Refactors `choose_target()`, renaming it and extracting functions with more meaningful names and more correct behavior.
- Adds FOV for agents scanning for hostile targets.
 2022-05-01 17:29:45 -05:00
holychowders
914b44c714 Fix villagers seeing cultists and familiar enemies through objects. 2022-05-01 15:06:43 +00:00
Marcel Märtens
fa49248c31 switch to upstream vek again 2022-04-28 09:10:55 +02:00
Youssef Fahmy
aec866e5ec Balance tweaks 2022-04-23 14:54:01 +00:00
holychowders
cc409fd537 Extract some retargeting logic. 2022-04-11 11:54:09 -05:00
James Melkonian
b590bc50d7 Fix #1516 Add else branch to allow for agent idling when no sound events 2022-04-05 03:40:26 +00:00
Marcel
50fd55daef Merge branch 'tormod-personalities' into 'master' 
Give NPCs random Big Five personalities.

See merge request veloren/veloren!3280
 2022-04-04 19:03:05 +00:00
Tormod G. Hellen
cb88648cca Give NPCs random Big Five personalities. 2022-04-04 20:17:50 +02:00
Marcel Märtens
64b9602760 update further dependencies, including strum and get rid of old strum_macro 2022-04-04 16:06:47 +02:00
Marcel Märtens
affdf3131f update a bunch of dependencies, including clap3 2022-04-04 11:43:29 +02:00
flo
3d24b1d635 CliffTowns 2022-03-29 12:52:08 +00:00
holychowders
39d5a73c10 Fix deadwood not attacking if target is at a different elevation than deadwood. 2022-03-27 20:02:38 +00:00
Samuel Keiffer
4aaefdf6be Merge branch 'ubruntu/site2-guards-raiders' into 'master' 
Bring raiders and guards to site2 towns

See merge request veloren/veloren!3300
 2022-03-26 00:29:53 +00:00
ubruntu
6d30f7f748 Bring raiders and guards to site2 towns 2022-03-26 00:29:52 +00:00
Justin Shipsey
aee1aa7c1d Merge branch 'holychowders/prevent_undesired_movement_on_agent_interaction' into 'master' 
Agent Perception: Improve Awareness System

See merge request veloren/veloren!3263
 2022-03-26 00:28:18 +00:00
holychowders
a88d8ada0f Comment out unused awareness increment/decrement calls and un-nest conditional for early return. 2022-03-19 12:02:29 -05:00
James Melkonian
8c06dc9a5c Add chunk reload command (admin only) 2022-03-19 08:43:38 +00:00
Manuel Schmidbauer
0037518472 Impl #1357: Agent chase abort 
- Adds util funcs to calculate benefit of continue pursue vs letting
target escape
- Hooks util funcs into agent's hostile tree
 2022-03-14 18:06:57 +01:00
Imbris
06b605a8d0 Add note on reasoning in optional argument parsing behavior 2022-03-13 16:03:29 -04:00
Imbris
008e9051f7 Don't consume command args that fail parsing, so that optional args are properly skipped. 2022-03-13 15:41:37 -04:00
holychowders
c6bc6b63ee Prevent enemy agents from reacting to sounds from too far away and remove an inconsequential distance check. 2022-03-12 18:13:02 -06:00
holychowders
cc808251e6 Make Enemy agents flee from dangerous sounds instead of follow. 2022-03-12 16:58:06 -06:00
holychowders
3ffb1a7706 Also restrict when Enemy agents respond to sounds and fix potential conditional bug. 2022-03-12 16:58:06 -06:00
holychowders
8d98ade15e Agent perception: Make handling of sounds and awareness more intuitive. 
When a sound was received in `idle_tree()`, awareness would be
incremented, causing a call to `handle_elevated_awareness()`, which
handled sounds heard. Instead, just `handle_sounds()` when they are heard and
increment awareness as part of hearing them.

The code more straightforwardly shows the agent first hearing a sound and then
becoming more aware based on that.
 2022-03-12 16:58:06 -06:00
holychowders
df91f665d7 Agent Perception: Restrict when idling agents respond to sounds. 
- Prevent utterances and other sounds from causing undesired jitters and
  fleeing, such as those caused by greeting villagers.
- Agents will no longer flee from quieter weapon sounds such as melee.
 2022-03-12 16:58:06 -06:00
Samuel Keiffer
a411db17bf Merge branch 'tygyh/Refactor-path_toward_target' into 'master' 
Tygyh/refactor path toward target

See merge request veloren/veloren!3241
 2022-03-08 16:43:37 +00:00
Dr. Dystopia
1810998641 Remove redundant 'pos' variable 2022-03-05 09:54:01 +01:00
Dr. Dystopia
1cb7a083e7 Remove redundant if-statement 2022-03-05 09:53:28 +01:00
Dr. Dystopia
4aab1eea43 Remove redundant 'tgt_pos' variables 2022-03-01 22:54:44 +01:00
Dr. Dystopia
5aa1d3ceaf Rename 'vec3' parameter to 'pos_difference' 2022-03-01 22:47:01 +01:00
Dr. Dystopia
f99a637606 Rename 'dist_to_pos' variable to 'pos_diff' 2022-03-01 22:44:55 +01:00
Dr. Dystopia
50f877bdf6 Rename 'dist_to_pos_xy' variable to 'dist_xy' 2022-03-01 22:42:03 +01:00
Dr. Dystopia
83f46658a9 Fix pathing execution 2022-03-01 22:40:43 +01:00
Dr. Dystopia
0a3de57be6 Rename 'distance_to_target' variable to 'pos_difference' 2022-03-01 22:38:35 +01:00
Dr. Dystopia
4d24ff0027 Rename 'target_position' clojure to 'partial_path_tgt_pos' 2022-03-01 22:33:25 +01:00
ubruntu
94a9b407c2 Fix waypoints being movable 2022-02-28 19:20:37 +00:00
InfRandomness
042d258161 Modify message catch-all arms 2022-02-27 23:08:47 +00:00
Imbris
7be5b4c051 Merge branch 'imbris/fix-possesion-comp-sync' into 'master' 
Improve possession edge cases

See merge request veloren/veloren!3233
 2022-02-27 20:10:16 +00:00
Imbris
8742a37e0f Changes based on review. Fix tests. 2022-02-27 14:43:08 -05:00
N A
fc9c3c3be9 worth_choosing refactor 2022-02-27 19:21:21 +00:00
Imbris
e6c2239744 Fix typo. cargo fmt. 2022-02-27 13:47:13 -05:00
Imbris
e52159f638 Remove original character from game world when possessing to make persistence more robust. 2022-02-27 13:47:13 -05:00
Imbris
10803a9735 Stop using Character presence kind when possessing so that persistence doesn't get messed up. 2022-02-27 13:47:12 -05:00
Imbris
c2ad763b9c Handle removing/inserting SyncFrom::ClientEntity components properly during possession. 2022-02-27 13:47:12 -05:00
Imbris
63ed36bdde Limit possesse to regions which possessor is subscribed to. 2022-02-27 13:47:12 -05:00
Imbris
6f9ff17ce8 Properly handle cleanup of old entity controller during possession on both the client and server sides 2022-02-27 13:47:12 -05:00
Imbris
1a744808f0 Cleanup up possession code and add TODOs for issues to fix. Remove 
SyncFrom debug_assertions hack.
 2022-02-27 13:47:12 -05:00
Dr. Dystopia
7e70d7648e Dereference 'tgt_pos' variables 2022-02-27 10:36:01 +01:00
Dr. Dystopia
a39d514bae Replace 'tgt_data' parameter with 'tgt_pos' parameter 2022-02-27 10:19:45 +01:00
Imbris
fb2f731ac3 Small fix 2022-02-26 01:05:28 -05:00
Dr. Dystopia
75322ddfc0 Extract 'dist_to_pos' variable 2022-02-25 22:00:42 +01:00
Dr. Dystopia
ee26778118 Extract 'dist_to_pos_xy' variable 2022-02-25 21:57:29 +01:00
Dr. Dystopia
019d619cf6 Extract 'spacing' variable 2022-02-25 21:48:29 +01:00
Dr. Dystopia
15bea26823 Extract 'target_position' clojure 2022-02-25 21:44:43 +01:00
Dr. Dystopia
d921e1e3ea Extract 'pos' variable 2022-02-25 21:40:42 +01:00
Dr. Dystopia
e2d42207a4 Update 'path_toward_target' doc comment 2022-02-25 21:37:01 +01:00
Dr. Dystopia
4aebe19d94 Extract 'distance_to_target' variable 2022-02-25 21:35:50 +01:00
Dr. Dystopia
0dad86e1ca Replace flag parameters with 'Path' enum 2022-02-25 21:35:35 +01:00
Inojelis
9bdb7198f5 Fix imports 2022-02-21 03:46:02 +02:00
Inojelis
3e5a220980 Fix generate_chunk to also accept Calendar 2022-02-21 02:48:12 +02:00
Marcel
6506a97dcd Merge branch 'zesterer/enable-site2-towns' into 'master' 
Enabled site2 towns by default

See merge request veloren/veloren!3206
 2022-02-20 14:02:53 +00:00
Marcel
df7cd2da1a Merge branch 'isse/shared-waypoints' into 'master' 
Shared and persistent waypoints

See merge request veloren/veloren!3162
 2022-02-20 10:10:18 +00:00
Isidor Nielsen
a685a353cb Shared and persistent waypoints 2022-02-20 10:10:18 +00:00
Marcel Märtens
802b9e7914 Change the version number to 0.12 2022-02-18 22:36:53 +01:00
James Melkonian
7f21cbf4bc Fix airship command by splitting out ships 2022-02-18 08:34:14 +00:00
Joshua Barretto
34871c9355 List locations on empty command 2022-02-17 16:01:18 +00:00
Joshua Barretto
b786570470 Added location system, switched to release map 2022-02-17 14:51:59 +00:00
jshipsey
e569ee24c3 fix 2022-02-17 00:58:25 -05:00
Marcel
b09698b8ac Merge branch 'shouvik/prevent_empty_trades' into 'master' 
Fixes #1452 - Prevents empty trades

Closes #1452

See merge request veloren/veloren!3202
 2022-02-16 21:41:26 +00:00
ShouvikGhosh2048
d72f43190b Fixes #1452 - Prevents empty trades 2022-02-16 21:41:26 +00:00
Joshua Barretto
00b003a23c Enabled site2 towns by default 2022-02-15 19:01:43 +00:00
James Melkonian
c906c9e2dc Fix NPC humanoids not rolling when on fire 2022-02-15 08:28:37 +00:00
Samuel Keiffer
6c7c0eefae Merge branch 'gnarlings' into 'master' 
Gnarlings

See merge request veloren/veloren!3194
 2022-02-15 00:22:37 +00:00
Joshua Barretto
6e46b4ddef Fixed CI 2022-02-14 11:46:42 -05:00
unvariant
9d98cd9e58 Render item drops instead of placeholder textures 2022-02-14 02:09:45 +00:00
Sam
c77270b799 Addressed feedback 2022-02-12 20:52:01 -05:00
jshipsey
2eee43865f chieftain anims 2022-02-11 02:18:48 -05:00
Sam
4991f7ecea Gnarlign site tweaks and chieftain buff 2022-02-11 01:23:09 -05:00
Sam
0031aa6f5f Chieftain AI and attacks 2022-02-10 14:58:35 -05:00
Sam
fcb0f8d8f0 Wood golem attacks and ai 2022-02-10 14:58:32 -05:00
Sam
e044bf5091 Mandragora attacks and ai 2022-02-10 14:58:32 -05:00
Sam
f1801560fa Deadwood ai 2022-02-10 14:58:31 -05:00
Sam
40bb74c42f Gnarling stalker AI 2022-02-10 14:58:28 -05:00
Sam
c15fb2b68f Better mugger AI 2022-02-10 14:58:28 -05:00
Sam
e1f164d099 Initial AI for gnarling logger/mugger. 2022-02-10 14:58:27 -05:00
jshipsey
786ae39fb4 new entities 2022-02-09 20:10:59 -05:00
Tormod G. Hellen
a00121bedf Make entities protect owned bodies. 2022-02-08 22:53:00 +01:00
Tormod G. Hellen
82273f0f36 Make friendly creatures defend each other. 2022-02-08 22:32:25 +01:00
juliancoffee
d9726e5b90 Define 4 traveler kinds in RtSim 2022-02-08 01:35:54 +02:00
juliancoffee
ffac9f1b9c Smol RtSim refactor 
- Remove traveler branch from adhoc_loadout
- Rename RtSimEntityKind::Random to RtSimEntityKind::Wanderer, which
  encompasses all wandering stuff like birds that travel from site to
  site, humanoid travelers, ships, etc.
 2022-02-08 01:35:54 +02:00
juliancoffee
79e5a20960 Add stub implementation in RtSim 2022-02-08 01:35:54 +02:00
Marcel Märtens
7ba45fa7e5 adjust tracing and remove unused coding 2022-02-05 13:04:16 +01:00
protheory8
7148737252 Remove quic_files server setting 
(cherry picked from commit 38339d90ceb87008bbb0ce31ad4e28350213a401)
 2022-02-05 13:04:16 +01:00
protheory8
89580eba8c Remove gameserver_address setting and add protocols_and_addresses setting 
(cherry picked from commit a5e4575ad349aacb1f41a7e93e3d5ff9eeafc6ae)
 2022-02-05 13:04:16 +01:00
James Melkonian
f21e0f31fb Restrict RtSim ships to airships 2022-02-03 21:41:20 -08:00
Marcel
72e270368d Merge branch 'aweinstock/resolve-clippy-lints' into 'master' 
Globally allow more clippy lints and reconfigure complexity to be less verbose

See merge request veloren/veloren!3052
 2022-01-30 22:53:36 +00:00
James Melkonian
44865d99ff Fix guards menacing instead of defending villagers 2022-01-30 13:14:24 -08:00
Avi Weinstock
f3f08936d8 Decrease too-many-arguments-threshold and type-complexity-threshold. 2022-01-30 20:16:21 +01:00
Avi Weinstock
5f8957d8ef Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}. 2022-01-30 20:16:20 +01:00
Joshua Barretto
d8c4284a32 Merge branch 'zesterer/worldgen' into 'master' 
Improvements to site2

See merge request veloren/veloren!3159
 2022-01-28 17:14:07 +00:00
Joshua Barretto
5b3d826396 Better hazard checks 2022-01-28 15:17:56 +00:00
Joshua Barretto
69436db64c Added wall lamps 2022-01-28 13:58:41 +00:00
juliancoffee
ed593cd0cb Adress review №2 2022-01-28 00:02:34 +02:00
juliancoffee
6ae25d5956 Require rng from EntityInfo::with_asset_expect 2022-01-28 00:02:34 +02:00
juliancoffee
e004fba9da Adress review 2022-01-28 00:02:34 +02:00
juliancoffee
5a370cb6f7 Loadout Update: Use 
Delete guard and villager lazy_loadout and use LoadoutKind::Extended
with potions instead
 2022-01-28 00:02:34 +02:00
juliancoffee
4a4f2f8d8f Loadout Update: Managed Rng 
Rewrite EntityInfo api to take Rng from caller.
 2022-01-28 00:02:34 +02:00
juliancoffee
d5b927602a Loadout Udpate: NpcData part 
Actually implement creating npc with new EntitytInfo by chaning
CreateNpc.loadout to CreateNpc.inventory and cleaning code in
NpcData::from_entity_info.
 2022-01-28 00:02:34 +02:00
Samuel Keiffer
d89edc9357 Merge branch 'tygyh/Extract-controller-functions' into 'master' 
Tygyh/extract controller functions

See merge request veloren/veloren!3151
 2022-01-26 22:36:36 +00:00
Dr. Dystopia
b0d6a68e8c Create 'push_initiate_invite' function 2022-01-26 21:23:37 +01:00
Dr. Dystopia
027154a5be Create 'push_invite_response' function 2022-01-26 21:16:29 +01:00
Dr. Dystopia
0516526985 Create 'push_utterance' function 2022-01-26 21:12:19 +01:00
Dr. Dystopia
765e858c19 Create 'push_cancel_input' function 2022-01-26 21:07:36 +01:00
Dr. Dystopia
b2b208687c Create 'push_basic_input' function 2022-01-26 20:09:59 +01:00
Dr. Dystopia
bc0a8c7704 Create 'push_action' function 2022-01-26 19:52:19 +01:00
Dr. Dystopia
f47184df85 Use 'push_event' function in more places 2022-01-26 19:40:18 +01:00
juliancoffee
e3927ed3f6 Move server to 2021 edition 2022-01-26 15:57:50 +02:00
James Melkonian
2671f824d0 Prohibit accidental cliff diving by NPCs 2022-01-25 16:25:40 +00:00
Justin Shipsey
54d5a06a0d Merge branch 'unvariant/lantern_bug' into 'master' 
Fixes #1406 - Lantern light does not change when dragging it from inventory

Closes #1406

See merge request veloren/veloren!3107
 2022-01-25 02:59:29 +00:00
ninefox
04b0277e33 Changed how lantern swap is caught 2022-01-23 13:28:23 -08:00
Dr. Dystopia
dd76438299 Revert parameter removal 2022-01-23 19:03:47 +01:00
Dr. Dystopia
bb48267827 Fix warnings 2022-01-23 19:03:47 +01:00
Samuel Keiffer
7052aad11b Merge branch 'snowram/arthropods' into 'master' 
Snowram/arthropods

See merge request veloren/veloren!3071
 2022-01-20 00:20:24 +00:00
Snowram
a6e396e29a Stunned and jump anims, stats, spawns, more IA work 2022-01-20 00:53:29 +01:00
InfRandomness
dabae7ece8 Remove bomb pile item 2022-01-19 19:31:43 +00:00
Snowram
fd3ed89899 More arthropod animations 2022-01-19 19:01:15 +01:00
Snowram
38bbd60fd2 Arthropod basic attack 2022-01-19 19:01:14 +01:00
Snowram
1e6ead4005 Arthropod charge 2022-01-19 19:01:13 +01:00
Snowram
02ed6ffd60 More arthropod work 2022-01-19 19:01:13 +01:00
Snowram
ae71f2e4f0 Adds poisoned debuff (energy change over time) 2022-01-19 19:01:13 +01:00
Snowram
f67bf2a539 Adds arthropod skeleton 2022-01-19 19:01:11 +01:00
Imbris
13d970bf6f Rename SyncFrom::AllEntities to SyncFrom::AnyEntity for more clarity, add more comments for component syncing code, address MR comment 2022-01-19 00:56:42 -05:00
Imbris
7f7dc5ff8a Add ability to plot component update counts each tick in tracy, controlled by the PLOT_UPDATE_COUNTS env var 2022-01-19 00:56:42 -05:00
Imbris
aa122c1a18 Sync some components only from the client's own entity. Vastly reduce the amount of places to modify when adding/removing a component from network syncing. 2022-01-19 00:56:42 -05:00
ninefox
973b392e38 Fixed code quality issues 2022-01-18 21:14:27 -08:00
ninefox
8ca627342a Changed how the lantern swap is caught 2022-01-18 20:21:12 -08:00
James Melkonian
ac6f53922f Move agent code into separate files 2022-01-18 03:02:43 +00:00
ninefox
64f6faece5 Switched to using existing swap_lantern function 
Removed unnecessary function
 2022-01-17 11:24:18 -08:00
Joshua Barretto
9c565dadc5 Merge branch 'zesterer/mount-everest' into 'master' 
Mount Everest

See merge request veloren/veloren!3101
 2022-01-17 13:21:38 +00:00
Joshua Barretto
60b7528199 Improved rtsim entity pathfinding 2022-01-17 12:34:31 +00:00
Joshua Barretto
c9762568d6 Don't block teleportation when mounted 2022-01-17 09:47:29 +00:00
ninefox
889a593b13 cargo fmt 2022-01-16 16:32:03 -08:00
ninefox
fc012b4989 Lantern color will now change when swapping lanterns while lantern is activated 2022-01-16 16:24:31 -08:00
Joshua Barretto
3b7ea72a9c Fixed review comments 2022-01-16 21:13:13 +00:00
terrarier2111
5da2850624 Fix loot forcing 2022-01-16 21:12:59 +00:00
Joshua Barretto
043016a433 Don't try to mount unmountable entities, clippy fixes and fmt 2022-01-16 17:53:14 +00:00
Joshua Barretto
504e2a38d5 Added overhead hints, smoother mount movement 2022-01-16 17:53:14 +00:00
Joshua Barretto
2923d3cd2b Made NPCs prefer food when idle 2022-01-16 17:53:13 +00:00
Joshua Barretto
5c37786185 Improved interpolation for riders 2022-01-16 17:53:13 +00:00
Joshua Barretto
6931514ae5 Made teleport commands redirect to mount 2022-01-16 17:53:13 +00:00
Joshua Barretto
537cc38b5e Fixed lantern position when mounting 2022-01-16 17:53:13 +00:00
Joshua Barretto
b3e2d825ed Overhauled mounting to make it more reliable 2022-01-16 17:53:13 +00:00
Sam
7ae8ed09f6 Addressed MR comments. 2022-01-15 21:50:27 -05:00
Sam
4d3b0736d0 Fixed bug with returning to general combat skill tree. 2022-01-15 21:49:30 -05:00
Sam
e662946130 Removed placeholder abilities, tweaked migration. 2022-01-15 21:49:29 -05:00
Sam
745cc20c66 Hardened json model of ability sets and added dev panics for when conversion from database failed with dev opt mode. 2022-01-15 21:49:28 -05:00
Sam
27c9f702db Fixed issue with character creation referencing incorrect table in database 2022-01-15 21:49:28 -05:00
Sam
fe80e365fa Changed persistence of abilities to go through an intermediate state in json models. 2022-01-15 21:46:57 -05:00
Sam
d0e487da8a Ability sets now start with non-empty defaults. 2022-01-15 21:45:27 -05:00
Sam
4c3771a1a0 Persistence of auxiliary abilities. 2022-01-15 21:42:34 -05:00
Sam
cf724bd76c Initial UI work 2022-01-15 21:42:32 -05:00
Sam
9b6c76bd3b Removed health scaling that bypasses the skill system. 2022-01-15 11:58:28 -05:00
jshipsey
0e9d50162b last fixes 2022-01-14 00:19:32 -05:00
jshipsey
1fac6359de more gnarling weapons 2022-01-13 23:20:56 -05:00
jshipsey
7f928d0bc0 woodengolem, chieftain, icedrake, blowgun 2022-01-13 23:20:52 -05:00
Sam
e98edbcc7a Conversion of poise damage to health damage now scales depending on the poise state the target is in. 
Entities are now immune to poise damage for 1 second after exiting a poise state.
Rebalanced most phyiscal damage attacks on player-accessible tools.
 2022-01-12 22:18:59 -05:00
Sam
d1e1de3b14 Slashing damage now decreases target's energy if available, and if target has no remaining energy will do additional damage. 
Piercing damage now ignores an amount of protection equal to the piercing damage value.
Crushing damage now does poise damage equal to the amount of mitigated damage.
When poise damage is dealt while in a poise state, poise damage is instead converted to damage.
 2022-01-12 22:18:58 -05:00
Sam
b82aa621d5 Gracefully handle asset not existing. 2022-01-04 18:07:33 -05:00
Sam
efbc5f9b75 UI notifying player that their skillset has been invalidated. 2022-01-03 19:55:06 -05:00
Sam
0a9f3381f5 Skill points now attempt to be earned as experience is added. 2022-01-03 19:55:05 -05:00
Sam
da78800047 Changed skill groups to be a hashmap instead of a vec. 2022-01-03 19:55:05 -05:00
Sam
6d2496b7de Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments. 2022-01-03 19:55:04 -05:00
Sam
8221336587 Addressed some review. 2022-01-03 19:55:04 -05:00
Sam
64c8321626 Made skill groups remain locked if skill to unlock them not acquired. 2022-01-03 19:55:03 -05:00
Sam
8feb9fb67b Hash value now stored as a blob instead of a json string. 2022-01-03 19:55:03 -05:00
Sam
903c57b862 Persitence now tracks spent_exp as an additional point to potentially invalidate skills. 2022-01-03 19:55:03 -05:00
Sam
c8675eaf45 Added hash value to decide if we should invalidate persited skills and allow a respec. 2022-01-03 19:55:02 -05:00
Sam
6ab2839eaa Fixed migration, added field for hash value. 2022-01-03 19:55:02 -05:00
Sam
bf3bcd9213 Migration for skill persistence fixes (no hash yet). 2022-01-03 19:55:01 -05:00
Sam
356eae85a6 Skillsets now store an ordered vec of skills that is used to track order that skills were acquired in. 2022-01-03 19:55:01 -05:00
Sam
27dd7b4391 Refactored skills code. 2022-01-03 19:55:01 -05:00
Sam
c44c10718b Split skillset and skills into separate files. 2022-01-03 19:55:00 -05:00
Sam
fe45a158ed Skill groups now only persist earned_exp instead of available_exp, earned_sp, and available_sp. 2022-01-03 19:55:00 -05:00
Imbris
b255f0ee0f put Client::tick_network function behind feature, remove unnecessary cloning of deleted entity vecs in entity sync, move prepare_send hack that avoids locking during message serialization from send_fallible to send, add job.cpu_status par mode adjustment around parallel section 2021-12-26 12:04:08 -05:00
Imbris
6547a6bf5e Parallelize entity sync loop over regions. 2021-12-25 19:24:12 -05:00
Imbris
bf48bd5346 update toolchain to nightly-2021-12-19 2021-12-23 13:04:24 +01:00
Christof Petig
8a85d6e6e0 cargo fmt, pass calendar down into building creation 2021-12-20 18:06:58 +00:00
Christof Petig
42ba9212ea move Calendar object into WorldSim 
(needed for Christmas decoration in towns)
 2021-12-20 18:06:58 +00:00
Joshua Barretto
78f76dde83 Added baubles to trees 2021-12-20 18:03:52 +00:00
Joshua Barretto
3ddacb96ab Added christmas snow 2021-12-20 18:03:52 +00:00
Joshua Barretto
e3203080ed Added Calendar for temporal events based on the real-world calendar 2021-12-20 18:03:52 +00:00
Ben Wallis
9a4e6b81d3 Merge branch 'Character-editting' into 'master' 
Character editing

See merge request veloren/veloren!3059
 2021-12-20 15:24:43 +00:00
Dr. Dystopia
9b407b8aef Update warning message 2021-12-20 12:33:51 +01:00
Dr. Dystopia
d7f5c301f6 Extract 'check_response' function 2021-12-18 13:38:22 +01:00
Dr. Dystopia
3a52599e49 Clean up 2021-12-15 21:55:53 +01:00
IsseW
8b258e4e81 Non editable data 2021-12-15 20:40:01 +01:00
Joshua Barretto
dd95d69dc4 Fixed character editing 2021-12-13 00:55:25 +00:00
Dr. Dystopia
408fe1e6b6 Begin creating character editing 2021-12-13 01:13:33 +01:00
holychowders
b40d94dd53 Re-allow and improve fleeing. 2021-12-07 20:18:03 -06:00
Jonathan Berglin
596307c9b7 Remove unused clippy suppressions 2021-12-05 17:59:02 +00:00
Jonathan Berglin
d9dd49552b Tygyh/resolve all '# allow(clippy needless update)]' error supressions 2021-11-29 09:32:55 +00:00
Marcel
3fa2dab3aa Merge branch 'xMAC94x/update-toolchain' into 'master' 
xMAC94x/update toolchain

See merge request veloren/veloren!3027
 2021-11-26 16:52:51 +00:00
James Melkonian
ab99126a7b Floor merchant cost percentages and display as whole numbers 2021-11-25 01:32:20 +00:00
Marcel Märtens
ef40ebe0c8 update toolchain to nightly-2021-11-24 2021-11-24 10:09:22 +01:00
Marcel Märtens
aa93b4b53c update other binaries 2021-11-20 20:19:48 +01:00
Marcel Märtens
e29ede7c97 updating dependencies, 
cannot update the following dependencies:
 - vek: Sharps SIMD isnt upstream
 - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes,
 - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql
 - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update
 - wgpu: cant update due new version doesnt support DX11

Got quinn updated which now require some dependencies to be explicit.
 2021-11-20 20:17:49 +01:00
Ben Wallis
022c1417b6 EXP on kill is now shared between damage contributors. A "damage contributor" is either an individual entity, or a group - depending if the attacker is in a group. This means that not only does the "killing blow" no longer get 100% of EXP, but multiple groups and individuals all receive their fair share of EXP on death (assuming they are still within range of the entity when it dies). 
Damage from a given individual or group only counts towards a kill for 10 minutes since that individual or group's last damage to the entity - after this period their damage contribution is removed. This avoids the list of damage contributors growing excessively large for an entity that does a lot of combat but never dies.

EXP sharing within groups is unchanged - the difference is simply that the input to this calculation may be less than 100% of the base EXP reward for the kill if other individuals or groups contributed damage.
 2021-11-13 20:46:45 +00:00
Joshua Barretto
c0bf9503bd Addressed review issues, added cloning docs to BodySpec::Manifests 2021-11-13 17:20:23 +00:00
Joshua Barretto
657ac45288 Updated changelog 2021-11-13 17:13:09 +00:00
Joshua Barretto
46ec4203a2 Arbitrary volume airships 2021-11-13 17:13:08 +00:00
Joshua Barretto
026a4a07bb Made explosions bonk sprites 2021-11-13 17:12:17 +00:00
Joshua Barretto
edf9c59e7d Added bomb sprites 2021-11-13 17:12:16 +00:00
Samuel Keiffer
6e57380735 Merge branch 'sam/ability-pool-and-hotbar' into 'master' 
Ability pool

See merge request veloren/veloren!2996
 2021-11-12 05:11:12 +00:00
Sam
040d70c750 Final fixes. 2021-11-11 23:11:17 -05:00
Sam
a288f9ee43 Addressed further review. 2021-11-11 22:37:37 -05:00
Sam
dfcb8c8519 Addressed review feedback. 2021-11-11 18:10:22 -05:00
Sam
b678f7f46e Added some client methods for changing abilities to hook into. 2021-11-11 01:55:32 -05:00
Sam
4309e1ff9b Did voxygen stuff for ability pool. 2021-11-09 21:20:41 -05:00
Sam
d33ff9f17e Ability pool updates after switching weapons now. 2021-11-09 19:51:06 -05:00
Sam
a8bec0280c Ability pool mostly functional. 2021-11-09 12:56:07 -05:00
Socksonme
0a4df2b158 Temporary fix to the textures of dropped items 2021-11-09 06:12:16 +00:00
Joshua Barretto
de087ae992 Added site2 worldgen feature 2021-11-01 22:53:38 +00:00
Joshua Barretto
9ce057212b Trading for travelers 2021-11-01 22:19:49 +00:00
Joshua Barretto
0cb88139c9 Made merchants work in new sites 2021-11-01 22:19:49 +00:00
Joshua Barretto
4b8bf94320 Used correct entity configs 2021-11-01 22:19:49 +00:00
Joshua Barretto
e3ab8fc8ce Added rtsim merchants to site2 2021-11-01 22:19:49 +00:00
Joshua Barretto
8e2ca9cdec Added rtsim villagers to site2 towns 2021-11-01 22:19:49 +00:00
Samuel Keiffer
e692f49463 Merge branch 'sam/potion-tweaks' into 'master' 
Potion tweaks

See merge request veloren/veloren!2976
 2021-10-31 21:12:08 +00:00
Marcel
bcba2aae7e Merge branch 'juliancoffee/fix_testserver' into 'master' 
Make test-server compile again

See merge request veloren/veloren!2974
 2021-10-30 09:27:27 +00:00
Sam
41effe61d0 Being knocked out of item use or sprite interact states forces a poise state. 2021-10-29 19:24:40 -04:00
Sam
aad2384622 Addressed review, changelog. 2021-10-29 17:57:00 -04:00
Sam
696da74c94 Fixed falloff calculations 2021-10-29 17:37:05 -04:00
Sam
2b447852fd Added min fall off to explosions. 2021-10-29 17:37:02 -04:00
juliancoffee
1dc53dad3a Make test-server compile again 2021-10-29 23:49:37 +03:00
Monty Marz
727295aec1 text and alignment WIP 2021-10-27 17:02:35 -04:00
Sam
e28ca15059 Salvaging now requires a salvaging station. 2021-10-27 17:02:33 -04:00
Sam
356057afc4 Added comments in areas that were lacking. 2021-10-27 17:02:31 -04:00
Sam
794b072d3e Simple recipes now take a vec of slots to look in for the ingredients. 2021-10-27 17:02:30 -04:00
Sam
ed5cf8ebf9 Backend stuff for salvaging. 2021-10-27 17:02:29 -04:00
Kemper
034041fd4f Aim fireballs at feet 
AI aims fireballs at the target’s feet, for a slight improvement
in splash damage.
 2021-10-27 19:50:50 +00:00
Kemper
b0b90744cf Add a range limit to trading 
Prevents initiating trades with client-side ghosts.
 2021-10-25 00:47:45 +00:00
Q-I-U
64209967aa Prevent lantern from turning off on death 2021-10-24 20:45:57 +02:00
ubruntu
e6bfce99bb Use stealth stat on armors 2021-10-24 05:31:49 +00:00
Doctor Kompot
51f8aa06df DoctorKompot - New Necklaces 2021-10-22 05:24:20 +00:00
Bryant Deters
b2bd43f4d3 Sneak with weapons drawn 2021-10-18 14:53:55 -05:00
Joshua Barretto
c397bfa69f Merge branch 'socksonme/refactor_villageralarm' into 'master' 
Socksonme/refactor villageralarm

See merge request veloren/veloren!2931
 2021-10-17 12:47:19 +00:00
socksonme
8099b516a9 Renamed emit_alarm to emit_scream 2021-10-16 19:11:57 +03:00
Joshua Barretto
3357008601 Merge branch 'zesterer/small-fixes' into 'master' 
Caverns

See merge request veloren/veloren!2763
 2021-10-16 09:33:57 +00:00
socksonme
2b36a957ac small code quality change 2021-10-15 23:23:45 +03:00