Commit Graph

292 Commits

Author SHA1 Message Date
Christof Petig
be1a9050a4 make Christmas decoration unconditional for now 2021-12-20 18:06:57 +00:00
Joshua Barretto
6e97e3179d Slippery ice 2021-12-20 18:03:52 +00:00
Jonathan Berglin
596307c9b7 Remove unused clippy suppressions 2021-12-05 17:59:02 +00:00
Jonathan Berglin
d9dd49552b Tygyh/resolve all '# allow(clippy needless update)]' error supressions 2021-11-29 09:32:55 +00:00
Joshua Barretto
0cb88139c9 Made merchants work in new sites 2021-11-01 22:19:49 +00:00
Joshua Barretto
4acffb9cfb New CSG API for site2 2021-11-01 22:19:49 +00:00
Joshua Barretto
e3ab8fc8ce Added rtsim merchants to site2 2021-11-01 22:19:49 +00:00
Sam
ad257410e9 Merchants now have less potion stock. 2021-10-29 19:58:38 -04:00
Monty Marz
727295aec1 text and alignment WIP 2021-10-27 17:02:35 -04:00
Monty Marz
7aae35f286 bench 2021-10-27 17:02:31 -04:00
MohammadHasanKargar
c82b3859e0 Deleting extra grasses on the air 2021-10-15 19:09:36 +03:30
Marcel Märtens
e36eef99c8 apply some clippy fixes that comes with the new toolchain version 2021-09-24 23:18:18 +02:00
juliancoffee
f810af4eec Rename EntityInfo level field to health_scaling 2021-09-17 20:12:42 +03:00
jshipsey
3c623c6801 address comments, boost village pop, lower raid chance 2021-09-06 00:01:26 -04:00
jshipsey
da9585205c buff guards 2021-09-05 23:17:14 -04:00
Joshua Barretto
9ac5e555e6 Improved giant trees 2021-08-30 00:03:16 +01:00
Joshua Barretto
98f4e95111 Improved giant trees 2021-08-29 14:37:11 +01:00
Avi Weinstock
516ad1c772 Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions"
This reverts commit 63eff216f0.
2021-07-25 12:28:25 -04:00
Jonathan Berglin
cd2992afd3 Tygyh/resolve clippy error supressions 2021-07-25 15:35:14 +00:00
Jonathan Berglin
b15f426ee5 Resolve all approved error supressions 2021-07-18 17:11:46 +00:00
Samuel Keiffer
37147e2a83 Merge branch 'juliancoffee/overworld_assetization' into 'master'
Wildlife assetization

See merge request veloren/veloren!2591
2021-07-18 13:43:32 +00:00
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
juliancoffee
c999720dbf adress review 2021-07-17 15:37:31 +03:00
juliancoffee
fa34739ed6 clippy 2021-07-17 15:37:31 +03:00
juliancoffee
23a020f602 Add Automatic NameKind to EntityConfig
+ add animal entities for wildlife spawns
2021-07-17 15:37:31 +03:00
juliancoffee
d920f911a2 Add Exact body field for EntityConfig
Add Alignment field to EntityConfig

+ Migrate to specifying alignment and body in entity assets
+ Make Body required field (with Uninit if you want to specify it later)
2021-07-17 15:37:30 +03: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