Commit Graph

1579 Commits

Author SHA1 Message Date
b08a501aef Cleaned up ready for merge 2022-07-16 11:09:35 +01:00
120ee6b6c0 Fix typos 2022-07-15 18:59:37 +02:00
26202c294f Better biome distribution 2022-07-15 17:53:24 +01:00
abdd5e3906 Lift return out of if-statements 2022-07-15 16:36:11 +02:00
fb7bdd8bf8 Fix deprecated imports 2022-07-15 16:17:19 +02:00
cbe4d9d807 Remove unused imports 2022-07-15 16:00:27 +02:00
997a572647 Simplify assertions 2022-07-15 15:52:52 +02:00
5b8bdb9c9c Cave entity spawns 2022-07-15 14:15:42 +01:00
5e5698249b Remove unnecessarily qualified paths 2022-07-15 14:49:46 +02:00
4ca1c9ddf4 Gems and ores 2022-07-15 08:43:35 +01:00
1a3b1e48da Better cave shape variety 2022-07-15 08:43:35 +01:00
f4e50d18df Better ice 2022-07-15 08:43:35 +01:00
a9c9a9d0d2 Ice caves 2022-07-15 08:43:35 +01:00
e97d58011e Made trees and cave entrances play better 2022-07-15 08:43:35 +01:00
629c4dbdb7 Prevented cave/water intersection 2022-07-15 08:43:35 +01:00
f3cfff424d Distinct mushroom and leafy biomes 2022-07-15 08:43:34 +01:00
7353c6f02b Better mushroom placement 2022-07-15 08:43:34 +01:00
a39901d24c Better cave entrance locations 2022-07-15 08:43:34 +01:00
9ad32b37e7 More efficient texture fetches 2022-07-15 08:43:34 +01:00
07fc53f9bc No walls outside caves 2022-07-15 08:43:34 +01:00
2694f5f917 Fixed lava 2022-07-15 08:43:34 +01:00
07ba4dcc33 Fixed particles for non-body entities, AO for non-volumetric illumination 2022-07-15 08:43:34 +01:00
b5662163f0 Better lighting and verticality in caves 2022-07-15 08:43:33 +01:00
7463acc641 Moonbells in caves 2022-07-15 08:42:56 +01:00
af10a3e6da No biomes near cave entrance 2022-07-15 08:42:56 +01:00
b40095d867 Better mushroom cave biome 2022-07-15 08:42:56 +01:00
1f979e4133 More biomes 2022-07-15 08:42:56 +01:00
418839ee20 Biome improvements 2022-07-15 08:42:56 +01:00
c6564e2c59 Better cave biomes 2022-07-15 08:42:56 +01:00
2cce44fc36 Began work on caves2 2022-07-15 08:42:56 +01:00
7a1218cf2f make a recipe of all modular weapons 2022-07-13 20:15:28 +02:00
2b2ac20403 use ItemDefintionId across trade_pricing 2022-07-13 20:15:27 +02:00
e4909650e1 update hashbrown, specs, and tracy 2022-07-06 15:41:59 +02:00
273c5ed2f0 Temporary noise solution 2022-07-04 18:07:00 +02:00
fddc97bc77 Merge branch 'tweaks' into 'master'
tweaks entity stats

See merge request veloren/veloren!3437
2022-06-29 19:29:38 +00:00
d1c80f0b25 #1455 | Sprites now only spawn on designated block types 2022-06-20 19:24:51 +00:00
25eed55ca9 stat tweaks to theropod, arthropods and basilisk 2022-06-19 01:35:18 +02:00
179bf7216e Merge branch 'tormod/remove-size' into 'master'
Remove site size from site suitability function.

See merge request veloren/veloren!3427
2022-06-10 18:12:59 +00:00
1c5cb8abcd follow the more elegant proposal by clippy 2022-06-07 23:37:51 +02:00
fca4372205 avoid economy of scale in economy_tree 2022-06-07 21:46:41 +02:00
5a965d21c7 replace vector copying with an iterator 2022-06-07 21:38:17 +02:00
db85d2a146 fix clippy 2022-06-07 18:30:05 +02:00
6d3ea3172c separate orders by professions and everyone
cleanup and fix
strictly this population growth logic is wrong, but identical to the existing one
standardize on production, remove more dead code
fix example + rustfmt
separate csv logic from tick (intention is to move it into economy)
remove the format call from economy (inactive debugging code)
remove more formatting
rustfmt
small clippy fix
Reduce precision on output
move csv code
move rest of sim2 mod into economy (context)
remove more unused parts
keep things a bit more coherent
remove pub
make more functions and fields private
remove outdated input, fix other, print names, move output to proper abstraction
remove dead code
2022-06-07 18:30:05 +02:00
edffd576d4 only the code move part of shredded_economy4 2022-06-07 18:30:05 +02:00
08ffcdf5a5 Create temperature requirement for giant tree.
Since the giant tree is currently a leafy tree, it looks a bit out
of place in colder regions where there's otherwise only pine trees.
2022-06-07 00:32:46 +02:00
c1335e16fe Remove site size from site suitability function.
This was buggy, in that the requirement was for _any_ chunk
in the site area being suitable as opposed to _all_ chunks
in the site being suitable. This is easy to fix, but we don't
always want to have exactly the same criteria for the center
of a site as for the outskirts of it.

This should fix gnarling forts etc. spawning in the water just
off the shore.
2022-06-07 00:27:37 +02:00
59d876a654 pass humidity to meta, move smoke cycle to separate file 2022-06-01 22:13:34 +02:00
3fc59d7e4d lower trading output to trace (and raise one to warn) 2022-05-29 19:09:52 +02:00
47a7943cc2 Merge branch 'upgrade_assets_manager' into 'master'
Upgrade `assets_manager` to `0.8.0` and `image` to `0.24`

See merge request veloren/veloren!3410
2022-05-28 22:41:23 +00:00
69041137a0 reduced bamboo spawn rates 2022-05-28 18:04:06 -04:00