Marcel
ce4beff7fe
Merge branch 'xMAC94x/update_deps' into 'master'
...
update veloren deps
See merge request veloren/veloren!3911
2023-05-04 18:28:59 +00:00
Marcel Märtens
054f4f9453
update veloren deps
2023-05-04 11:58:43 +02:00
Imbris
d29a1ec052
Switch back to 100 attempts for each site, optimization of
...
find_site_loc, and fix pre-existing bugs.
* In two spots, there were suspicious conversions between chunk positions
/ world positions that I removed. Everything, here should just be in
chunk positions afaict!
* Optimized by skipping further checks if `in_suitable_loc` is false
(main optimization (10x speedup for desert city site location finding
attempts)) as well as only computing `in_suitable_loc` once (minor
optimization).
2023-05-02 06:12:33 -04:00
Imbris
ddf9e0eaab
Address review on !3888
2023-05-01 21:01:50 -04:00
Imbris
4becb2c616
Refactor iteration over cardinals for bridges to explicitly check for the cardinal direction instead of using specific indices, performance seems roughly the same.
2023-04-25 01:10:34 -04:00
Imbris
87f042eb45
Lower max attempts for site placement to 15 from 100, to save time in the case of sites that can't easily be placed
2023-04-22 00:13:51 -04:00
Imbris
d18100c87a
Add a max cost parameter to the astar algorithm so that it will terminate as exausted if this limit is reached. This is used to optimize site pathfinding by exiting early from finding a novel path if we know it won't be used.
2023-04-21 23:16:24 -04:00
Imbris
ed94c1c1b6
Fix existing bug with all site route costs be computed as 0
2023-04-20 22:22:21 -04:00
Imbris
c0db1310be
Fix bug
2023-04-20 21:53:59 -04:00
Imbris
c82e6cfc77
Cleanup, fmt, appease clippy
2023-04-20 21:53:59 -04:00
Imbris
c6f5e8dac2
Add more profiling spans to Server startup related things in order to
...
visualize where time is being spent. Make `Lod::from_world` use the same
rayon pool as other things during the server startup. Move parallel
iteration up out of structure_gen.par_iter in order to slightly optimize
Lod::from_world (saves a few hundred milliseconds on my machine)
2023-04-20 21:53:59 -04:00
Imbris
92a42ced18
Apply experimental astar2 changes to the original impl
2023-04-20 21:53:59 -04:00
Imbris
d1ca47da41
Remove astar node clustering related code
2023-04-20 21:53:59 -04:00
Imbris
81885fe8e5
Additional optimizations (such as avoiding calling find_path when we know we won't use the result or that it will fail), cleanup of excess notes and commented code, probably other misc optimizations
2023-04-20 21:53:59 -04:00
Imbris
1f5ebbd100
mess (server startup time related experimentation, in particular with
...
pathfinding between sites)
2023-04-20 21:53:59 -04:00
Imbris
ed4643e80b
Add profiling spans for Server::new and World::generate
2023-04-20 21:53:59 -04:00
Sam
e819cd2309
Updated hashbrown, removed some to_owned calls in handling recently unequipped items
2023-04-19 18:43:40 -04:00
Isse
e4a6c67fb0
try to get at least one workshop in towns
2023-04-15 19:57:18 +02:00
Isse
9c30d2018d
add bridge tile for better bridge pathfinding
2023-04-14 11:17:08 +02:00
Joshua Barretto
a835ce7e26
Better starting site choices
2023-04-13 18:32:21 +01:00
Joshua Barretto
d8702f128b
Variable town sizes
2023-04-13 12:05:16 +01:00
Joshua Barretto
308ee2f674
Don't pessimise worldgen fast paths for rtsim resources
2023-04-09 19:25:58 +01:00
Joshua Barretto
efbab102a5
Make LoD towns glow
2023-04-09 19:25:58 +01:00
Joshua Barretto
70538dae66
Choose random plaza tile
2023-04-09 19:25:58 +01:00
Joshua Barretto
a7a08763f2
Gave NPCs names
2023-04-09 19:25:58 +01:00
Joshua Barretto
85c572f6e2
Better town layout
2023-04-09 19:25:57 +01:00
Joshua Barretto
06820dbf16
Better path distance check for site2
2023-04-09 19:25:57 +01:00
Joshua Barretto
c8d0443111
Clippy fixes
2023-04-09 19:25:57 +01:00
Joshua Barretto
2eaf3c7e92
Spawn dogs and cats in towns
2023-04-09 19:25:57 +01:00
Isse
71039b56e6
fix examples
2023-04-09 19:25:55 +01:00
Joshua Barretto
ea007ff702
Cleaning up
2023-04-09 19:25:55 +01:00
Isse
dda1be58d4
big birds!
2023-04-09 19:25:54 +01:00
Joshua Barretto
bb96e92362
Track almost all collectable sprites, added resource replenishment
2023-04-09 19:25:54 +01:00
Joshua Barretto
ac83cfc4a3
More interesting idle behaviours
2023-04-09 19:25:54 +01:00
Joshua Barretto
7e9474ab70
Overhauled rtsim2 pathfinding with TravelTo
2023-04-09 19:25:53 +01:00
Joshua Barretto
e8b489a71a
sync
2023-04-09 19:25:53 +01:00
IsseW
9be6c7b527
Pathing between sites.
2023-04-09 19:25:53 +01:00
IsseW
afd9ea5462
site pathing
2023-04-09 19:25:52 +01:00
Joshua Barretto
f40cfb4ac3
Made farmers sell food
2023-04-09 19:25:52 +01:00
IsseW
64c56f544d
randomly walk around town
2023-04-09 19:25:52 +01:00
Joshua Barretto
c856f2625c
Added rtsim sites
2023-04-09 19:25:51 +01:00
Joshua Barretto
c168ff2f9b
Added rtsim saving, chunk resources, chunk resource depletion
2023-04-09 19:25:51 +01:00
Sam
7fab9d192b
Add repair bench to desert and cliff towns.
2023-04-06 10:57:18 -04:00
Sam
c3f5bc13f1
Equipment can now be repaired at sprites in town.
2023-04-06 10:54:48 -04:00
Joshua Barretto
acec45b756
Initial implementation of starting site choice
2023-03-31 14:24:14 +01:00
Monty Marz
d1a7884ac8
Merge branch 'more_spot_things' into 'master'
...
grave models, spot fixes, sword overlay
See merge request veloren/veloren!3842
2023-03-31 02:57:39 +00:00
Isse
c34e5ad4ed
Small fixes
2023-03-29 23:11:59 +00:00
Monty Marz
e4c5e50fb2
grave models, spot fixes, sword overlay
2023-03-29 13:10:49 +02:00
Sam
e31668b188
Fixed dynlib features to not have UB when allocating.
2023-03-21 20:03:20 -04:00
Imbris
61cb0ad39b
Merge branch 'imbris/small-tweaks' into 'master'
...
Various small tweaks / fixes
Closes #1475
See merge request veloren/veloren!3817
2023-03-18 00:52:20 +00:00
Christof Petig
0e73bd23ed
significant code simplification proposed by zesterer
2023-03-17 22:43:19 +01:00
Christof Petig
b555d619fb
prefer imbris syntax proposal, documentation and changelog
2023-03-17 22:35:47 +01:00
Christof Petig
1f976f9f1c
follow clippy's advice
2023-03-17 22:35:47 +01:00
Christof Petig
28da420c82
enable spot addition via ron file
2023-03-17 22:35:47 +01:00
Imbris
19b5ed3487
Appease clippy
2023-03-11 11:06:08 -05:00
Imbris
475ae65d16
Avoid extra StructureBlock clones in layer/tree.rs
2023-03-11 10:24:45 -05:00
Monty Marz
277a402781
Initial quest window work, spot fixes
2023-03-10 22:16:26 +00:00
Marcel
9396fa9741
Merge branch 'Thegaming_Life/replacing_all_map2_with_RECT_SIZE_with_cpos_to_wpos_and_wpos_to_cpos' into 'master'
...
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
See merge request veloren/veloren!3807
2023-03-06 21:03:35 +00:00
Thegaming Life
5ddc55be52
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
2023-03-06 21:03:35 +00:00
Monty Marz
9a025cfcc8
More spot features
2023-03-03 23:21:37 +00:00
Samuel Keiffer
01da8b6a82
Merge branch 'tursus_werewolf_anim&spawn_loot_tweaks' into 'master'
...
spawn and loot tweaks, tursus and werewolf anims
See merge request veloren/veloren!3790
2023-02-22 01:32:05 +00:00
flo
98e93d1a1c
spawn and loot tweaks, tursus and werewolf anims
2023-02-22 01:32:05 +00:00
Tormod Gjeitnes Hellen
7164391c40
Refactor the site enemy functions to return iterators.
2023-02-21 17:14:04 +01:00
Tormod Gjeitnes Hellen
5e506a02ef
Change warning level for failing to find site placement to debug.
2023-02-21 17:03:23 +01:00
Tormod Gjeitnes Hellen
0fbe6a67f2
Make castles appear close to towns.
2023-02-21 17:03:22 +01:00
Tormod Gjeitnes Hellen
a0dd527a1d
Refactor proximity checking to be more flexible.
2023-02-21 16:58:54 +01:00
Tormod G. Hellen
90b945e18b
Make castles avoid trees.
2023-02-20 23:24:03 +01:00
Sam
4f26e37ae6
Addressed review
2023-01-09 20:18:31 -05:00
Sam
7d42c45fdd
Site2 code is now hot-reloadable with 'hot-site2' feature.
2023-01-09 20:06:35 -05:00
Joshua Barretto
873d3fb7a4
Added dead trees to LoD
2022-12-31 15:32:56 +00:00
Isse
ef2c1633ed
Merge branch 'isse/bridges' into 'master'
...
Bridges
See merge request veloren/veloren!3680
2022-11-30 15:07:03 +00:00
Marcel Märtens
4a1404cd71
fix leftovers from toolchain update
2022-11-30 15:14:47 +01:00
Isse
02eadc3002
add doc comment
2022-11-30 15:13:52 +01:00
Isse
560d5c3153
fix doc test
2022-11-30 15:13:52 +01:00
Isse
c81fbf50c4
Fix cylinder primitive and better ramp function
2022-11-30 15:13:52 +01:00
Isse
dda54bcb01
small fixes
2022-11-30 15:13:52 +01:00
IsseW
17cd863605
tuning
2022-11-30 15:13:52 +01:00
IsseW
179c6dab8f
better flat
2022-11-30 15:13:52 +01:00
IsseW
6d2b39c254
simple hang bridge
2022-11-30 15:13:52 +01:00
IsseW
df8db713ea
lights
2022-11-30 15:13:52 +01:00
IsseW
91ed3c6a84
draw on map
2022-11-30 15:13:52 +01:00
IsseW
31b56b03b5
desert skin
2022-11-30 15:13:52 +01:00
IsseW
78e227d317
short bridges
2022-11-30 15:13:52 +01:00
IsseW
3bb66cf2ff
add hipped roof
2022-11-30 15:13:52 +01:00
IsseW
7296843923
simple bridges
2022-11-30 15:13:52 +01:00
Marcel Märtens
225cbf472f
update tag and fix empty maps, other bugs introduced by auto fix
2022-11-29 09:19:10 +01:00
Marcel Märtens
2812729b78
cargo clippy lifetimes
2022-11-28 15:19:57 +01:00
Marcel Märtens
dad73ba2a3
fix clamp clippy errors
2022-11-28 14:26:27 +01:00
Marcel Märtens
0ab7a2543e
fix clippy errors
2022-11-28 14:08:11 +01:00
Marcel Märtens
ba3747a3f0
update toolchain
2022-11-28 14:08:11 +01:00
Tormod G. Hellen
44f118c437
Get rid of redundant sources of truth on site locations.
2022-11-20 00:57:05 +01:00
Christof Petig
24aac2d92f
Merge branch 'floppy_savannahpit_merchants' into 'master'
...
add merchants to savannah pits
See merge request veloren/veloren!3690
2022-11-13 19:14:27 +00:00
flo
6d8f2c8c7b
add merchants to savannah pits
2022-11-13 19:14:26 +00:00
Christof Petig
a820eee289
Merge branch 'floppy-bat-wing-tweaks' into 'master'
...
tweak bat wing animation
See merge request veloren/veloren!3684
2022-11-12 10:18:11 +00:00
flo
df70381a7c
tweak bat wing animation
2022-11-12 10:18:10 +00:00
Avi Weinstock
f5c1293e9f
Address review comments for MR 3679:
...
- Fix normal vectors/lighting for train tracks.
- Adjust chat command logging statement.
- Remove train tracks when their chunks get unloaded.
- Create a struct for the 6-tuple returned from `get_nearest_ways`.
- Move code that creates the train tracks into `layers::apply_trains_to`.
2022-11-03 15:20:53 -04:00
Avi Weinstock
2242f7245d
Avoid placing site2 houses on paths (this affects worldgen even with train tracks disabled, since the paths are already there).
2022-10-31 14:55:13 -04:00
Avi Weinstock
f83afcd5a8
Make train tracks configurable as a worldgen feature. Fixes for clippy and fmt.
2022-10-29 14:50:52 -04:00
Avi Weinstock
08a50afd9f
Mostly working train tracks.
2022-10-28 21:36:42 -04:00
flo666
ada9bd8f36
fix unitest error:
...
layer::wildlife::tests::test_name_uniqueness' panicked at 'world.wildlife.spawn.calendar.halloween.halloween:
2022-10-25 00:33:36 +02:00
IsseW
9a6a3a05a1
bat config
2022-10-25 00:31:04 +02:00
flo666
586d0f6dd8
add bat (created by Gemu)
2022-10-23 20:05:39 +02:00
flo666
1d98050f28
halloween npcs:
...
in forests, spawn harvester or dullahans or tricksters with custom halloween loot: facegourd, pumpkin_spice_brew, honeygourd
2022-10-23 20:05:39 +02:00
Isse
3b2eba1457
autumn leaves
2022-10-23 20:05:39 +02:00
IsseW
9c4736f47b
Make pumpkins more common for Halloween
2022-10-23 20:05:39 +02:00
flo
698a00bae3
savannah_pit
2022-10-22 19:48:50 +00:00
IsseW
2ba5b33868
fmt
2022-10-10 00:15:57 +02:00
IsseW
c8a08b4794
fix warnings
2022-10-09 23:42:38 +02:00
Joshua Barretto
0a6ac5f5f1
sync
2022-10-09 23:25:40 +02:00
Joshua Barretto
68df88a721
Added redwoods
2022-10-09 23:23:43 +02:00
Joshua Barretto
1392a8662f
Added dead trees
2022-10-09 23:23:42 +02:00
Joshua Barretto
0b5d043d8e
Began work on citadel
2022-10-09 23:23:39 +02:00
Marcel
6844094389
Merge branch 'kitswas/worldgen-spawn-fixes' into 'master'
...
Spawn fix(es)
See merge request veloren/veloren!3579
2022-10-05 07:07:43 +00:00
Marcel
17c940e0f8
Merge branch 'xMAC94x/update_toolchain' into 'master'
...
update toolchain to `2022-09-23`
See merge request veloren/veloren!3615
2022-09-25 19:44:58 +00:00
Marcel Märtens
1e1ee5031f
remove enum_iterator with strum, fixes #1723
2022-09-25 16:09:46 +02:00
Marcel Märtens
cf6a764aa4
update toolchain to 2022-09-23
2022-09-25 15:58:32 +02:00
Marcel Märtens
c2b453f6f1
update toolchain to 2022-09-08
...
This reverts commit 6c9deee491a32b269252
2022-09-24 00:04:40 +02:00
Marcel
3490600ca0
Merge branch 'xMAC94x/update-deps2' into 'master'
...
update_deps_2 - now with more expirmental stuff
See merge request veloren/veloren!3634
2022-09-23 21:44:50 +00:00
flo
cfbadd36ea
fix_desert_rock_animals
2022-09-22 18:42:34 +00:00
Marcel Märtens
29d0f5b25d
update dependencies
2022-09-22 11:57:55 +02:00
flo
a37e1f8d99
seachapel npc work
2022-09-22 01:04:01 +00:00
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
