socksonme
db16e6147c
Instance inside projectile constructor is now a variable
2022-06-29 17:31:09 +03:00
socksonme
202d558246
Instance number generated inside projectile constructor, remove crit field
2022-06-29 17:31:07 +03:00
socksonme
6c75ad6ef8
Code quality changes and comments
2022-06-29 17:30:54 +03:00
socksonme
c0e78d869e
Instance numbers are now based on the AttackDamage struct
2022-06-29 17:30:53 +03:00
socksonme
ac5bf53c42
Instance numbers for HpChanges
2022-06-29 17:30:50 +03:00
socksonme
f8924d6c1a
tweaks to damage floaters
...
Added some comments where stuff needs to be discussed
2022-06-29 17:30:32 +03:00
socksonme
7a1e19d42c
Crits now only glob with eachother, now show up like healing
...
Still a WIP, need to change crits to being non-floating and try implementing crits popping, need to remove some debugging stuff later
2022-06-29 17:30:29 +03:00
socksonme
ce95680df9
Addressed comments, health and damage floaters are now separated
...
Enemy healing probably needs to be discussed as it doesn't show up as of now and the way crits are handled also needs to be discussed
2022-06-29 17:29:59 +03:00
socksonme
94f193fbe0
Damage outcomes are now emitted with health change events
...
Being healed and damaged at the same time still leads to issues - needs to be sorted out
2022-06-29 17:29:19 +03:00
socksonme
634a3095d6
Handling crits (very bad color choice+naming)
2022-06-29 17:24:05 +03:00
socksonme
93d3ce18b4
Remove dbgs and temporary? 0.0 damage fix
2022-06-29 17:24:05 +03:00
socksonme
aee7888a92
HpFloaters are now created by Outcomes, touched up Damage Outcome
2022-06-29 17:24:05 +03:00
socksonme
bf6c6fb33d
Changed Damage Outcome to store more data
2022-06-29 17:24:05 +03:00
Sam
4a5ef6dce3
Poise damage dealt to a target in a stunned state is now no longer universally applied to the target as health damage.
...
Instead poise damage is only converted to health damage when its source is mitigated crushing damage.
Fixed 'Long Pole' -> 'Longpole'
2022-06-17 21:13:45 -04:00
Imbris
950723dd0d
Add metrics for counting server events
2022-06-15 00:40:58 -04:00
Samantha W
57ab1c5767
Add a client-side mutelist
2022-06-14 20:35:01 +00:00
IsseW
e05da7f6fa
fix depot bug
2022-06-09 09:53:06 +02:00
Christof Petig
a55cbbbf11
move the character_state test to the systems crate (where the infrastructure is complete)
2022-06-08 07:47:20 +02:00
Christof Petig
b702a27b28
different incomplete unit test attempts [ci skip]
2022-06-08 07:46:00 +02:00
Christof Petig
f8dd030643
remove dead code, test skeleton
2022-06-08 07:46:00 +02:00
Christof Petig
9c07f204a4
introduce a fast path for the common case of already horizontal ori and small rotation changes
2022-06-08 07:46:00 +02:00
Marcel Märtens
17661d9655
Revert "massivly decrease the effects of bigger tick times on the pos calculatuion by moving the block friction calcuation into the inner iterator"
...
This reverts commit 819dae754e
2022-06-07 22:57:40 +02:00
Marcel Märtens
819dae754e
massivly decrease the effects of bigger tick times on the pos calculatuion by moving the block friction calcuation into the inner iterator
...
do physics always after character_behavior as this one is saying how the input should be handled
2022-06-07 22:57:17 +02:00
Marcel Märtens
997b330f19
add physics tests that verify the status quo
2022-06-07 22:53:34 +02:00
terrarier2111
45efdb6602
Implement group owned loot
2022-06-04 17:16:12 +00:00
Christof Petig
59d876a654
pass humidity to meta, move smoke cycle to separate file
2022-06-01 22:13:34 +02:00
Maxwell
14d5b2e579
added all other types of chest sprites to check for non-explodable objects
2022-05-30 22:41:57 -05:00
Maxwell
a8892bab53
updated explode_power function to make chests non-explodable
2022-05-30 22:40:59 -05:00
Sam
5e57eabd11
Code changes and msm
2022-05-30 20:25:31 -04:00
N A
c09f070241
Change animal species to have only one inventory slot
2022-05-29 23:53:00 +00:00
Christof Petig
b8c3d71fbe
economy trace defaults to info
2022-05-29 19:08:39 +02:00
Benoît du Garreau
8488c7b25e
Upgrade assets_manager to 0.8.0 and image to 0.24
...
This removes a significant number of duplicated dependencies
2022-05-28 23:18:31 +02:00
Ben Wallis
34f580dfaa
Introduced loot ownership rules to combat loot stealing by players
...
* Added `LootOwner` component used to indicate that an `ItemDrop` entity is owned by another entity
* A loot winner is now calculated after EXP allocation using the EXP per entity for weighted chance distribution
* Used existing Inventory Full overitem text to show "Owned by {player} for {seconds}secs" when a pickup fails due to a loot ownership check
* Updated agent code to take into account loot ownership when searching for `ItemDrop` targets to pick up
* Added `loot` ECS system to clear expired loot ownerships
2022-05-28 12:06:49 +00:00
Christof Petig
2bf8e1865f
Skiing and ice skating
2022-05-27 17:19:52 +00:00
Imbris
ca1a27bd11
Merge branch 'imbris/update-tracy' into 'master'
...
Update tracy
See merge request veloren/veloren!3400
2022-05-27 02:50:24 +00:00
Joshua Barretto
3b6e6be947
Merge branch 'zesterer/fix-climbing' into 'master'
...
Fixed climbing
See merge request veloren/veloren!3401
2022-05-26 09:34:10 +00:00
Joshua Barretto
4eb781cdf7
Fixed climbing
2022-05-26 10:08:41 +01:00
Imbris
a366fc4512
Update tracy
2022-05-26 00:04:03 -04:00
N A
d84a26dfd8
Special case taming and mounting.
2022-05-24 02:09:45 +00:00
Corvella
42af9b8e15
Hitbox improvements
2022-05-23 09:18:10 +00:00
Joshua Barretto
d18483756b
Fixed frozen character when wall-run into water horizontally
2022-05-22 19:37:52 +01:00
Sam
bbe22d6807
Fixed bins (no assets)
2022-05-18 16:44:09 -04:00
Sam
534c7dc8b9
Simplified item key (no assets)
2022-05-18 16:28:06 -04:00
Sam
72f38068e0
Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (no assets).
2022-05-16 15:11:44 -04:00
Sam
bcf36d08b0
Add removed items to migration.
2022-05-16 15:11:43 -04:00
Sam
54a6c31c63
Slight optimization to persistence
2022-05-16 15:11:42 -04:00
Sam
85c2a85817
Addressed review comments
2022-05-16 15:11:42 -04:00
Sam
00276acbdb
More feedback addressed (no assets).
2022-05-16 15:11:41 -04:00
Sam
5d0ba6e2b8
Addressed round 3 of feedback (no assets).
2022-05-16 15:11:41 -04:00
Sam
c0dd748bc7
Addressed second round of balance feedback (no assets).
2022-05-16 15:11:40 -04:00
Sam
95c3fdffa1
Addressed playtest feedback (no assets).
2022-05-16 15:11:39 -04:00
Sam
f47cbeb022
Addressed review comments
2022-05-16 15:11:38 -04:00
Sam
de8f98446e
Fixed errors in csv import, csv export, and recipe graphviz bins
2022-05-16 15:11:37 -04:00
Sam
528b62c59a
Rebase commit
2022-05-16 15:11:36 -04:00
Sam
64d07d02c4
Changed item definition id to better handle modular items.
2022-05-16 15:11:34 -04:00
Sam
37442b638c
Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (no assets).
2022-05-16 15:11:33 -04:00
Sam
afd2c8730f
Addressed most review comments (no assets).
2022-05-16 15:11:32 -04:00
Sam
816c265662
Rebase stuffs
2022-05-16 15:11:26 -04:00
Sam
fceb48c3ac
Removed vec allocation for component recipe iterators
2022-05-16 15:11:26 -04:00
Sam
a5a517916e
Initial UI including ingredients in crafting modular components
2022-05-16 15:11:25 -04:00
Sam
085b18c07a
Formatting tweaks to tooltips
2022-05-16 15:11:25 -04:00
Bryant Deters
075fee5190
modular component tooltips
2022-05-16 15:11:25 -04:00
Sam
e69aa8c4ee
Fixed items with components having incorrect hashes
2022-05-16 15:11:24 -04:00
Sam
6fa7852a8c
Fixed random generation of modular weapons.
2022-05-16 15:11:23 -04:00
Sam
e86d2ab46a
Fixed rebase
2022-05-16 15:11:22 -04:00
Sam
cb04433c14
Fix rebase
2022-05-16 15:11:22 -04:00
Sam
d436362a8d
Consolidated crafting UI for the primnary component of modular weapons.
2022-05-16 15:11:21 -04:00
Sam
5877334ed3
Tags are now generated for modular items.
2022-05-16 15:11:20 -04:00
Sam
ef5b2e4a1e
Added method of differing names for 1h and 2h variants of a modular wepaon.
...
Added all 1h melee weapon models.
2022-05-16 15:11:19 -04:00
Sam
af50864643
Fixed issue in updating item config when loading persisted items.
2022-05-16 15:11:18 -04:00
Sam
bf348b7f43
Addressed further review.
2022-05-16 15:11:16 -04:00
Sam
94c19735ca
Fixed broken stuff during rebase.
2022-05-16 15:11:16 -04:00
Sam
81c83c5e83
Items with components can now have their name modified by the components. Also addressed more review. NO ASSETS
2022-05-16 15:11:15 -04:00
Sam
524845b661
Addressed more comments on MR.
2022-05-16 15:11:15 -04:00
Sam
259db56ca6
Addressed more comments in MR review.
2022-05-16 15:11:14 -04:00
Sam
fa9e034757
Gave modular items a pseudo item definition id that can be used when serializing ItemBase or when persisting items to the database. NO ASSETS
2022-05-16 15:11:13 -04:00
Sam
36da0cf981
Removed inner toolkind from ModularBase::Tool.
2022-05-16 15:11:13 -04:00
Sam
a9e9a70687
Changed ModularComponent to allow it to be more extensible. Overhauled random modular weapon function so that there is less runtime cost to generate one. NO ASSETS
2022-05-16 15:11:11 -04:00
Sam
b048179c0a
Changed Item to have ItemBase instead of ItemDef. ONLY ASSETS.
2022-05-16 15:11:11 -04:00
Sam
08b7bb781f
Changed Item to have ItemBase instead of ItemDef. NO ASSETS.
2022-05-16 15:11:10 -04:00
Sam
5bacf526ad
Began addressing initial review of modular weapons.
2022-05-16 15:11:10 -04:00
Sam
03ab68eb60
Added models for sword blade, axe head, and hammer head components.
2022-05-16 15:11:09 -04:00
Sam
2aad3f3961
Switched to item list as an input for modular components so that allowed items could be centralized.
2022-05-16 15:11:08 -04:00
Sam
539c3307a6
Fixed persistence error that would occur when dropping a modular item and then picking up that same item in the same persistence cycle.
2022-05-16 15:11:06 -04:00
Sam
33feee787b
Removed stuff no longer needed after new method of crafting modular weapons.
2022-05-16 15:11:05 -04:00
Sam
00649f8ebb
Added crafting method for modular weapons.
2022-05-16 15:11:04 -04:00
Sam
4f466d0523
Modular weapons now work in kits.
2022-05-16 15:11:03 -04:00
Sam
ca644f8f0b
Added more interesting ingredients to recipes.
...
Changed bow main component from held (grip) to damage (limbs).
2022-05-16 15:11:02 -04:00
Sam
01450b7e34
Fixed migration to properly insert components in the correct position. Fixed small error in how names were generated for any modular weapon that used the held component as its main component.
2022-05-16 15:11:01 -04:00
Sam
21084e48f0
Removed old weapons that were migrated to modular weapons.
2022-05-16 15:11:00 -04:00
Sam
b4e86bf741
Fixed csv import
2022-05-16 15:10:59 -04:00
Sam
c10fa35fa4
Added correct names to every bow, staff, and sceptre component.
2022-05-16 15:10:58 -04:00
Sam
0a44874e88
Renamed components of bow, staff, and sceptre
2022-05-16 15:10:58 -04:00
Sam
38cb465722
Fixed loading of modular weapons from the loadout to work with nested components.
...
Modular weapons can now be correctly dispalyed when wielded.
2022-05-16 15:10:57 -04:00
Sam
0a38567e8d
Modular weapons can now be properly displayed in the inventory.
2022-05-16 15:10:57 -04:00
Sam
762b3be3c3
Modular weapons can now be dropped as loot or assigned to enemies.
2022-05-16 15:10:56 -04:00
Sam
c01fe655f1
Added wood
2022-05-16 15:10:55 -04:00
Sam
d380a2dbaf
Quality is now propogated through modular items from the quality of the components.
2022-05-16 15:10:55 -04:00
Sam
c6f4b51215
Removed descriptions from modular weapons and components.
2022-05-16 15:10:54 -04:00
Sam
885bb9aaa7
Added programmatic names for modular components.
2022-05-16 15:10:53 -04:00
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
Sam
f9256ecd62
Added recipes
2022-05-16 15:10:51 -04:00
Sam
6620c1dd1f
Added HandsKind to automatically resolve handedness of modular weapons.
2022-05-16 15:10:51 -04:00
Sam
85b7382487
Added handedness requirements to recipes and components.
2022-05-16 15:10:50 -04:00
Sam
2feb8f298b
Removed deprecated functionality from modular weapons.
2022-05-16 15:10:49 -04:00
Sam
511f39c5ae
Adds support for loading modular item from database with an arbitrary amount of component nesting.
2022-05-16 15:10:49 -04:00
Sam
77934c9214
Made changes to crafting to allow modular weapons to work as intended.
2022-05-16 15:10:48 -04:00
IsseW
fb7aa07b01
site command completion
2022-05-15 23:57:21 +02:00
Hugo Peixoto
74d4e4f45e
Fix path finding calculation of starting point
...
When a chaser's route finishes calculating, the chaser may already be a
few blocks away from the starting position, thanks to movement inertia.
The path finding code finds the point along the route closest to the
chaser's position.
This calculation only considered the xy coordinates when finding the
closest point. This caused issues whenever the calculated route goes
below the chaser's position (for example, when the chaser is on top of a
bridge and the route circled around to go under the bridge). In this
case, there was a chance that the closest point was the one below the
bridge. This caused the chaser to try to move directly to a directly
inaccessible block.
The fix was to remove the xy() filter so that the closest point
algorithm also considered the z coordinate.
2022-05-14 16:41:45 +01:00
Hugo Peixoto
b681ad79ce
Fix heuristic to restart route in chase()
...
We had a random chance of restarting the route to avoid getting the
chaser stuck. This didn't work properly because the rerouting code was
only triggered if `self.route.is_none()` or if the target moved
significantly, and the random chance branch only set `bearing` to `None`.
This change sets `self.route = None` to trigger rerouting.
2022-05-14 16:41:45 +01:00
Hugo Peixoto
ba6d1bce60
Remove unnecessary code
...
We had an unnecessary unwrap_or_else() preceded by a question mark
operator, which means that the or_else clause could never be called.
2022-05-14 16:41:45 +01:00
Joshua Barretto
e02f8aee65
Merge branch 'zesterer/lod-objects' into 'master'
...
LoD Objects (inc. Trees)
See merge request veloren/veloren!3367
2022-05-11 14:56:12 +00:00
Joshua Barretto
907ba3dcbc
Added giant trees to LoD
2022-05-10 20:30:48 +01:00
Joshua Barretto
d4fd9d2d0e
Added LoD houses
2022-05-10 19:19:46 +01:00
Joshua Barretto
7382aab13a
Upped default LoD distance
2022-05-10 17:12:12 +01:00
Samuel Keiffer
1bd33bb997
Merge branch 'holychowders/streamline_stealth_coefficient' into 'master'
...
Distinguish armor and sneaking stealth; Show stealth as percentage in Stats UI.
Closes #1525
See merge request veloren/veloren!3352
2022-05-10 11:41:49 +00:00
Joshua Barretto
f35c98d1a1
Added LoD distance setting
2022-05-10 12:40:06 +01:00
Joshua Barretto
2df01385d2
Voxelise trees
2022-05-10 12:38:37 +01:00
Joshua Barretto
1db7cc7fde
LoD trees in snow are white
2022-05-10 12:38:36 +01:00
Joshua Barretto
cf346d05c1
Different kinds of tree
2022-05-10 12:38:36 +01:00
Joshua Barretto
ac0e7a7724
Use dedicated fragment shader
2022-05-10 12:38:36 +01:00
Joshua Barretto
b3126ca687
Initial implementation of LoD trees
2022-05-10 12:38:36 +01:00
holychowders
fc2095803d
Use inline conditional to simplify assignment.
2022-05-09 22:23:08 -05:00
Forest Anderson
cea55143ce
Change outcomes to eventbus
2022-05-09 19:58:13 +00:00
Marcel Märtens
3fcf95061e
before buff was around 5ms - 6ms on 100 players
2022-05-08 19:49:21 +02:00
holychowders
4c76e9314d
Use sum instead of fold.
2022-05-06 19:27:30 -05:00
holychowders
1ebbf335e1
Simplify stealth logic. Remove max item stealth upper limit and restore close to original curve.
2022-05-06 19:25:03 -05:00
holychowders
e473c47bcf
Distinguish stealth from armor and stealth from sneaking. Also fixes #1525 .
...
- Armor and sneaking have exclusive effects on overall stealth, rather
than armor taking effect only while sneaking.
Gameplay:
- Agents factor in stealth from armor in all cases, not only when sneaking.
- Max stealth takes place when sneaking (final multiplier of `0.7`) and with stealth from armor up to `0.7` (`0.3` multiplier), resulting in a max distance modifier of about `0.5`, approximately what it was previously.
- Min stealth score from armor is now 0 instead of 2.
Internals:
- Stealth getter accounts for sneaking in final calculation, not just
armor.
- Prevents potential division by zero.
- Stealth getter returns value that should be multiplied instead of divided.
- Legitimized stealth as a score between 0 and 1.
Notes:
- FIXME: Someone more familiar with the different armor types may want to adjust their stealths.
- Armor stealths seem to be valued between `0.0` and `1.0`, and I've reinforced this in the code. However, it is possible, particularly for the `Dragonscale` armors, to cumulatively reach a value of `2.0`.
2022-05-06 13:15:46 -05:00
holychowders
9c68fbbeed
Fix agents not hearing sounds due to reduced listen_dist, caused by commit a6955e5af.
...
- `listen_dist` has been restored to normal and the behavior intended by
the trouble commit has been much more properly encoded.
2022-05-04 21:22:19 -05:00
Marcel
84ab219cf3
Merge branch 'xMAC94x/update-toolchain' into 'master'
...
update toolchain to `nightly-2022-04-25`
See merge request veloren/veloren!3343
2022-05-03 14:07:49 +00:00
Marcel Märtens
697673bcca
update toolchain to nightly-2022-04-25
2022-05-03 15:22:28 +02:00
Samuel Keiffer
3abba05fb8
Merge branch 'holychowders/improve_perception_system' into 'master'
...
Agent: Use FOV when scanning for hostile targets and refactor `choose_target()`.
See merge request veloren/veloren!3307
2022-05-02 22:45:14 +00:00
Jonathan Berglin
144d6d41f7
Extract 'calculate_projection_and_collision_dist' function
2022-05-02 09:14:17 +00:00
Marcel
593d8fa4b5
Merge branch 'xMAC94x/update_vek' into 'master'
...
switch to upstream vek again
See merge request veloren/veloren!3342
2022-05-02 08:34:21 +00:00
holychowders
a6955e5afb
Re-add listen_dist check in choose_target() and add randomness to simulate agents detecting entities directly behind them.
2022-05-01 19:18:43 -05:00
holychowders
dda85e4bc3
Address code review.
2022-05-01 18:23: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
d70c8dd160
remove unused file
2022-04-28 12:23:55 +02: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
Samuel Keiffer
7b1e7046df
Merge branch 'fix_sneak_on_mount' into 'master'
...
Fixed being able to sneak on mount
See merge request veloren/veloren!3296
2022-04-16 16:56:47 +00:00
Plright
cffa980f24
Fixed being able to sneak on mount
2022-04-16 16:56:47 +00:00
juliancoffee
1b18629616
Execute asset migration
2022-04-08 19:17:01 +03:00
juliancoffee
f875c0b5d4
Adress review
2022-04-08 16:37:06 +03:00
juliancoffee
8a1d665b0d
Box inlined LoadoutSpec
2022-04-07 18:44:16 +03:00
juliancoffee
11bf16e3d7
Make ItemSpec and Hands untagged
2022-04-07 18:44:16 +03:00
juliancoffee
13324700ba
Post-cleaning
2022-04-07 18:44:16 +03:00
juliancoffee
faeac0eef3
Fully implement tests for new EntityConfig
2022-04-07 18:44:15 +03:00
