IsseW
87821d5c1d
force update counter
2022-08-09 19:22:09 +02:00
Imbris
d5b59c2bb7
Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage
2022-08-08 00:38:20 -04:00
Sam
28a4ce9be1
Various tweaks
2022-07-26 19:44:49 -04:00
Forest Anderson
67534488b3
Merge branch 'tygyh/CleanUp' into 'master'
...
Tygyh/clean up
See merge request veloren/veloren!3480
2022-07-17 14:04:45 +00:00
Youssef Fahmy
91c85dea22
Humanoid Model Overhaul
2022-07-16 11:13:24 +00:00
tygyh
120ee6b6c0
Fix typos
2022-07-15 18:59:37 +02:00
tygyh
cbe4d9d807
Remove unused imports
2022-07-15 16:00:27 +02:00
tygyh
fefe745508
Reorder impl member order to match trait member order
2022-07-15 15:54:32 +02:00
tygyh
5e5698249b
Remove unnecessarily qualified paths
2022-07-15 14:49:46 +02:00
Christof Petig
bb952fe755
rustfmt the last cleanup
2022-07-13 23:38:11 +02:00
Christof Petig
edfe6d887e
final polish
2022-07-13 23:32:20 +02:00
Christof Petig
eab062450a
clippy helped to get rid of one level of indirection
2022-07-13 23:27:17 +02:00
Christof Petig
d2aa9028ec
clippy is right about this flat_map
2022-07-13 23:17:22 +02:00
Christof Petig
197f84a360
returning a vec creates much more readable code
2022-07-13 23:03:58 +02:00
Christof Petig
3bdeb77268
Full support for modular weapon in loot table read
2022-07-13 22:56:52 +02:00
Christof Petig
a0749ac9bc
test passes, not happy with implementation yet
2022-07-13 20:15:28 +02:00
Christof Petig
5bbb73bc17
changelog + remove dead code, but the test still fails
2022-07-13 20:15:28 +02:00
Christof Petig
5ee72f8a5e
fix test; add tusk, crest, pincer
2022-07-13 20:15:28 +02:00
Christof Petig
8c5901516e
clean up
2022-07-13 20:15:28 +02:00
Christof Petig
7a1218cf2f
make a recipe of all modular weapons
2022-07-13 20:15:28 +02:00
Christof Petig
3a7835c6d0
replace one Owned reference by the normal Reference type
2022-07-13 20:15:28 +02:00
Avi Weinstock
cea2550dde
Add Item::new_from_item_definition_id.
2022-07-13 20:15:28 +02:00
Christof Petig
7e5ebada2d
still incomplete but looks surprisingly usable
2022-07-13 20:15:28 +02:00
Christof Petig
33a01a0dab
fix compilation of example
2022-07-13 20:15:28 +02:00
Christof Petig
2b2ac20403
use ItemDefintionId across trade_pricing
2022-07-13 20:15:27 +02:00
Avi Weinstock
27d2cdeb79
WIP modular weapon pricing.
2022-07-13 20:15:27 +02:00
Socksonme
6a355c58f2
Remove instance from PoiseChange
2022-06-29 18:36:05 +03:00
Socksonme
2c5fd06d0b
Address review
...
- Change hp_pulse to not be framerate dependent
- Change some of the HpFloater checks to be inside the find() function
- Remove unnecessary join
- Add back option for showing incoming damage + add option for
experience accumulation
- Change `ExpFloater`s to not store the owner, as they are only shown
for the player (will have to see if the implementation is correct so
that it may be applied to the other floaters)
- Rename `Outcome::Damage` to `Outcome::HealthChange` and `DamageInfo`
to `HealthChangeInfo`
- Update some outdated comments/documentation
2022-06-29 17:31:58 +03:00
socksonme
eabbfe6a51
Remove damage batch option + crit_mult
2022-06-29 17:31:54 +03:00
socksonme
0e84794217
change font size formula to not use crit_mult + use ints for change by check
2022-06-29 17:31:43 +03:00
socksonme
3d2dcbf894
Revert some changes
2022-06-29 17:31:43 +03:00
socksonme
559d5ca804
Some changes to DamageSources + various code qual changes
2022-06-29 17:31:43 +03:00
socksonme
5360a7c93e
Tons of code quality changes, added damage rounding option
2022-06-29 17:31:37 +03:00
socksonme
64f0f05608
Fixed bug with healing above 5.0 and preparing for options
2022-06-29 17:31:10 +03:00
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
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
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
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
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
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
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
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
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
