8757 Commits

Author SHA1 Message Date
Joshua Barretto
2d58650f51 Repaired common such that it works for plugin targets 2021-06-11 08:33:32 +01:00
Marcel
f6503364a6 Merge branch 'zesterer/small-fixes' into 'master'
Prevent creatures spawning in the ground

See merge request veloren/veloren!2418
2021-06-11 07:20:49 +00:00
Joshua Barretto
6dae58c8a6 Prevent creatures spawning in the ground 2021-06-11 07:09:58 +01:00
juliancoffee
193c961459 Make bow zoom less intense 2021-06-11 01:46:32 +03:00
juliancoffee
aa37bda44a fix Wet debuff image 2021-06-11 01:45:02 +03:00
juliancoffee
0940fe6ef5 Balanse fixes
- Make bow charge time even smaller and reduce damage/enery reward a little
- Buff staff firebomb
- Nerf spear dash
- Longer recover time of Tidal shockwaves and less knockback
- Nerf Tidal bubbles
2021-06-11 01:34:33 +03:00
juliancoffee
32e81f5d06 Add warnings about non-existent items in /kit 2021-06-11 01:33:47 +03:00
juliancoffee
2764dfbdc8 add new armour and legendary weapons to /kit 2021-06-11 01:33:18 +03:00
juliancoffee
67a03d9cd1 add temporary "middle" skill preset 2021-06-11 01:31:46 +03:00
juliancoffee
fb76c2a4c7 Split consumables to different tables in trading 2021-06-10 16:04:59 +03:00
João Capucho
40904130f6
Update wgpu and check for best swap chain format 2021-06-09 21:15:37 +01:00
Marcel
84a809df82 Merge branch 'jvck10-master-patch-73738' into 'master'
Small fixes to pt_br language.

See merge request veloren/veloren!2410
2021-06-09 20:01:49 +00:00
Marcel
efe7b628b4 Merge branch 'swilliams/more-collision-balancing' into 'master'
Fixed biped_small and humanoid hitboxes

See merge request veloren/veloren!2411
2021-06-09 15:44:00 +00:00
Marcel Märtens
e9f3c3c2a3 fix tracy-server compilation via cargo tracy-server 2021-06-09 17:17:37 +02:00
João Victor Cardoso Kdouk
38ab1e20dc Small fixes to pt_br language. 2021-06-09 14:36:10 +00:00
Scott Williams
3ac5f9a027 Fixed biped_small and humanoid hitboxes 2021-06-09 15:23:10 +01:00
Marcel
8792c18dea Merge branch 'tygyh/Extract-get-duration-image-from-update' into 'master'
Extract 'get_duration_image' function from 'update'

See merge request veloren/veloren!2407
2021-06-09 14:08:38 +00:00
Marcel
326daaab7b Merge branch 'tygyh/Extract-create-new-text-from-update' into 'master'
Tygyh/extract create new text from update

See merge request veloren/veloren!2408
2021-06-09 14:08:34 +00:00
juliancoffee
72bc681570 Move loot tables to entityconfigs
* Moved all entities in dungeons to assets
2021-06-09 15:37:04 +03:00
juliancoffee
14a99cd0e1 Move body to EntityConfig assets
* currently works only for random and random_with, uses FromStr for
NpcKind
2021-06-09 15:37:04 +03:00
juliancoffee
e6d7b70ee0 remove Mindflayer skillset 2021-06-09 15:37:04 +03:00
juliancoffee
f9575d7df0 Load skillsets from assets
Done:
    support loading from assets in skillset_builder.rs
    entity_config field with skillset asset field
    move every SkillSet config to assets
    tests for skillset assets
    tests for assets in entity configs
2021-06-09 15:37:04 +03:00
juliancoffee
1ff238037e SkillSetBuilder pre-refactoring 2021-06-09 15:37:04 +03:00
juliancoffee
c61cfac20c Post refactoring 2021-06-09 15:37:04 +03:00
juliancoffee
817ee2aa41 Fix issue with villagers not having any item 2021-06-09 15:37:04 +03:00
juliancoffee
e1c19f6c93 docs 2021-06-09 15:37:04 +03:00
juliancoffee
299d660857 Start to load EntityInfo from assets in dungeons
* All enemies in dungeons are now specify loadout_config, name and
main_tool in assets
* Add more variance to the enemies names
2021-06-09 15:37:04 +03:00
juliancoffee
6b487fbadf Split LodoutBuilder::build_loadout
LoadoutBuilder::build_loadout is a function which has four parameters
and 3 of them are Option<>, and although fourth (body) isn't Option<>,
it's optional too because it is used only in some combinations of
another arguments.

Because these combinations produces quirky code flow, it will be better
to split it to different methods.

So we did following changes to remove it and rewrite code that was using it
to use better methods.

* Introduce LoadoutPreset as new LoadoutConfig, currently it's only used
in Summon ability, because SummonInfo uses Copy and we can't specify
String for specifying asset path for loadout.
Everything else is rewritten to use asset path to create loadouts.

