252 Commits

Author SHA1 Message Date
timokoesters
34c959bef0
Update to github vek repo 2019-08-26 13:12:45 +02:00
Joshua Yanovski
608685ef36 Fixes to worldgen and adding a debug command.
Humidity and temperature are now indexed to uniform altitude *over land
chunks* (and water chunks adjacent to land) rather than over the whole
range of altitude.  This is necessary in order to satisfy the uniformity
conditions of the formula for weighted sum CDF.

Additionally, fixes the computation of whether a tree should be
generated or not.  Previously, it was using a source of randomness
scaled to use much less than the full 0-1 range; this has been resolved.
This makes for much nicer and more gradual transitions between densities
and reduces the amount of completely barren landscapes, while also
making forests larger.

Finally, this commit adds a server command, debug_column, which returns
some useful debug information about a column given an x and y
coordinate.  This is useful for debugging worldgen.
2019-08-26 11:52:25 +02:00
Joshua Yanovski
6cb33ba004 Fix clean code lints. 2019-08-25 18:17:51 +02:00
Joshua Yanovski
5dfbf86d87 Chaos doesn't depend on temperature anymore.
Also fix some things to use a consistent coordinate system and bump up
tree density and variation around tree density in hopes of creating more
aesthetically pleasing jungles.  However, this does change worldgen a
bit, so please make sure you look through it before merging.
2019-08-25 17:49:33 +02:00
jshipsey
d926965e7c fmt 2019-08-24 15:32:07 -04:00
Joshua Yanovski
798e8d7e8f Make humidity ignore ocean chunks. 2019-08-24 21:13:32 +02:00
Joshua Barretto
65a7c725a8 Merge branch 'sharp/jungle' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-23 00:33:33 +01:00
Joshua Barretto
7ffe8979a2 Better snow noise 2019-08-23 00:31:27 +01:00
Joshua Yanovski
27ea09d24e Remove out of date comment. 2019-08-23 01:16:15 +02:00
Joshua Yanovski
ba9c5533dc Merge remote-tracking branch 'origin/sharp/jungle' into sharp/jungle 2019-08-23 01:10:48 +02:00
Joshua Barretto
802bb601f3 Merge branch 'sharp/jungle' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-23 00:09:45 +01:00
Joshua Barretto
1de8132ffb More interesting terrain chaos 2019-08-23 00:09:14 +01:00
Joshua Yanovski
000a200b65 Fine, removing box syntax. 2019-08-23 01:08:47 +02:00
Joshua Yanovski
4e0966fa85 Addressing concerns, for real. 2019-08-23 00:57:42 +02:00
Joshua Yanovski
2d88cd8c8b Addressing PR issues. 2019-08-22 23:48:13 +02:00
Joshua Barretto
0e001e263b Better snow, colours, more chaos 2019-08-22 22:25:17 +01:00
Joshua Yanovski
fbdf7dc235 Closest attempt. 2019-08-22 21:10:04 +02:00
Joshua Yanovski
df2eb30898 Total chaos. 2019-08-22 21:03:42 +02:00
Joshua Yanovski
9973c72692 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-22 17:47:10 +02:00
Joshua Yanovski
111eac3eda Fix density computation. 2019-08-22 17:45:47 +02:00
Joshua Yanovski
c9e9356b0c Adding more jungle trees. 2019-08-22 01:33:47 +02:00
Joshua Yanovski
861bc567b3 Restore old chaos. 2019-08-22 01:01:13 +02:00
Joshua Yanovski
7bb649bda2 Fixing colors. 2019-08-22 00:15:24 +02:00
Joshua Yanovski
0104ae7447 Fixing a few visual issues. 2019-08-21 23:36:43 +02:00
Joshua Yanovski
dc6f95cc09 Putting back splotchy mud. 2019-08-21 20:59:26 +02:00
Joshua Yanovski
7bb74b8905 Get rid of extraneous things. 2019-08-21 20:48:51 +02:00
Joshua Yanovski
a4606143ba Fixing jungle. 2019-08-21 20:41:32 +02:00
Joshua Barretto
ea8aaf6cae Added cacti 2019-08-21 19:18:16 +01:00
Joshua Barretto
deabbb8835 Better plant grouping distribution 2019-08-21 18:56:46 +01:00
Monty Marz
01eb26206f Pfauenauge/plants grass 2019-08-21 17:22:05 +00:00
Joshua Yanovski
5a39e78557 Distribution "fun." 2019-08-20 22:48:22 +02:00
Joshua Barretto
f0fa7b7045 More grass 2019-08-20 12:06:41 +01:00
Joshua Barretto
b9202f7264 Patchier plants, wind swaying 2019-08-20 11:05:01 +01:00
Joshua Barretto
baf42f2203 Added multiple sprite block kind support 2019-08-20 00:31:11 +01:00
Joshua Barretto
7e5222e75b Sprite distance fading, grass 2019-08-19 22:54:16 +01:00
Joshua Barretto
9b647993f0 Added wheat and sprite rendering 2019-08-19 21:09:35 +01:00
Joshua Yanovski
3056007924 Smoother blending into sand. 2019-08-19 19:46:47 +02:00
Joshua Yanovski
46f588bc39 t merge Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-19 19:21:05 +02:00
Joshua Yanovski
86d48f3c39 Fixing visual issues. 2019-08-19 19:20:54 +02:00
Acrimon
724d6dffb4 Disabled unsafe using lint level. 2019-08-19 14:39:23 +02:00
Joshua Yanovski
2bb8a59118 Smoothed some things out. 2019-08-19 05:22:39 +02:00
Joshua Yanovski
08646cd9a4 Billow tweaks. 2019-08-19 03:41:32 +02:00
Joshua Yanovski
7036ca88d4 Fixing some colors. 2019-08-19 03:01:11 +02:00
Joshua Yanovski
bdbe3d2f42 Making jungles work. 2019-08-19 01:52:26 +02:00
Joshua Yanovski
10f959b9dd WIP for humidity. 2019-08-18 18:35:27 +02:00
Joshua Barretto
da91572a37 Renamed normal StructureBlock variant 2019-08-18 15:33:16 +01:00
Joshua Barretto
02a01fd959 More interesting waves 2019-08-18 10:33:18 +01:00
Vechro
d185d8628a Dungeon fixes 2019-08-18 10:33:18 +01:00
Joshua Barretto
90630a4edc Added default block kind to structure loading 2019-08-18 10:33:18 +01:00
Vechro
4a92bfba73 Add water-based dungeons 2019-08-18 10:33:18 +01:00