Joshua Yanovski
e9a463d459
Revert "Merge branch 'xMAC94x/update-deps' into 'master'"
...
This reverts merge request !3608
2022-09-15 18:51:48 +00:00
Joshua Yanovski
cafdcad8ce
Merge branch 'sharp/improve-msg' into 'master'
...
Improve some server system performance
See merge request veloren/veloren!3614
2022-09-15 04:30:31 +00:00
Joshua Yanovski
2c15d0af56
Reduce overhead of messaging systems.
2022-09-14 21:04:53 -07:00
flo
dc688bccb9
fix_salamander_and_elbst
2022-09-13 17:32:53 +00:00
Marcel Märtens
a32b269252
steal sharps clippy improvements to the old nightly
2022-09-11 16:10:56 +02:00
Joshua Yanovski
986d104faa
Update Rust toolchain.
2022-09-08 15:43:53 -07:00
Marcel Märtens
d9e6f10688
update dependencies
2022-09-08 23:29:08 +02:00
kitswas
c6efafd214
Flax spawn fix
...
Flax now does not grow in the flood plains and extreme altitudes.
Lowered the humidity requirement.
Made Flax density vary by altitude.
Flax temperature changed.
2022-08-31 11:30:37 +05:30
kitswas
1064055bb2
Cotton spawn fix
...
Cotton now grows in low altitudes only. (mostly near rivers and lakes)
Density increased to compensate for the reduction in growable area.
Cotton Soil and Temperature changed.
Made patch density vary by altitude.
2022-08-31 11:30:37 +05:30
kitswas
c0911707e5
Added helper function density_factor_by_altitude
2022-08-31 11:30:37 +05:30
Christof Petig
863f9857b5
cargo fmt
2022-08-30 00:37:38 +02:00
Christof Petig
04b7090197
handle terrain more correctly
2022-08-30 00:37:38 +02:00
Christof Petig
fbe0aee40d
move trading good properties (decay, transportation) from hard coded to ron file
2022-08-30 00:37:38 +02:00
flo666
87bac7c24a
- remove barriers in chapel tube & tower tube
...
- change pitfall entry
2022-08-26 17:40:46 +02:00
flo
e882e62c08
seachapel
2022-08-24 21:50:53 +00:00
Isse
14aad5fde7
Merge branch 'campfires_for_clifftown_and_desertcity' into 'master'
...
add campfires to clifftown and desertcity
See merge request veloren/veloren!3538
2022-08-14 20:22:31 +00:00
flo
4c49cb933e
add campfires to clifftown and desertcity
2022-08-14 20:22:30 +00:00
DaforLynx
daadf3abdb
Gnarling Fort music; more specific sites; fix music spacing; new sfx
2022-08-14 01:57:58 +00:00
flo
4ccec12dc7
DesertCity small fix
2022-08-12 11:34:40 +00:00
IsseW
0cd4d71d00
Add town music to cliff towns and desert cities
2022-08-10 11:03:22 +02:00
flo
5dd9991311
DesertCity
2022-08-08 09:58:18 +00:00
Marcel
ed4d70ac5b
Merge branch 'juliancoffee/add_cache_load_map' into 'master'
...
Add FileOpts::CacheLoad and a bit of refactoring
See merge request veloren/veloren!3472
2022-07-17 19:28:35 +00:00
Forest Anderson
67534488b3
Merge branch 'tygyh/CleanUp' into 'master'
...
Tygyh/clean up
See merge request veloren/veloren!3480
2022-07-17 14:04:45 +00:00
juliancoffee
fac67a40a1
Make worldgen panic if loaded map has invalid size
2022-07-17 14:49:42 +03:00
juliancoffee
9d67d80a63
Only ovewrite LoadOrGenerate map if it's fresh map
2022-07-17 14:38:29 +03:00
juliancoffee
5079c0007f
Remove prefix map_ for LoadOrGenerate maps
2022-07-17 14:38:29 +03:00
juliancoffee
d2962d544b
Add overwrite option to LoadOrGenerate
2022-07-17 14:38:29 +03:00
juliancoffee
60a9cce57f
Change map_path to inslude map directory
2022-07-17 14:38:29 +03:00
juliancoffee
a437d31205
Checking options from loaded map instead of hash
2022-07-17 14:38:29 +03:00
juliancoffee
6d9c7a5645
Adressing review
2022-07-17 14:38:29 +03:00
juliancoffee
6faba8a1e9
Use hashable wrapper around gen opts
2022-07-17 14:38:29 +03:00
juliancoffee
ddf2c43c18
Make hacky hash for gen opts
2022-07-17 14:38:29 +03:00
juliancoffee
1a21dfbc5b
Add FileOpts::CacheLoad
...
Add map setting that allows both generating (if not exists) and loading map
2022-07-17 14:38:29 +03:00
juliancoffee
85cee14643
Refactoring, extract FileOpts dependent methods
2022-07-17 14:38:29 +03:00
Joshua Yanovski
ef4b190ad9
Temporarily remove waypoints in caves as people are getting stuck.
2022-07-16 23:08:05 -07:00
Joshua Barretto
b08a501aef
Cleaned up ready for merge
2022-07-16 11:09:35 +01:00
tygyh
120ee6b6c0
Fix typos
2022-07-15 18:59:37 +02:00
Joshua Barretto
26202c294f
Better biome distribution
2022-07-15 17:53:24 +01:00
tygyh
abdd5e3906
Lift return out of if-statements
2022-07-15 16:36:11 +02:00
tygyh
fb7bdd8bf8
Fix deprecated imports
2022-07-15 16:17:19 +02:00
tygyh
cbe4d9d807
Remove unused imports
2022-07-15 16:00:27 +02:00
tygyh
997a572647
Simplify assertions
2022-07-15 15:52:52 +02:00
Joshua Barretto
5b8bdb9c9c
Cave entity spawns
2022-07-15 14:15:42 +01:00
tygyh
5e5698249b
Remove unnecessarily qualified paths
2022-07-15 14:49:46 +02:00
Joshua Barretto
4ca1c9ddf4
Gems and ores
2022-07-15 08:43:35 +01:00
Joshua Barretto
1a3b1e48da
Better cave shape variety
2022-07-15 08:43:35 +01:00
Joshua Barretto
f4e50d18df
Better ice
2022-07-15 08:43:35 +01:00
Joshua Barretto
a9c9a9d0d2
Ice caves
2022-07-15 08:43:35 +01:00
Joshua Barretto
e97d58011e
Made trees and cave entrances play better
2022-07-15 08:43:35 +01:00
Joshua Barretto
629c4dbdb7
Prevented cave/water intersection
2022-07-15 08:43:35 +01:00
Joshua Barretto
f3cfff424d
Distinct mushroom and leafy biomes
2022-07-15 08:43:34 +01:00
Joshua Barretto
7353c6f02b
Better mushroom placement
2022-07-15 08:43:34 +01:00
Joshua Barretto
a39901d24c
Better cave entrance locations
2022-07-15 08:43:34 +01:00
Joshua Barretto
9ad32b37e7
More efficient texture fetches
2022-07-15 08:43:34 +01:00
Joshua Barretto
07fc53f9bc
No walls outside caves
2022-07-15 08:43:34 +01:00
Joshua Barretto
2694f5f917
Fixed lava
2022-07-15 08:43:34 +01:00
Joshua Barretto
07ba4dcc33
Fixed particles for non-body entities, AO for non-volumetric illumination
2022-07-15 08:43:34 +01:00
Joshua Barretto
b5662163f0
Better lighting and verticality in caves
2022-07-15 08:43:33 +01:00
Joshua Barretto
7463acc641
Moonbells in caves
2022-07-15 08:42:56 +01:00
Joshua Barretto
af10a3e6da
No biomes near cave entrance
2022-07-15 08:42:56 +01:00
Joshua Barretto
b40095d867
Better mushroom cave biome
2022-07-15 08:42:56 +01:00
Joshua Barretto
1f979e4133
More biomes
2022-07-15 08:42:56 +01:00
Joshua Barretto
418839ee20
Biome improvements
2022-07-15 08:42:56 +01:00
Joshua Barretto
c6564e2c59
Better cave biomes
2022-07-15 08:42:56 +01:00
Joshua Barretto
2cce44fc36
Began work on caves2
2022-07-15 08:42:56 +01:00
Christof Petig
7a1218cf2f
make a recipe of all modular weapons
2022-07-13 20:15:28 +02:00
Christof Petig
2b2ac20403
use ItemDefintionId across trade_pricing
2022-07-13 20:15:27 +02:00
Marcel Märtens
e4909650e1
update hashbrown, specs, and tracy
2022-07-06 15:41:59 +02:00
IsseW
273c5ed2f0
Temporary noise solution
2022-07-04 18:07:00 +02:00
Marcel
fddc97bc77
Merge branch 'tweaks' into 'master'
...
tweaks entity stats
See merge request veloren/veloren!3437
2022-06-29 19:29:38 +00:00
Brandon Dyer
d1c80f0b25
#1455 | Sprites now only spawn on designated block types
2022-06-20 19:24:51 +00:00
runrobdog
25eed55ca9
stat tweaks to theropod, arthropods and basilisk
2022-06-19 01:35:18 +02:00
Samuel Keiffer
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
Christof Petig
1c5cb8abcd
follow the more elegant proposal by clippy
2022-06-07 23:37:51 +02:00
Christof Petig
fca4372205
avoid economy of scale in economy_tree
2022-06-07 21:46:41 +02:00
Christof Petig
5a965d21c7
replace vector copying with an iterator
2022-06-07 21:38:17 +02:00
Christof Petig
db85d2a146
fix clippy
2022-06-07 18:30:05 +02:00
Christof Petig
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
Christof Petig
edffd576d4
only the code move part of shredded_economy4
2022-06-07 18:30:05 +02:00
Tormod G. Hellen
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
Tormod G. Hellen
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
Christof Petig
59d876a654
pass humidity to meta, move smoke cycle to separate file
2022-06-01 22:13:34 +02:00
Christof Petig
3fc59d7e4d
lower trading output to trace (and raise one to warn)
2022-05-29 19:09:52 +02:00
Marcel
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
Makselord
69041137a0
reduced bamboo spawn rates
2022-05-28 18:04:06 -04:00
Makselord
c92cd26ff1
bamboo collectibles spawn near rivers
2022-05-28 17:56:35 -04:00
Benoît du Garreau
f36e74e383
Fix deprecated function use
2022-05-28 23:53:30 +02:00
Benoît du Garreau
8488c7b25e
Upgrade assets_manager to 0.8.0 and image to 0.24
...
This removes a significant number of duplicated dependencies
2022-05-28 23:18:31 +02:00
Sam
95c3fdffa1
Addressed playtest feedback (no assets).
2022-05-16 15:11:39 -04:00
Sam
816c265662
Rebase stuffs
2022-05-16 15:11:26 -04:00
Joshua Barretto
eec2d67bb7
Merge branch 'zesterer/worldgen' into 'master'
...
Worldgen Improvements
See merge request veloren/veloren!3378
2022-05-15 19:44:12 +00:00
Joshua Barretto
30b041282f
More rocks near rivers
2022-05-15 18:31:24 +01:00
Joshua Barretto
692309029d
Improved badlands
2022-05-15 16:14:03 +01:00
Joshua Barretto
cc295b483a
Better snow cover
2022-05-15 15:34:36 +01:00
Isse
2050bce77d
Water caves
2022-05-15 10:16:53 +00:00
Joshua Barretto
ecf97a53cd
Regular warping
2022-05-15 10:19:57 +01:00
Joshua Barretto
e5c49af547
Faster, prettier, and less troublesome terrain warping
2022-05-14 17:00:03 +01:00
Joshua Barretto
907ba3dcbc
Added giant trees to LoD
2022-05-10 20:30:48 +01:00
Joshua Barretto
d4fd9d2d0e
Added LoD houses
2022-05-10 19:19:46 +01:00
Joshua Barretto
f35c98d1a1
Added LoD distance setting
2022-05-10 12:40:06 +01:00
Joshua Barretto
3881d2ea38
Fixed i16 underflow
2022-05-10 12:38:36 +01:00
Joshua Barretto
1db7cc7fde
LoD trees in snow are white
2022-05-10 12:38:36 +01:00
Joshua Barretto
cf346d05c1
Different kinds of tree
2022-05-10 12:38:36 +01:00
Joshua Barretto
b3126ca687
Initial implementation of LoD trees
2022-05-10 12:38:36 +01:00
IsseW
9a9302a0b6
Use a seperate rng for peak and biome name gen
2022-05-10 10:24:25 +02:00
Imbris
bed8ae68fe
Optimize biome naming floodfill by replacing hashmaps
2022-05-10 03:30:09 -04:00
IsseW
9abbb0e928
naming behind feature and fix addition overflow
2022-05-10 08:03:40 +02:00
Joshua Barretto
30e73735de
Added SpawnMode to allow for ice and water column spawning of wildlife
2022-05-08 12:37:29 +01:00
Treeco
66fe458623
Improve water.rs usability
...
Will have an accompanying book update
2022-05-06 13:12:11 +01:00
Marcel Märtens
697673bcca
update toolchain to nightly-2022-04-25
2022-05-03 15:22:28 +02:00
Marcel
593d8fa4b5
Merge branch 'xMAC94x/update_vek' into 'master'
...
switch to upstream vek again
See merge request veloren/veloren!3342
2022-05-02 08:34:21 +00:00
Marcel
e30845c68f
Merge branch 'christof/shredded_economy3' into 'master'
...
Economic debugging and documentation
See merge request veloren/veloren!3309
2022-05-01 18:26:29 +00:00
Marcel Märtens
fa49248c31
switch to upstream vek again
2022-04-28 09:10:55 +02:00
Isse
3027597352
Site2 giant tree entity spawning
2022-04-27 10:53:08 +00:00
Christof Petig
2ddd1cc0a7
execute with local tracing environment
...
sadly the level passed is ignored, and it warns about an invalid filter directive
but RUST_LOG environment variables work as expected
2022-04-24 17:26:16 +02:00
Christof Petig
ab985b54ab
initialize ERROR not INFO
2022-04-24 17:26:16 +02:00
Christof Petig
5f5ebeecfe
ignore expensive tests without much added value
2022-04-24 17:26:16 +02:00
Christof Petig
2f7c50281f
fix neighbor logic in test, fix clippy, fix rustfmt
2022-04-24 17:26:16 +02:00
Christof Petig
8dfd6dc523
document more elements of economy
2022-04-24 17:26:16 +02:00
Christof Petig
53ace17327
output trade to csv file
2022-04-24 17:26:16 +02:00
Christof Petig
dc4b9dc19e
more readable and meaningful csv output
2022-04-24 17:26:16 +02:00
Christof Petig
d897df4b78
output number of trade partners
2022-04-24 17:26:16 +02:00
Christof Petig
eedfce45bc
also output normal economic simulation
2022-04-24 17:26:16 +02:00
Christof Petig
8e48d59539
also print situation in other econ test
2022-04-24 17:26:16 +02:00
Christof Petig
b144ed42e3
display trade volume
2022-04-24 17:26:16 +02:00
Christof Petig
57dafea9b4
group the first three settlements together (should enable them to survive by trade)
2022-04-24 17:26:16 +02:00
Christof Petig
6f431a6fff
rearrange and connect towns (shows planning weakness)
2022-04-24 17:26:16 +02:00
Christof Petig
faf12118f0
remember which good a profession is missing for productivity
2022-04-24 17:26:16 +02:00
Christof Petig
94bef521ce
new test to check different resource situations
2022-04-24 17:26:15 +02:00
Christof Petig
40cf44d7b1
Enforce a minimum price for goods
2022-04-23 22:11:29 +02:00
Youssef Fahmy
aec866e5ec
Balance tweaks
2022-04-23 14:54:01 +00:00
aflying pumpkin
c7f7e63495
Added Lionesses
2022-04-16 16:57:59 +00:00
flo
262a730cc6
clifftown sprite fix
2022-04-15 20:01:59 +00:00
Marcel Märtens
64b9602760
update further dependencies, including strum and get rid of old strum_macro
2022-04-04 16:06:47 +02:00
Marcel Märtens
affdf3131f
update a bunch of dependencies, including clap3
2022-04-04 11:43:29 +02:00
flo
3d24b1d635
CliffTowns
2022-03-29 12:52:08 +00:00
James Melkonian
5b801dc44d
Adjust harvester boss arena offset
2022-03-27 20:41:03 -07:00
Samuel Keiffer
4aaefdf6be
Merge branch 'ubruntu/site2-guards-raiders' into 'master'
...
Bring raiders and guards to site2 towns
See merge request veloren/veloren!3300
2022-03-26 00:29:53 +00:00
ubruntu
6d30f7f748
Bring raiders and guards to site2 towns
2022-03-26 00:29:52 +00:00
Marcel
a8a8ee181d
Merge branch 'christof/parallel_economy' into 'master'
...
Parallel economic simulation, based on shredded_economy2
See merge request veloren/veloren!3288
2022-03-25 19:59:57 +00:00
Samuel Keiffer
3964ac466a
Merge branch 'ubruntu/house-decorations' into 'master'
...
Site2 house decorations
See merge request veloren/veloren!3273
2022-03-24 15:13:56 +00:00
ubruntu
c71354e192
Site2 house decorations
2022-03-24 15:13:56 +00:00
InfRandomness
8359d5754a
Add new primitive to draw giant trees
2022-03-24 15:13:53 +00:00
Christof Petig
aeac483bac
parallel simulation of economies
2022-03-21 23:35:08 +01:00
Christof Petig
96c5d17460
Address xmac's comments and prepare for parallelization
2022-03-21 23:35:08 +01:00
Christof Petig
ef6cee891f
move the economy tick into Economy
...
This prepares for a parallel processing as it centralizes access to the surrounding index
2022-03-19 09:39:56 +01:00
Olexorus
cf66eccb75
Use Rust 2021 postfix .into_iter()
2022-03-15 16:34:56 +01:00
DaforLynx
ff624dd6e9
Reinstate town music.
2022-03-13 11:18:32 +00:00
DaforLynx
7b6f424bb0
Loud rivers
2022-03-13 07:47:23 +00:00
Samuel Keiffer
c5365c850a
Merge branch 'isse/primitive-fixes' into 'master'
...
Primitive fixes
See merge request veloren/veloren!3260
2022-03-13 03:34:49 +00:00
