Commit Graph

267 Commits

Author SHA1 Message Date
Imbris
251c201604 Merge branch 'revert-eb08b6a1' into 'master'
Revert "Resolve all '#[allow(clippy::approx_constant)]' error supressions" and re-address the lint using just the PI constant

See merge request veloren/veloren!2639
2021-07-18 08:00:43 +00:00
Imbris
9c72333741 Revert "Merge branch..."
This reverts merge request !2608
2021-07-17 22:04:59 +00:00
Dr. Dystopia
52b4192dbd Resolve all '#[allow(clippy::logic_bug)]' error supressions 2021-07-17 17:27:44 +02:00
Jonathan Berglin
b88c23e74f Resolve all '#[allow(clippy::if_same_then_else)]' error supressions 2021-07-15 21:07:55 +00:00
Jonathan Berglin
c1c331d59e Resolve all '#[allow(clippy::approx_constant)]' error supressions 2021-07-15 16:56:55 +00:00
Marcel
ad2cf88e33 Merge branch 'tygyh/Resolve-all-'#-allow(clippy--int_plus_one)]'-error-supressions' into 'master'
Resolve all '#[allow(clippy::int_plus_one)]' error supressions

See merge request veloren/veloren!2606
2021-07-15 13:35:28 +00:00
Dr. Dystopia
5cc2fc8182 Resolve all '#[allow(clippy::or_fun_call))]' error supressions 2021-07-15 13:49:59 +02:00
Dr. Dystopia
d10cb2f161 Resolve all '#[allow(clippy::int_plus_one)]' error supressions 2021-07-15 12:47:57 +02:00
juliancoffee
1ed9d8d455 (fix) Use backpack item for merchant's ingredients 2021-07-05 18:49:25 +03:00
juliancoffee
dd2d0a98fb Improve Merchant inventory from UX perspective
Changes:
- Make it use red bags with 18 slots (2 rows * 9)
- Sort items by quality
- Stack ingredients, food, potions
- Move coins to ingedients bag and put it first
- Filter unconsumed good (case when you saw 16 rugged shirts)

Refactoring:
- Split bag creation to separate functions
2021-07-03 22:16:06 +03:00
Avi Weinstock
19979413d5 Convert dungeon lights to CSG, tweak pillars, convert the magic circle from lava to glowing rock, make enemies spawn in dungeons, and fix clippy warnings. 2021-06-24 23:03:24 -04:00
Avi Weinstock
c8383aba38 Traverse the dungeon tile structure to create the rooms, and align the stairs. 2021-06-23 23:22:14 -04:00
Avi Weinstock
c6bb61f2e6 Add Primitive::Prefab and Fill::Prefab for coloring dungeon entrances. 2021-06-23 23:22:14 -04:00
Avi Weinstock
df4f536523 Progress on converting dungeons to site2. Adds Sampling and Translate primitives. 2021-06-23 23:22:14 -04:00
Dominik Broński
b046541b69 Merge branch 'christof/trade_optimization' into 'master'
Accelerate econsim using arrays instead of hashmaps

See merge request veloren/veloren!2216
2021-06-20 16:00:37 +00:00
Christof Petig
79d7e79776 Accelerate econsim using arrays instead of hashmaps 2021-06-20 16:00:37 +00:00
juliancoffee
0ec6a4e5ff Create distribution map for dungeons
* tl;dr T0 - 27%, T1/T2 - 22%, T3/T4 - 11%, T5 - 5%.
Before every dungeon had 16% chance to be created.
2021-06-20 00:14:54 +03:00
juliancoffee
e5c63b2ca7 Add config file for dungeon distribution
- Now you can specify probability of "spawn" of dungeon with specific
difficulty
2021-06-19 23:26:13 +03:00
juliancoffee
7bf8c67808 Don't spawn enemies in boss room 2021-06-19 10:47:45 +03: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
Vincent Junge
a77b156cd2 Added dungeon shape to MagicaVoxel export example 2021-06-14 14:43:00 +02: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
jshipsey
4deeb42155 cave adjustments 2021-06-07 11:02:34 +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
754b60d810 crafting stations 2021-06-07 10:59:35 +02: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
juliancoffee
9ed15105c5 Transer Animal Trainers to lvl5 dungeons 2021-05-07 14:50:03 +03:00
Monty
86445af09c change cauldron spawning
cooking pot height
fmt
fmt, changelog
2021-04-20 02:48:13 +02:00
Monty
a4d56e7843 more sprite stuff and crafting UI update
fix item images
fix CR display
2021-04-20 02:46:06 +02:00