Snowram
38bbd60fd2
Arthropod basic attack
2022-01-19 19:01:14 +01:00
Snowram
6da42e61ab
Arthropod jump attack, hitboxes
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
fa549eece7
Adds new arthropod species
2022-01-19 19:01:12 +01:00
Snowram
f67bf2a539
Adds arthropod skeleton
2022-01-19 19:01:11 +01:00
Imbris
59d195b9bc
Merge branch 'imbris/component-sync' into 'master'
...
Sync some components only from the client's own entity.
See merge request veloren/veloren!3108
2022-01-19 07:44:14 +00:00
Samuel Keiffer
c3e92b6c7a
Merge branch 'sam/melee-constructor' into 'master'
...
Melee Constructor
See merge request veloren/veloren!3111
2022-01-19 06:36:51 +00:00
Sam
f93b85368d
Addressed review comments.
2022-01-19 00:56:44 -05:00
Imbris
3beb3c8205
Address review comments
2022-01-19 00:56:42 -05:00
Imbris
374bd10e5d
Small comment fixes
2022-01-19 00:56:42 -05:00
Imbris
cc40058ae2
Reduce extra energy updates
2022-01-19 00:56:42 -05:00
Imbris
5494bd31f2
Sync SkillSet from all entities for now since it is needed for some things in voxygen, fix character_behavior system always triggering energy and density modification flags
2022-01-19 00:56:42 -05:00
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
31a894601f
Removed health sclaing from summon character state.
2022-01-16 18:18:23 -05:00
Joshua Barretto
20509a7818
Removed mounted combat edge cases
2022-01-16 19:28:53 +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
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
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
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
bf48bd5346
update toolchain to nightly-2021-12-19
2021-12-23 13:04:24 +01: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
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
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
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
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
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
Oolnokk
b67558c1ba
2 new beards, four new hairstyles and 1 new eye option for dwarf males
2021-10-31 22:58:25 -04:00
Sam
560f73d296
Addressed review feedback.
2021-10-31 16:39:47 -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
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
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
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
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
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
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
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
Imbris
aa1ffa9f61
Remove timings and commented code (separate from the previous commit so we can keep these notes in the git history), add potentially better version of the straight up/down case for to_horizontal as a comment for testing in the future, remove fine grained spans
2021-10-15 01:38:56 -04:00
Imbris
b0bd8cdb45
Improve Ori impl of From<Dir> and Ori::to_horizontal by avoiding acos/asin calls by constructing the quaternions in a more direct fashion
2021-10-15 01:23:00 -04:00
Imbris
457ed6ac64
Remove per entity VecDeque's of events from character StateUpdate and instead pass in external Vecs that can be pushed to (saves significant time not allocating for VecDeque::new)
2021-10-15 01:23:00 -04:00
Imbris
43e743c2bc
Rewrite Ori::to_horizontal to reduce redundant normalization and directly calculate the needed yaw instead of using the more general Ori::from(dir), fix bugs in Ori::from(dir) and optimize the up/down case, add tests for Ori::to_horizontal and Ori::angle_between
2021-10-15 01:23:00 -04:00
Imbris
d515b42eac
Improve efficiency of states::utils::handle_orientation by reducing the conversions between Ori/Dir less frequent and optimizing the conversion of Dir -> Ori, also added a method to compute the angle between two Ori so that they don't need to be converted to Dir
2021-10-15 01:23:00 -04:00
Henry Corse
e01ce2dcf4
Kaedr/pretty printing error messages
2021-10-14 18:37:51 +00:00
Sam
1e3b0dcd16
Fix block energy cost being multiplied by 10 and also slightly reduce it.
2021-10-13 10:02:28 -04:00
Imbris
f65399eb00
Make LiquidKind::merge as inlineable, remove always from TerrainGrid::for_each_in inline annotation
2021-10-10 02:42:07 -04:00
ubruntu
0e2808a8fd
Interactable campfires
2021-10-05 00:55:29 +00:00
Joshua Barretto
2ae7bca9c0
Rebalanced boat speed
2021-10-05 00:02:03 +01:00
Joshua Barretto
c6d3137612
Fixed sail boat thrust, removed dead water code, added comments
2021-10-05 00:02:03 +01:00
Joshua Barretto
bfbca3e517
Added sail boat
2021-10-05 00:02:03 +01:00
Benoît du Garreau
ef1c51332d
Update assets_manager to 0.6.0
2021-10-01 21:13:01 +02: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
juliancoffee
b056cccb0c
Hardened loot table handling
...
- Rename LootSpec::None to LootSpec::Nothing to not confuse with Option
- Warn on invalid item paths in loot tables
2021-09-27 15:09:22 +03:00
Sam
09dd9b4813
Changed ItemDrop to use LootSpec
2021-09-27 15:09:22 +03:00
Marcel
cea927efb6
Merge branch 'xMAC94x/update-toolchain' into 'master'
...
update toolchain to `nightly-2021-09-24`
See merge request veloren/veloren!2862
2021-09-26 19:25:02 +00: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
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
Marcel Märtens
e36eef99c8
apply some clippy fixes that comes with the new toolchain version
2021-09-24 23:18:18 +02: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
bee5b232e6
Fixed crash caused by invalid health, stated current <= maximum invariant more clearly
2021-09-23 12:36:03 +01:00
Snowram
cf6bf74f7a
Set beam offset depending on body dimensions
2021-09-21 15:31:46 +02:00
Snowram
7a73e4240b
Bird large beam offset hack
2021-09-21 15:31:43 +02:00
jshipsey
1ad107f4a7
animation tweaks
2021-09-21 15:30:43 +02:00
jshipsey
aedb2e9d2b
wyvern walk
2021-09-21 15:30:43 +02:00
Snowram
834749353a
Adds flame wyvern npc
2021-09-21 15:30:42 +02:00
Justin Shipsey
02c19aaee8
Merge branch 'zesterer/remove-unscheduled-skydives' into 'master'
...
Remove unscheduled skydives
See merge request veloren/veloren!2851
2021-09-18 04:53:22 +00:00
Joshua Barretto
a76496c339
Use previous position caches for airship collision detection
2021-09-17 22:34:28 +01:00
Imbris
bc4455afe4
Merge branch 'anomaluridae/cleanup-interactable' into 'master'
...
Seperation of targets vs interactables. Cleaner cursor interactions.
See merge request veloren/veloren!2754
2021-09-17 19:25:08 +00:00
anomaluridae
5c66f73bb4
make the ContollerInputs.select_pos be explicitly the breakable blacks for mining
2021-09-17 10:34:20 -07:00
juliancoffee
f810af4eec
Rename EntityInfo level field to health_scaling
2021-09-17 20:12:42 +03:00
juliancoffee
e5d69d153b
Adress review
...
Make sausage ascii-art have `a` line inside of stadium
2021-09-17 13:28:34 +03:00
juliancoffee
4e3fb87526
Adress review
...
- Rename Collider::get_radius to bounding_radius
- Check origin difference in CapsulePrism with EPSILON * 10.0 instead of
magic 0.00001
- Add comments for closest_points, hardnened expression against NaNs
- Add comments to try_e2e_collision function, renamed to
resolve_e2e_collision, make it return whether collision was triggered.
- Remove Collider::Box (it is Cylinder, which is subset of CapsulePrism
with p0=p1=Vec2::zero())
2021-09-17 13:28:34 +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
juliancoffee
eeb3bec8ad
Refactor implementation of e2e collision
...
+ Add some hopefully helpful comments
+ Extract colliding tries to separate function
+ Move to Capsule + Cylinder collider combination instead of Capsule +
Capsule.
2021-09-17 13:28:34 +03:00
juliancoffee
d86c9f2678
Remove body::Shape enum, make npc use CapsulePrism
2021-09-17 13:28:34 +03:00
