Commit Graph

967 Commits

Author SHA1 Message Date
Avi Weinstock
cb0566299a Make tornado (and empty models in general) work on WGPU. 2021-06-15 09:49:13 +02:00
Snowram
97ce50e5d4 Add troll variants and roc npcs 2021-06-15 09:49:13 +02:00
Marcel
bc68168801 Merge branch 'dungeon_voxel_export' into 'master'
Add dungeon shape to MagicaVoxel export example

See merge request veloren/veloren!2412
2021-06-14 15:07:25 +00:00
Marcel
b0702d792a Merge branch 'juliancoffee/asset_entity' into 'master'
EntityInfo assetization.

See merge request veloren/veloren!2382
2021-06-14 12:56:28 +00:00
Vincent Junge
a77b156cd2 Added dungeon shape to MagicaVoxel export example 2021-06-14 14:43:00 +02:00
Marcel Märtens
4167621f5d Change the version number to 0.10 2021-06-12 10:14:07 +02:00
Joshua Barretto
358f9f268d Prevent creatures spawning in the ground 2021-06-11 07:09:58 +01:00
juliancoffee
057aa7fecf Move loot tables to entityconfigs
* Moved all entities in dungeons to assets
2021-06-09 15:37:04 +03:00
juliancoffee
a4cc1e24ee 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
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
juliancoffee
c3a120c551 Post refactoring 2021-06-09 15:37:04 +03:00
juliancoffee
f5bf991eb0 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
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
Marcel
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
jshipsey
acf9111141 mig fix 2021-06-07 08:32:59 -04:00
Marcel Märtens
7185dcee68 switch to hashbrown 0.11 and specs 0.16.2 2021-06-07 13:01:01 +02:00
jshipsey
4deeb42155 cave adjustments 2021-06-07 11:02:34 +02:00
jshipsey
1d23b7aebf finalize stats
t
2021-06-07 11:02:03 +02:00
jshipsey
9034d0f25d comment addressing, cave tweaks 2021-06-07 11:01:46 +02:00
jshipsey
7a573efab7 proper recipes, tanning racks, various fixes 2021-06-07 11:00:14 +02:00
jshipsey
8acd3832e3 more loot tables, overworld ores, more items 2021-06-07 11:00:00 +02:00
jshipsey
05de96c94b ore deposits, flower drops 2021-06-07 10:59:50 +02:00
jshipsey
1c17d8fe5e cave changes 2021-06-07 10:59:44 +02:00
jshipsey
754b60d810 crafting stations 2021-06-07 10:59:35 +02:00
Imbris
23eca4c3f6 Re-disable incremental just for common-systems, small fix in plugin
crate, more new clippy fixes
2021-05-31 20:44:57 -04:00
Imbris
48ebb10d50 Update toolchain 2021-05-31 20:44:57 -04:00
Avi Weinstock
5380fc4eac Clear the economy database when creating it. 2021-05-28 16:14:31 -04:00
Avi Weinstock
3684cf0454 Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns.
Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).
2021-05-28 15:09:29 -04:00
juliancoffee
6f0f3d1b62 Refactor enemy creation in dungeons 2021-05-26 01:39:48 +03:00
juliancoffee
940655dcb6 Adding different chests for each dungeon 2021-05-24 23:00:44 +03:00
juliancoffee
22b1880ae5 LoadoutBuilder efactoring 2021-05-23 20:29:19 +03:00
juliancoffee
12d4afd3a5 fmt 2021-05-23 01:04:11 +03:00
juliancoffee
66709c4d17 Adjust mob numbers and add /kit tier-0 2021-05-23 01:04:11 +03:00
juliancoffee
4156f373c1 Adjust loot tables
- Add regular drop to T5 miniboss
- Fixup cultist loot table
- Give own loot table to Deadwood in T0
2021-05-23 01:04:11 +03:00
juliancoffee
a1037501e2 Edit minibosses in lower tiers
- Deadwood to T0 (instead of bonerattlers)
- Rats to T1 (instead of bonerattlers)
- Bonerattlers to T3 (instead of hakulaqs, it's still placeholder)
2021-05-23 01:04:05 +03:00
Monty Marz
30bcc6aaa3 Ferocious armour for t5-dungeon minibosses 2021-05-22 10:55:36 +00:00
juliancoffee
849d51aaa3 Add note to tests 2021-05-21 19:33:31 +03:00
juliancoffee
5d86850291 fmt 2021-05-21 11:36:48 +03:00
juliancoffee
df58fa9acf Fixing loot tables
- Use quad_low and quad_medium loot table for corresponding mobs in
dungeons
- Remove cultist loot table from T3-T4 loot tables
- Use resize instead of vec[obj; len] to create different loot and not
duplicated for miniboss_1
2021-05-21 11:31:39 +03:00
juliancoffee
e48e3e11ba Give bosses own creation function and loot table
- Make goose miniboss fallback to differentiate bosses and minibosses
2021-05-21 11:01:47 +03:00
Sam
9bbdc26089 Added haniwa sentries to level 3 dungeons. 2021-05-10 18:53:50 -05:00
Sam
c67c56d194 Dungeon placement. Tweaks to melee. 2021-05-10 18:53:47 -05:00
Illia Denysenko
cb2412148b Miniboss Loot quickfix 2021-05-09 21:29:35 +00:00
Marcel
eb3cc2fd22 Merge branch 'aweinstock/heightmap_visualization' into 'master'
Add heightmap visualization to world/examples.

See merge request veloren/veloren!2246
2021-05-08 16:02:11 +00:00
Avi Weinstock
560c58663e Add max-convolution to heightmap visualization, and specify required-features for it to make CI work. 2021-05-08 11:19:37 -04:00
juliancoffee
9ed15105c5 Transer Animal Trainers to lvl5 dungeons 2021-05-07 14:50:03 +03:00
Marcel Märtens
76319cb260 cleanup some unused functions, which were exported but never used 2021-05-04 22:13:04 +02:00
Marcel Märtens
6e3a74b476 rayon::join creates a global threadpool, which is only used in /world
instead just use the same threadpool for everything
helps with debugging problems with GDB
using threadpool.install() to also be used when `into_par_iter()` is called
2021-05-04 21:06:07 +02:00
Avi Weinstock
a8a89cd6d3 Add heightmap visualization to world/examples. 2021-05-03 16:05:05 -04:00
Avi Weinstock
be39054767 Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic. 2021-05-03 00:09:44 -04:00