1678 Commits

Author SHA1 Message Date
Ben Wallis
925a174205 Merge branch 'xvar/fix-plugin-build-warnings' into 'master'
Fixed build warnings for server-cli related to non-default plugin feature

See merge request 
2021-06-26 21:35:54 +00:00
Ben Wallis
ed9c619822 Fixed build warnings for server-cli related to non-default plugin feature 2021-06-26 21:56:03 +01:00
Avi Weinstock
bea9de0d46 Rename remove_warlock_warlord migration so it actually triggers. 2021-06-26 16:28:49 -04:00
Daan Vanoverloop
7d39c14481 Fixing - use strum macros for BlockKind conversion 2021-06-26 17:52:32 +02:00
Snowram
3b393a9c5c Ajust new npcs from feedback 2021-06-25 03:26:32 +02:00
Snowram
f518aebe81 Ajustments to new npcs 2021-06-24 19:31:21 +02:00
Snowram
38c9ff5225 Husk brute animations 2021-06-24 19:31:19 +02:00
Snowram
080328941b Adds alpaca and llama npcs 2021-06-24 19:30:15 +02:00
Snowram
78afaf32a2 Removes warlord and warlock armours 2021-06-24 19:30:11 +02:00
Sam
e93c981ed5 Balance tweaks for harvester. 2021-06-23 22:38:16 -05:00
Sam
d46aa358c8 Harvester AI 2021-06-23 22:38:16 -05:00
Sam
cc748c0a3f Ensnaring vines now ensnare you. 2021-06-23 22:38:16 -05:00
Sam
c326df0b88 Slightly functional sprite summon. 2021-06-23 22:38:16 -05:00
Marcel
1de3dd515c Merge branch 'imbris/tracy' into 'master'
Refactor Client message handling, improve use of tracy, increase coverage of profiling spans in voxygen

See merge request 
2021-06-20 23:17:08 +00:00
Christof Petig
11d9b93684 Accelerate econsim using arrays instead of hashmaps 2021-06-20 16:00:37 +00:00
Imbris
156e2e86b5 Remove tracy features that are no longer needed now that macros have been fixed 2021-06-19 04:27:50 -04:00
juliancoffee
0ac97ed156 Nerf golem laser dmg and ori_rate, make it fire
+ Make laser state duration lower
2021-06-19 10:47:45 +03:00
juliancoffee
27e309fb19 Use Golem Shockwave only after loosing 30% health
+ Make shockwave buildup longer
2021-06-18 22:32:43 +03:00
Joshua Barretto
c3c8fcc54a Renamed command event 2021-06-18 11:31:06 +01:00
Joshua Barretto
e2f558dacd Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients 2021-06-17 19:55:21 +01:00
DaforLynx
fd2094ca3d Added npc hurt sfx 2021-06-17 05:49:09 +00:00
jshipsey
a98734d609 buffs to stretch progression 2021-06-16 20:50:46 -04:00
Joshua Barretto
0c925ea03e Added more cow noises, prepare for merge 2021-06-16 17:23:54 +01:00
Joshua Barretto
93affee6ac Significantly more efficient sound effect processing, more NPC sounds 2021-06-16 17:23:22 +01:00
Joshua Barretto
19dd62a887 More voice kinds, more opportunities for sounds 2021-06-16 17:23:22 +01:00
Joshua Barretto
0a8d4af404 VoiceKind for better sound effect specs 2021-06-16 17:23:22 +01:00
Joshua Barretto
64e79b5659 Chasing sounds 2021-06-16 17:23:22 +01:00
Snowram
e2b26dc0ef Addresses comments about roc AI 2021-06-15 09:50:23 +02:00
Snowram
e32c103e9a Makes summon range inclusive 2021-06-15 09:49:13 +02:00
Avi Weinstock
a5ff4be601 Make tornado (and empty models in general) work on WGPU. 2021-06-15 09:49:13 +02:00
Snowram
aa62ad8bc0 Tornado summoning attack 2021-06-15 09:49:13 +02:00
Snowram
3df69ba11d Add troll variants and roc npcs 2021-06-15 09:49:13 +02:00
Marcel
27e0b17651 Merge branch 'aweinstock/mining-skill-tree' into 'master'
Mining skill tree.

See merge request 
2021-06-14 14:19:06 +00:00
Marcel
f41bedc02c Merge branch 'juliancoffee/asset_entity' into 'master'
EntityInfo assetization.

See merge request 
2021-06-14 12:56:28 +00:00
Monty Marz
8466df5078 mining exp sct color and icon; add mining to skill_preset 2021-06-13 14:34:42 -04:00
Avi Weinstock
4bd989e2a5 Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange. 2021-06-13 14:34:42 -04:00
Monty Marz
c34fa59a08 icons and naming 2021-06-13 14:34:42 -04:00
Avi Weinstock
667e5eb510 Mining skill tree. 2021-06-13 14:34:42 -04:00
Marcel Märtens
d291a71f79 Change the version number to 0.10 2021-06-12 10:14:07 +02:00
Forest Anderson
f8dae445aa Merge branch 'juliancoffee/small_fixes' into 'master'
Ranged, Tidal Warrior, spears, assets

See merge request 
2021-06-11 17:46:56 +00:00
juliancoffee
9a8ae64f4c adjust staff firebomb 2021-06-11 15:41:38 +03:00
juliancoffee
32e81f5d06 Add warnings about non-existent items in /kit 2021-06-11 01:33:47 +03:00
Marcel Märtens
e9f3c3c2a3 fix tracy-server compilation via cargo tracy-server 2021-06-09 17:17:37 +02: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
c61cfac20c Post refactoring 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
Marcel
3520a3afed Merge branch 'xMAC94x/hashbrown' into 'master'
switch to hashbrown 0.11 and specs 0.16.2

See merge request 
2021-06-07 14:31:58 +00:00
jshipsey
5ef6bff0f2 mig fix 2021-06-07 08:32:59 -04:00
Marcel Märtens
4c29484f22 switch to hashbrown 0.11 and specs 0.16.2 2021-06-07 13:01:01 +02:00