Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,657 Commits 151 Branches 18 Tags 2.1 GiB
1cf733597d
Commit Graph

1769 Commits

Author SHA1 Message Date
Maxicarlos08
73a79b32a1
no dungeons = no dungeons with caves! 2023-08-15 12:24:17 +02:00
Michal Sroczynski
c8feb568ba Bosses loot overhaul p1 2023-08-11 09:47:13 +02:00
Michał
5762e62704 Desert hum fix 2023-08-09 15:53:16 +00:00
Isse
254c1c7145 ResourceSprite Fill, so we can track giant tree IronWood in rtsim 2023-08-02 18:48:01 +02:00
Michal Sroczynski
0d4fc62468 Code quality fix 2023-08-02 18:48:01 +02:00
Michal Sroczynski
1301761445 Scatter changes and fixes 2023-08-02 18:48:01 +02:00
Michal Sroczynski
2c23781d22 Remove tiers from dungeons names 2023-08-02 18:48:01 +02:00
Michal Sroczynski
50304ed54e Format fix 2023-08-02 18:48:01 +02:00
Michal Sroczynski
28cf9bf19d Add woods to scatter and rarify the pyrebloom 2023-08-02 18:48:01 +02:00
Michal Sroczynski
a577ed1d36 Changes to Gnarling Tree 2023-08-02 18:45:40 +02:00
David Fisher
e2a0bc55c3 Lower grass target in standalone economy tests 
because: The test_economy_moderate_standalone was failing tests on
arm64 MacOS systems with the following error:

```
thread 'site::economy::context::tests::test_economy_moderate_standalone' panicked at 'assertion failed: site.economy.pop >= env.targets[&id]', world/src/site/economy/context.rs:562:17
```

This was originally reported in Discord by @sharp in July, 2022
https://discord.com/channels/449602562165833758/797421546871324712/997332351195553874

Debugging showed that the grass target was 880, and the population was only around 718.
Local testing showed that lowering the grass target to 700 fixed the issue.

this commit: Lowers the grass target to 700 in the standalone economy tests.

unaddressed questions:

- Why is the grass target so high in the standalone economy tests?
- Alternately, why did the grass population drift so low, and no longer aligned with the tests.
- Why is this passing in CI, but not local testing?
- There are a number of commented out add_settlement calls in the standalone economy tests. Were there issues with the tests prior?
 2023-07-31 16:51:29 -04:00
Isse
e7269a510b Fix adlet site division by zero 2023-07-28 16:08:25 +02:00
flo
36889f671e fix_desertcity_repairbench 2023-07-13 11:30:53 +00:00
flo
b556befe73 coastal_town 2023-07-12 23:02:40 +00:00
Monty Marz
102945b9e7 Dungeon rework initial patch 2023-07-09 20:03:09 +00:00
flo
3611fd2b3d wildlife_spawn_work 2023-07-03 23:21:56 +00:00
Samuel Keiffer
079e7bfed6 Merge branch 'uniior/cacti' into 'master' 
New/revamped cacti sprites

See merge request veloren/veloren!3986
 2023-06-18 01:22:33 +00:00
unknown
8978bc9dc4 Test 2023-06-14 13:14:33 -04:00
Tormod G. Hellen
cf002478b8
Optimally place towns. 
This gets rid of the arbitrary threshold values for what is and
isn't an acceptable town.
 2023-06-09 13:44:01 +02:00
unknown
526386e51c Initial cacti work 2023-06-07 14:46:54 -04:00
flo
02bba1e343 clifftown rework 2023-06-07 18:45:12 +00:00
Isse
a884e0e058 Various rtsim related stuff 2023-06-03 22:14:18 +00:00
Joshua Barretto
dc2afe8236 Merge branch 'floppy_savannah_hut' into 'master' 
savannah_hut

See merge request veloren/veloren!3872
 2023-06-03 11:54:58 +00:00
flo
22854cbea2 savannah_hut 2023-06-03 11:54:58 +00:00
Tormod G. Hellen
4f2548fe78
Pass SiteKind by reference. 2023-06-02 15:04:16 +02:00
Tormod G. Hellen
1d0329cfa7
Make sure location hint calculation is only done once. 
Location hint calculation is expensive and should not be done
in a hot loop.

This is a fixup for 1572a5a759.
 2023-06-02 15:04:09 +02:00
Isse
68491dde55 Merge branch 'seachapel_rework' into 'master' 
seachapel_rework

See merge request veloren/veloren!3856
 2023-05-24 18:13:29 +00:00
flo
a55276ea73 seachapel_rework 2023-05-24 18:13:29 +00:00
Tormod G. Hellen
a2ecd0b403
Replace SquareLocationRestriction with Aabr<i32>. 
This is a fixup for 1572a5a759
 2023-05-23 01:25:36 +02:00
