Commit Graph

139 Commits

Author SHA1 Message Date
Joshua Barretto
4ef1c92858 Merge branch 'enable_custom_names_for_lakes' into 'master'
enable custom naming bricks for lake biomes

See merge request veloren/veloren!3210
2022-02-20 19:47:23 +00:00
floppy
0d3a0cd1b8 enable custom naming bricks for lake biomes 2022-02-16 20:30:52 +01:00
Joshua Barretto
00b003a23c Enabled site2 towns by default 2022-02-15 19:01:43 +00:00
Sam
c77270b799 Addressed feedback 2022-02-12 20:52:01 -05:00
Sam
cab87658a3 Placement tweaks 2022-02-10 14:58:39 -05:00
Sam
c15fb2b68f Better mugger AI 2022-02-10 14:58:28 -05:00
James Melkonian
3a8a0d9c53 Cavern systems under gnarling fortifications 2022-02-10 14:58:24 -05:00
Sam
90cedfc95d Gnarlings can now make walls. 2022-02-10 14:58:15 -05:00
Sam
b28f6276dd Gnarling dungeons now only generate near forests. 2022-02-10 14:58:09 -05:00
Joshua Barretto
31192c80bc Merge branch 'biome_name_update_and_site&theme_based_naming' into 'master'
biome_name_update_and_site&theme_based_naming

See merge request veloren/veloren!3187
2022-02-10 09:35:47 +00:00
floppy
680a6e477e enable flattening for site2 towns in civ/mod.rs,
to avoid mountain towns spawning underground
2022-02-09 23:28:56 +01:00
floppy
03cb885af4 - add more custom bricks for biomes
- update biome and site names
2022-02-09 08:14:13 +01:00
floppy
33dae9b3b1 -adjust size-threshold for Jungle to fix Jungles not being named.
-set size-threshold for anticipated Swamp sizes
2022-02-04 17:14:38 +01:00
floppy
b85a384d38 -adjust size-threshold for Jungle to fix Jungles not being named. 2022-02-04 16:54:42 +01:00
floppy
b5dfe74d41 -add more biome specific namegen functions
-introduce random choice between engl and custom naming
-add namegen section for site/theme based naming
2022-02-04 15:45:11 +01:00
InfRandomness
54b69e37a5 Implement giant trees in site2 2022-02-02 02:33:37 +00:00
IsseW
0f7f0ace93 Use DHashMap 2022-02-01 01:20:00 +01:00
IsseW
0ba4a3a409 Use DHashSet 2022-02-01 01:07:36 +01:00
Avi Weinstock
5f8957d8ef Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}. 2022-01-30 20:16:20 +01:00
Joshua Barretto
cb45cea6a0 Merge branch 'fix-dungeon-collision' into 'master'
Fix dungeon collision

See merge request veloren/veloren!3131
2022-01-28 14:07:01 +00:00
threadexception
9822abf9ba Fix dungeon collision 2022-01-28 13:59:49 +01:00
floppy
87ea7a906a more biome namegen bricks 2022-01-26 14:58:48 +01:00
Joshua Barretto
59ac3b1d4f Fixed site2 economies 2022-01-25 16:31:12 +00:00
floppy
d47e06baac - fix Swamp-naming 2022-01-20 21:46:51 +01:00
floppy
8f0ad56d25 change algorithm for biome-naming to weigh chunks evenly 2022-01-20 20:08:59 +01:00
floppy
9f0664c73b civ/mod.rs - replace duplicate code 2022-01-20 16:17:40 +01:00
floppy
ceb3507e50 -remove line breaks from biome names
-disable Wilderness world message in unspecified mini-biomes
-remove duplicate name in Grasslands name pattern
2022-01-18 11:27:55 +01:00
IsseW
40580578a0 Don't add unnecessary biome pois 2022-01-18 10:07:40 +01:00
floppy
4a8c428a3f update/add namegen-bricks for forest and grassland 2022-01-18 08:36:40 +01:00
floppy
1a5c1ae319 length comparison to zero in /civ/mod.rs
warning: length comparison to zero
   --> world/src/civ/mod.rs:482:15
    |
482 |         while to_explore.len() > 0 {
    |               ^^^^^^^^^^^^^^^^^^^^ help: using `!is_empty` is clearer and more explicit: `!to_explore.is_empty()`
    |
    = note: `#[warn(clippy::len_zero)]` on by default
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#len_zero

warning: length comparison to zero
   --> world/src/civ/mod.rs:489:19
    |
489 |             while to_floodfill.len() > 0 {
    |                   ^^^^^^^^^^^^^^^^^^^^^^ help: using `!is_empty` is clearer and more explicit: `!to_floodfill.is_empty()`
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#len_zero
2022-01-18 00:41:59 +01:00
floppy
0c97a6e91a add synonyms for biomes 2022-01-17 20:14:16 +01:00
floppy
609d23ae4f - make individual size thresholds for biome name generation to include small lakes
- add original Lake naming pattern, partly (no water_alt check)
2022-01-17 16:02:52 +01:00
floppy
ced1a82824 - add size threshold for biomes to name, to exclude mini-biomes from clogging the map.
- fmt, clippy
2022-01-17 11:19:34 +01:00
floppy
c00f5bafee add fn generate_forest in namegen to name forest biomes 2022-01-17 08:36:35 +01:00
IsseW
5b9f405671 Better placement of poi and actual names 2022-01-16 20:28:53 +01:00
IsseW
f8d94ef25f biome name to chunk name 2022-01-16 18:11:22 +01:00
IsseW
5bd7507f31 Added poi for all biomes 2022-01-16 16:54:49 +01:00
floppy
d5f0ee2fc5 create fn generate_biome in namegen 2022-01-16 16:40:22 +01:00
Joshua Barretto
db741fe4c0 Added waypoints to towns 2021-11-13 17:13:09 +00:00
Joshua Barretto
de087ae992 Added site2 worldgen feature 2021-11-01 22:53:38 +00:00
Joshua Barretto
8e2ca9cdec Added rtsim villagers to site2 towns 2021-11-01 22:19:49 +00:00
Snowram
ee37c8d62d Adds new dungeon entrances 2021-09-04 14:55:55 +02:00
Imbris
9c72333741 Revert "Merge branch..."
This reverts merge request !2608
2021-07-17 22:04:59 +00:00
Dr. Dystopia
353c4411c7 Resolve all '#[allow(clippy::print_literal)]' error supressions 2021-07-17 17:32:00 +02:00
Jonathan Berglin
c1c331d59e Resolve all '#[allow(clippy::approx_constant)]' error supressions 2021-07-15 16:56:55 +00:00
Dr. Dystopia
5cc2fc8182 Resolve all '#[allow(clippy::or_fun_call))]' error supressions 2021-07-15 13:49:59 +02:00
Marcel Märtens
9b3b21f368 fix clippy warnings 2021-07-12 12:09:09 +02:00
Avi Weinstock
df4f536523 Progress on converting dungeons to site2. Adds Sampling and Translate primitives. 2021-06-23 23:22:14 -04:00
James Melkonian
f553700e8c Add map markers for lakes and mountains 2021-05-03 02:00:23 +00:00
Louis Pearson
126b7efa92 Tries to implement npcs only travelling by paths
Unfortunately, there's a degenerate case where npcs can get stuck in a
town. Not sure why
2021-04-08 04:19:02 -06:00