* More builder methods for LoadoutBuilder.
Namely:
    - from_default which is used in server/src/cmd.rs in "/spawn" command.
    - with_default_equipment, with_default_maintool to use default
    loadout for specific body
    - with_preset to use LoadoutPreset

* Add new make_loadout field with `fn (loadout_builder, trading_info) -> loadout_builder`
to EntityInfo which allows to lazily construct loadout without
modifying LoadoutBuilder code

* Fix Merchants not having trade site
We had heuristic that if something has Merchant LoadoutConfig - it's
merchant, which can be false, especially if we create Merchant loadout
lazily
As side note, we do same check for Guards and it fails too.

Too fix it, we introduce new agent::Mark, which explicitly specifies
kind of agent for entity

* `LoadoutBuilder::build_loadout` was written in a such way that depending
on main_tool you will have different loadout. Turns out it was this
way only for Adlets though and this behaviour is reproduced by specifying
different loadouts directly in world code.
2021-06-09 15:37:04 +03:00
juliancoffee
1973dcc8d2 Move traveler loadout declaration to asset
* New loadout/world/traveler.ron file to specify traveler loadout
* LoadoutBuilder::with_asset_expect now can use passed rng to choose
items
2021-06-09 15:37:03 +03:00
juliancoffee
07e01dc6c7 Rename LoadoutBuilder::apply_asset_expect
to LoadoutBuilder::with_asset_expect
2021-06-09 15:37:03 +03:00
juliancoffee
3d8807bcb1 EntityInfo assetization
* Rename skillset_config to skillset_preset
* Rename loadout_config to loadout_preset
* Add skillset_config for asset_specifier of skillset
* Add loadout_config for asset_specifier of loadout
2021-06-09 15:37:03 +03:00
juliancoffee
dd88aeb2bd Add entity template and make 'loadouts' singular 2021-06-09 15:37:03 +03:00
Dr. Dystopia
fc33e42c23 Extract 'create_new_text' function from 'update' 2021-06-09 13:35:41 +02:00
Dr. Dystopia
5e37995e7f Extract 'get_duration_image' function from 'update' 2021-06-09 13:09:31 +02:00
Marcel
1104dfc983 Merge branch 'aweinstock/recipe-graphviz' into 'master'
Add graphviz diagram generator for crafting recipes.

See merge request veloren/veloren!2401
2021-06-09 09:14:13 +00:00
Marcel
6928271319 Merge branch 'swilliams/collision-balance' into 'master'
NPC Hitbox Adjustments

See merge request veloren/veloren!2403
2021-06-09 08:08:44 +00:00
Scott Williams
207e10d890 NPC Hitbox Adjustments 2021-06-09 08:08:41 +00:00
Marcel
2c2d86a658 Merge branch 'slipped/smallfixes' into 'master'
small tweaks

See merge request veloren/veloren!2405
2021-06-09 07:39:01 +00:00
jshipsey
7c1798d71a small tweaks
t
2021-06-09 01:58:08 -04:00
Forest Anderson
b0cebd745c Merge branch 'sam/minotaur-anim-fix' into 'master'
Minotaur Anim Fix

See merge request veloren/veloren!2404
2021-06-09 01:59:54 +00:00
Sam
c7fbe0580b Fix 2021-06-08 20:12:42 -05:00
Marcel
0090347b08 Merge branch 'juliancoffee/asset_tweak_fix' into 'master'
serialize AssetTweakWrapper<T>, not just T

See merge request veloren/veloren!2402
2021-06-08 22:39:55 +00:00
juliancoffee
1d5c35a48b add asset_tweaks to unittests on CI 2021-06-08 23:00:59 +03:00
juliancoffee
6ffbbe85bd serialize AssetTweakWrapper<T>, not just T
asset_tweak::tweak_expect_or_create works by writing default data to
file and then read it as asset.
the problem is that it was writing T, and read AssetTweakWrapper<T>
which are different types.

Tests didn't handle case when you will load data back so bug was hidden.
2021-06-08 22:39:51 +03:00
Avi Weinstock
e9202024d7 Run clippy for graphviz target in CI and add instructions on how to consume the output. 2021-06-08 15:08:14 -04:00
Avi Weinstock
22ac7745b2 Add graphviz diagram generator for crafting recipes. 2021-06-08 14:42:51 -04:00
Marcel
a47aeb79be Merge branch 'xMAC94x/todo' into 'master'
add todo for clippy exception

See merge request veloren/veloren!2400
2021-06-08 14:24:41 +00:00
Marcel Märtens
c1740ed486 add todo for clippy exception 2021-06-08 15:45:46 +02:00
Marcel
ccf6f9023e Merge branch 'juliancoffee/asset_tweak' into 'master'
tweak_expect function to tweak values from .ron

See merge request veloren/veloren!2391
2021-06-08 11:37:01 +00:00
juliancoffee
e5d2c66cb8 put serde behind feature gate 2021-06-08 14:03:15 +03:00