Tormod G. Hellen
af080016ab
Get rid of the old and clunky loc_suitable_for_site function. 2023-05-22 16:35:12 +02:00
Tormod G. Hellen
a58b589c1a
Consolidate SiteKind impl. 2023-05-22 16:26:30 +02:00
Tormod G. Hellen
2397209b5d
Add proximity test. 2023-05-22 00:58:53 +02:00
Tormod G. Hellen
1572a5a759
Add location hint optimization. 2023-05-22 00:58:53 +02:00
Tormod G. Hellen
057c502218
Factor out town attribute calculation. 2023-05-22 00:58:53 +02:00
Sam
ca070f7ae8 Removed old tier-1 files 2023-05-13 09:32:29 -04:00
flo666
aca38d0cf4 review fixes 2023-05-13 09:32:29 -04:00
Sam
07afecfcd1 Clippy 2023-05-13 09:32:28 -04:00
Sam
92074e16d3 Made most inaccessible adlet caves accessible 2023-05-13 09:32:28 -04:00
flo666
8516899c18 inuit inspired location names for adlet stronghold 2023-05-13 09:32:27 -04:00
flo666
0431ebf8dc solid fill for igloo foundations 2023-05-13 09:32:26 -04:00
flo666
34bfb8ba68 tweak igloo&bonehut top decor bone 2023-05-13 09:32:26 -04:00
Isse
62a598c59b remove unwrap TODO 2023-05-13 09:32:26 -04:00
flo666
19b90d078a rebase & fix pipeline 2023-05-13 09:32:25 -04:00
flo666
7739aaff78 add more loot 2023-05-13 09:32:24 -04:00
flo666
713baa615e chests 2023-05-13 09:32:22 -04:00
flo666
7bed8488e7 level yetipit room entries 2023-05-13 09:32:22 -04:00
flo666
dfc6cbae3a reduce bonfire particles - Ember, 
reduce animals
 2023-05-13 09:32:21 -04:00
flo666
ed260f832d add loot, reduce enemies 2023-05-13 09:32:21 -04:00
flo666
c2cf88da3d - bigger yetipit mob rooms 
- tweaks
 2023-05-13 09:32:20 -04:00
flo666
17e4af3c48 BlockKind::ArtSnow 
replace BlockKind::Snow with BlockKind::Misc
 2023-05-13 09:32:19 -04:00
flo666
25ef582f1a - sprites IceCrystal, GlowIceCrystal for yetipit 
- rough creature balance
 2023-05-13 09:32:16 -04:00
flo666
38a6cc67f9 add models: bone_door, bone_keyhole, bone_key 2023-05-13 09:31:29 -04:00
flo666
72418e6804 where possible, replace intersect(painter.cylinder with intersect(painter.aabb 2023-05-13 09:30:57 -04:00
flo666
f4c7ab16d2 outside igloo variety 2023-05-13 09:30:57 -04:00
flo666
eb269c0e89 remove without() from adlet site code 2023-05-13 09:30:56 -04:00
flo666
6668df9f08 add adlet elder 2023-05-13 09:30:56 -04:00
flo666
86803c43bf adlet tracker tweaks 2023-05-13 09:30:54 -04:00
flo666
f936c2f00e rocky yetipit entrance & AdletTrap object 2023-05-13 09:30:54 -04:00
Sam
9fbc759ccd Creature distribution 2023-05-13 09:30:52 -04:00
Sam
2e9f1edef3 Adlet AI 2023-05-13 09:30:52 -04:00
Sam
92e28f09fc Adlet abilities 2023-05-13 09:30:51 -04:00
flo666
715a0b7b20 rebase 2023-05-13 09:30:50 -04:00
flo666
1750c9a0f2 structure work 2023-05-13 09:30:48 -04:00
Sam
3557f93f1e Initial cookfires and rock and bone huts 2023-05-13 09:30:19 -04:00
Sam
60f0505e8a Initial tannery and animal pen 2023-05-13 09:30:19 -04:00
Sam
cda910468a Initial yeti pit 2023-05-13 09:30:18 -04:00
Sam
1115877f5f Initial central bonfire 2023-05-13 09:30:18 -04:00
Sam
4c67691e45 Initial speleothems 2023-05-13 09:30:17 -04:00
Sam
6f70882ffe Placeholder igloos (someone with aesthetics fix please) 2023-05-13 09:30:17 -04:00
James Melkonian
c0676a008f Add rib cage to tunnel entrance 2023-05-13 09:30:17 -04:00
Sam
a87548e8b2 Tunnel entrance 2023-05-13 09:30:16 -04:00
Sam
bd222cb1eb Walls correctly sample and handle cliffs 2023-05-13 09:30:16 -04:00
Sam
dd1d5d1c29 Wall, in progress 2023-05-13 09:30:15 -04:00
Sam
c90159840c Tunnel tweaks 2023-05-13 09:30:15 -04:00
IsseW
731195f864 Sampled caverns 2023-05-13 09:30:15 -04:00
Sam
abf3546e64 Adlets can now carve tunnels and caverns 2023-05-13 09:30:14 -04:00
Sam
76f4db6f70 Tweaked positioning of adlet sites 2023-05-13 09:30:14 -04:00
jshipsey
da3c2369e5 initial setup 2023-05-13 09:30:13 -04:00
James Hiew
3a85a8d399
Always generate at least one civilization 2023-05-11 02:15:56 +01:00
Marcel Märtens
3a19669d53 use workspace dependencies to make our life easier maintaining them :) 2023-05-10 18:16:25 +02:00
Marcel Märtens
95bca5418a update toolchain to nightly-2023-04-20 2023-05-08 18:58:54 +02:00
Corvella
6367a51fa3 Cheesing fixes mainly focused on bosses 2023-05-06 01:57:41 +00:00
Marcel Märtens
4be1e82ba9 update further dependencies 2023-05-04 23:42:05 +02:00
Marcel Märtens
27620e665b we need a new version of refinery that needs a new version of rusqlite, so update both 2023-05-04 20:53:00 +02:00
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