Commit Graph

663 Commits

Author SHA1 Message Date
Sam
405b9b2448 Modular weapons now have programmatically generated names. 2022-05-16 15:10:53 -04:00
Sam
4e89bc7485 Added test functions to assist in fixing unit tests that broke from changed functionality. 2022-05-16 15:10:52 -04:00
Forest Anderson
cea55143ce Change outcomes to eventbus 2022-05-09 19:58:13 +00: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
ubruntu
94a9b407c2 Fix waypoints being movable 2022-02-28 19:20:37 +00:00
Imbris
8742a37e0f Changes based on review. Fix tests. 2022-02-27 14:43:08 -05: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
Isidor Nielsen
a685a353cb Shared and persistent waypoints 2022-02-20 10:10:18 +00:00
unvariant
9d98cd9e58 Render item drops instead of placeholder textures 2022-02-14 02:09:45 +00: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
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
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
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
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
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
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
5c37786185 Improved interpolation for riders 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
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
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
0a9f3381f5 Skill points now attempt to be earned as experience is added. 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
64c8321626 Made skill groups remain locked if skill to unlock them not acquired. 2022-01-03 19:55:03 -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
bf48bd5346 update toolchain to nightly-2021-12-19 2021-12-23 13:04:24 +01:00
Jonathan Berglin
596307c9b7 Remove unused clippy suppressions 2021-12-05 17:59:02 +00:00
Marcel Märtens
ef40ebe0c8 update toolchain to nightly-2021-11-24 2021-11-24 10:09:22 +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
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
a288f9ee43 Addressed further review. 2021-11-11 22:37:37 -05:00
Sam
d33ff9f17e Ability pool updates after switching weapons now. 2021-11-09 19:51:06 -05:00
Socksonme
0a4df2b158 Temporary fix to the textures of dropped items 2021-11-09 06:12:16 +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
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
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
Bryant Deters
b2bd43f4d3 Sneak with weapons drawn 2021-10-18 14:53:55 -05:00
Joshua Barretto
4be50b8c56 Merge branch 'ubruntu/group-loot-notifications' into 'master'
Groups can see what each member picks up

See merge request veloren/veloren!2906
2021-10-09 10:50:02 +00:00
ubruntu
5fbc0d3a06 Groups can see what each member picks up 2021-10-09 10:50:01 +00:00
Imbris
8987389e8a Submit chunk requests to the generator within the terrain system right before receiving new chunks, so that duplicate work is not done for chunks that just finished but were not yet added to the terrain. 2021-10-08 16:17:31 -04:00
Imbris
396604f6d8 Merge branch 'ubruntu/trade-fix-part3' into 'master'
Trade fix (with hashmap awareness)

See merge request veloren/veloren!2877
2021-10-01 21:17:19 +00:00
ubruntu
ddd98de72f Trade fix (with hashmap awareness) 2021-10-01 21:17:19 +00:00
juliancoffee
68aba856ec Cleaning 2021-09-27 23:21:57 +03:00
juliancoffee
7291d32209 Make ItemDrop component with Item again 2021-09-27 20:36:18 +03:00
Sam
56b17e7141 Format fixes. 2021-09-27 15:09:22 +03:00
juliancoffee
2475b97918 Move loot tables to entity configs 2021-09-27 15:09:22 +03:00
Sam
09dd9b4813 Changed ItemDrop to use LootSpec 2021-09-27 15:09:22 +03:00
Samuel Keiffer
ea2fa5f110 Merge branch 'sam/cr-weights' into 'master'
Changed weights of cr calculation and exp from cr formula.

See merge request veloren/veloren!2875
2021-09-26 18:21:56 +00:00
Sam
aa7c183862 Condense assignment of variables 2021-09-26 13:51:27 -04:00
Sam
c62162c2d3 Changed weights of cr calculation and exp from cr formula. 2021-09-25 21:52:20 -04:00
Sam
942376f88c Made poise a float at interface of module. 2021-09-25 14:07:47 -04:00
Sam
0e5e2b46f2 Changed energy to internally use an integer with a high resolution, and externally to use a float. 2021-09-23 14:11:09 -04:00
Joshua Barretto
4e61e5a04f Revert "Merge branch 'ubruntu/trade-fix-part3' into 'master'"
This reverts merge request !2866
2021-09-22 11:45:54 +00:00
Samuel Keiffer
0b477ec9af Merge branch 'snowram/projectile-offsets' into 'master'
Set projectile offsets in states instead of globally

See merge request veloren/veloren!2855
2021-09-22 01:55:39 +00:00
ubruntu
33526afe5a Trade Fix III: Revolutions 2021-09-21 23:16:00 +00:00
Snowram
9c2ce83430 Set projectile offsets in states instead of globally 2021-09-22 01:07:09 +02:00
juliancoffee
6e2f9be13f Allow aiming bombs 2021-09-20 22:29:25 +03:00
juliancoffee
c069a3523d Fix beam offsets
- Introduce notion of min and max radius for Body instead of old
  `radius()` function (which is renamed to `max_radius()`).
2021-09-17 13:28:34 +03:00
ubruntu
56f26dc3a8 Another trade fix 2021-09-16 22:06:30 +00:00
Sam
99981338bb Fixed exp fix mistake and fixed lava, campfire, and bomb damage. 2021-09-15 08:32:44 -04:00
Sam
c4c4318ac0 Fixed fall damage and sceptre regen. 2021-09-14 06:53:01 -04:00
ubruntu
8eb61192fd Fix trade/merchant bugs 2021-09-14 07:31:06 +00:00
Samuel Keiffer
73d3d3e4bb Merge branch 'sam/health-float' into 'master'
Turned Health into a Float

See merge request veloren/veloren!2824
2021-09-13 15:23:18 +00:00
Sam
85f4e66337 Addressed MR 2824 comments 2021-09-10 15:20:14 -04:00
Monty Marz
1d94adc2e1 0.11 Background images and more 2021-09-10 08:34:01 +00:00
Sam
42012fddcb Overhauled health component, making it a float to outer interfaces. 2021-09-09 00:10:17 -04:00
Joshua Barretto
896d9299e5 Merge branch 'ubruntu/fix-dungeon-loot-fallback' into 'master'
fix BipedSmall NPCs using fallback loot table

See merge request veloren/veloren!2809
2021-09-04 18:53:55 +00:00
Bryant Deters
f8c54cbd05 added a bipedsmall variant to loot fallback 2021-09-04 12:11:09 -05:00
juliancoffee
43d40c4efc Workaround of bug with global Player component
* Set default value of battle_mode and last_battlemode_change explicitly
if isn't found in battlemode_buffer
2021-09-04 02:29:02 +03:00
juliancoffee
1baa9e9879 Add in-memory persistence for battlemode changes 2021-09-04 01:41:48 +03:00
juliancoffee
3fd573f1ec Allow changing battle_mode only in towns 2021-09-03 17:28:34 +03:00
juliancoffee
338e81de10 Deduplicate pvp-checks 2021-09-03 17:28:34 +03:00
juliancoffee
6b0d016418 Don't forget about pets in PvP checks 2021-09-03 17:28:34 +03:00