roidujeu
13b0ad8c0e
included other stats, gave constant definition for some constants
...
reduced weight for poise
refuced weight for equipment time
2022-01-18 10:48:53 +05:30
roidujeu
dcc6b75c1c
fixed equip_time reverse logic, dimished effect_power's effect on CR
2022-01-18 10:48:53 +05:30
roidujeu
773bf9d9fd
changed the combat rating equation to a simpler one, which results in a more accurate weapon ranting.
2022-01-18 10:48:52 +05:30
James Melkonian
ac6f53922f
Move agent code into separate files
2022-01-18 03:02:43 +00:00
Sam
b0644ca767
Melee attacks are now created through a melee constructor.
2022-01-17 20:41:24 -05:00
Maveth
fa6e5f2cec
Add a comment explaining something unintuitive
2022-01-17 10:39:58 -06: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
Sam
bc402dd1b2
Changed then_some to then
2022-01-16 18:36:46 -05:00
Sam
31a894601f
Removed health sclaing from summon character state.
2022-01-16 18:18:23 -05:00
Joshua Barretto
7f3d9898db
More sensible turn rate in air
2022-01-16 19:43:13 +00:00
Joshua Barretto
20509a7818
Removed mounted combat edge cases
2022-01-16 19:28:53 +00:00
Joshua Barretto
5008dba413
Sensibly filter mount inputs
2022-01-16 18:45:27 +00:00
Joshua Barretto
2966a42093
Added mounted combat
2022-01-16 18:30:00 +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
157cd6cd14
Fixed unusual speech bubble placement
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
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
ed38272d23
Diary stats now use real values.
2022-01-15 21:46:55 -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
d86692c4fe
Added in-memory persistence of ability sets per weapon kind pair.
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
Tormod G. Hellen
3afa16bf03
Fix hotbar changing when sorting inventory.
...
Previously the hotbar slots would refer to inventory slots. An
unfortunate consequence of this was that when the contents of an
inventory slot changed, so would the corresponding hotbar slot
change. This commit fixes that.
2022-01-14 19:14:24 +01:00
Tormod G. Hellen
a33e6df303
Remove unused code.
2022-01-14 18:23:42 +01:00
jshipsey
475fc1631f
akhlut
2022-01-13 23:20:58 -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
Maveth
c8f083aa44
Thank you clippy, very cool
2022-01-13 12:31:51 -06:00
Maveth
167c9b2113
Test for cyclic skill dependencies
2022-01-13 12:21:11 -06:00
Sam
8c2a484ee5
Addressed review comments.
2022-01-12 22:19:00 -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
2e2e56661f
Tweaked poise effects and thresholds.
2022-01-12 22:18:59 -05:00
Sam
f182eec611
Fixed bugs in piercing penetration and crushing poise damage calculations.
2022-01-12 22:18:58 -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
fetsorn
338dec41ab
Fix typo "incase"->"in case"
2022-01-06 18:28:05 +00:00
Sam
2e09feb426
Tweaks to prompt dialog.
2022-01-03 19:55:06 -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
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
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
DoctorKompot
0dba858ca9
fixed turban specifier in item image manifest, reverted bag size for purified soulkeeper, updated item quality colors in mod files
2021-12-27 03:01:26 +02: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
cbd2a422f3
Add Chrismas wreath (25% chance) and make the towns go wild with illumination
2021-12-20 18:06:58 +00:00
Christof Petig
201101c059
Add glowing christmas ornaments
2021-12-20 18:06:57 +00:00
UncomfySilence
065da20812
+ Finished hat offsets for all races
...
+ Villagers only wear christmas hat
+ Guards wear boreal_warhelm
+ Gave guards christmas color lanterns
+ Grave_robbers now wear hood and hood_dark too while also dropping them at a higher rate than previously.
+ Christmas event now starts at 20th and goes till 30th of december
+ item_image_manifest.ron manifest fix
+ Created a potential boss loot table which allows the player to get the winter_cap, the boreal_warhelm, polaris lantern, and more blue cheese.
+ Updated hood_dark with another index 17 layer to prevent hair clip.
2021-12-20 18:06:21 +00:00
UncomfySilence
e70fd8d397
+ Added Gemu models
...
+ Created manifest files for each
+ Created stats and other needs
+ Changed Event date from (24..=25) to (20..=30)
2021-12-20 18:06:19 +00:00
Joshua Barretto
17e7879777
Added surface traction factor
2021-12-20 18:03:52 +00:00
Joshua Barretto
6e97e3179d
Slippery ice
2021-12-20 18:03:52 +00:00
Joshua Barretto
a2a3a20aad
Added ice to cold water
2021-12-20 18:03:52 +00:00
Joshua Barretto
78f76dde83
Added baubles to trees
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
ubruntu
59cb9ea7c2
Hide empty stats on item tooltips
2021-12-20 15:07:38 +00:00
ubruntu
333bc0bed8
Fix stat comparisons in item tooltips
2021-12-18 02:31:30 +00:00
Samuel Keiffer
9684fe09b7
Merge branch 'holychowders/allow_most_npcs_to_flee_again' into 'master'
...
Re-allow and Improve Agents' Fleeing
See merge request veloren/veloren!2950
2021-12-16 01:12:03 +00:00
Benoît du Garreau
8cf871f449
Edit log message as suggested
2021-12-13 18:54:30 +01:00
Benoît du Garreau
287896facd
Remove common_assets::path_of`
2021-12-13 18:17:23 +01:00
Dr. Dystopia
408fe1e6b6
Begin creating character editing
2021-12-13 01:13:33 +01:00
Benoît du Garreau
aca088388b
Update assets_manager to 0.7
2021-12-12 22:11:47 +01:00
James Melkonian
5f6d1c3438
Convert Armor Stats to Options
2021-12-12 00:25:35 +00:00
holychowders
b40d94dd53
Re-allow and improve fleeing.
2021-12-07 20:18:03 -06:00
Marcel
de5ca67615
Merge branch 'evanmeek/friendly_error_message' into 'master'
...
Add friendly error message for override assets.
See merge request veloren/veloren!2983
2021-12-07 15:35:40 +00:00
Evan
6bc8bbb4ed
Add friendly error message for override assets.
2021-12-07 15:35:40 +00:00
Jonathan Berglin
596307c9b7
Remove unused clippy suppressions
2021-12-05 17:59:02 +00:00
Dr. Dystopia
f4c5abf36b
Resolve all '#[allow(clippy::needless_range_loop)]' error supressions
2021-12-03 10:38:30 +01:00
Imbris
7760210824
Remove redundant closures
2021-11-28 12:24:57 -05:00
Marcel
724e3bcdfd
Merge branch 'capucho/tracing-bump' into 'master'
...
Bump tracing-subscriber to 0.3.2
See merge request veloren/veloren!3032
2021-11-27 11:11:47 +00:00
João Capucho
8b89903d57
Bump tracing-subscriber to 0.3.2
...
We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
Marcel Märtens
ef40ebe0c8
update toolchain to nightly-2021-11-24
2021-11-24 10:09:22 +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
Kemper
d37dbf5d24
Adjust hitboxes for husk and medium birds
...
The hitbox of the husk did not include the head and the hitboxes
of the medium birds were far too wide.
2021-11-19 06:18:13 +00:00
Marcel Märtens
086f9737e4
move server.voxel for airship to common
2021-11-15 16:39:39 +01:00
Marcel Märtens
cd516d0912
name it just manifests rather then tmp_manifests
2021-11-15 09:47:38 +01:00
Marcel Märtens
d24b904563
move ship_manifest to common assets until its properly included in servers ECS and pushed to clients
2021-11-15 09:00:12 +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
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
f65c89862c
Removed vec allocation with an impl Iterator.
2021-11-11 22:43:25 -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
da677e8ea6
Abilities can now be referred to by the asset id.
2021-11-10 17:30:19 -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
Imbris
79afad626b
Merge branch 'socksonme/pushback_require_collider' into 'master'
...
Make the collider component be required for entity pushback
See merge request veloren/veloren!2954
2021-11-09 06:11:07 +00:00
DemonicOnPc
7fc57c027b
Fixes to jungle sprites and lillypads
2021-11-08 17:09:15 -05:00
DemonicOnPc
9514cd71c6
Jungle and River update
...
-Added Lillypads to rivers
-Added new types of reeds
-Added reeds to water
-Added more Ferns/Flowers/Plants to jungles
2021-11-08 17:09:11 -05: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
Oolnokk
b67558c1ba
2 new beards, four new hairstyles and 1 new eye option for dwarf males
2021-10-31 22:58:25 -04: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
Sam
560f73d296
Addressed review feedback.
2021-10-31 16:39:47 -04:00
jshipsey
c2b7d3bb44
good hat rendering
2021-10-30 23:42:16 -04:00
jshipsey
a05c1ea4c5
switch to new matcell variant
2021-10-30 23:42:15 -04:00
jshipsey
3915aa7aac
support for hollow voxels ty zesterer
2021-10-30 23:42:14 -04: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
ca292a53ea
All aspects of an attack now scale with the modifier.
2021-10-29 17:37:12 -04:00
Sam
57851b7df3
Fixed buff applied.
2021-10-29 17:37:10 -04:00
Sam
f339793911
Buffed staff firebomb a little.
2021-10-29 17:37:07 -04:00
Sam
2b447852fd
Added min fall off to explosions.
2021-10-29 17:37:02 -04:00
socksonme
2ef668a16c
removed unnecessary self
2021-10-29 15:23:49 +03:00
socksonme
42ed5c43f5
fixed code quality
2021-10-29 15:01:21 +03:00
socksonme
584e379e40
Removed beams and shockwaves from phys.rs
...
calc_z_limit doesn't use an Opyion anymore, construct_spacial_grid also doesn't check for beams or shockwaves, collider_other in apply_pushback is also required now and resolve_e2e_pushback also doesn't use Options anymore.
2021-10-29 09:43:01 +03:00
Sam
fbd742abdb
Changed crafting to only consume items after checking that the crafting would be successful instead of consuming items first and reinserting on failure.
2021-10-27 17:02:36 -04:00
Sam
4b9e9c506b
Fixed opening salvaging station not showing salvage text.
2021-10-27 17:02:35 -04:00
Monty Marz
727295aec1
text and alignment WIP
2021-10-27 17:02:35 -04:00
Sam
6ff7317e05
Added function that returns the output of salvaging an item when result just needs to be checked.
2021-10-27 17:02:32 -04:00
Sam
9fc3a9bf01
Fixed item path of leather items under hide folder.
2021-10-27 17:02:32 -04:00
Monty Marz
7aae35f286
bench
2021-10-27 17:02:31 -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
111abbc3bc
Added salvage tags to items, removed old salvage recipes from recipe book.
2021-10-27 17:02:29 -04:00
Sam
ed5cf8ebf9
Backend stuff for salvaging.
2021-10-27 17:02:29 -04:00
Sam
cac3f00250
Lengendary crit changes.
2021-10-26 20:55:32 -04:00
Sam
4d4b7e846a
Haha, nerfs go brr
2021-10-26 18:44:45 -04:00
Joshua Barretto
37056e75f9
Merge branch 'demonic/shrubs' into 'master'
...
Added new Spots, Shrubs and Ships.
See merge request veloren/veloren!2953
2021-10-26 10:06:14 +00:00
DemonicOnPc
a74af55c46
Gemu's Revamped vox models added.
2021-10-26 05:28:05 -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
Justin Shipsey
434913b946
Merge branch 'kemper/sand-shark-hitbox' into 'master'
...
Better sand shark hitbox
See merge request veloren/veloren!2956
2021-10-24 22:03:08 +00:00
Kemper
b96c6c94ab
Adjust sand shark hitbox
2021-10-24 21:04:46 +00:00
DemonicOnPc
b1476071b1
Added new Spots, Shrubs and Ships.
...
Spots
- Gnarling Tree
- Troll Cave
- Underwater Shipwreck second variation.
Shrubs added to biomes
- Savannah Shrubs
- Taiga Shrubs
- Temperate Shrubs
Galleon ship added
2021-10-24 08:10:44 -04:00
ubruntu
e6bfce99bb
Use stealth stat on armors
2021-10-24 05:31:49 +00:00
socksonme
052e09039a
Made the pushback cache require colliders
2021-10-19 15:05:30 +03: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
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
Sam
c5c70f6945
Correctly took dot product, switched to square root of dot product
2021-10-15 22:41:53 -04:00
Sam
7b2ade34c4
Removed angle between with dot product in handle_orientation.
2021-10-15 17:26:10 -04:00
socksonme
c631341da9
Refactored SoundKind and UtteranceKind
2021-10-15 22:49:25 +03:00
Imbris
f61d742d29
Fix NaNs
2021-10-15 13:17:13 -04:00
Imbris
e67c688c11
Add test for Ori::angle_between
2021-10-15 12:02:53 -04:00
Imbris
c412a96d6a
Fix issue with angle between going over PI and remove faulty test (angle between Quaternions isn't equivalent to the angle between Dir vectors since Quaternions involve rolling as well)
2021-10-15 03:20:40 -04:00
