Commit Graph

1674 Commits

Author SHA1 Message Date
ef6d6563ea Ajust new npcs from feedback 2021-06-25 03:26:32 +02:00
d7f25627ab Ajustments to new npcs 2021-06-24 19:31:21 +02:00
8760b69345 Husk brute animations 2021-06-24 19:31:19 +02:00
58b95d12d4 Adds alpaca and llama npcs 2021-06-24 19:30:15 +02:00
fef0f407d3 Removes warlord and warlock armours 2021-06-24 19:30:11 +02:00
Sam
68c6a0a495 Balance tweaks for harvester. 2021-06-23 22:38:16 -05:00
Sam
c162827f97 Harvester AI 2021-06-23 22:38:16 -05:00
Sam
763461ebef Ensnaring vines now ensnare you. 2021-06-23 22:38:16 -05:00
Sam
ed503236d6 Slightly functional sprite summon. 2021-06-23 22:38:16 -05:00
b0574b4ddc Merge branch 'imbris/tracy' into 'master'
Refactor Client message handling, improve use of tracy, increase coverage of profiling spans in voxygen

See merge request veloren/veloren!2479
2021-06-20 23:17:08 +00:00
79d7e79776 Accelerate econsim using arrays instead of hashmaps 2021-06-20 16:00:37 +00:00
659b42e813 Remove tracy features that are no longer needed now that macros have been fixed 2021-06-19 04:27:50 -04:00
573607c32a Nerf golem laser dmg and ori_rate, make it fire
+ Make laser state duration lower
2021-06-19 10:47:45 +03:00
36fa8bf4f7 Use Golem Shockwave only after loosing 30% health
+ Make shockwave buildup longer
2021-06-18 22:32:43 +03:00
294b6e394a Renamed command event 2021-06-18 11:31:06 +01:00
96cbf60c3f Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients 2021-06-17 19:55:21 +01:00
9a5b95bc16 Added npc hurt sfx 2021-06-17 05:49:09 +00:00
0941f03608 buffs to stretch progression 2021-06-16 20:50:46 -04:00
b8749dc219 Added more cow noises, prepare for merge 2021-06-16 17:23:54 +01:00
9510869870 Significantly more efficient sound effect processing, more NPC sounds 2021-06-16 17:23:22 +01:00
e3c44ba7fe More voice kinds, more opportunities for sounds 2021-06-16 17:23:22 +01:00
0ef29a6989 VoiceKind for better sound effect specs 2021-06-16 17:23:22 +01:00
559311e1b0 Chasing sounds 2021-06-16 17:23:22 +01:00
8351aab25d Addresses comments about roc AI 2021-06-15 09:50:23 +02:00
f2c7836161 Makes summon range inclusive 2021-06-15 09:49:13 +02:00
cb0566299a Make tornado (and empty models in general) work on WGPU. 2021-06-15 09:49:13 +02:00
3ba0500b90 Tornado summoning attack 2021-06-15 09:49:13 +02:00
97ce50e5d4 Add troll variants and roc npcs 2021-06-15 09:49:13 +02:00
4cafdb3bfd Merge branch 'aweinstock/mining-skill-tree' into 'master'
Mining skill tree.

See merge request veloren/veloren!2406
2021-06-14 14:19:06 +00:00
b0702d792a Merge branch 'juliancoffee/asset_entity' into 'master'
EntityInfo assetization.

See merge request veloren/veloren!2382
2021-06-14 12:56:28 +00:00
45f79059d0 mining exp sct color and icon; add mining to skill_preset 2021-06-13 14:34:42 -04:00
9d4a65e8ac Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange. 2021-06-13 14:34:42 -04:00
01a04a80fa icons and naming 2021-06-13 14:34:42 -04:00
0e394029de Mining skill tree. 2021-06-13 14:34:42 -04:00
4167621f5d Change the version number to 0.10 2021-06-12 10:14:07 +02:00
f578c56db7 Merge branch 'juliancoffee/small_fixes' into 'master'
Ranged, Tidal Warrior, spears, assets

See merge request veloren/veloren!2416
2021-06-11 17:46:56 +00:00
6c11aa80e0 adjust staff firebomb 2021-06-11 15:41:38 +03:00
5084548b53 Add warnings about non-existent items in /kit 2021-06-11 01:33:47 +03:00
005f528e25 fix tracy-server compilation via cargo tracy-server 2021-06-09 17:17:37 +02:00
0c9f05b8d1 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
c3a120c551 Post refactoring 2021-06-09 15:37:04 +03:00
5f3eaddb70 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
aad65c6159 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
7e8bebdfa1 Merge branch 'xMAC94x/hashbrown' into 'master'
switch to hashbrown 0.11 and specs 0.16.2

See merge request veloren/veloren!2390
2021-06-07 14:31:58 +00:00
acf9111141 mig fix 2021-06-07 08:32:59 -04:00
7185dcee68 switch to hashbrown 0.11 and specs 0.16.2 2021-06-07 13:01:01 +02:00
f2eedf81f4 Merge branch 'imbris/648-cleanup' into 'master'
Make handling of shortcut keywords for commands clearer and revise a TODO...

Closes #648

See merge request veloren/veloren!2387
2021-06-07 10:27:54 +00:00
4deeb42155 cave adjustments 2021-06-07 11:02:34 +02:00
9034d0f25d comment addressing, cave tweaks 2021-06-07 11:01:46 +02:00
5fdb2ac01d migration 2021-06-07 11:01:04 +02:00